Commit bbe6ef88 by nanrui

gitset测试缺陷修改。

parent affacbe0
...@@ -91,26 +91,29 @@ ...@@ -91,26 +91,29 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="购汇金额" prop="bopmod.dbcgrp.bas.lcyamt"> <el-form-item label="购汇金额" prop="bopmod.dbcgrp.bas.lcyamt">
<c-input <c-input-currency-min
v-model="model.bopmod.dbcgrp.bas.lcyamt" v-model="model.bopmod.dbcgrp.bas.lcyamt"
placeholder="请输入购汇金额" placeholder="请输入购汇金额"
></c-input> class="input-currency-left"
></c-input-currency-min>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="现汇金额" prop="bopmod.dbcgrp.bas.fcyamt"> <el-form-item label="现汇金额" prop="bopmod.dbcgrp.bas.fcyamt">
<c-input <c-input-currency-min
v-model="model.bopmod.dbcgrp.bas.fcyamt" v-model="model.bopmod.dbcgrp.bas.fcyamt"
placeholder="请输入现汇金额" placeholder="请输入现汇金额"
></c-input> class="input-currency-left"
></c-input-currency-min>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="其它金额" prop="bopmod.dbcgrp.bas.othamt"> <el-form-item label="其它金额" prop="bopmod.dbcgrp.bas.othamt">
<c-input <c-input-currency-min
v-model="model.bopmod.dbcgrp.bas.othamt" v-model="model.bopmod.dbcgrp.bas.othamt"
placeholder="请输入其它金额" placeholder="请输入其它金额"
></c-input> class="input-currency-left"
></c-input-currency-min>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="14"> <c-col :span="14">
...@@ -128,14 +131,15 @@ ...@@ -128,14 +131,15 @@
<c-col :span="10"> <c-col :span="10">
<el-form-item <el-form-item
label="" label=""
label-width="10px" label-width="5px"
prop="bopmod.dbcgrp.bas.txamt" prop="bopmod.dbcgrp.bas.txamt"
> >
<c-input <c-input-currency-min
disabled disabled
v-model="model.bopmod.dbcgrp.bas.txamt" v-model="model.bopmod.dbcgrp.bas.txamt"
placeholder="请输入付款币种及金额" placeholder="请输入付款币种及金额"
></c-input> class="input-currency-left"
></c-input-currency-min>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="14"> <c-col :span="14">
...@@ -156,14 +160,15 @@ ...@@ -156,14 +160,15 @@
<c-col :span="10"> <c-col :span="10">
<el-form-item <el-form-item
label="" label=""
label-width="10px" label-width="5px"
prop="bopmod.dbcgrp.bas.actuamt" prop="bopmod.dbcgrp.bas.actuamt"
> >
<c-input <c-input-currency-min
disabled disabled
v-model="model.bopmod.dbcgrp.bas.actuamt" v-model="model.bopmod.dbcgrp.bas.actuamt"
placeholder="请输入实际付款币种及金额" placeholder="请输入实际付款币种及金额"
></c-input> class="input-currency-left"
></c-input-currency-min>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -289,14 +294,15 @@ ...@@ -289,14 +294,15 @@
<c-col :span="10"> <c-col :span="10">
<el-form-item <el-form-item
label="" label=""
label-width="10px" label-width="5px"
prop="bopmod.dbcgrp.bas.outchargeamt" prop="bopmod.dbcgrp.bas.outchargeamt"
> >
<c-input <c-input-currency-min
disabled disabled
v-model="model.bopmod.dbcgrp.bas.outchargeamt" v-model="model.bopmod.dbcgrp.bas.outchargeamt"
placeholder="请输入扣费币种及金额" placeholder="请输入扣费币种及金额"
></c-input> class="input-currency-left"
></c-input-currency-min>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
......
...@@ -91,26 +91,29 @@ ...@@ -91,26 +91,29 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="购汇金额" prop="bopmod.dbfgrp.bas.lcyamt"> <el-form-item label="购汇金额" prop="bopmod.dbfgrp.bas.lcyamt">
<c-input <c-input-currency-min
v-model="model.bopmod.dbfgrp.bas.lcyamt" v-model="model.bopmod.dbfgrp.bas.lcyamt"
placeholder="请输入购汇金额" placeholder="请输入购汇金额"
></c-input> class="input-currency-left"
></c-input-currency-min>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="现汇金额" prop="bopmod.dbfgrp.bas.fcyamt"> <el-form-item label="现汇金额" prop="bopmod.dbfgrp.bas.fcyamt">
<c-input <c-input-currency-min
v-model="model.bopmod.dbfgrp.bas.fcyamt" v-model="model.bopmod.dbfgrp.bas.fcyamt"
placeholder="请输入现汇金额" placeholder="请输入现汇金额"
></c-input> class="input-currency-left"
></c-input-currency-min>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="其它金额" prop="bopmod.dbfgrp.bas.othamt"> <el-form-item label="其它金额" prop="bopmod.dbfgrp.bas.othamt">
<c-input <c-input-currency-min
v-model="model.bopmod.dbfgrp.bas.othamt" v-model="model.bopmod.dbfgrp.bas.othamt"
placeholder="请输入其它金额" placeholder="请输入其它金额"
></c-input> class="input-currency-left"
></c-input-currency-min>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="14"> <c-col :span="14">
...@@ -128,14 +131,15 @@ ...@@ -128,14 +131,15 @@
<c-col :span="10"> <c-col :span="10">
<el-form-item <el-form-item
label="" label=""
label-width="10px" label-width="5px"
prop="bopmod.dbfgrp.bas.txamt" prop="bopmod.dbfgrp.bas.txamt"
> >
<c-input <c-input-currency-min
disabled disabled
v-model="model.bopmod.dbfgrp.bas.txamt" v-model="model.bopmod.dbfgrp.bas.txamt"
placeholder="请输入付款币种及金额" placeholder="请输入付款币种及金额"
></c-input> class="input-currency-left"
></c-input-currency-min>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="14"> <c-col :span="14">
...@@ -156,14 +160,15 @@ ...@@ -156,14 +160,15 @@
<c-col :span="10"> <c-col :span="10">
<el-form-item <el-form-item
label="" label=""
label-width="10px" label-width="5px"
prop="bopmod.dbfgrp.bas.actuamt" prop="bopmod.dbfgrp.bas.actuamt"
> >
<c-input <c-input-currency-min
disabled disabled
v-model="model.bopmod.dbfgrp.bas.actuamt" v-model="model.bopmod.dbfgrp.bas.actuamt"
placeholder="请输入实际付款币种及金额" placeholder="请输入实际付款币种及金额"
></c-input> class="input-currency-left"
></c-input-currency-min>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -289,14 +294,15 @@ ...@@ -289,14 +294,15 @@
<c-col :span="10"> <c-col :span="10">
<el-form-item <el-form-item
label="" label=""
label-width="10px" label-width="5px"
prop="bopmod.dbfgrp.bas.outchargeamt" prop="bopmod.dbfgrp.bas.outchargeamt"
> >
<c-input <c-input-currency-min
disabled disabled
v-model="model.bopmod.dbfgrp.bas.outchargeamt" v-model="model.bopmod.dbfgrp.bas.outchargeamt"
placeholder="请输入扣费币种及金额" placeholder="请输入扣费币种及金额"
></c-input> class="input-currency-left"
></c-input-currency-min>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
......
...@@ -170,10 +170,10 @@ ...@@ -170,10 +170,10 @@
</c-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-form-item label="付款行行名" prop="trnmod.cipmod.skkhhmc"> <c-form-item label="付款行行名" prop="trnmod.cipmod.fkkhmc">
<c-input <c-input
type="textarea" type="textarea"
v-model="model.trnmod.cipmod.skkhhmc" v-model="model.trnmod.cipmod.fkkhmc"
disabled disabled
maxlength="35" maxlength="35"
show-word-limit show-word-limit
...@@ -377,10 +377,12 @@ ...@@ -377,10 +377,12 @@
></c-input> ></c-input>
</c-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="24" offset="7"> <c-col :span="24">
<c-checkbox v-model="model.trnmod.cipmod.cips112" disabled <c-form-item label="">
>112cov</c-checkbox <c-checkbox v-model="model.trnmod.cipmod.covflg" class="checkbox-left" disabled
> >112cov</c-checkbox
>
</c-form-item>
</c-col> </c-col>
</c-col> </c-col>
</div> </div>
......
...@@ -472,6 +472,12 @@ ...@@ -472,6 +472,12 @@
></el-option> ></el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
<el-form-item
label=""
style="height:48px"
v-else
>
</el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item <el-form-item
......
...@@ -41,10 +41,25 @@ ...@@ -41,10 +41,25 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item <el-form-item
label="付款人名称"
prop="cnybop.spayeename"
>
<c-input
v-model="model.cnybop.spayeename"
maxlength="80"
placeholder=""
readonly
>
</c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item
label="收款人常驻国家/地区编号" label="收款人常驻国家/地区编号"
prop="cnybop.cnyout.spayercountrycode" prop="cnybop.cnyout.spayercountrycode"
> >
<c-col :span="20"> <c-fullbox>
<c-input <c-input
v-model="model.cnybop.cnyout.spayercountrycode" v-model="model.cnybop.cnyout.spayercountrycode"
maxlength="3" maxlength="3"
...@@ -53,24 +68,24 @@ ...@@ -53,24 +68,24 @@
showGridPromptDialog('cnybop.cnyout.spayercountrycode') showGridPromptDialog('cnybop.cnyout.spayercountrycode')
" "
></c-input> ></c-input>
</c-col> <template slot="footer">
<c-col :span="4" style="text-align: right"> <c-button
<c-button size="small"
size="small" style="margin-left: 10px; padding: 0 12px"
type="primary" type="primary"
icon="el-icon-search" @click="
@click=" showGridPromptDialog(
showGridPromptDialog( 'cnybop.outcty',
'cnybop.outcty', null,
null, null,
null, { TXT: 'cnybop.cnyout.spayercountrycode' },
{ TXT: 'cnybop.cnyout.spayercountrycode' }, { TXT: false },
{ TXT: false }, 'doxpDialog'
'doxpDialog' )
) "
" >?</c-button>
></c-button> </template>
</c-col> </c-fullbox>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -145,7 +160,7 @@ ...@@ -145,7 +160,7 @@
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
v-for="item in options" v-for="item in codes.infled_Cur"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -230,10 +245,10 @@ ...@@ -230,10 +245,10 @@
<el-form-item <el-form-item
label="付款人机构代码或身份证件号码" label="付款人机构代码或身份证件号码"
label-width="30%" label-width="30%"
prop="cnybop.spayeename" prop="cnybop.cnyout.spayeeorgcode"
> >
<c-input <c-input
v-model="model.cnybop.spayeename" v-model="model.cnybop.cnyout.spayeeorgcode"
maxlength="80" maxlength="80"
style="width: 100%" style="width: 100%"
placeholder="" placeholder=""
...@@ -265,7 +280,7 @@ ...@@ -265,7 +280,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item <el-form-item
label="款人名称" label="款人名称"
label-width="30%" label-width="30%"
prop="cnybop.spayername" prop="cnybop.spayername"
> >
......
...@@ -11,12 +11,12 @@ ...@@ -11,12 +11,12 @@
</el-collapse-item> </el-collapse-item>
<el-collapse-item title="CIPS" name="cips2" <el-collapse-item title="CIPS" name="cips"
v-if="model.trnmod.cmtflg == 'P'&&model.gidgrp.rec.cmtflg"> v-if="model.trnmod.cmtflg == 'P'&&model.gidgrp.rec.cmtflg">
<m-cips :model="model" :codes="codes" /> <m-cips :model="model" :codes="codes" />
</el-collapse-item> </el-collapse-item>
<el-collapse-item title="CIPS2" name="cips" <el-collapse-item title="CIPS2" name="cips2"
v-if="model.trnmod.cmtflg == 'P'&&model.gidgrp.rec.cmtflg"> v-if="model.trnmod.cmtflg == 'P'&&model.gidgrp.rec.cmtflg">
<m-cips2 :model="model" :codes="codes" /> <m-cips2 :model="model" :codes="codes" />
</el-collapse-item> </el-collapse-item>
...@@ -53,8 +53,7 @@ ...@@ -53,8 +53,7 @@
import Gitsetp from "./Gitsetp"; import Gitsetp from "./Gitsetp";
const tabNameToRulePathMapping = { const tabNameToRulePathMapping = {
"det756": "setmod.setglg.setgll(2).sespay.det756", "cips": "trnmod.cipmod.cips",
"det202cv": "setmod.setglg.setgll(2).sespay.det202"
} }
export default { export default {
...@@ -93,7 +92,11 @@ ...@@ -93,7 +92,11 @@
pa.push({ idx: i, title: '头寸调拨(MT202 ' + temp.join(' ') + ')', name: 'det202cv_' + temp.join('_'), type: '202' }) pa.push({ idx: i, title: '头寸调拨(MT202 ' + temp.join(' ') + ')', name: 'det202cv_' + temp.join('_'), type: '202' })
} }
} }
return pa if(pa.length !== 0){
tabNameToRulePathMapping[pa[0].name] = "setmod.setglg.setgll(2).sespay.det756";
tabNameToRulePathMapping[pa[1].name] = "setmod.setglg.setgll(2).sespay.det202cv";
}
return pa;
} }
}, },
methods: { methods: {
...@@ -120,8 +123,29 @@ ...@@ -120,8 +123,29 @@
}); });
} }
}, },
myTabClick(tab) {
this.tabClick(tab);
const name = tab.name;
let rulePath;
if(name === tabNameToRulePathMapping[1]){
rulePath = "setmod.setglg.setgll(2).sespay.det756"
}
if (name === tabNameToRulePathMapping[2]) {
rulePath = "setmod.setglg.setgll(2).sespay.det202cv"
}
if (!!rulePath) {
this.executeRule(rulePath).then((res) => {
if (res.respCode == SUCCESS) {
this.updateModel(res.data);
}
});
}
},
}, },
created: function () {}, created: function () {},
mounted() {
console.log(pacs);
}
}; };
</script> </script>
......
...@@ -227,6 +227,12 @@ export default { ...@@ -227,6 +227,12 @@ export default {
if (name === "cips") { if (name === "cips") {
rulePath = "trnmod.cipmod.cips" rulePath = "trnmod.cipmod.cips"
} }
// if(name === 'det756'){
// rulePath = "setmod.setglg.setgll(2).sespay.det756"
// }
// if (name === "det202cv") {
// rulePath = "setmod.setglg.setgll(2).sespay.det202cv"
// }
if (!!rulePath) { if (!!rulePath) {
this.executeRule(rulePath).then((res) => { this.executeRule(rulePath).then((res) => {
if (res.respCode == SUCCESS) { if (res.respCode == SUCCESS) {
......
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