Skip to content

V
vue-gjjs
Commit 2c63347b by WF1020
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 2e3c484b 31b37e54
Showing with 110 additions and 252 deletions
src/business/brtdcr/event/index.js
...@@ -27,7 +27,7 @@ export default { ...@@ -27,7 +27,7 @@ export default {
const res = await Api.post('/service/brtdcr/init', { const res = await Api.post('/service/brtdcr/init', {
transName: this.trnName, transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
lidinr: this.$route.query.inr brdinr: this.$route.query.inr,
}); });
if (!res.data) { if (!res.data) {
return return
......
src/business/brteus/event/buildCommons.js
...@@ -64,7 +64,7 @@ export default { ...@@ -64,7 +64,7 @@ export default {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
liaall: model.liaall, liaall: model.liaall,
liaccv: model.liaccv, liaccv: model.liaccv,
doceot: model.trnmod.trndoc.doceot, // doceot: model.trnmod.trndoc.doceot,
}; };
return params return params
}, },
...@@ -128,7 +128,7 @@ export default { ...@@ -128,7 +128,7 @@ export default {
objtyp: 'LID', objtyp: 'LID',
objinr: model.brdgrp.rec.objinr, objinr: model.brdgrp.rec.objinr,
ownref: model.brdgrp.rec.ownref, ownref: model.brdgrp.rec.ownref,
swiftflg: model.brtp.swiftflg, // swiftflg: model.brtp.swiftflg,
}, },
}; };
return params return params
......
src/business/litcan/model/index.js
...@@ -7,42 +7,6 @@ export default class Litcan { ...@@ -7,42 +7,6 @@ export default class Litcan {
litapll1blk: '', litapll1blk: '',
litrmbl3blk: '', litrmbl3blk: '',
litcanl1blk: '', litcanl1blk: '',
lidgrp: {
rec: {
branchinr: '00000047',
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
},
},
apl: {
pts: new Pts().data,
},
ben: {
pts: new Pts().data,
},
adv: {
pts: new Pts().data,
},
avbnam: '', // 指定银行 .lidgrp.avbnam
},
litp0: { litp0: {
aammod: { aammod: {
addamtflg: '', // Add. Amount .litp0.aammod.addamtflg addamtflg: '', // Add. Amount .litp0.aammod.addamtflg
...@@ -90,9 +54,6 @@ export default class Litcan { ...@@ -90,9 +54,6 @@ export default class Litcan {
adv: { adv: {
pts: new Pts().data, pts: new Pts().data,
}, },
apl: {
pts: new Pts().data,
},
}, },
gidgrp: { gidgrp: {
rec: { rec: {
...@@ -138,130 +99,6 @@ export default class Litcan { ...@@ -138,130 +99,6 @@ export default class Litcan {
pts: new Pts().data, pts: new Pts().data,
}, },
}, },
liaall: {
concur: '',
liaccv: {
concur: '',
newamt: '',
dnfmod: {
zhruzh: '',
kehuzh: '',
intdsp: '',
lxzyzh: '',
pridsp: '',
yewudh: '',
qicuje: '',
ccvtyp: '',
tizamt: '',
zhqtyp: '',
stm8023: '',
zhhuye: '',
zhqucs: ''
},
relcshpct: '',
gleflg: '',
addinf: '',
newresamt: '',
chgcurflg: '',
pctresamt: '',
cshpct: '',
totcovamt: ''
},
outpct: '',
exttotamt: '',
exttotoldamt: '',
outamt: '',
misamt: '',
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: {
trndia: {
usrget: {
sdamod: {
seainf: ''
}
},
atpget: {
sdamod: {
seainf: '',
dadsnd: ''
}
},
usr: {
extkey: ''
},
diamodflg: '',
dspstm: '',
atp: {
cod: ''
},
diarec: {
prechkdat: '',
inftxt: '',
usr: '',
ptyextkey: '',
paycur: '',
dat: '',
ownusg: '',
cod: '',
donflg: '',
nam: '',
payamt: '',
ptynam: ''
},
atptxt: ''
},
ptsmod: {
adrp: {
prtpanblk: ''
}
},
trndoc: {
condocstm: '',
filrecv: '',
amdapl: '',
doclbl: '',
doctrestm: '',
shwout: '',
shwinc: '',
amdnam: '',
advnam: '',
advdoc: '',
advlabel: '',
rcvatt: {
seainf: ''
}
},
docimm: {
xmldocblk: '',
prtswtpblk: '',
ascin: '',
prtswtrpblk: ''
},
ctr: {
pts: new Pts().data,
},
con: {
pts: new Pts().data,
},
iss: {
pts: new Pts().data,
},
},
byinst: '', // On Applicant instruction .byinst byinst: '', // On Applicant instruction .byinst
pageId: '', // ctx的key pageId: '', // ctx的key
setmod: new Pub().data.Setmod, setmod: new Pub().data.Setmod,
......
src/business/litcan/views/index.vue
...@@ -20,11 +20,29 @@ ...@@ -20,11 +20,29 @@
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="费用/账务" name="setmod"> <!--PD000027 -->
<c-content> <el-tab-pane label="表外记账" name="engp">
<m-setmod :model="model" :codes="codes" /> <c-content>
</c-content> <!-- 表外记账 -->
</el-tab-pane> <m-engp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000027 -->
<el-tab-pane label="费用/账务" name="setmod">
<c-content>
<m-setmod :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000027 -->
<el-tab-pane label="会计分录" name="glepan">
<c-content>
<!-- 会计分录 -->
<m-glepan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="备查/附言" name="addbcb"> <el-tab-pane label="备查/附言" name="addbcb">
<c-content> <c-content>
...@@ -70,6 +88,9 @@ import Docpan from "~/components/business/docpan/views"; ...@@ -70,6 +88,9 @@ import Docpan from "~/components/business/docpan/views";
import Doctre from "~/components/business/doctre/views"; import Doctre from "~/components/business/doctre/views";
import Limitbody from "~/components/business/limitbody/views"; import Limitbody from "~/components/business/limitbody/views";
import Setpan from "~/components/business/setmod/views"; import Setpan from "~/components/business/setmod/views";
import Engp from "~/components/business/engp/views";
import Glentry from "~/components/business/glentry/views";
import Glepan from "~/components/business/glentry/views";
export default { export default {
name: "Litcan", name: "Litcan",
...@@ -85,6 +106,9 @@ export default { ...@@ -85,6 +106,9 @@ export default {
"m-ovwp": Ovwp, "m-ovwp": Ovwp,
"m-addbcb": Addbcb, "m-addbcb": Addbcb,
"m-setpan": Setpan, "m-setpan": Setpan,
"m-engp": Engp,
"m-glentry": Glentry,
"m-glepan": Glepan,
}, },
provide() { provide() {
return { return {
......
src/business/litdav/event/buildCommons.js
...@@ -19,42 +19,47 @@ export default { ...@@ -19,42 +19,47 @@ export default {
}, },
buildCommonData (model, trnName) { buildCommonData (model, trnName) {
let ptsptaList = []; let ptsptaList = [];
if (model.gidgrp.apl.pts.extkey) { if (model.lidgrp.apl.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.gidgrp.apl)); ptsptaList.push(this.buildPtspta(model.lidgrp.apl));
} }
if (model.gidgrp.adv.pts.extkey) { if (model.lidgrp.adv.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.gidgrp.adv)); ptsptaList.push(this.buildPtspta(model.lidgrp.adv));
} }
if (model.gidgrp.ben.pts.extkey) { if (model.lidgrp.ben.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.gidgrp.ben)); ptsptaList.push(this.buildPtspta(model.lidgrp.ben));
} }
let dataObj = { let dataObj = {
rec: { rec: {
objtyp: 'GID', objtyp: 'LID',
ownref: model.gidgrp.rec.ownref, ownref: model.lidgrp.rec.ownref,
opndat: model.gidgrp.rec.opndat, opndat: model.lidgrp.rec.opndat,
expdat: model.gidgrp.rec.expdat, expdat: model.lidgrp.rec.expdat,
branchInr: model.gidgrp.rec.branchInr, branchInr: model.lidgrp.rec.branchInr,
hndtyp: model.gidgrp.rec.hndtyp, hndtyp: model.lidgrp.rec.hndtyp,
gartyp: model.gidgrp.rec.gartyp, gartyp: model.lidgrp.rec.gartyp,
fingua: model.gidgrp.rec.fingua, fingua: model.lidgrp.rec.fingua,
segtyp: model.gidgrp.ghd.segtyp, // segtyp: model.gidgrp.ghd.segtyp,
fromflg: model.gidgrp.rec.fromflg, fromflg: model.lidgrp.rec.fromflg,
othersno: model.gidgrp.rec.othersno, othersno: model.lidgrp.rec.othersno,
sndto: model.gidgrp.rec.sndto, sndto: model.lidgrp.rec.sndto,
swiftflg: model.gitp.swiftflg, // swiftflg: model.gitp.swiftflg,
giduil: model.gidgrp.rec.giduil, giduil: model.lidgrp.rec.giduil,
purpos: model.gidgrp.rec.purpos, purpos: model.lidgrp.rec.purpos,
revflg: model.gidgrp.rec.revflg, revflg: model.lidgrp.rec.revflg,
cnfsta: model.gidgrp.rec.cnfsta, cnfsta: model.lidgrp.rec.cnfsta,
}, },
cbsMap: { cbsMap: {
MAX: model.gidgrp.cbs.max, MAX: model.lidgrp.cbs.max,
OPN1: model.gidgrp.cbs.opn1,
MAC: model.gidgrp.cbs.mac, OLDMAX: model.lidgrp.cbs.oldmax,
MAC2: model.gidgrp.cbs.mac2, MAX2: model.lidgrp.cbs.max2,
OPC2: model.gidgrp.cbs.opc2, NOM1: model.lidgrp.cbs.nom1,
CNF: model.gidgrp.cbs.cnf,
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, ptsList: ptsptaList,
transName: trnName, transName: trnName,
...@@ -117,7 +122,7 @@ export default { ...@@ -117,7 +122,7 @@ export default {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
rec: { rec: {
objtyp: 'GID', objtyp: 'LID',
objinr: model.gidgrp.rec.objinr, objinr: model.gidgrp.rec.objinr,
ownref: model.gidgrp.rec.ownref, ownref: model.gidgrp.rec.ownref,
}, },
...@@ -128,7 +133,7 @@ export default { ...@@ -128,7 +133,7 @@ export default {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
rec: { rec: {
objtyp: 'GID', objtyp: 'LID',
objinr: model.gidgrp.rec.objinr, objinr: model.gidgrp.rec.objinr,
ownref: model.gidgrp.rec.ownref, ownref: model.gidgrp.rec.ownref,
swiftflg: model.gitp.swiftflg, swiftflg: model.gitp.swiftflg,
......
src/business/litdav/event/index.js
...@@ -25,9 +25,16 @@ export default { ...@@ -25,9 +25,16 @@ export default {
spt: JSON.parse(localStorage.getItem('row_' + this.trnName)) spt: JSON.parse(localStorage.getItem('row_' + this.trnName))
} }
const res = await Api.post('/service/litdav/init', { const res = await Api.post('/service/litdav/init', {
...params, // ...params,
transName: this.trnName, transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
lidgrp:{
rec:{
inr:'00000122',
}
}
}); });
if (!res.data) { if (!res.data) {
return return
...@@ -64,7 +71,7 @@ export default { ...@@ -64,7 +71,7 @@ export default {
let engpRequest = buildFn.buildEngp(this.model, this.trnName); let engpRequest = buildFn.buildEngp(this.model, this.trnName);
this.processLiaall(engpRequest); this.processLiaall(engpRequest);
break; break;
case 'setpan': case 'setmod':
let setfegRequest = buildFn.buildSetfeg(this.model, this.trnName); let setfegRequest = buildFn.buildSetfeg(this.model, this.trnName);
// 此处利用回调是为了等setfeg的接口调用完成后才去获取setglg参数，由于setglg参数依赖于setfeg函数的返回值 // 此处利用回调是为了等setfeg的接口调用完成后才去获取setglg参数，由于setglg参数依赖于setfeg函数的返回值
this.processSetpan(setfegRequest, () => { this.processSetpan(setfegRequest, () => {
......
src/business/litdav/model/check.js
...@@ -145,32 +145,32 @@ export default { ...@@ -145,32 +145,32 @@ export default {
], ],
"setmod.docamt":[ // "setmod.docamt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, // {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], // ],
"setmod.zmqacc":[ // "setmod.zmqacc":[
{type: "string", required: false, message: "必输项"}, // {type: "string", required: false, message: "必输项"},
{max: 20,message:"长度不能超过20"} // {max: 20,message:"长度不能超过20"}
], // ],
"mtabut.coninf.oitinf.oit.inftxt":[ // "mtabut.coninf.oitinf.oit.inftxt":[
{type: "string", required: false, message: "必输项"}, // {type: "string", required: false, message: "必输项"},
{max: 60,message:"长度不能超过60"} // {max: 60,message:"长度不能超过60"}
], // ],
"mtabut.coninf.oitset.oit.inftxt":[ // "mtabut.coninf.oitset.oit.inftxt":[
{type: "string", required: false, message: "必输项"}, // {type: "string", required: false, message: "必输项"},
{max: 60,message:"长度不能超过60"} // {max: 60,message:"长度不能超过60"}
], // ],
"mtabut.coninf.conexedat":[ "mtabut.coninf.conexedat":[
{type: "string", required: false, message: "输入正确的日期"} {type: "string", required: false, message: "输入正确的日期"}
......
src/business/litdav/model/index.js
...@@ -71,6 +71,7 @@ export default class Litdav { ...@@ -71,6 +71,7 @@ export default class Litdav {
pts: new Pts().data, pts: new Pts().data,
}, },
rec: { rec: {
cur:'',
totcur: '', totcur: '',
advtyp: '', advtyp: '',
ownref: '', ownref: '',
...@@ -113,6 +114,7 @@ export default class Litdav { ...@@ -113,6 +114,7 @@ export default class Litdav {
}, },
lidgrp: { lidgrp: {
rec: { rec: {
branchinr:'00000047',
revflg: '', revflg: '',
expdat: '', expdat: '',
expplc: '', expplc: '',
...@@ -134,37 +136,18 @@ export default class Litdav { ...@@ -134,37 +136,18 @@ export default class Litdav {
amt: '' amt: ''
} }
}, },
avbnam: '' avbnam: '',
apl:{
pts: new Pts().data,
},
adv:{
pts: new Pts().data,
},
ben: {
pts: new Pts().data,
},
}, },
// liaall: {
// limmod: {
// ownref: '',
// dggrd: '',
// limpts: {
// wrk: {
// pts: {
// extkey: '',
// nam: ''
// }
// },
// oth: {
// pts: {
// extkey: '',
// nam: ''
// }
// },
// pfcod1: '',
// pfcod2: '',
// nonrevflg1: '',
// nonrevflg2: ''
// },
// comamt: '',
// ccvamt: '',
// limgrd: '',
// lmegrd: '',
// tygrd: ''
// }
// },
setmod: new Pub().data.Setmod, setmod: new Pub().data.Setmod,
mtabut: new Pub().data.Mtabut, mtabut: new Pub().data.Mtabut,
......
src/business/litdav/views/index.vue
...@@ -197,7 +197,9 @@ export default { ...@@ -197,7 +197,9 @@ export default {
}; };
}, },
methods: {}, methods: {},
created: async function () {}, mounted () {
this.init()
},
}; };
</script> </script>
<style> <style>
......
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