Skip to content

V
vue-gjjs
Commit 7d80163b by wangyanjiao
Options

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… 

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
parents 23987531 5ad1c701
Showing with 221 additions and 107 deletions
src/config/CodeTable/index.js
...@@ -106,7 +106,7 @@ const CodeTable = { ...@@ -106,7 +106,7 @@ const CodeTable = {
{ label: "系统外还款", value: "1" }, { label: "系统外还款", value: "1" },
{ label: "正常还款", value: "0" }, { label: "正常还款", value: "0" },
], ],
acttyp1: [ acttyp0: [
{ label: "境外", value: "(JW)" }, { label: "境外", value: "(JW)" },
{ label: "境内非居民", value: "(JN)" }, { label: "境内非居民", value: "(JN)" },
], ],
...@@ -3413,7 +3413,7 @@ const CodeTable = { ...@@ -3413,7 +3413,7 @@ const CodeTable = {
{ label: "Wait for Response", value: "W" }, { label: "Wait for Response", value: "W" },
{ label: "Send Documents", value: "C" }, { label: "Send Documents", value: "C" },
{ label: "Accept/ Settle Document now", value: "A" }, { label: "Accept/ Settle Document now", value: "A" },
{ label: "Send and Accept/ Settle Documents", value: "B" }, { label: "Send and Accept/ Settle Documents", value: "B" },
], ],
fpdsta: [ fpdsta: [
{ label: "Agreement Under Negotiation", value: "N" }, { label: "Agreement Under Negotiation", value: "N" },
...@@ -4043,7 +4043,6 @@ const CodeTable = { ...@@ -4043,7 +4043,6 @@ const CodeTable = {
{ label: "1st Third Party .", value: "TP1" }, { label: "1st Third Party .", value: "TP1" },
{ label: "2nd Third Party", value: "TP2" }, { label: "2nd Third Party", value: "TP2" },
{ label: "3rd Third Party", value: "TP3" }, { label: "3rd Third Party", value: "TP3" },
{ label: "4th Third Party", value: "TP4" }, { label: "4th Third Party", value: "TP4" },
{ label: "5th Third Party", value: "TP5" }, { label: "5th Third Party", value: "TP5" },
{ label: "6th Third Party", value: "TP6" }, { label: "6th Third Party", value: "TP6" },
...@@ -4066,8 +4065,37 @@ const CodeTable = { ...@@ -4066,8 +4065,37 @@ const CodeTable = {
{ label: "TP7 Third Party", value: "TP7" }, { label: "TP7 Third Party", value: "TP7" },
{ label: "TP8 Third Party", value: "TP8" }, { label: "TP8 Third Party", value: "TP8" },
], ],
searol: [
{ label: "Correspondent Bank", value: "AGB" },
{ label: "Agent", value: "AGT" },
{ label: "2nd Collecting Bank", value: "CO2" },
{ label: "Drawee (DRE)", value: "DRE" },
{ label: "Drawer", value: "DRR" },
{ label: "Old Account Party", value: "OAP" },
{ label: "Remitting Bank", value: "RMI" },
{ label: "Carrier (ROG)", value: "ROG" },
],
searol1: [
{ label: "2nd Collecting Bank", value: "CO2" },
{ label: "Collecting Bank", value: "COL" },
{ label: "Drawee (DRE)", value: "DRE" },
{ label: "Drawer", value: "DRR" },
{ label: "Old Account Party", value: "OAP" },
{ label: "Remitting Bank", value: "RMI" },
{ label: "Receiver of 2nd mail", value: "RSM" },
{ label: "Third Party", value: "TPO" },
{ label: "1st Third Party .", value: "TP1" },
{ label: "2nd Third Party", value: "TP2" },
{ label: "3rd Third Party", value: "TP3" },
{ label: "4th Third Party", value: "TP4" },
{ label: "5th Third Party", value: "TP5" },
{ label: "6th Third Party", value: "TP6" },
{ label: "7th Third Party", value: "TP7" },
{ label: "8th Third Party", value: "TP8" },
{ label: "9th Third Party", value: "TP9" },
],
// lcrtyp: [ // lcrtyp: [
// { label: "可转让", value: "IT" }, // { label: "可转让", value: "IT" },
// { label: "不可转让", value: "I" }, // { label: "不可转让", value: "I" },
...@@ -4400,11 +4428,11 @@ const CodeTable = { ...@@ -4400,11 +4428,11 @@ const CodeTable = {
{ label: "Beneficiary", value: "BEN" }, { label: "Beneficiary", value: "BEN" },
{ label: "Presenter(PRP)", value: "PRB" }, { label: "Presenter(PRP)", value: "PRB" },
], ],
// payrol1:[ // payrol1:[
// {label:"Applicant : TG3131232121",value:"1"}, // {label:"Applicant : TG3131232121",value:"1"},
// {label:"Issuing Bank : CHINA EVERBRIGHT BANK",value:"2"}, // {label:"Issuing Bank : CHINA EVERBRIGHT BANK",value:"2"},
// {label:"other paying party",value:"3"} // {label:"other paying party",value:"3"}
// ], // ],
mhtyp: [ mhtyp: [
{ label: "更换单据", value: "A" }, { label: "更换单据", value: "A" },
...@@ -6915,14 +6943,14 @@ const CodeTable = { ...@@ -6915,14 +6943,14 @@ const CodeTable = {
gtxinr3: [ gtxinr3: [
{ label: "blank text", value: "" }, { label: "blank text", value: "" },
], ],
ctytxt1:[ ctytxt1: [
{label:"CN People's Republic of China",value:"CN"}, { label: "CN People's Republic of China", value: "CN" },
{label:"HK HONG KONG",value:"HK"}, { label: "HK HONG KONG", value: "HK" },
{label:"GB Great Britain",value:"GB"}, { label: "GB Great Britain", value: "GB" },
], ],
trndoc_advdoc:[ trndoc_advdoc: [
{label:"经核验，证实电相符/印鉴相符。",value:""}, { label: "经核验，证实电相符/印鉴相符。", value: "" },
{label:"信用证真实性待核实。",value:"2"}, { label: "信用证真实性待核实。", value: "2" },
], ],
} }
export default CodeTable; export default CodeTable;
src/model/Betrcl/Pattern.js
...@@ -109,7 +109,7 @@ export default { ...@@ -109,7 +109,7 @@ export default {
"payinstxt": [ "payinstxt": [
{ type: "string", required: false, message: "必输项" }, { type: "string", required: false, message: "必输项" },
{ max: 65, message: "长度不能超过65" } { type: "string",max: 300, message: "长度不能超过300" }
], ],
"bedgrp.rec.lescom": [ "bedgrp.rec.lescom": [
{ type: "string", required: false, message: "必输项" }, { type: "string", required: false, message: "必输项" },
......
src/model/Betset/Pattern.js
...@@ -18,7 +18,7 @@ export default { ...@@ -18,7 +18,7 @@ export default {
"ledgrp.cbs.opn1.amt": [ "ledgrp.cbs.opn1.amt": [
{ type: "string", required: false, message: "必输项" }, { type: "string", required: false, message: "必输项" },
{ max: 18, message: "整数位不能超过14位" }, { max: 18, message: "整数位不能超过14位" },
{ pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } { pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
"betp.recget.sdamod.dadsnd": [ "betp.recget.sdamod.dadsnd": [
{ type: "string", required: false, message: "必输项" }, { type: "string", required: false, message: "必输项" },
......
src/model/Botpay/index.js
...@@ -5,10 +5,6 @@ import Pub from "../Public" ...@@ -5,10 +5,6 @@ import Pub from "../Public"
export default class Botpay { export default class Botpay {
constructor() { constructor() {
this.data = { this.data = {
// addbcbl1blk: "",
// litbenl1blk: "",
// litapll1blk: "",
// litrmbl1blk: "",
bodgrp: { bodgrp: {
rec: { rec: {
matpertyp: "", // Days/Months or Years for Maturity Period .bodgrp.rec.matpertyp matpertyp: "", // Days/Months or Years for Maturity Period .bodgrp.rec.matpertyp
......
src/model/Infbcd/Event.js
...@@ -216,14 +216,14 @@ export default { ...@@ -216,14 +216,14 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败！' }); this.$notify.error({ title: '错误', message: '服务请求失败！' });
} }
}, },
handleReset() { async handleReset() {
this.model.infcon.seaownref = "" this.model.infcon.seaownref = ""
this.model.infcon.opndatfrom = new Date(); this.model.infcon.opndatfrom = new Date();
this.model.infcon.opndatto = new Date(); this.model.infcon.opndatto = new Date();
this.model.infcon.searef = ""; this.model.infcon.searef = "";
this.model.infcon.pty.extkey = ""; this.model.infcon.pty.extkey = "";
this.model.infcon.usr.extkey = ""; this.model.infcon.usr.extkey = "";
this.model.infcon.payrol = ""; this.model.infcon.searol = "";
this.model.infcon.pty.nam = ""; this.model.infcon.pty.nam = "";
this.model.infcon.seapty = ""; this.model.infcon.seapty = "";
this.model.infcon.curtxt1 = ""; this.model.infcon.curtxt1 = "";
......
src/model/Infbod/Event.js
...@@ -206,14 +206,14 @@ export default { ...@@ -206,14 +206,14 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败！' }); this.$notify.error({ title: '错误', message: '服务请求失败！' });
} }
}, },
handleReset() { async handleReset() {
this.model.infcon.seaownref = "" this.model.infcon.seaownref = ""
this.model.infcon.opndatfrom = new Date(); this.model.infcon.opndatfrom = new Date();
this.model.infcon.opndatto = new Date(); this.model.infcon.opndatto = new Date();
this.model.infcon.searef = ""; this.model.infcon.searef = "";
this.model.infcon.pty.extkey = ""; this.model.infcon.pty.extkey = "";
this.model.infcon.usr.extkey = ""; this.model.infcon.usr.extkey = "";
this.model.infcon.payrol = ""; this.model.infcon.searol = "";
this.model.infcon.pty.nam = ""; this.model.infcon.pty.nam = "";
this.model.infcon.seapty = ""; this.model.infcon.seapty = "";
this.model.infcon.curtxt1 = ""; this.model.infcon.curtxt1 = "";
......
src/model/Infbod/index.js
...@@ -102,6 +102,7 @@ export default class Infbod { ...@@ -102,6 +102,7 @@ export default class Infbod {
wairmtcod: "", // Waive Remitting Bank Charges .bodgrp.rec.wairmtcod wairmtcod: "", // Waive Remitting Bank Charges .bodgrp.rec.wairmtcod
othins: "", // Defer Payment until .bodgrp.rec.othins othins: "", // Defer Payment until .bodgrp.rec.othins
lescom: "", // Warehouse/Insurance .bodgrp.rec.lescom lescom: "", // Warehouse/Insurance .bodgrp.rec.lescom
inr: ""
}, },
cbs: { cbs: {
max: { max: {
......
src/model/Letdrv/Default.js
...@@ -63,5 +63,6 @@ export default { ...@@ -63,5 +63,6 @@ export default {
"mtabut.coninf.conexedat" :Utils.defaultFunction, "mtabut.coninf.conexedat" :Utils.defaultFunction,
"ledgrp.rec.ownref" :Utils.defaultFunction, "ledgrp.rec.ownref" :Utils.defaultFunction,
"ledgrp.rec.redclsflg" :Utils.defaultFunction, "ledgrp.rec.redclsflg" :Utils.defaultFunction,
"bedgrp.rec.nam" :Utils.defaultFunction,
} }
//你可以添加自动default处理 //你可以添加自动default处理
src/views/Business/Betrcl/Rclp.vue
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
disabled disabled
> >
<el-option <el-option
v-for="item in codes.docsta1" v-for="item in codes.docsta"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -330,6 +330,9 @@ ...@@ -330,6 +330,9 @@
v-model="model.aamset.utlamt" v-model="model.aamset.utlamt"
placeholder="Please input Doc. Amount Part" placeholder="Please input Doc. Amount Part"
disabled disabled
@change="eventFunction(
'aamset.utlamt'
)"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -352,6 +355,9 @@ ...@@ -352,6 +355,9 @@
v-model="model.aamset.utlamt2" v-model="model.aamset.utlamt2"
placeholder="Please input Add. Amount Part" placeholder="Please input Add. Amount Part"
disabled disabled
@change="eventFunction(
'aamset.utlamt2'
)"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -383,7 +389,7 @@ ...@@ -383,7 +389,7 @@
v-model="model.trnmod.trndoc.nar754" v-model="model.trnmod.trndoc.nar754"
maxlength="35" maxlength="35"
show-word-limit show-word-limit
placeholder="Please input Narrative :77A:'" placeholder="Please input Narrative :77A:"
></c-input> ></c-input>
</c-form-item> </c-form-item>
</c-col> </c-col>
...@@ -400,7 +406,7 @@ ...@@ -400,7 +406,7 @@
<c-input <c-input
type="textarea" type="textarea"
v-model="model.payinstxt" v-model="model.payinstxt"
maxlength="65" maxlength="300"
show-word-limit show-word-limit
placeholder="Please input Payment instructions to ISS/AVB" placeholder="Please input Payment instructions to ISS/AVB"
></c-input> ></c-input>
...@@ -409,6 +415,7 @@ ...@@ -409,6 +415,7 @@
style="margin-left: 10px; padding: 0 10px" style="margin-left: 10px; padding: 0 10px"
size="small" size="small"
type="primary" type="primary"
@click="showGridPromptDialog('payins.buttxmsel',null,null,{TXT:'payinstxt'},{TXT:false},'doxpDialog')"
> >
... ...
</c-button> </c-button>
......
src/views/Business/Betrcl/Remp.vue
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
@change="selectOrCheckboxRule('rmbclm.rmbrol')" @change="selectOrCheckboxRule('rmbclm.rmbrol')"
> >
<el-option <el-option
v-for="item in codes.payrol" v-for="item in codes.rolall"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -30,10 +30,12 @@ ...@@ -30,10 +30,12 @@
rol: 'rmbrmb', rol: 'rmbrmb',
}" }"
:noRef="false" :noRef="false"
:disabled="true"
:isAdrblk="true" :isAdrblk="true"
:disabled="true"
@onSeainf="onSeainf" @onSeainf="onSeainf"
@onAplpDet="onBenpDet" @onAplpDet="onBenpDet"
:disabledRef="rmbrolFlag"
:disabledExtkey="rmbrolFlag"
> >
</c-ptap> </c-ptap>
</c-col> </c-col>
...@@ -285,6 +287,16 @@ export default { ...@@ -285,6 +287,16 @@ export default {
data() { data() {
return {}; return {};
}, },
computed:{
rmbrolFlag: {
get() {
return (
this.model.rmbclm.rmbrol == 'AVB' ||
this.model.rmbclm.rmbrol == 'ISS'
)
},
},
},
methods: { ...Event }, methods: { ...Event },
created: function () {}, created: function () {},
}; };
......
src/views/Business/Betrcl/index.vue
...@@ -67,6 +67,13 @@ ...@@ -67,6 +67,13 @@
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
</el-form> </el-form>
<c-grid-ety-prompt-dialog
ref="doxpDialog"
:isPty="false"
:promptData="promptData"
@select-ety="selectMsg"
>
</c-grid-ety-prompt-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -133,7 +140,9 @@ export default { ...@@ -133,7 +140,9 @@ export default {
let rtnmsg = await this.init({}); let rtnmsg = await this.init({});
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
this.updateModel(rtnmsg.data); this.updateModel(rtnmsg.data);
console.log(this.$refs.rclp); if (this.isInDisplay) {
this.restoreDisplay();
}
this.$refs.rclp.$refs.table.$refs.table.toggleAllSelection(); this.$refs.rclp.$refs.table.$refs.table.toggleAllSelection();
//TODO 处理数据逻辑 //TODO 处理数据逻辑
} else { } else {
......
src/views/Business/Betset/Cnyp.vue
...@@ -58,10 +58,6 @@ ...@@ -58,10 +58,6 @@
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col>
<!-- right -->
<c-col :span="11" :offset="1">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="是否报送跨境人民币2106表" prop="cnybop.libflg"> <el-form-item label="是否报送跨境人民币2106表" prop="cnybop.libflg">
<c-select <c-select
......
src/views/Business/Betset/Docpan1.vue
...@@ -16,6 +16,16 @@ ...@@ -16,6 +16,16 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24">
<el-form-item label="Declaration Number" prop="lendoc.decnum">
<c-input
v-model="model.lendoc.decnum"
maxlength="22"
placeholder="Please input Declaration Number"
></c-input>
</el-form-item>
</c-col>
</c-col> </c-col>
<!-- right --> <!-- right -->
...@@ -40,16 +50,6 @@ ...@@ -40,16 +50,6 @@
</c-fullbox> </c-fullbox>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24">
<el-form-item label="Declaration Number" prop="lendoc.decnum">
<c-input
v-model="model.lendoc.decnum"
maxlength="22"
placeholder="Please input Declaration Number"
></c-input>
</el-form-item>
</c-col>
</c-col> </c-col>
<!-- <c-col :span="12"> <!-- <c-col :span="12">
......
src/views/Business/Betset/Wg.vue
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
:disabled="!(this.model.bopmod.szflg == '1')" :disabled="!(this.model.bopmod.szflg == '1')"
> >
<el-option <el-option
v-for="item in codes.acttyp" v-for="item in codes.acttyp0"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -51,9 +51,7 @@ ...@@ -51,9 +51,7 @@
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col>
<!-- right -->
<c-col :span="11" :offset="1">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="地区机构号" prop="bopmod.ownextkey"> <el-form-item label="地区机构号" prop="bopmod.ownextkey">
<c-select <c-select
...@@ -69,20 +67,23 @@ ...@@ -69,20 +67,23 @@
<c-col :span="24"> <c-col :span="24">
<c-col :span="12"> <c-col :span="12">
<el-form-item label="国外银行扣费（涉外收入申报专用）" prop="bopmod.outchargeccy"> <el-form-item
label="国外银行扣费（涉外收入申报专用）"
prop="bopmod.outchargeccy"
>
<c-select <c-select
v-model="model.bopmod.outchargeccy" v-model="model.bopmod.outchargeccy"
placeholder="请选择国外银行扣费（涉外收入申报专用）" placeholder="请选择国外银行扣费（涉外收入申报专用）"
disabled disabled
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
v-for="item in codes.curtxt1" v-for="item in codes.curtxt1"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
> >
</el-option> </el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -91,12 +92,18 @@ ...@@ -91,12 +92,18 @@
<c-input <c-input
v-model="model.bopmod.outchargeamt" v-model="model.bopmod.outchargeamt"
placeholder="请输入国外银行扣费（涉外收入申报专用）" placeholder="请输入国外银行扣费（涉外收入申报专用）"
:disabled="!(this.model.bopmod.szflg == '1' && this.model.bopmod.basflg!='')" :disabled="
!(
this.model.bopmod.szflg == '1' &&
this.model.bopmod.basflg != ''
)
"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
</c-col> </c-col>
<!-- <c-col :span="12"> <!-- <c-col :span="12">
<c-checkbox v-model="model.bopmod.basflg">基础数据</c-checkbox> <c-checkbox v-model="model.bopmod.basflg">基础数据</c-checkbox>
</c-col> </c-col>
...@@ -157,19 +164,18 @@ export default { ...@@ -157,19 +164,18 @@ export default {
data() { data() {
return {}; return {};
}, },
computed:{ computed: {
basflg:{ basflg: {
get(){ get() {
console.log(this.model.bopmod.szflg == "1") console.log(this.model.bopmod.szflg == "1");
if(this.model.bopmod.szflg == "1" || this.model.bopmod.szflg == "2"){ if (this.model.bopmod.szflg == "1" || this.model.bopmod.szflg == "2") {
return this.model.bopmod.basflg != "" return this.model.bopmod.basflg != "";
} }
}, },
set(val){ set(val) {
this.model.bopmod.basflg = val ? "X":""; this.model.bopmod.basflg = val ? "X" : "";
} },
} },
}, },
methods: { ...Event }, methods: { ...Event },
created: function () {}, created: function () {},
......
src/views/Business/Betset/index.vue
...@@ -152,6 +152,10 @@ export default { ...@@ -152,6 +152,10 @@ export default {
if(rtnmsg.respCode == SUCCESS) if(rtnmsg.respCode == SUCCESS)
{ {
this.updateModel(rtnmsg.data) this.updateModel(rtnmsg.data)
console.log(this.$refs.setp)
if(this.isInDisplay){
this.restoreDisplay();
}
this.$refs.setp.$refs.table.$refs.table.toggleAllSelection(); this.$refs.setp.$refs.table.$refs.table.toggleAllSelection();
//TODO 处理数据逻辑 //TODO 处理数据逻辑
......
src/views/Business/Botacc/Inst.vue
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<c-input type="textarea" v-model="model.bodgrp.blk.colins" maxlength="65" show-word-limit <c-input type="textarea" v-model="model.bodgrp.blk.colins" maxlength="65" show-word-limit
placeholder="请输入Collection Instructions" disabled></c-input> placeholder="请输入Collection Instructions" disabled></c-input>
<template slot="footer"> <template slot="footer">
<c-button size="small" type="primary"> <c-button size="small" type="primary" disabled>
... ...
</c-button> </c-button>
</template> </template>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
placeholder="请输入Draft Instructions" disabled> placeholder="请输入Draft Instructions" disabled>
</c-input> </c-input>
<template slot="footer"> <template slot="footer">
<c-button size="small" type="primary"> <c-button size="small" type="primary" disabled>
... ...
</c-button> </c-button>
</template> </template>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<c-input type="textarea" v-model="model.bodgrp.blk.proins" maxlength="65" show-word-limit <c-input type="textarea" v-model="model.bodgrp.blk.proins" maxlength="65" show-word-limit
placeholder="请输入Protest Instructions" disabled></c-input> placeholder="请输入Protest Instructions" disabled></c-input>
<template slot="footer"> <template slot="footer">
<c-button size="small" type="primary"> <c-button size="small" type="primary" disabled>
... ...
</c-button> </c-button>
</template> </template>
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
<c-input type="textarea" v-model="model.bodgrp.blk.othins" maxlength="65" show-word-limit <c-input type="textarea" v-model="model.bodgrp.blk.othins" maxlength="65" show-word-limit
placeholder="请输入Other Instructions" disabled></c-input> placeholder="请输入Other Instructions" disabled></c-input>
<template slot="footer"> <template slot="footer">
<c-button size="small" type="primary"> <c-button size="small" type="primary" disabled>
... ...
</c-button> </c-button>
</template> </template>
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
<c-input type="textarea" v-model="model.bodgrp.blk.delins" maxlength="65" show-word-limit <c-input type="textarea" v-model="model.bodgrp.blk.delins" maxlength="65" show-word-limit
placeholder="请输入Warehouse/Insurance Instructions" disabled></c-input> placeholder="请输入Warehouse/Insurance Instructions" disabled></c-input>
<template slot="footer"> <template slot="footer">
<c-button size="small" type="primary"> <c-button size="small" type="primary" disabled>
... ...
</c-button> </c-button>
</template> </template>
......
src/views/Business/Botpay/Inst.vue
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<c-input type="textarea" v-model="model.bodgrp.blk.colins" maxlength="65" show-word-limit <c-input type="textarea" v-model="model.bodgrp.blk.colins" maxlength="65" show-word-limit
placeholder="请输入Collection Instructions" disabled></c-input> placeholder="请输入Collection Instructions" disabled></c-input>
<template slot="footer"> <template slot="footer">
<c-button size="small" type="primary"> <c-button size="small" type="primary" disabled>
... ...
</c-button> </c-button>
</template> </template>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
placeholder="请输入Draft Instructions" disabled> placeholder="请输入Draft Instructions" disabled>
</c-input> </c-input>
<template slot="footer"> <template slot="footer">
<c-button size="small" type="primary"> <c-button size="small" type="primary" disabled>
... ...
</c-button> </c-button>
</template> </template>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<c-input type="textarea" v-model="model.bodgrp.blk.proins" maxlength="65" show-word-limit <c-input type="textarea" v-model="model.bodgrp.blk.proins" maxlength="65" show-word-limit
placeholder="请输入Protest Instructions" disabled></c-input> placeholder="请输入Protest Instructions" disabled></c-input>
<template slot="footer"> <template slot="footer">
<c-button size="small" type="primary"> <c-button size="small" type="primary" disabled>
... ...
</c-button> </c-button>
</template> </template>
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
<c-input type="textarea" v-model="model.bodgrp.blk.othins" maxlength="65" show-word-limit <c-input type="textarea" v-model="model.bodgrp.blk.othins" maxlength="65" show-word-limit
placeholder="请输入Other Instructions" disabled></c-input> placeholder="请输入Other Instructions" disabled></c-input>
<template slot="footer"> <template slot="footer">
<c-button size="small" type="primary"> <c-button size="small" type="primary" disabled>
... ...
</c-button> </c-button>
</template> </template>
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
<c-input type="textarea" v-model="model.bodgrp.blk.delins" maxlength="65" show-word-limit <c-input type="textarea" v-model="model.bodgrp.blk.delins" maxlength="65" show-word-limit
placeholder="请输入Warehouse/Insurance Instructions" disabled></c-input> placeholder="请输入Warehouse/Insurance Instructions" disabled></c-input>
<template slot="footer"> <template slot="footer">
<c-button size="small" type="primary"> <c-button size="small" type="primary" disabled>
... ...
</c-button> </c-button>
</template> </template>
......
src/views/Business/Infbcd/Infsea.vue
...@@ -66,10 +66,8 @@ ...@@ -66,10 +66,8 @@
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item label="Role" prop="infcon.searol" style="width: 100%"> <el-form-item label="Role" prop="infcon.searol" style="width: 100%">
<!-- <c-select v-model="model.infcon.searol" style="width: 100%" placeholder="请选择Role"> <c-select v-model="model.infcon.searol" style="width: 100%" placeholder="请选择Role">
</c-select> --> <el-option v-for="item in codes.searol" :key="item.value" :label="item.label" :value="item.value">
<c-select v-model="model.infcon.payrol" style="width: 100%" placeholder="请选择Role">
<el-option v-for="item in codes.payrol" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -277,23 +275,23 @@ export ...@@ -277,23 +275,23 @@ export
stmData: { stmData: {
columns: [ columns: [
"1 1 \"Reference\" 150", "1 1 \"Reference\" 150",
"2 2 \"Resp. User\" 100", "2 2 \"Resp. User\" 120",
"3 3 \"Opened\" 150 4 7", "3 3 \"Opened\" 150 4 7",
"4 4 \"Closed\" 150 4 7", "4 4 \"Closed\" 150 4 7",
"5 5 \"Goods Code\" 130 1 0 1 GODCOD", "5 5 \"Goods Code\" 130 1 0 1 GODCOD",
"6 6\"分行名称\" 136", "6 6 \"分行名称\" 170",
"7 7 \"Pta.No\" 130", "7 7 \"Pta.No\" 130",
"8 8 \"Drawee Party Number\" 150", "8 8 \"Drawee Party Number\" 170",
"9 9 \"Drawee\" 300", "9 9 \"Drawee\" 300",
"10 10 \"Drawee CN\" 130", "10 10 \"Drawee CN\" 130",
"11 11 \"Drawer Party Number\" 150", "11 11 \"Drawer Party Number\" 170",
"12 12 \"Drawer\" 100", "12 12 \"Drawer\" 100",
"13 13 \"Remitting Bank Party Number\" 200", "13 13 \"Remitting Bank Party Number\" 220",
"14 14 \"Remitting Bank\" 200", "14 14 \"Remitting Bank\" 200",
"15 15 \"Doc.Amount Cur\" 130", "15 15 \"Doc.Amount Cur\" 150",
"16 16 \"Doc.Amount\" 100 2 8 1 15", "16 16 \"Doc.Amount\" 120 2 8 1 15",
"17 17 \"Open Amount Cur\" 130", "17 17 \"Open Amount Cur\" 150",
"18 18 \"Open Amount\" 100 2 8 1 17", "18 18 \"Open Amount\" 130 2 8 1 17",
], ],
data: [] data: []
......
src/views/Business/Infbod/Infsea.vue
...@@ -66,8 +66,8 @@ ...@@ -66,8 +66,8 @@
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item label="Role" prop="infcon.searol" style="width: 100%"> <el-form-item label="Role" prop="infcon.searol" style="width: 100%">
<c-select v-model="model.infcon.payrol" style="width: 100%" placeholder="请选择Role"> <c-select v-model="model.infcon.searol" style="width: 100%" placeholder="请选择Role">
<el-option v-for="item in codes.payrol" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in codes.searol1" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -243,7 +243,7 @@ ...@@ -243,7 +243,7 @@
<m-busbtn ref="childs" :ownref="ownref" :model="BotselModel" ownrefPath="bodgrp" trnCode="botsel" <m-busbtn ref="childs" :ownref="ownref" :model="BotselModel" ownrefPath="bodgrp" trnCode="botsel"
@onChoose="onChoose">11</m-busbtn> @onChoose="onChoose">11</m-busbtn>
</div> </div>
</template> </template>
<script> <script>
import Api from "~/service/Api"; import Api from "~/service/Api";
...@@ -281,23 +281,23 @@ export default { ...@@ -281,23 +281,23 @@ export default {
stmData: { stmData: {
columns: [ columns: [
'1 1 "Reference" 150', '1 1 "Reference" 150',
'2 2 "Resp. User" 100', '2 2 "Resp. User" 120',
'3 3 "Opened" 150 4 7', '3 3 "Opened" 150 4 7',
'4 4 "Closed" 150 4 7', '4 4 "Closed" 150 4 7',
'5 5 "分行名称" 200', '5 5 "分行名称" 200',
'6 6 "Drawee Party Number" 150', '6 6 "Drawee Party Number" 170',
'7 7 "Drawee" 133', '7 7 "Drawee" 133',
'8 8 "PTA NO." 100', '8 8 "PTA NO." 100',
'9 9 "Drawer Party Number" 150', '9 9 "Drawer Party Number" 170',
'10 10 "Drawer" 300', '10 10 "Drawer" 300',
'11 11 "Invoice No." 133', '11 11 "Invoice No." 133',
'12 12 "Drawer CN" 150', '12 12 "Drawer CN" 150',
'13 13 "Collecting Party Number" 200', '13 13 "Collecting Party Number" 200',
'14 14 "Collecting Bank" 200', '14 14 "Collecting Bank" 200',
'15 15 "Doc.Amount Cur" 130', '15 15 "Doc.Amount Cur" 150',
'16 16 "Doc.Amount" 100 2 8 1 15', '16 16 "Doc.Amount" 120 2 8 1 15',
'17 17 "Open Amount Cur" 130', '17 17 "Open Amount Cur" 150',
'18 18 "Open Amount" 100 2 8 1 -1' '18 18 "Open Amount" 130 2 8 1 -1'
], ],
data: [], data: [],
}, },
......
src/views/Business/Letdrv/Drv.vue
...@@ -471,7 +471,7 @@ ...@@ -471,7 +471,7 @@
@change="selectOrCheckboxRule('bedgrp.rec.docprbrol')" @change="selectOrCheckboxRule('bedgrp.rec.docprbrol')"
> >
<el-option <el-option
v-for="item in codes.docprbrol" v-for="item in codes.docprbrol0"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -490,8 +490,9 @@ ...@@ -490,8 +490,9 @@
rol: 'prb', rol: 'prb',
}" }"
:noRef="false" :noRef="false"
:disabled="true" :disabled="!(model.bedgrp.rec.docprbrol=='PRB')"
:isAdrblk="true" :isAdrblk="true"
:disabledExtkey="model.bedgrp.rec.docprbrol=='BEN'"
@onSeainf="onSeainf" @onSeainf="onSeainf"
@onAplpDet="onBenpDet" @onAplpDet="onBenpDet"
> >
......
src/views/Business/Letdrv/Dscins.vue
...@@ -171,8 +171,10 @@ ...@@ -171,8 +171,10 @@
rol: 'oth', rol: 'oth',
}" }"
:noRef="false" :noRef="false"
:disabled="true" :disabled="!(model.bedgrp.rec.payrol=='OTH')"
:isAdrblk="true" :isAdrblk="true"
:disabledRef="payrolFlag"
:disabledExtkey="payrolFlag"
@onSeainf="onSeainf" @onSeainf="onSeainf"
@onAplpDet="onBenpDet" @onAplpDet="onBenpDet"
> >
...@@ -512,6 +514,11 @@ export default { ...@@ -512,6 +514,11 @@ export default {
this.model.bedgrp.blk.docdisflg = val ? "X" : ""; this.model.bedgrp.blk.docdisflg = val ? "X" : "";
}, },
}, },
payrolFlag:{
get() {
return this.model.bedgrp.rec.payrol == "AVB"||this.model.bedgrp.rec.payrol == "ISS";
},
}
}, },
methods: { methods: {
...Event, ...Event,
......
src/views/Business/Letdrv/index.vue
...@@ -68,6 +68,12 @@ ...@@ -68,6 +68,12 @@
</c-tabs> </c-tabs>
</el-form> </el-form>
<c-grid-ety-prompt-dialog <c-grid-ety-prompt-dialog
ref="etyDialog"
:promptData="promptData"
v-on:select-ety="selectEty"
>
</c-grid-ety-prompt-dialog>
<c-grid-ety-prompt-dialog
ref="doxpDialog" ref="doxpDialog"
:isPty="false" :isPty="false"
:promptData="promptData" :promptData="promptData"
......
src/views/Review/Business/ReviewBetrcl.vue 0 → 100644
<template>
<ReviewWrapper>
<Betrcl></Betrcl>
</ReviewWrapper>
</template>
<script>
import Betrcl from "~/views/Business/Betrcl";
import { ReviewWrapper } from "~/components/gj-common.min.js";
export default {
name: "ReviewBetrcl",
components: { ReviewWrapper, Betrcl },
created() {},
mounted() {},
};
</script>
<style></style>
src/views/Review/Business/ReviewBetset.vue 0 → 100644
<template>
<ReviewWrapper>
<Betset></Betset>
</ReviewWrapper>
</template>
<script>
import Betset from "~/views/Business/Betset";
import { ReviewWrapper } from "~/components/gj-common.min.js";
export default {
name: "ReviewBetset",
components: { ReviewWrapper, Betset },
created() {},
mounted() {},
};
</script>
<style></style>
src/views/Review/ReviewRouter.js
...@@ -34,6 +34,8 @@ import ReviewLetdrv from "./Business/ReviewLetdrv.vue"; ...@@ -34,6 +34,8 @@ import ReviewLetdrv from "./Business/ReviewLetdrv.vue";
import ReviewBetacc from "./Business/ReviewBetacc.vue"; import ReviewBetacc from "./Business/ReviewBetacc.vue";
import ReviewDitame from "./Business/ReviewDitame.vue"; import ReviewDitame from "./Business/ReviewDitame.vue";
import ReviewLetrsv from "./Business/ReviewLetrsv.vue"; import ReviewLetrsv from "./Business/ReviewLetrsv.vue";
import ReviewBetrcl from "./Business/ReviewBetrcl.vue";
import ReviewBetset from "./Business/ReviewBetset.vue";
const ReviewRouter = [ const ReviewRouter = [
...@@ -90,6 +92,8 @@ const ReviewRouter = [ ...@@ -90,6 +92,8 @@ const ReviewRouter = [
{ path: "betacc", component: ReviewBetacc, name: "ReviewBetacc", meta: { title: "复核-Betacc" } }, { path: "betacc", component: ReviewBetacc, name: "ReviewBetacc", meta: { title: "复核-Betacc" } },
{ path: "ditame", component: ReviewDitame, name: "ReviewDitame", meta: { title: "复核-Ditame" } }, { path: "ditame", component: ReviewDitame, name: "ReviewDitame", meta: { title: "复核-Ditame" } },
{ path: "letrsv", component: ReviewLetrsv, name: "ReviewLetrsv", meta: { title: "复核-Letrsv" } }, { path: "letrsv", component: ReviewLetrsv, name: "ReviewLetrsv", meta: { title: "复核-Letrsv" } },
{ path: "betrcl", component: ReviewBetrcl, name: "ReviewBetrcl", meta: { title: "复核-Betrcl" } },
{ path: "betset", component: ReviewBetset, name: "ReviewBetset", meta: { title: "复核-Betset" } },
]; ];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment