Skip to content

V
vue-gjjs
Commit 43964450 by liaoxing
Options

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs… 

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110
parents 862356a2 a9b2a753
Showing with 244 additions and 206 deletions
src/business/brtacp/event/buildCommons.js
......@@ -19,42 +19,42 @@ export default {
},
buildCommonData (model, trnName) {
let ptsptaList = [];
if (model.gidgrp.apl.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.gidgrp.apl));
if (model.lidgrp.apl.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.lidgrp.apl));
}
if (model.gidgrp.adv.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.gidgrp.adv));
if (model.lidgrp.adv.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.lidgrp.adv));
}
if (model.gidgrp.ben.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.gidgrp.ben));
if (model.lidgrp.ben.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.lidgrp.ben));
}
let dataObj = {
rec: {
objtyp: 'GID',
ownref: model.gidgrp.rec.ownref,
opndat: model.gidgrp.rec.opndat,
expdat: model.gidgrp.rec.expdat,
branchInr: model.gidgrp.rec.branchInr,
hndtyp: model.gidgrp.rec.hndtyp,
gartyp: model.gidgrp.rec.gartyp,
fingua: model.gidgrp.rec.fingua,
segtyp: model.gidgrp.ghd.segtyp,
fromflg: model.gidgrp.rec.fromflg,
othersno: model.gidgrp.rec.othersno,
sndto: model.gidgrp.rec.sndto,
objtyp: 'LID',
ownref: model.lidgrp.rec.ownref,
opndat: model.lidgrp.rec.opndat,
expdat: model.lidgrp.rec.expdat,
branchInr: model.lidgrp.rec.branchInr,
hndtyp: model.lidgrp.rec.hndtyp,
gartyp: model.lidgrp.rec.gartyp,
fingua: model.lidgrp.rec.fingua,
segtyp: model.lidgrp.ghd.segtyp,
fromflg: model.lidgrp.rec.fromflg,
othersno: model.lidgrp.rec.othersno,
sndto: model.lidgrp.rec.sndto,
swiftflg: model.gitp.swiftflg,
giduil: model.gidgrp.rec.giduil,
purpos: model.gidgrp.rec.purpos,
revflg: model.gidgrp.rec.revflg,
cnfsta: model.gidgrp.rec.cnfsta,
liduil: model.lidgrp.rec.liduil,
purpos: model.lidgrp.rec.purpos,
revflg: model.lidgrp.rec.revflg,
cnfsta: model.lidgrp.rec.cnfsta,
},
cbsMap: {
MAX: model.gidgrp.cbs.max,
OPN1: model.gidgrp.cbs.opn1,
MAC: model.gidgrp.cbs.mac,
MAC2: model.gidgrp.cbs.mac2,
OPC2: model.gidgrp.cbs.opc2,
CNF: model.gidgrp.cbs.cnf,
MAX: model.lidgrp.cbs.max,
OPN1: model.lidgrp.cbs.opn1,
MAC: model.lidgrp.cbs.mac,
MAC2: model.lidgrp.cbs.mac2,
OPC2: model.lidgrp.cbs.opc2,
CNF: model.lidgrp.cbs.cnf,
},
ptsList: ptsptaList,
transName: trnName,
......@@ -67,7 +67,7 @@ export default {
...this.buildCommonData(model, trnName),
liaall: model.liaall,
liaccv: model.liaccv,
doceot: model.trnmod.trndoc.doceot,
// doceot: model.trnmod.trndoc.doceot,
};
return params
},
......@@ -117,9 +117,9 @@ export default {
let params = {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'GID',
objinr: model.gidgrp.rec.objinr,
ownref: model.gidgrp.rec.ownref,
objtyp: 'LID',
objinr: model.lidgrp.rec.objinr,
ownref: model.lidgrp.rec.ownref,
},
};
return params
......@@ -128,9 +128,9 @@ export default {
let params = {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'GID',
objinr: model.gidgrp.rec.objinr,
ownref: model.gidgrp.rec.ownref,
objtyp: 'LID',
objinr: model.lidgrp.rec.objinr,
ownref: model.lidgrp.rec.ownref,
swiftflg: model.gitp.swiftflg,
},
};
......
src/business/brtacp/model/index.js
......@@ -151,6 +151,15 @@ export default class Brtacp {
}
},
lidgrp: {
ben: {
pts: new Pts().data,
},
apl: {
pts: new Pts().data,
},
adv: {
pts: new Pts().data,
},
rec: {
branchinr: '',
expdat: '',
......@@ -162,8 +171,10 @@ export default class Brtacp {
amt: 0
}
},
ben: {
maps: {}
ghd: {
segtyp: '',
bustyp: '',
remark: '',
},
},
gcdgrp: {
......
src/business/brteus/event/index.js
......@@ -30,9 +30,9 @@ export default {
userId: window.sessionStorage.userId || 'ZL',
lidgrp:{
rec:{
inr:'00000342',
inr: this.$route.query.inr
}
}
},
});
// debugger
if (!res.data) {
......
src/business/litcan/event/buildCommons.js
export default {
buildPtspta(ptsptaObj) {
buildPtspta (ptsptaObj) {
let pts = ptsptaObj.pts;
let ptspta = {
rol: pts.rol,
......@@ -13,149 +13,113 @@ export default {
dftfeecur: pts.dftfeecur,
dftactptainr: pts.dftactptainr,
glggrpflg: pts.glggrpflg,
adrblk: pts.adrblk,
adrblk: pts.adrblk
};
return ptspta;
},
buildCommonData(model, trnName) {
buildCommonData (model, trnName) {
let ptsptaList = [];
if (model.gidgrp.apl.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.gidgrp.apl));
if (model.lidgrp.apl.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.lidgrp.apl));
}
if (model.gidgrp.ben.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.gidgrp.ben));
if (model.lidgrp.adv.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.lidgrp.adv));
}
if (model.lidgrp.ben.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.lidgrp.ben));
}
let dataObj = {
rec: {
objtyp: 'LID',
objinr: model.gidgrp.rec.objinr,
ownref: model.gidgrp.rec.ownref,
segtyp: model.gidgrp.rec.segtyp,
fromflg: model.gidgrp.rec.fromflg,
othersno: model.gidgrp.rec.othersno,
sndto: model.gidgrp.rec.sndto,
giduil: model.gidgrp.rec.giduil,
purpos: model.gidgrp.rec.purpos,
revflg: model.gidgrp.rec.revflg,
cnfsta: model.gidgrp.rec.cnfsta,
ownref: model.lidgrp.rec.ownref,
opndat: model.lidgrp.rec.opndat,
expdat: model.lidgrp.rec.expdat,
branchInr: model.lidgrp.rec.branchInr,
hndtyp: model.lidgrp.rec.hndtyp,
gartyp: model.lidgrp.rec.gartyp,
fingua: model.lidgrp.rec.fingua,
segtyp: model.lidgrp.ghd.segtyp,
fromflg: model.lidgrp.rec.fromflg,
othersno: model.lidgrp.rec.othersno,
sndto: model.lidgrp.rec.sndto,
swiftflg: model.gitp.swiftflg,
liduil: model.lidgrp.rec.liduil,
purpos: model.lidgrp.rec.purpos,
revflg: model.lidgrp.rec.revflg,
cnfsta: model.lidgrp.rec.cnfsta,
},
cbsMap: {
MAX: model.gidgrp.cbs.max,
OPN1: model.gidgrp.cbs.opn1,
MAC: model.gidgrp.cbs.mac,
MAC2: model.gidgrp.cbs.mac2,
OPC2: model.gidgrp.cbs.opc2,
CNF: model.gidgrp.cbs.cnf,
MAX: model.lidgrp.cbs.max,
OPN1: model.lidgrp.cbs.opn1,
MAC: model.lidgrp.cbs.mac,
MAC2: model.lidgrp.cbs.mac2,
OPC2: model.lidgrp.cbs.opc2,
CNF: model.lidgrp.cbs.cnf,
},
ptsList: ptsptaList,
transName: trnName,
userId: window.sessionStorage.userId
? window.sessionStorage.userId
: 'ZL',
userId: window.sessionStorage.userId ? window.sessionStorage.userId : 'ZL'
};
return dataObj;
return dataObj
},
buildSetfeg(model, trnName) {
buildSetfeg (model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
liaall: model.liaall,
liaccv: model.liaccv,
doceot: model.trnmod.trndoc.doceot,
// doceot: model.trnmod.trndoc.doceot,
};
return params;
return params
},
buildSetglg(model, trnName) {
buildSetglg (model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
setfeg: model.setmod.setfeg,
liaall: model.liaall,
liaccv: model.liaccv,
};
return params;
return params
},
buildGlentry(model, trnName) {
buildGlentry (model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'LID',
segtyp: model.gidgrp.rec.segtyp,
fromflg: model.gidgrp.rec.fromflg,
othersno: model.gidgrp.rec.othersno,
sndto: model.gidgrp.rec.sndto,
giduil: model.gidgrp.rec.giduil,
purpos: model.gidgrp.rec.purpos,
revflg: model.gidgrp.rec.revflg,
cnfsta: model.gidgrp.rec.cnfsta,
},
liaccv: model.liaccv,
doceot: model.trnmod.trndoc.doceot,
transName: trnName,
liaallg: model.liaall.liaallg,
setfog: model.setmod.setfog,
setfeg: model.setmod.setfeg,
setglg: model.setmod.setglg,
};
return params;
return params
},
buildEngp(model, trnName) {
buildEngp (model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
cbsMap: {
CNF: model.gidgrp.cbs.cnf,
},
liaccv: model.liaccv,
doceot: model.trnmod.trndoc.doceot,
transName: trnName,
liaallg: model.liaall.liaallg,
};
params.rec = {
...params.rec,
opndat: model.gidgrp.rec.opndat,
branchInr: model.gidgrp.rec.branchInr,
hndtyp: model.gidgrp.rec.hndtyp,
gartyp: model.gidgrp.rec.gartyp,
fingua: model.gidgrp.rec.fingua,
};
return params;
return params
},
buildDocpan(model, trnName) {
buildDocpan (model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'LID',
fromflg: model.gidgrp.rec.fromflg,
othersno: model.gidgrp.rec.othersno,
sndto: model.gidgrp.rec.sndto,
giduil: model.gidgrp.rec.giduil,
purpos: model.gidgrp.rec.purpos,
cnfsta: model.gidgrp.rec.cnfsta,
revflg: model.gidgrp.rec.revflg,
},
liaccv: model.liaccv,
doceot: model.trnmod.trndoc.doceot,
transName: trnName,
};
return params;
return params
},
buildCcvpan(model, trnName) {
buildCcvpan (model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
};
params.rec = {
...params.rec,
opndat: model.gidgrp.rec.opndat,
expdat: model.gidgrp.rec.expdat,
branchInr: model.gidgrp.rec.branchInr,
hndtyp: model.gidgrp.rec.hndtyp,
gartyp: model.gidgrp.rec.gartyp,
fingua: model.gidgrp.rec.fingua,
liaccvg: model.liaccv.liaccvg,
oldamt: model.liaccv.oldamt,
chgamt: model.liaccv.chgamt,
concur: model.liaccv.concur,
};
return params;
return params
},
buildLimitbody (model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'GID',
objinr: model.gidgrp.rec.objinr,
ownref: model.gidgrp.rec.ownref,
objtyp: 'LID',
objinr: model.lidgrp.rec.objinr,
ownref: model.lidgrp.rec.ownref,
},
};
return params
......@@ -164,9 +128,9 @@ export default {
let params = {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'GID',
objinr: model.gidgrp.rec.objinr,
ownref: model.gidgrp.rec.ownref,
objtyp: 'LID',
objinr: model.lidgrp.rec.objinr,
ownref: model.lidgrp.rec.ownref,
swiftflg: model.gitp.swiftflg,
},
};
......@@ -180,4 +144,4 @@ export default {
};
return params
}
}
\ No newline at end of file
}
\ No newline at end of file
src/business/litcan/event/index.js
......@@ -6,7 +6,10 @@ import glentry from '~/components/business/glentry/event';
import engp from '~/components/business/engp/event';
import docpan from '~/components/business/docpan/event';
import ccvpan from '~/components/business/ccvpan/event';
import limitbody from '~/components/business/limitbody/event';
import doctre from '~/components/business/doctre/event';
import Utils from "~/utils"
export default {
mixins: [commonFunctions],
methods: {
......@@ -15,18 +18,22 @@ export default {
...engp,
...docpan,
...ccvpan,
...limitbody,
...doctre,
async init () {
const params = {
spt: JSON.parse(localStorage.getItem('row_' + this.trnName))
}
const res = await Api.post('/service/litcan/init', {
...params,
transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL',
gidInr: this.$route.query.inr,
// lidInr:'00006832',
lidgrp:{
rec:{
// inr:this.$route.query.inr
inr:'00006829'
inr:this.$route.query.inr
}
}
});
if (!res.data) {
return
......@@ -63,7 +70,7 @@ export default {
let engpRequest = buildFn.buildEngp(this.model, this.trnName);
this.processLiaall(engpRequest);
break;
case 'setpan':
case 'setmod':
let setfegRequest = buildFn.buildSetfeg(this.model, this.trnName);
// 此处利用回调是为了等setfeg的接口调用完成后才去获取setglg参数，由于setglg参数依赖于setfeg函数的返回值
this.processSetpan(setfegRequest, () => {
......@@ -79,22 +86,20 @@ export default {
this.processGlentry(glentryRequest);
break;
case 'limitbody':
let limitbodyRequest = buildFn.buildLimitbody(
this.model,
this.trnName
);
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;
}
},
// 点击获取按钮拉取当前key字段下的表单数据
queryFormData(key) {
// 点击获取按钮拉取当前key字段下的表单数据
queryFormData(key) {
console.log(key);
},
// 业务信息=》基本信息=》保函编号-----获取保函编号
......@@ -111,7 +116,7 @@ export default {
this.model.gidgrp.rec.ownref = res.data;
}
},
// 获取gitopn弹框表格数据
// 获取litcan弹框表格数据
async queryGridEtyPromptDialogData(type, ptytyp) {
let params = {
userId: window.sessionStorage.userId || 'ZL',
......@@ -125,7 +130,7 @@ export default {
this.root.promptData.type = type;
}
},
// 选中gitopn弹框表格的行数据
// 选中litcan弹框表格的行数据
async selectGridEtyPromptData(row) {
let params = {
...row,
......@@ -194,5 +199,5 @@ export default {
return
}
}
}
}
\ No newline at end of file
},
};
src/business/litcan/model/index.js
......@@ -3,10 +3,68 @@ import Pub from '~/components/business/commonModel/index.js';
export default class Litcan {
constructor() {
this.data = {
sndmsg: 'X',
litapll1blk: '',
litrmbl3blk: '',
litcanl1blk: '',
cbsMap:{
MAX:{
cur:''
}
},
gitp:{
swiftflg:'',
},
sndmsg: '',
lidgrp: {
ghd:{
segtyp:'',
},
rec: {
branchinr: '',
ownref: '', // 参考号 .lidgrp.rec.ownref
nam: '', // 名称 .lidgrp.rec.nam
avbby: '', // 兑付方式 .lidgrp.rec.avbby
redclsflg: '', // Red/Green Clause .lidgrp.rec.redclsflg
opndat: '', // 开立日期 .lidgrp.rec.opndat
shpdat: '', // Shipment Date .lidgrp.rec.shpdat
expdat: '', // 到期日 .lidgrp.rec.expdat
expplc: '', // 到期日 .lidgrp.rec.expplc
lcrtyp: '', // 信用证类型 .lidgrp.rec.lcrtyp
revflg: '', // Revolving Flag .lidgrp.rec.revflg
advnam: '',
},
cbs: {
nom1: {
cur: '', // 开证金额 .lidgrp.cbs.nom1.cur
amt: '', // 开证金额 .lidgrp.cbs.nom1.amt
},
opn1: {
cur: '', // 信用证余额 .lidgrp.cbs.opn1.cur
amt: '', // Balance .lidgrp.cbs.opn1.amt
},
max: {
cur: '', // 信用证余额 .lidgrp.cbs.opn1.cur
amt: '', // Balance .lidgrp.cbs.opn1.amt
},
},
apl: {
pts: {
ref:'',
nam:'',
}
},
ben: {
pts: {
ref:'',
nam:'',
}
},
adv: {
pts: {
ref:'',
nam:'',
}
},
avbnam: '', // 指定银行 .lidgrp.avbnam
},
litp0: {
aammod: {
addamtflg: '', // Add. Amount .litp0.aammod.addamtflg
......@@ -16,25 +74,7 @@ export default class Litcan {
strinf: '', // Narrative .litcanf.strinf
},
gcdgrp: {
prb: {
adrelc: '',
dbfadrblkcn: '',
namelc: '',
pts: new Pts().data,
},
rec: {
clmdat: '',
ownref: '',
payrol: '',
nam: '',
docprbrol: '',
},
oth: {
adrelc: '',
dbfadrblkcn: '',
namelc: '',
pts: new Pts().data,
},
cbs: {
opn1: {
cur: '',
......@@ -54,25 +94,13 @@ export default class Litcan {
adv: {
pts: new Pts().data,
},
apl: {
pts: new Pts().data,
},
},
gidgrp: {
rec: {
expdat: '',
liadat: '',
ownref: '',
gartyp: ''
},
ghd: {
wahnum: '',
remark: '',
bustyp: '',
segtyp: ''
},
cbs: {
opn1: {
cur: '',
amt: ''
}
rec:{
objinr:'',
},
ctr: {
pts: new Pts().data,
......@@ -98,6 +126,37 @@ export default class Litcan {
apl: {
pts: new Pts().data,
},
cbs: {
max: '',
}
},
liaall: {
con: {
pts: new Pts().data,
},
iss: {
pts: new Pts().data,
},
ben: {
pts: new Pts().data,
},
atb: {
pts: new Pts().data,
},
avc: {
pts: new Pts().data,
},
},
trnmod: {
ctr: {
pts: new Pts().data,
},
con: {
pts: new Pts().data,
},
iss: {
pts: new Pts().data,
},
},
byinst: '', // On Applicant instruction .byinst
pageId: '', // ctx的key
......
src/components/business/doctre/views/index.vue
......@@ -142,19 +142,19 @@ export default {
},
},
watch: {
'model.trnmod.trndoc.doceot': {
handler(val, oldVal) {
var arr = [];
let k = 0;
for (let i = 0; i < val.length; i++) {
if (val[i].role != '') {
arr[k++] = val[i];
}
}
this.data1 = arr;
},
immediate: true,
},
// 'model.trnmod.trndoc.doceot': {
// handler(val, oldVal) {
// var arr = [];
// let k = 0;
// for (let i = 0; i < val.length; i++) {
// if (val[i].role != '') {
// arr[k++] = val[i];
// }
// }
// this.data1 = arr;
// },
// immediate: true,
// },
model: {
handler (newVal) {
console.log('model', newVal)
......
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