Skip to content

V
vue-gjjs
Commit 5bc0fce1 by zhujiazhan
Options

Brtset、Cptopn交易BUG修改

parent c8aba79c
Showing with 164 additions and 57 deletions
src/model/Cptopn/Pattern.js
...@@ -139,7 +139,7 @@ export default { ...@@ -139,7 +139,7 @@ export default {
], ],
"cpdgrp.snd.pts.adrblk":[ "cpdgrp.snd.pts.adrblk":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 35,message:"长度不能超过35"}
], ],
"cpdgrp.snd.dbfadrblkcn":[ "cpdgrp.snd.dbfadrblkcn":[
......
src/views/Business/Brtset/Utlp.vue
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="远期单据到期日" prop="matp.matinf"> <el-form-item label="远期单据到期日" prop="brdgrp.rec.matdat">
<c-date-picker type="date" v-model="model.brdgrp.rec.matdat" style="width:100%" placeholder="请选择到单日期" disabled></c-date-picker> <c-date-picker type="date" v-model="model.brdgrp.rec.matdat" style="width:100%" placeholder="请选择到单日期" disabled></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
</c-col> </c-col>
<c-col :span="11"> <c-col :span="11">
<el-form-item label="" prop="aamset.utlamt" label-width="5px"> <el-form-item label="" prop="aamset.utlamt" label-width="5px">
<c-input v-model="model.aamset.utlamt" placeholder="请输入单据金额"></c-input> <c-input v-model="model.aamset.utlamt" placeholder="请输入单据金额" disabled></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -197,14 +197,20 @@ ...@@ -197,14 +197,20 @@
</c-col> </c-col>
<c-col :span="11"> <c-col :span="11">
<el-form-item label="" prop="aamset.utlamt2" label-width="5px"> <el-form-item label="" prop="aamset.utlamt2" label-width="5px">
<c-input v-model="model.aamset.utlamt2" placeholder=""></c-input> <c-input v-model="model.aamset.utlamt2" placeholder="" disabled></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="12"> <c-col :span="12">
<el-form-item label="跨境人民币清算模式" prop="trnmod.cmtflg"> <el-form-item label="跨境人民币清算模式" prop="trnmod.cmtflg">
<c-select v-model="model.trnmod.cmtflg" style="width:100%" placeholder="请选择跨境人民币清算模式" :code="codes.cmtflg"> <c-select
v-model="model.trnmod.cmtflg"
style="width:100%"
placeholder="请选择跨境人民币清算模式"
:code="this.cmtflg"
@change="commonExecuteRule('trnmod.cmtflg')"
>
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -216,7 +222,7 @@ ...@@ -216,7 +222,7 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="报文类型" prop="trnmod.swftyp" v-show="model.trnmod.cmtflg=='P'?true:false"> <el-form-item label="报文类型" prop="trnmod.swftyp" v-show="model.trnmod.cmtflg=='P'?true:false">
<c-select v-model="model.trnmod.swftyp" style="width:100%" placeholder="请选择报文类型" :code="codes.swftyp"> <c-select v-model="model.trnmod.swftyp" style="width:100%" placeholder="请选择报文类型" :code="codes.swftyp1" disabled>
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -377,7 +383,12 @@ ...@@ -377,7 +383,12 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="External Key of Address" prop="brdgrp.prb.pts.extkey"> <el-form-item label="External Key of Address" prop="brdgrp.prb.pts.extkey">
<c-fullbox> <c-fullbox>
<c-input v-model="model.brdgrp.prb.pts.extkey" maxlength="16" placeholder="请输入External Key of Address"></c-input> <c-input
v-model="model.brdgrp.prb.pts.extkey"
maxlength="16"
placeholder="请输入External Key of Address"
@keyup.enter.native="showGridPromptDialog('brdgrp.prb.pts.extkey')"
></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10px;padding: 0 12px;" style="margin:0 10px 0 10px;padding: 0 12px;"
...@@ -426,6 +437,11 @@ export default { ...@@ -426,6 +437,11 @@ export default {
mixins: [commonProcess], mixins: [commonProcess],
data(){ data(){
return { return {
cmtflg:[
{ label: "代理行模式", value: "C" },
{ label: "Other", value: "O" },
{ label: "CIPS系统", value: "P" },
],
table1:[], table1:[],
columns:[ columns:[
"1 1 \"Type\" 40", "1 1 \"Type\" 40",
...@@ -437,12 +453,31 @@ export default { ...@@ -437,12 +453,31 @@ export default {
] ]
} }
}, },
methods:{...Event}, methods:{...Event,
commonExecuteRule(ruleName) {
this.executeRule(ruleName).then((res) => {
if ((res.respCode == SUCCESS)) {
}
});
},
},
created:function(){ created:function(){
}, },
watch: { watch: {
declareParams() {}, declareParams() {},
"model.trnmod.cmtflg":{
immediate:true,
handler(val ,oldVal){
if(this.model.trnmod.cmtflg=='P'){
this.model.trnmod.swftyp='CIV';
}else{
this.model.trnmod.swftyp='';
}
}
},
}, },
} }
</script> </script>
......
src/views/Business/Brtset/index.vue
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</el-tab-pane> </el-tab-pane>
<!--PD000027 --> <!--PD000027 -->
<!-- <el-tab-pane label="同业代付" name="dftcrep" > <!-- <el-tab-pane label="同业代付" name="dftcrep" v-if="this.model.dftcre.dfflag==''">
<m-dftcrep :model="model" :codes="codes" /> <m-dftcrep :model="model" :codes="codes" />
</el-tab-pane> --> </el-tab-pane> -->
...@@ -106,6 +106,10 @@ ...@@ -106,6 +106,10 @@
</el-tab-pane>--> </el-tab-pane>-->
</c-tabs> </c-tabs>
</el-form> </el-form>
<c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty"></c-grid-ety-prompt-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -184,14 +188,7 @@ export default { ...@@ -184,14 +188,7 @@ export default {
} }
}, },
watch:{ watch:{
'model.dftcre.dfflag': function(){
var val = this.model.dftcre.dfflag;
if(val == ""){
document.getElementById("tab-dftcrep").style.display = 'none';
}else{
document.getElementById("tab-dftcrep").style.display = '';
}
}
}, },
created:async function(){ created:async function(){
console.log("进入brtset交易"); console.log("进入brtset交易");
...@@ -200,9 +197,6 @@ export default { ...@@ -200,9 +197,6 @@ export default {
{ {
this.updateModel(rtnmsg.data) this.updateModel(rtnmsg.data)
//TODO 处理数据逻辑 //TODO 处理数据逻辑
document.getElementById("tab-dftcrep").style.display = 'none';
} }
else else
{ {
......
src/views/Business/Cptopn/Opnp1.vue
...@@ -229,6 +229,23 @@ ...@@ -229,6 +229,23 @@
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24">
<el-form-item label="货物类型">
<c-select
v-model="model.cpdgrp.rec.stagod"
style="width: 100%"
placeholder="请选择货物类型"
>
<el-option
v-for="item in codes.godcod"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</c-select>
</el-form-item>
</c-col>
</c-col> </c-col>
<!-- ===================中部--右==================== --> <!-- ===================中部--右==================== -->
...@@ -330,14 +347,12 @@ ...@@ -330,14 +347,12 @@
style="width: 100%" style="width: 100%"
placeholder="" placeholder=""
v-model="model.cpdgrp.rec.swftyp" v-model="model.cpdgrp.rec.swftyp"
:disabled=" :disabled=this.flag2
model.cpdgrp.cbs.nom1.amt === '0.000'
"
@change="swftypChange" @change="swftypChange"
> >
<!-- :disabled="model.cptp.liqtyp != 'C' && model.cptp.liqtyp != 'S' && model.cptp.liqtyp != ''" --> <!-- :disabled="model.cptp.liqtyp != 'C' && model.cptp.liqtyp != 'S' && model.cptp.liqtyp != ''" -->
<el-option <el-option
v-for="item in codes.swftypOpnp" v-for="item in this.swftypOpnp"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
:key="item.value" :key="item.value"
...@@ -381,7 +396,7 @@ ...@@ -381,7 +396,7 @@
</c-fullbox> </c-fullbox>
</c-col> </c-col>
<!-- <c-col :span="24"> <c-col :span="24">
<c-col :span="14"> <c-col :span="14">
<el-form-item <el-form-item
label="清算模式" label="清算模式"
...@@ -394,13 +409,9 @@ ...@@ -394,13 +409,9 @@
:disabled=" :disabled="
model.cpdgrp.cbs.nom1.amt === '0.000' model.cpdgrp.cbs.nom1.amt === '0.000'
" "
:code=this.liqtypOptions
@change="swftypChange"
> >
<el-option
v-for="item in liqtypOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
...@@ -408,24 +419,9 @@ ...@@ -408,24 +419,9 @@
v-if="!(model.cpdgrp.cbs.nom1.cur === 'CNY')" v-if="!(model.cpdgrp.cbs.nom1.cur === 'CNY')"
></el-form-item> ></el-form-item>
</c-col> </c-col>
</c-col> -->
<c-col :span="24">
<el-form-item label="货物类型">
<c-select
v-model="model.cpdgrp.rec.stagod"
style="width: 100%"
placeholder="请选择货物类型"
>
<el-option
v-for="item in codes.godcod"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</c-select>
</el-form-item>
</c-col> </c-col>
</c-col> </c-col>
</c-col> </c-col>
...@@ -464,12 +460,18 @@ export default { ...@@ -464,12 +460,18 @@ export default {
{ value: "3", label: "其他" }, { value: "3", label: "其他" },
], ],
liqtypOptions: [ liqtypOptions: [
{ value: "B", label: "人行支付系统" },
{ value: "C", label: "代理行模式" }, { value: "C", label: "代理行模式" },
{ value: "O", label: "Other" }, { value: "O", label: "Other" },
{ value: "S", label: "CIPS系统" }, { value: "S", label: "CIPS系统" },
], ],
swftypOpnp: [
{ label: 'MT103', value: '103' },
{ label: 'Mt202 COV', value: '202' },
{ label: 'MT202', value: '200' },
{ label: 'Other', value: 'OTH' },
],
flag1:true, flag1:true,
flag2:true,
}; };
}, },
methods: { methods: {
...@@ -497,6 +499,78 @@ export default { ...@@ -497,6 +499,78 @@ export default {
} }
} }
}, },
"model.cptp.liqtyp":{
immediate:true,
handler(val ,oldVal){
//清除数据
if(this.model.cptp.liqtyp != 'C'){
//清除liqtyp = C时填写的数据
this.model.cptp.cleage="";
this.model.cptp.evebch="";
this.model.cptp.coract="";
}else if(this.model.cptp.liqtyp != 'O'){
this.model.cpdgrp.blk.contag70="";
}else if(this.model.cptp.liqtyp != 'S'){
this.model.cptp.orcnam="";
this.model.cptp.orcadr="";
this.model.cptp.pyenam="";
this.model.cptp.pyeadr="";
this.model.cptp.reconebch="";
this.model.cptp.reconebchnam="";
this.model.cptp.cptp.bustyp="";
this.model.cptp.commetr="";
}
if(this.model.cptp.liqtyp == 'C'){
this.model.cpdgrp.rec.swftyp="103";
this.swftypOpnp=[
{ label: 'MT103', value: '103' },
{ label: 'MT202', value: '200' },
]
this.flag2 = false;
}else if(this.model.cptp.liqtyp == 'O'){
//同步切换报文类型的值
this.model.cpdgrp.rec.swftyp= "OTH";
this.flag2 = true;
}else if(this.model.cptp.liqtyp == 'S'){
this.flag2 = false;
//同步切换报文类型的值
this.model.cpdgrp.rec.swftyp= "CIU";
this.swftypOpnp=[
{ label: "cips111", value: "CIU" },
{ label: "cips112", value: "CIV" },
]
}else{
//当为空时，恢复下拉选的选项
this.swftypOpnp=[
{ label: 'MT103', value: '103' },
{ label: 'Mt202 COV', value: '202' },
{ label: 'MT202', value: '200' },
{ label: 'Other', value: 'OTH' },
]
}
}
},
"model.cpdgrp.cbs.nom1.amt":{
immediate:true,
handler(val ,oldVal){
if(this.model.cpdgrp.cbs.nom1.amt !== '0.000' && this.model.cpdgrp.cbs.nom1.cur !='CNY'){
this.flag2 = false;
}else{
this.flag2 = true;
}
}
},
"model.cpdgrp.cbs.nom1.cur":{
immediate:true,
handler(val ,oldVal){
if(this.model.cpdgrp.cbs.nom1.amt !== '0.000' && this.model.cpdgrp.cbs.nom1.cur !='CNY'){
this.flag2 = false;
}else{
this.flag2 = true;
}
}
}
}, },
created: function () {}, created: function () {},
computed: { computed: {
......
src/views/Business/Cptopn/Payment103.vue
...@@ -163,6 +163,7 @@ ...@@ -163,6 +163,7 @@
<c-input <c-input
maxlength="16" maxlength="16"
placeholder="" placeholder=""
disabled
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -172,12 +173,14 @@ ...@@ -172,12 +173,14 @@
label="Intermediary Institut.(Tag 54a)" label="Intermediary Institut.(Tag 54a)"
style="width: 100%" style="width: 100%"
label-width="35%" label-width="35%"
> >
<c-fullbox> <c-fullbox>
<c-input <c-input
maxlength="16" maxlength="16"
placeholder="请输入Reference" placeholder="请输入Reference"
disabled v-model="model.cpdgrp.orc.pts.extkey"
@keyup.enter.native="showGridPromptDialog('cpdgrp.orc.pts.extkey')"
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
...@@ -211,6 +214,7 @@ ...@@ -211,6 +214,7 @@
type="textarea" type="textarea"
:rows="3" :rows="3"
maxlength="140" maxlength="140"
v-model="model.cpdgrp.orc.pts.adrblk"
show-word-limit show-word-limit
placeholder="请输入Address Block" placeholder="请输入Address Block"
disabled disabled
...@@ -236,6 +240,7 @@ ...@@ -236,6 +240,7 @@
label="Account with Institution/Account(Tag 54a)" label="Account with Institution/Account(Tag 54a)"
style="width: 100%" style="width: 100%"
label-width="35%" label-width="35%"
> >
<c-fullbox> <c-fullbox>
<c-input <c-input
...@@ -244,7 +249,7 @@ ...@@ -244,7 +249,7 @@
v-model="setgll.setgrp.awi.pts.extkey" v-model="setgll.setgrp.awi.pts.extkey"
@change="setgllChange" @change="setgllChange"
@keyup.enter.native=" @keyup.enter.native="
showGridPromptDialog('cpdgrp.pye.pts.extkey') showGridPromptDialog('setgll.setgrp.awi.pts.extkey')
" "
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
...@@ -259,8 +264,7 @@ ...@@ -259,8 +264,7 @@
font-family: '宋体'; font-family: '宋体';
font-weight: bold; font-weight: bold;
" "
>i</span >i</span>
>
</c-button> </c-button>
<c-button <c-button
style="margin: 0 0" style="margin: 0 0"
...@@ -297,9 +301,7 @@ ...@@ -297,9 +301,7 @@
></c-input> ></c-input>
</c-col> </c-col>
<c-col :span="5" style="text-align: right"> <c-col :span="5" style="text-align: right">
<c-checkbox v-model="model.cpdgrp.rec.tsnflg" <c-checkbox v-model="model.cpdgrp.rec.tsnflg">Use Opt.F</c-checkbox>
>Use Opt.F</c-checkbox
>
</c-col> </c-col>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -418,6 +420,8 @@ export default { ...@@ -418,6 +420,8 @@ export default {
setgrp:{ setgrp:{
awi:{ awi:{
pts:{ pts:{
extkey: '',
adrblk: '',
} }
} }
} }
......
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