Commit e9c8d541 by WH

修复缺陷

parent 9dfcaf9b
...@@ -35,8 +35,7 @@ export default { ...@@ -35,8 +35,7 @@ export default {
const res = await Api.post('/service/betdcr/init', { const res = await Api.post('/service/betdcr/init', {
transName: this.trnName, transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
// brdinr: this.$route.query.inr, bedgrp:{
brdgrp:{
rec:{ rec:{
inr: this.$route.query.inr inr: this.$route.query.inr
} }
......
...@@ -35,8 +35,7 @@ export default { ...@@ -35,8 +35,7 @@ export default {
const res = await Api.post('/service/betsnd/init', { const res = await Api.post('/service/betsnd/init', {
transName: this.trnName, transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
// brdinr: this.$route.query.inr, bedgrp:{
brdgrp:{
rec:{ rec:{
inr: this.$route.query.inr inr: this.$route.query.inr
} }
......
...@@ -36,13 +36,11 @@ export default { ...@@ -36,13 +36,11 @@ export default {
...params, ...params,
transName: this.trnName, transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
// brdinr: this.$route.query.inr, bedgrp:{
// brdgrp:{ rec:{
// rec:{ inr: this.$route.query.inr
// inr: this.$route.query.inr }
// // inr: '00000484' },
// }
// },
}); });
if (!res.data) { if (!res.data) {
return return
......
...@@ -36,13 +36,11 @@ export default { ...@@ -36,13 +36,11 @@ export default {
...params, ...params,
transName: this.trnName, transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
// brdinr: this.$route.query.inr, bedgrp:{
// brdgrp:{ rec:{
// rec:{ inr: this.$route.query.inr
// inr: this.$route.query.inr }
// // inr: '00000484' },
// }
// },
}); });
if (!res.data) { if (!res.data) {
return return
......
...@@ -9,196 +9,202 @@ import docpan from '~/components/business/docpan/event'; ...@@ -9,196 +9,202 @@ import docpan from '~/components/business/docpan/event';
import ccvpan from '~/components/business/ccvpan/event'; import ccvpan from '~/components/business/ccvpan/event';
import limitbody from '~/components/business/limitbody/event'; import limitbody from '~/components/business/limitbody/event';
import doctre from '~/components/business/doctre/event'; import doctre from '~/components/business/doctre/event';
export default { export default {
mixins: [commonFunctions], mixins: [commonFunctions],
methods: { methods: {
...setmod, ...setmod,
...glentry, ...glentry,
...engp, ...engp,
...docpan, ...docpan,
...ccvpan, ...ccvpan,
...limitbody, ...limitbody,
...doctre, ...doctre,
async init() { async init() {
const params = { const params = {
spt: JSON.parse(localStorage.getItem('row_' + this.trnName)), spt: JSON.parse(localStorage.getItem('row_' + this.trnName)),
trnmod:{ trnmod: {
trn:JSON.parse(localStorage.getItem('review_'+this.trnName)) trn: JSON.parse(localStorage.getItem('review_' + this.trnName))
} }
} }
if ( typeof(this.$route.query.inr) == 'string' ){ if (typeof (this.$route.query.inr) == 'string') {
params.spt = null params.spt = null
params.trnmod.trn =null params.trnmod.trn = null
} }
const loading = this.loading(); const loading = this.loading();
const res = await Api.post('/service/letnot/init', { const res = await Api.post('/service/letnot/init', {
...params, ...params,
transName: this.trnName, transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
}); ledgrp: {
loading.close(); rec: {
if (!res.data) { inr: this.$route.query.inr
return }
} }
this.copyValueFromVoData(this.model, res.data) });
this.copyValueFromVoData(this.model.setmod.setfeg, res.data.setfeg) loading.close();
this.copyValueFromVoData(this.model.setmod.setfog, res.data.setfog) if (!res.data) {
this.copyValueFromVoData(this.model.setmod.setglg, res.data.setglg) return
}, }
// 兼容处理在前端model中定义了字段,后端返回的数据中不存在字段的问题 this.copyValueFromVoData(this.model, res.data)
copyValueFromVoData (model, data) { this.copyValueFromVoData(this.model.setmod.setfeg, res.data.setfeg)
let keysList = Object.keys(model) this.copyValueFromVoData(this.model.setmod.setfog, res.data.setfog)
keysList.map((key) => { this.copyValueFromVoData(this.model.setmod.setglg, res.data.setglg)
if (data[key]) { },
if (Utils.typeOf(model[key]) === 'Object') { // 兼容处理在前端model中定义了字段,后端返回的数据中不存在字段的问题
this.copyValueFromVoData(model[key], data[key]) copyValueFromVoData(model, data) {
} else { let keysList = Object.keys(model)
this.$set(model, key, data[key]) keysList.map((key) => {
} if (data[key]) {
} if (Utils.typeOf(model[key]) === 'Object') {
}) this.copyValueFromVoData(model[key], data[key])
}, } else {
async tabClick(tab) { this.$set(model, key, data[key])
if (this.isInDisplay) { }
return;
}
let name = tab.name;
switch (name) {
case 'ccvpan':
let ccvpanRequest = buildFn.buildCcvpan(this.model, this.trnName);
this.processLiaccv(ccvpanRequest);
break;
case 'engp':
let engpRequest = buildFn.buildEngp(this.model, this.trnName);
this.processLiaall(engpRequest);
break;
case 'setmod':
let setfegRequest = buildFn.buildSetfeg(this.model, this.trnName);
// 此处利用回调是为了等setfeg的接口调用完成后才去获取setglg参数,由于setglg参数依赖于setfeg函数的返回值
this.processSetpan(setfegRequest, () => {
return buildFn.buildSetglg(this.model, this.trnName);
});
break;
case 'docpan':
let docpanRequest = buildFn.buildDocpan(this.model, this.trnName);
this.processTrndoc(docpanRequest);
break;
case 'glentry':
let glentryRequest = buildFn.buildGlentry(this.model, this.trnName);
this.processGlentry(glentryRequest);
break;
case 'limitbody':
let limitbodyRequest = buildFn.buildLimitbody(
this.model,
this.trnName
);
this.processLimitbody(limitbodyRequest);
break;
case 'doctre':
let doctreRequest = buildFn.buildDoctre(this.model, this.trnName);
this.processDoctre(doctreRequest);
break;
default:
return;
}
},
// 获取弹框表格数据
async queryGridEtyPromptDialogData(type, ptytyp) {
let params = {
userId: window.sessionStorage.userId || 'ZL',
ptytyp: ptytyp,
extkey: this.model.ledgrp[type.toLowerCase()].pts.extkey,
};
let res = await Api.post('/service/ptspta/list', params);
if (res.respCode == SUCCESS) {
this.root.$refs['etyDialog'].show = true;
this.root.promptData.data = res.data.ptaInfos;
this.root.promptData.type = type;
}
},
// 选中letnot弹框表格的行数据
async selectGridEtyPromptData(row) {
let params = {
...row,
};
let res = await Api.post('/service/ptspta/fetch', params);
if (res.respCode == SUCCESS) {
this.$set(this.model.ledgrp, row.role.toLowerCase(), res.data);
}
},
// //获取信用证编号
// async onLitpButgetref() {
// let params = {
// ptainr: this.model.ledgrp.apl.pts.ptainr,
// businessType: 'LG',
// tbl: 'LG',
// };
// const loading = this.loading();
// let res = await Api.post('/service/letnot/getOwnRef', params);
// if (res.respCode == SUCCESS) {
// loading.close();
// this.model.ledgrp.rec.ownref = res.data;
// }
// },
// // 初始化开立类型码表下拉列表
// async queryHndtypCodeTableList(trnName) {
// let params = {
// letp: {
// swiftflg: this.model.letp.swiftflg,
// },
// ledgrp: {
// rec: {
// purpos: this.model.ledgrp.rec.purpos,
// },
// },
// transName: trnName.toUpperCase(),
// };
// // let res = await Api.post('/service/litopn/initHndtyp', params);
// // if (res.respCode == SUCCESS) {
// // this.$set(this.codes, 'voHndtyp', res.data);
// // }
// },
// 是否SWIFT格式修改--联动保函开立类型
// handleChangeSwiftflg() {
// this.queryHndtypCodeTableList(this.root.trnName);
// },
// 支出目的修改--联动保函开立类型
// handleChangePurpos() {
// this.queryHndtypCodeTableList(this.root.trnName);
// },
apprulChange(v) {
if (v !== 'OTHR') {
this.model.ledgrp.rec.apprultxt = ''
}
},
openAddAmount(val){
if(val ==='' && !(this.model.ledgrp.cbs.max2.amt =='0.000'&& this.model.ledgrp.blk.addamtcov === '') ){
this.$confirm('是否确定要删除此合同的附加金额?','提示',{
confirmButtonText: '是',
cancelButtonText: '否',
type: 'warning',
showClose:false
}).then(() => {//yes的执行在这里写
this.executeRule('letp.aamp.aammod.addamtflg').then(res => {
if (res.respCode == SUCCESS) {
this.updateModel(res.data)
} }
}) })
// this.model.ledgrp.cbs.max2.amt ='0.000'; },
// this.model.ledgrp.blk.addamtcov = ''; async tabClick(tab) {
// this.$message({ if (this.isInDisplay) {
// type: 'success', return;
// message: '删除成功!' }
// }); let name = tab.name;
}).catch(() => {//No的功能在这里写 switch (name) {
this.model.letp.aamp.aammod.addamtflg ='X' case 'ccvpan':
// this.$message({ let ccvpanRequest = buildFn.buildCcvpan(this.model, this.trnName);
// type: 'info', this.processLiaccv(ccvpanRequest);
// message: '已取消' break;
// }); case 'engp':
}); let engpRequest = buildFn.buildEngp(this.model, this.trnName);
} this.processLiaall(engpRequest);
break;
case 'setmod':
let setfegRequest = buildFn.buildSetfeg(this.model, this.trnName);
// 此处利用回调是为了等setfeg的接口调用完成后才去获取setglg参数,由于setglg参数依赖于setfeg函数的返回值
this.processSetpan(setfegRequest, () => {
return buildFn.buildSetglg(this.model, this.trnName);
});
break;
case 'docpan':
let docpanRequest = buildFn.buildDocpan(this.model, this.trnName);
this.processTrndoc(docpanRequest);
break;
case 'glentry':
let glentryRequest = buildFn.buildGlentry(this.model, this.trnName);
this.processGlentry(glentryRequest);
break;
case 'limitbody':
let limitbodyRequest = buildFn.buildLimitbody(
this.model,
this.trnName
);
this.processLimitbody(limitbodyRequest);
break;
case 'doctre':
let doctreRequest = buildFn.buildDoctre(this.model, this.trnName);
this.processDoctre(doctreRequest);
break;
default:
return;
}
},
// 获取弹框表格数据
async queryGridEtyPromptDialogData(type, ptytyp) {
let params = {
userId: window.sessionStorage.userId || 'ZL',
ptytyp: ptytyp,
extkey: this.model.ledgrp[type.toLowerCase()].pts.extkey,
};
let res = await Api.post('/service/ptspta/list', params);
if (res.respCode == SUCCESS) {
this.root.$refs['etyDialog'].show = true;
this.root.promptData.data = res.data.ptaInfos;
this.root.promptData.type = type;
}
},
// 选中letnot弹框表格的行数据
async selectGridEtyPromptData(row) {
let params = {
...row,
};
let res = await Api.post('/service/ptspta/fetch', params);
if (res.respCode == SUCCESS) {
this.$set(this.model.ledgrp, row.role.toLowerCase(), res.data);
}
},
// //获取信用证编号
// async onLitpButgetref() {
// let params = {
// ptainr: this.model.ledgrp.apl.pts.ptainr,
// businessType: 'LG',
// tbl: 'LG',
// };
// const loading = this.loading();
// let res = await Api.post('/service/letnot/getOwnRef', params);
// if (res.respCode == SUCCESS) {
// loading.close();
// this.model.ledgrp.rec.ownref = res.data;
// }
// },
// // 初始化开立类型码表下拉列表
// async queryHndtypCodeTableList(trnName) {
// let params = {
// letp: {
// swiftflg: this.model.letp.swiftflg,
// },
// ledgrp: {
// rec: {
// purpos: this.model.ledgrp.rec.purpos,
// },
// },
// transName: trnName.toUpperCase(),
// };
// // let res = await Api.post('/service/litopn/initHndtyp', params);
// // if (res.respCode == SUCCESS) {
// // this.$set(this.codes, 'voHndtyp', res.data);
// // }
// },
// 是否SWIFT格式修改--联动保函开立类型
// handleChangeSwiftflg() {
// this.queryHndtypCodeTableList(this.root.trnName);
// },
// 支出目的修改--联动保函开立类型
// handleChangePurpos() {
// this.queryHndtypCodeTableList(this.root.trnName);
// },
apprulChange(v) {
if (v !== 'OTHR') {
this.model.ledgrp.rec.apprultxt = ''
}
},
openAddAmount(val) {
if (val === '' && !(this.model.ledgrp.cbs.max2.amt == '0.000' && this.model.ledgrp.blk.addamtcov === '')) {
this.$confirm('是否确定要删除此合同的附加金额?', '提示', {
confirmButtonText: '是',
cancelButtonText: '否',
type: 'warning',
showClose: false
}).then(() => {//yes的执行在这里写
this.executeRule('letp.aamp.aammod.addamtflg').then(res => {
if (res.respCode == SUCCESS) {
this.updateModel(res.data)
}
})
// this.model.ledgrp.cbs.max2.amt ='0.000';
// this.model.ledgrp.blk.addamtcov = '';
// this.$message({
// type: 'success',
// message: '删除成功!'
// });
}).catch(() => {//No的功能在这里写
this.model.letp.aamp.aammod.addamtflg = 'X'
// this.$message({
// type: 'info',
// message: '已取消'
// });
});
}
},
}, },
},
}; };
...@@ -255,7 +255,7 @@ export default class Letnot { ...@@ -255,7 +255,7 @@ export default class Letnot {
// }, // },
// chaadv: "", // Narrative to .chaadv // chaadv: "", // Narrative to .chaadv
// pageId: "", // ctx的key // pageId: "", // ctx的key
// //
// setmod: new Pub().data.Setmod, // setmod: new Pub().data.Setmod,
// mtabut: new Pub().data.Mtabut, // mtabut: new Pub().data.Mtabut,
// trnmod: new Pub().data.Trnmod, // trnmod: new Pub().data.Trnmod,
...@@ -263,7 +263,7 @@ export default class Letnot { ...@@ -263,7 +263,7 @@ export default class Letnot {
// liaccv: new Pub().data.Liaccv, // liaccv: new Pub().data.Liaccv,
// docpan: new Pub().data.Docpan, // docpan: new Pub().data.Docpan,
// } // }
this.data = { this.data = {
number: '', number: '',
ledgrp: { ledgrp: {
blk: { blk: {
...@@ -383,12 +383,12 @@ export default class Letnot { ...@@ -383,12 +383,12 @@ export default class Letnot {
} }
} }
}, },
setmod: new Pub().data.Setmod, setmod: new Pub().data.Setmod,
mtabut: new Pub().data.Mtabut, mtabut: new Pub().data.Mtabut,
trnmod: new Pub().data.Trnmod, trnmod: new Pub().data.Trnmod,
liaall: new Pub().data.Liaall, liaall: new Pub().data.Liaall,
liaccv: new Pub().data.Liaccv, liaccv: new Pub().data.Liaccv,
docpan: new Pub().data.Docpan, docpan: new Pub().data.Docpan,
}; };
} }
} }
\ No newline at end of file
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