Skip to content

V
vue-gjjs
Commit 7c90366a by liyixun
Options

getame bug (651)

parent 94ea3dd4
Showing with 123 additions and 36 deletions
src/model/Getame/Default.js
...@@ -228,5 +228,6 @@ export default { ...@@ -228,5 +228,6 @@ export default {
"gidgrp.rec.delto" :Utils.defaultFunction, "gidgrp.rec.delto" :Utils.defaultFunction,
"gidgrp.ghd.aplnam" :Utils.defaultFunction, "gidgrp.ghd.aplnam" :Utils.defaultFunction,
"gidgrp.rec.orddat" :Utils.defaultFunction, "gidgrp.rec.orddat" :Utils.defaultFunction,
"setmod.glemod.glepan" :Utils.defaultFunction,
} }
//你可以添加自动default处理 //你可以添加自动default处理
src/model/Getset/Default.js
...@@ -53,6 +53,9 @@ export default { ...@@ -53,6 +53,9 @@ export default {
"cnybop.outflg" :Utils.defaultFunction, "cnybop.outflg" :Utils.defaultFunction,
"gcdgrp.rec.docprbrol" :Utils.defaultFunction, "gcdgrp.rec.docprbrol" :Utils.defaultFunction,
"setmod.glemod.glepan" :Utils.defaultFunction, "setmod.glemod.glepan" :Utils.defaultFunction,
"bopmod.dbdp.basp" :Utils.defaultFunction, // "bopmod.dbdp.basp" :Utils.defaultFunction,
// "bopmod.dbap.basp" :Utils.defaultFunction,
"bopmod.dbdp.baspp.acp" :Utils.defaultFunction,
"bopmod.dbap.baspp.acp" :Utils.defaultFunction,
} }
//你可以添加自动default处理 //你可以添加自动default处理
src/model/Gitame/Default.js
...@@ -248,5 +248,6 @@ export default { ...@@ -248,5 +248,6 @@ export default {
"gidgrp.ghd.aplnam" :Utils.defaultFunction, "gidgrp.ghd.aplnam" :Utils.defaultFunction,
"gitamep.plateflg" :Utils.defaultFunction, "gitamep.plateflg" :Utils.defaultFunction,
"gidgrp.rec.orddat" :Utils.defaultFunction, "gidgrp.rec.orddat" :Utils.defaultFunction,
"setmod.glemod.glepan" :Utils.defaultFunction,
} }
//你可以添加自动default处理 //你可以添加自动default处理
src/model/Gitopn/Pattern.js
...@@ -477,10 +477,10 @@ export default { ...@@ -477,10 +477,10 @@ export default {
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 780,message:"长度不能超过780"} {max: 780,message:"长度不能超过780"}
], ],
"gidgrp.blk.atxexptxt":[ // "gidgrp.blk.atxexptxt":[
{type: "string", required: true, message: "必输项"}, // {type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"} // {max: 65,message:"长度不能超过65"}
], // ],
"gidgrp.rec.inudat":[ "gidgrp.rec.inudat":[
...@@ -523,10 +523,10 @@ export default { ...@@ -523,10 +523,10 @@ export default {
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 780,message:"长度不能超过780"} {max: 780,message:"长度不能超过780"}
], ],
"gidgrp.blk.atxliatxtc":[ // "gidgrp.blk.atxliatxtc":[
{type: "string", required: true, message: "必输项"}, // {type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"} // {max: 65,message:"长度不能超过65"}
], // ],
"gidgrp.ben.adrelc":[ "gidgrp.ben.adrelc":[
......
src/model/Gitpop/Default.js
...@@ -164,5 +164,6 @@ export default { ...@@ -164,5 +164,6 @@ export default {
"gidgrp.rec.orddat" :Utils.defaultFunction, "gidgrp.rec.orddat" :Utils.defaultFunction,
"gidgrp.blk.apprulc" :Utils.defaultFunction, "gidgrp.blk.apprulc" :Utils.defaultFunction,
"gidgrp.rec.autrnwflg" :Utils.defaultFunction, "gidgrp.rec.autrnwflg" :Utils.defaultFunction,
"setmod.glemod.glepan" :Utils.defaultFunction,
} }
//你可以添加自动default处理 //你可以添加自动default处理
src/views/Business/Getame/Ameps20.vue
...@@ -29,7 +29,9 @@ ...@@ -29,7 +29,9 @@
</c-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<c-input disabled v-if="model.gitp.swiftflg=='N'" v-model="model.oldgidgrp.cbs.max.amt" placeholder="请输入Balance"></c-input> <c-form-item v-if="model.gitp.swiftflg=='N'" label-width="5px" prop="oldgidgrp.cbs.max.amt">
<c-input disabled v-model="model.oldgidgrp.cbs.max.amt" placeholder="请输入Balance"></c-input>
</c-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -40,7 +42,9 @@ ...@@ -40,7 +42,9 @@
</c-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<c-input v-if="model.gitp.swiftflg=='N'" v-model="model.trnmod.swiadd.ameamt" placeholder="请输入Amended Amount"></c-input> <c-form-item v-if="model.gitp.swiftflg=='N'" label-width="5px" prop="trnmod.swiadd.ameamt">
<c-input v-model="model.trnmod.swiadd.ameamt" placeholder="请输入Amended Amount" @blur="ameamtBlur"></c-input>
</c-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -51,7 +55,9 @@ ...@@ -51,7 +55,9 @@
</c-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<c-input v-if="model.gitp.swiftflg=='N'" v-model="model.trnmod.swiadd.newamt" placeholder="请输入New amount"></c-input> <c-form-item v-if="model.gitp.swiftflg=='N'" label-width="5px" prop="trnmod.swiadd.newamt">
<c-input v-model="model.trnmod.swiadd.newamt" placeholder="请输入New amount" @blur="newamtBlur"></c-input>
</c-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -63,7 +69,9 @@ ...@@ -63,7 +69,9 @@
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<c-input disabled v-if="model.gitp.swiftflg=='N'" v-model="model.trnmod.swiadd.addamt" placeholder="请输入Additional Amount"></c-input> <c-form-item v-if="model.gitp.swiftflg=='N'" label-width="5px" prop="trnmod.swiadd.addamt">
<c-input disabled v-model="model.trnmod.swiadd.addamt" placeholder="请输入Additional Amount"></c-input>
</c-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -164,7 +172,9 @@ ...@@ -164,7 +172,9 @@
</c-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<c-input disabled v-if="model.gitp.swiftflg=='Y'" v-model="model.oldgidgrp.cbs.max.amt" placeholder="请输入Balance"></c-input> <c-form-item v-if="model.gitp.swiftflg=='Y'" label-width="5px" prop="oldgidgrp.cbs.max.amt">
<c-input disabled v-model="model.oldgidgrp.cbs.max.amt" placeholder="请输入Balance"></c-input>
</c-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -174,7 +184,9 @@ ...@@ -174,7 +184,9 @@
</c-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<c-input v-if="model.gitp.swiftflg=='Y'" v-model="model.trnmod.swiadd.ameamt" placeholder="请输入Amended Amount"></c-input> <c-form-item v-if="model.gitp.swiftflg=='Y'" label-width="5px" prop="trnmod.swiadd.ameamt">
<c-input v-model="model.trnmod.swiadd.ameamt" placeholder="请输入Amended Amount" @blur="ameamtBlur"></c-input>
</c-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -184,7 +196,9 @@ ...@@ -184,7 +196,9 @@
</c-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<c-input v-if="model.gitp.swiftflg=='Y'" v-model="model.trnmod.swiadd.newamt" placeholder="请输入New amount"></c-input> <c-form-item v-if="model.gitp.swiftflg=='Y'" label-width="5px" prop="trnmod.swiadd.newamt">
<c-input v-model="model.trnmod.swiadd.newamt" placeholder="请输入New amount" @blur="newamtBlur"></c-input>
</c-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -359,7 +373,9 @@ ...@@ -359,7 +373,9 @@
</c-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<c-input v-if="model.gitp.swiftflg=='Y'" :disabled="model.trnmod.swiadd.addamtflg==''" v-model="model.trnmod.swiadd.addamt" placeholder="请输入Additional Amount"></c-input> <c-form-item v-if="model.gitp.swiftflg=='Y'" label-width="5px" prop="trnmod.swiadd.addamt">
<c-input :disabled="model.trnmod.swiadd.addamtflg==''" v-model="model.trnmod.swiadd.addamt" placeholder="请输入Additional Amount"></c-input>
</c-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -634,8 +650,23 @@ export default { ...@@ -634,8 +650,23 @@ export default {
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data); Utils.copyValueFromVO(this.model, rtnmsg.data);
} }
},
async newamtBlur(){
let rtnmsg = await this.executeRule("trnmod.swiadd.newamt")
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
} }
}, },
async ameamtBlur(){
let rtnmsg = await this.executeDefault("trnmod.swiadd.newamt")
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},
},
created:function(){ created:function(){
} }
......
src/views/Business/Getame/index.vue
...@@ -64,11 +64,11 @@ ...@@ -64,11 +64,11 @@
<m-engp :model="model" :codes="codes"/> <m-engp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Settlement" name="Settlement"> <el-tab-pane label="Settlement" name="setpan">
<m-setpan :model="model" :codes="codes"/> <m-setpan :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Bookings" name="Booking"> <el-tab-pane v-if=this.flag label="Bookings" name="glepan">
<m-glepan :model="model" :codes="codes"/> <m-glepan :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
...@@ -213,6 +213,7 @@ export default { ...@@ -213,6 +213,7 @@ export default {
codes: { codes: {
...CodeTable, ...CodeTable,
}, },
flag:false,
} }
}, },
methods:{ methods:{
...@@ -221,6 +222,18 @@ export default { ...@@ -221,6 +222,18 @@ export default {
/** /**
* do it yourself * do it yourself
**/ **/
const name = tab.name
let rulePath;
if(name==="setpan"){
this.flag=true;
}
if (!!rulePath) {
this.executeRule(rulePath).then(res => {
if (res.respCode == SUCCESS) {
this.updateModel(res.data)
}
})
}
} }
}, },
created:async function(){ created:async function(){
......
src/views/Business/Getset/Basp.vue
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="地区机构号" prop="bopmod.dbagrp.bas.ownextkey"> <el-form-item label="地区机构号" prop="bopmod.dbagrp.bas.ownextkey">
<c-select disabled :code="codes.ownextkey" v-model="model.bopmod.dbagrp.bas.ownextkey" style="width:100%" placeholder="请选择地区机构号"> <c-select disabled :code="codes.ownextkey1" v-model="model.bopmod.dbagrp.bas.ownextkey" style="width:100%" placeholder="请选择地区机构号">
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -141,6 +141,14 @@ ...@@ -141,6 +141,14 @@
<c-input disabled v-model="model.bopmod.dbagrp.bas.othacc" maxlength="32" placeholder="请输入银行卡号"></c-input> <c-input disabled v-model="model.bopmod.dbagrp.bas.othacc" maxlength="32" placeholder="请输入银行卡号"></c-input>
</c-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="24">
<c-col :span="6" :offset="6">
<c-form-item label-width="5px" prop="bopmod.dbap.baspp.acp">
<c-checkbox disabled v-model="model.bopmod.dbap.baspp.acp">确认</c-checkbox>
</c-form-item>
</c-col>
</c-col>
</c-col> </c-col>
</c-col> </c-col>
</c-row> </c-row>
...@@ -276,6 +284,13 @@ ...@@ -276,6 +284,13 @@
</c-form-item> </c-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="24">
<c-col :span="6" :offset="6">
<c-form-item label-width="5px" prop="bopmod.dbdp.baspp.acp">
<c-checkbox disabled v-model="model.bopmod.dbdp.baspp.acp">确认</c-checkbox>
</c-form-item>
</c-col>
</c-col>
</c-col> </c-col>
</c-col> </c-col>
</c-row> </c-row>
......
src/views/Business/Getset/Gitsetp1.vue
...@@ -184,17 +184,23 @@ ...@@ -184,17 +184,23 @@
</c-col> </c-col>
<c-col :span=24> <c-col :span=24>
<c-col :span="6" :offset="6"> <c-col :span="6" :offset="6">
<c-form-item label-width="5px" prop="gcdgrp.rec.cannowflg">
<c-checkbox v-model="model.gcdgrp.rec.cannowflg">Payment under Cancelation of Guarantee</c-checkbox> <c-checkbox v-model="model.gcdgrp.rec.cannowflg">Payment under Cancelation of Guarantee</c-checkbox>
</c-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="6" :offset="6"> <c-col :span="6" :offset="6" >
<c-form-item label-width="5px" prop="mtabut.clsflg">
<c-checkbox v-model="model.mtabut.clsflg">Close Contract</c-checkbox> <c-checkbox v-model="model.mtabut.clsflg">Close Contract</c-checkbox>
</c-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="6" :offset="6"> <c-col :span="6" :offset="6">
<c-form-item label-width="5px" prop="gcdgrp.rec.frepayflg">
<c-checkbox v-model="model.gcdgrp.rec.frepayflg">free of payment</c-checkbox> <c-checkbox v-model="model.gcdgrp.rec.frepayflg">free of payment</c-checkbox>
</c-form-item>
</c-col> </c-col>
</c-col> </c-col>
</c-col> </c-col>
......
src/views/Business/Getset/Wg.vue
...@@ -116,11 +116,11 @@ export default { ...@@ -116,11 +116,11 @@ export default {
methods:{ methods:{
...Event, ...Event,
async slChange(){ async slChange(){
// this.executeRule("bopmod.szflg").then((res) => { this.executeRule("bopmod.szflg").then((res) => {
// if ((res.respCode == SUCCESS)) { if ((res.respCode == SUCCESS)) {
// Utils.updateModel(this.model, res.data); Utils.copyValueFromVO(this.model, res.data);
// } }
// }); });
} }
}, },
created:function(){ created:function(){
......
src/views/Business/Getset/index.vue
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<m-basp :model="model" :codes="codes"/> <m-basp :model="model" :codes="codes"/>
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane v-if="model.bopmod.szflg=='2' && model.bopmod.basflg=='X'" label="境内收入申报单－基础信息" name="basp"> <el-tab-pane v-if="model.bopmod.szflg=='2' && model.bopmod.basflg=='X'" label="境内收入申报单－基础信息" name="basp1">
<c-content> <c-content>
<m-basp :model="model" :codes="codes"/> <m-basp :model="model" :codes="codes"/>
</c-content> </c-content>
...@@ -96,6 +96,7 @@ ...@@ -96,6 +96,7 @@
<script> <script>
import Api from "~/service/Api" import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable"
import Utils from "~/utils";
import Getset from "~/model/Getset" import Getset from "~/model/Getset"
import commonProcess from "~/mixin/commonProcess" import commonProcess from "~/mixin/commonProcess"
import commonFuncs from "~/mixin/commonFuncs"; import commonFuncs from "~/mixin/commonFuncs";
...@@ -166,7 +167,11 @@ export default { ...@@ -166,7 +167,11 @@ export default {
**/ **/
const name = tab.name const name = tab.name
let rulePath; let rulePath;
let rulePath1;
if (name === "basp") { if (name === "basp") {
rulePath = "bopmod.dbap.basp";
}
if(name === "basp1"){
rulePath = "bopmod.dbdp.basp"; rulePath = "bopmod.dbdp.basp";
} }
if(name==="setpan"){ if(name==="setpan"){
......
src/views/Business/Gitame/Ameps20.vue
...@@ -373,7 +373,7 @@ ...@@ -373,7 +373,7 @@
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<c-form-item v-if="model.gitp.swiftflg=='Y'" label-width="5px" prop="trnmod.swiadd.addamt"> <c-form-item v-if="model.gitp.swiftflg=='Y'" label-width="5px" prop="trnmod.swiadd.addamt">
<c-input :disabled="model.trnmod.swiadd.addamtflg==''" v-model="model.trnmod.swiadd.addamt" placeholder="请输入Additional Amount"></c-input> <c-input :disabled="model.trnmod.swiadd.addamtflg==''" v-model="model.trnmod.swiadd.addamt" @blur="addamtBlur" placeholder="请输入Additional Amount"></c-input>
</c-form-item> </c-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -658,8 +658,15 @@ export default { ...@@ -658,8 +658,15 @@ export default {
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data); Utils.copyValueFromVO(this.model, rtnmsg.data);
} }
},
async addamtBlur(){
let rtnmsg = await this.executeDefault("trnmod.swiadd.addamtcovs20")
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
} }
}, },
},
created:function(){ created:function(){
} }
......
src/views/Business/Gitopn/Ovwp.vue
...@@ -1254,12 +1254,12 @@ ...@@ -1254,12 +1254,12 @@
<c-col :span="24"> <c-col :span="24">
<c-col :span="20"> <c-col :span="20">
<el-form-item v-if="model.gitp.swiftflg=='Y'&&model.gitp.exptxtmodflg==''" label="Expiry Condition/ Evt." prop="gidgrp.blk.exptxt"> <c-form-item v-show="model.gitp.swiftflg=='Y'&&model.gitp.exptxtmodflg==''" label="Expiry Condition/ Evt." prop="gidgrp.blk.exptxt">
<c-input type="textarea" rows="4" :disabled="model.gitp.exptxtmodflg==''" v-model="model.gidgrp.blk.exptxt" maxlength="780" show-word-limit placeholder="请输入Expiry Condition/ Evt." ></c-input> <c-input type="textarea" rows="4" :disabled="model.gitp.exptxtmodflg==''" v-model="model.gidgrp.blk.exptxt" maxlength="780" show-word-limit placeholder="请输入Expiry Condition/ Evt." ></c-input>
</el-form-item> </c-form-item>
<el-form-item v-if="model.gitp.swiftflg=='Y'&&model.gitp.exptxtmodflg=='X'" label="Expiry Condition/ Evt." prop="gidgrp.blk.atxexptxt"> <c-form-item v-show="model.gitp.swiftflg=='Y'&&model.gitp.exptxtmodflg=='X'" label="Expiry Condition/ Evt." prop="gidgrp.blk.atxexptxt">
<c-input type="textarea" rows="4" :disabled="model.gitp.exptxtmodflg==''" v-model="model.gidgrp.blk.atxexptxt" maxlength="780" show-word-limit placeholder="请输入Expiry Condition/ Evt." ></c-input> <c-input type="textarea" rows="4" :disabled="model.gitp.exptxtmodflg==''" v-model="model.gidgrp.blk.atxexptxt" maxlength="780" @blur="atxexpBlur" show-word-limit placeholder="请输入Expiry Condition/ Evt." ></c-input>
</el-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="4"> <c-col :span="4">
<c-checkbox v-if="model.gitp.swiftflg=='Y'" v-model="model.gitp.exptxtmodflg" :disabled="model.gidgrp.rec.exptyp=='FIXD'||model.gidgrp.rec.exptyp=='OPEN'||model.gidgrp.rec.exptyp==''" style="margin:0 0 0 10px">Modify Text</c-checkbox> <c-checkbox v-if="model.gitp.swiftflg=='Y'" v-model="model.gitp.exptxtmodflg" :disabled="model.gidgrp.rec.exptyp=='FIXD'||model.gidgrp.rec.exptyp=='OPEN'||model.gidgrp.rec.exptyp==''" style="margin:0 0 0 10px">Modify Text</c-checkbox>
...@@ -1336,6 +1336,7 @@ import commonProcess from "~/mixin/commonProcess"; ...@@ -1336,6 +1336,7 @@ import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable"
import Event from "~/model/Gitopn/Event" import Event from "~/model/Gitopn/Event"
import Ptap from "~/views/Public/Ptap"; import Ptap from "~/views/Public/Ptap";
import Utils from "~/utils";
export default { export default {
components: { "c-ptap": Ptap }, components: { "c-ptap": Ptap },
...@@ -1365,9 +1366,12 @@ export default { ...@@ -1365,9 +1366,12 @@ export default {
}, },
valueChange() { valueChange() {
if (this.onlySearch) return; if (this.onlySearch) return;
// this.showGridPromptDialog( },
// `${this.argadr.grp}.${this.argadr.rol}.pts.extkey` async atxexpBlur(){
// ); let rtnmsg = await this.executeRule("gidgrp.blk.atxexptxt")
if (rtnmsg.respCode == SUCCESS) {
Utils.updateModel(this.model, rtnmsg.data);
}
}, },
}, },
created:function(){ created:function(){
......
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