Skip to content

V
vue-gjjs
Commit 080e18dc by taojinrui
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 c1fbfd33 a6931b11
Showing with 72 additions and 53 deletions
src/views/Business/Bctset/Bctsus.vue
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24" class="bctdav_bctp_bctovw_cheak"> <c-col :span="24" class="bctdav_bctp_bctovw_cheak">
<c-checkbox v-model="model.bcdgrp.rec.focflg" @change="frepayflgDefault" <c-checkbox v-model="focflg" @change="focflgDefault"
>Free of Payment</c-checkbox >Free of Payment</c-checkbox
> >
</c-col> </c-col>
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
</c-col> </c-col>
<c-col :span="12" class="bctdav_bctp_bctovw_cheak"> <c-col :span="12" class="bctdav_bctp_bctovw_cheak">
<c-checkbox :disabled="model.bcdgrp.rec.focflg=='X'" v-model="model.trtcre.crefinflg" <c-checkbox :disabled="model.bcdgrp.rec.focflg=='X'" v-model="crefinflg"
@change="crefinflgChange" @change="crefinflgChange"
>Create Financing</c-checkbox >Create Financing</c-checkbox
> >
...@@ -265,7 +265,7 @@ ...@@ -265,7 +265,7 @@
</c-col> </c-col>
<c-col :span="24" class="bctdav_bctp_bctovw_cheak"> <c-col :span="24" class="bctdav_bctp_bctovw_cheak">
<c-checkbox true-label="C" v-model="model.mtabut.clsflg" @change="clsflgOtherDefault" <c-checkbox true-label="C" v-model="clsflg" @change="clsflgOtherDefault"
>Close Contract</c-checkbox >Close Contract</c-checkbox
> >
</c-col> </c-col>
...@@ -423,7 +423,7 @@ export default { ...@@ -423,7 +423,7 @@ export default {
crefinflg: { crefinflg: {
get() { get() {
if (this.model.bddgrp.rec.frepayflg == 'X') { if (this.model.bcdgrp.rec.focflg == 'X') {
return false; return false;
}else{ }else{
return this.model.trtcre.crefinflg != '' return this.model.trtcre.crefinflg != ''
...@@ -438,7 +438,7 @@ export default { ...@@ -438,7 +438,7 @@ export default {
} }
}, },
clsflg: { clsflg: {
get() { get() {
return this.model.mtabut.clsflg=='C'; return this.model.mtabut.clsflg=='C';
}, },
...@@ -446,41 +446,50 @@ export default { ...@@ -446,41 +446,50 @@ export default {
this.model.mtabut.clsflg = val ? "C" : "O" this.model.mtabut.clsflg = val ? "C" : "O"
} }
}, },
frepayflg: { focflg: {
get() { get() {
return this.model.bddgrp.rec.frepayflg != '' return this.model.bcdgrp.rec.focflg != ''
}, },
set(val) { set(val) {
if (this.model.bddgrp.rec.frepayflg == 'X' ) { if (this.model.bcdgrp.rec.focflg == 'X' ) {
this.model.trtcre.crefinflg = '' this.model.trtcre.crefinflg = ''
this.model.trnmod.cmtflg="O" this.model.trnmod.cmtflg='O'
}else{
this.model.trnmod.cmtflg=''
} }
this.model.bddgrp.rec.frepayflg = val ? "X" : "" this.model.bcdgrp.rec.focflg = val ? "X" : ""
}
},
dfflag: {
get() {
return this.model.dftcre.dfflag != ''
},
set(val) {
this.model.dftcre.dfflag = val ? "X" : ""
} }
}, },
// dfflag: {
// get() {
// return this.model.dftcre.dfflag != ''
// },
// set(val) {
// this.model.dftcre.dfflag = val ? "X" : ""
// }
// },
}, },
methods: { methods: {
...Event, ...Event,
frepayflgDefault(){ focflgDefault(){
this.executeDefault("trnmod.cmtflg").then((res) => { this.executeDefault("trnmod.cmtflg").then((res) => {
if ((res.respCode == SUCCESS)) { if ((res.respCode == SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data); Utils.copyValueFromVO(this.model, res.data);
} }
}); });
}, },
async crefinflgChange() { // async crefinflgChange() {
let rtnmsg = await this.executeRule("trtcre.crefinflg"); // let rtnmsg = await this.executeRule("trtcre.crefinflg");
if (rtnmsg.respCode == SUCCESS) { // if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data); // Utils.copyValueFromVO(this.model, rtnmsg.data);
} // }
// },
crefinflgChange(){
this.executeRule("trtcre.crefinflg").then((res) => {
if ((res.respCode == SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data);
}
});
}, },
clsflgOtherDefault(){ clsflgOtherDefault(){
this.executeDefault("mtabut.clsflg").then((res) => { this.executeDefault("mtabut.clsflg").then((res) => {
...@@ -526,28 +535,35 @@ export default { ...@@ -526,28 +535,35 @@ export default {
}, },
watch: { watch: {
// "model.bcdgrp.rec.focflg": { // "focflg":{
// immediate:true, // immediate: true,
// handler(val,oldval){ // handler(val, oldVal) {
// if(this.model.mtabut.clsflg=="C") { // if(this.model.focflg=="X"){
// if(this.model.bcdgrp.rec.focflg==""){ // this.model.trnmod.cmtflg="O"
// this.model.bcdgrp.rec.docsta="C" // }
// }else if(this.model.bcdgrp.rec.focflg=="X"){ // }
// this.model.bcdgrp.rec.docsta="E" // },
// } "bcdgrp.rec.doctypcod":{
// } immediate: true,
// if(this.model.mtabut.clsflg==""){ handler(val, oldVal) {
// if(this.model.bcdgrp.rec.focflg=="X"){ if(this.bcdgrp.rec.predat!=''){
// this.model.bcdgrp.rec.docsta="D" this.model.bcdgrp.rec.docsta="A"
}else if(this.bcdgrp.rec.opndat!=''){
// } else if(this.model.bcdgrp.rec.focflg==""){ this.model.bcdgrp.rec.docsta="B"
// if(this.model.bcdgrp.rec.doctypcod=="A"||this.model.bcdgrp.rec.doctypcod=="D"||this.model.bcdgrp.rec.doctypcod=="M"){ }
// this.model.bcdgrp.rec.docsta="C" else if(this.model.bcdgrp.rec.doctypcod=="A"||this.model.bcdgrp.rec.doctypcod=="D"||this.model.bcdgrp.rec.doctypcod=="M"){
// } this.model.bcdgrp.rec.docsta="C"
// } }
// } }
// } },
// }, "model.trnmod.cmtflg":{
immediate: true,
handler(val, oldVal) {
if(this.model.trnmod.cmtflg=="P"){
this.model.trnmod.swftyp="CIV"
}
}
},
"model.bctp.ischktyp": { "model.bctp.ischktyp": {
immediate: true, immediate: true,
......
src/views/Business/Bctset/Dftcrep.vue
...@@ -431,9 +431,7 @@ ...@@ -431,9 +431,7 @@
v-model="model.dftcre.dfdgrp.dff.pts.ref" v-model="model.dftcre.dfdgrp.dff.pts.ref"
maxlength="16" maxlength="16"
placeholder="请输入代付行" placeholder="请输入代付行"
@keyup.enter.native="
showGridPromptDialog('dftcre.dfdgrp.dff.pts.ref')
"
> >
></c-input> ></c-input>
</el-form-item> </el-form-item>
...@@ -449,6 +447,9 @@ ...@@ -449,6 +447,9 @@
v-model="model.dftcre.dfdgrp.dff.pts.extkey" v-model="model.dftcre.dfdgrp.dff.pts.extkey"
maxlength="16" maxlength="16"
placeholder="请输入External Key of Address" placeholder="请输入External Key of Address"
@keyup.enter.native="
showGridPromptDialog('dftcre.dfdgrp.dff.pts.extkey')
"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -460,7 +461,7 @@ ...@@ -460,7 +461,7 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="名称" prop="dftcre.dfdgrp.dff.namelc"> <el-form-item label="名称" prop="dftcre.dfdgrp.dff.namelc" v-show="false">
<c-input <c-input
type="textarea" type="textarea"
v-model="model.dftcre.dfdgrp.dff.namelc" v-model="model.dftcre.dfdgrp.dff.namelc"
...@@ -477,12 +478,13 @@ ...@@ -477,12 +478,13 @@
<el-form-item <el-form-item
label="地址" label="地址"
prop="dftcre.dfdgrp.dff.adrelc" prop="dftcre.dfdgrp.dff.adrelc"
v-show="false"
> >
<c-input <c-input
type="textarea" type="textarea"
v-model="model.dftcre.dfdgrp.dff.adrelc" v-model="model.dftcre.dfdgrp.dff.pts.adrblk"
maxlength="35" maxlength="35"
:rows="5"
show-word-limit show-word-limit
placeholder="请输入地址" placeholder="请输入地址"
></c-input> ></c-input>
......
src/views/Business/Bctset/index.vue
...@@ -272,7 +272,8 @@ export default { ...@@ -272,7 +272,8 @@ export default {
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.updateModel(rtnmsg.data); this.updateModel(rtnmsg.data);
if (this.isInDisplay) {
if (this.isInDisplay) {
this.restoreDisplay(); this.restoreDisplay();
} }
......
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