Commit e99e62c4 by xionglin

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 d18d585c 53c75ed2
...@@ -19,42 +19,42 @@ export default { ...@@ -19,42 +19,42 @@ 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.lidgrp.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, liduil: model.lidgrp.rec.liduil,
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, OPN1: model.lidgrp.cbs.opn1,
MAC: model.gidgrp.cbs.mac, MAC: model.lidgrp.cbs.mac,
MAC2: model.gidgrp.cbs.mac2, MAC2: model.lidgrp.cbs.mac2,
OPC2: model.gidgrp.cbs.opc2, OPC2: model.lidgrp.cbs.opc2,
CNF: model.gidgrp.cbs.cnf, CNF: model.lidgrp.cbs.cnf,
}, },
ptsList: ptsptaList, ptsList: ptsptaList,
transName: trnName, transName: trnName,
...@@ -67,7 +67,7 @@ export default { ...@@ -67,7 +67,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
}, },
...@@ -117,9 +117,9 @@ export default { ...@@ -117,9 +117,9 @@ 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.lidgrp.rec.objinr,
ownref: model.gidgrp.rec.ownref, ownref: model.lidgrp.rec.ownref,
}, },
}; };
return params return params
...@@ -128,9 +128,9 @@ export default { ...@@ -128,9 +128,9 @@ 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.lidgrp.rec.objinr,
ownref: model.gidgrp.rec.ownref, ownref: model.lidgrp.rec.ownref,
swiftflg: model.gitp.swiftflg, swiftflg: model.gitp.swiftflg,
}, },
}; };
......
...@@ -28,9 +28,11 @@ export default { ...@@ -28,9 +28,11 @@ export default {
...params, ...params,
transName: this.trnName, transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
// lidInr:'00000013', brdgrp:{
// lidInr:'00006821', rec:{
brtinr:this.$route.query.inr inr:this.$route.query.inr
}
}
}); });
if (!res.data) { if (!res.data) {
...@@ -91,6 +93,7 @@ export default { ...@@ -91,6 +93,7 @@ export default {
let doctreRequest = buildFn.buildDoctre(this.model, this.trnName); let doctreRequest = buildFn.buildDoctre(this.model, this.trnName);
this.processDoctre(doctreRequest); this.processDoctre(doctreRequest);
break; break;
default: default:
return; return;
} }
......
export default { export default {
"brdgrp.acb.namelc" :null,
"brdgrp.prb.adrelc" :null,
"brdgrp.blk.docdis" :null,
"brtp.furide" :null,
"brdgrp.acb.adrelc" :null,
"brdgrp.prb.pts.adrblk" :null,
"brdgrp.prb.namelc" :null,
"setmod.dspflg" :null,
"brdgrp.acb.pts.extkey" :null,
"brdgrp.rec.disdat" :null,
"brdgrp.prb.pts.nam" :null,
"brdgrp.ben.pts.nam" :null,
"brdgrp.acb.pts.adrblk" :null,
"brdgrp.prb.pts.extkey" :null,
"mtabut.coninf.conexedat" :null,
"brdgrp.prb.pts.ref" :null,
"brdgrp.apl.pts.nam" :null,
"setmod.docamt" :null,
"brtp.lidget.sdamod.dadsnd":[ "brtp.lidget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
...@@ -103,7 +121,7 @@ export default { ...@@ -103,7 +121,7 @@ export default {
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
], ],
"brdgrp.rec.disdat":[ "brdgrp.rec.disdat":[
{type: "date", required: true, message: "输入正确的日期"} {type: "string", required: true, message: "输入正确的日期"}
], ],
"brdgrp.prb.pts.extkey":[ "brdgrp.prb.pts.extkey":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
...@@ -265,24 +283,6 @@ export default { ...@@ -265,24 +283,6 @@ export default {
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"brdgrp.acb.namelc" :null,
"brdgrp.prb.adrelc" :null,
"brdgrp.blk.docdis" :null,
"brtp.furide" :null,
"brdgrp.acb.adrelc" :null,
"brdgrp.prb.pts.adrblk" :null,
"brdgrp.prb.namelc" :null,
"setmod.dspflg" :null,
"brdgrp.acb.pts.extkey" :null,
"brdgrp.rec.disdat" :null,
"brdgrp.prb.pts.nam" :null,
"brdgrp.ben.pts.nam" :null,
"brdgrp.acb.pts.adrblk" :null,
"brdgrp.prb.pts.extkey" :null,
"mtabut.coninf.conexedat" :null,
"brdgrp.prb.pts.ref" :null,
"brdgrp.apl.pts.nam" :null,
"setmod.docamt" :null,
} }
\ No newline at end of file
...@@ -11,6 +11,14 @@ ...@@ -11,6 +11,14 @@
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000027 -->
<el-tab-pane label="表外记账" name="engp">
<c-content>
<!-- 表外记账 -->
<m-engp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000027 --> <!--PD000027 -->
<el-tab-pane label="费用/账务" name="setmod"> <el-tab-pane label="费用/账务" name="setmod">
...@@ -19,6 +27,13 @@ ...@@ -19,6 +27,13 @@
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000027 -->
<el-tab-pane label="会计分录" name="glepan">
<c-content>
<!-- 会计分录 -->
<m-glepan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000510 --> <!--PD000510 -->
<el-tab-pane label="备查/附言" name="addbcb"> <el-tab-pane label="备查/附言" name="addbcb">
...@@ -76,6 +91,7 @@ ...@@ -76,6 +91,7 @@
import Docpan from "~/components/business/docpan/views"; 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 Glepan from "~/components/business/glentry/views";
export default { export default {
...@@ -84,7 +100,6 @@ ...@@ -84,7 +100,6 @@
"m-acpp" : Acpp, "m-acpp" : Acpp,
"m-mt750p" : Mt750p, "m-mt750p" : Mt750p,
"m-docpan" : Docpan, "m-docpan" : Docpan,
"m-doctre" : Doctre,
"m-addbcb": Addbcb, "m-addbcb": Addbcb,
"m-ovwp": Ovwp, "m-ovwp": Ovwp,
"m-engp": Engp, "m-engp": Engp,
...@@ -94,6 +109,7 @@ ...@@ -94,6 +109,7 @@
"m-docpan": Docpan, "m-docpan": Docpan,
"m-doctre": Doctre, "m-doctre": Doctre,
"m-limitbody": Limitbody, "m-limitbody": Limitbody,
"m-glepan": Glepan,
}, },
provide() { provide() {
......
...@@ -94,7 +94,7 @@ export default { ...@@ -94,7 +94,7 @@ export default {
mounted(){ mounted(){
this.init() this.init()
} },
} }
</script> </script>
......
...@@ -30,31 +30,31 @@ export default { ...@@ -30,31 +30,31 @@ export default {
} }
let dataObj = { let dataObj = {
rec: { rec: {
objtyp: 'GID', objtyp: 'LID',
ownref: model.gidgrp.rec.ownref, ownref: model.brdgrp.rec.ownref,
opndat: model.gidgrp.rec.opndat, opndat: model.brdgrp.rec.opndat,
expdat: model.gidgrp.rec.expdat, expdat: model.brdgrp.rec.expdat,
branchInr: model.gidgrp.rec.branchInr, branchInr: model.brdgrp.rec.branchInr,
hndtyp: model.gidgrp.rec.hndtyp, hndtyp: model.brdgrp.rec.hndtyp,
gartyp: model.gidgrp.rec.gartyp, gartyp: model.brdgrp.rec.gartyp,
fingua: model.gidgrp.rec.fingua, fingua: model.brdgrp.rec.fingua,
segtyp: model.gidgrp.ghd.segtyp, // segtyp: model.brdgrp.ghd.segtyp,
fromflg: model.gidgrp.rec.fromflg, fromflg: model.brdgrp.rec.fromflg,
othersno: model.gidgrp.rec.othersno, othersno: model.brdgrp.rec.othersno,
sndto: model.gidgrp.rec.sndto, sndto: model.brdgrp.rec.sndto,
swiftflg: model.gitp.swiftflg, // swiftflg: model.gitp.swiftflg,
giduil: model.gidgrp.rec.giduil, giduil: model.brdgrp.rec.giduil,
purpos: model.gidgrp.rec.purpos, purpos: model.brdgrp.rec.purpos,
revflg: model.gidgrp.rec.revflg, revflg: model.brdgrp.rec.revflg,
cnfsta: model.gidgrp.rec.cnfsta, cnfsta: model.brdgrp.rec.cnfsta,
}, },
cbsMap: { cbsMap: {
MAX: model.gidgrp.cbs.max, MAX: model.brdgrp.cbs.max,
OPN1: model.gidgrp.cbs.opn1, OPN1: model.brdgrp.cbs.opn1,
MAC: model.gidgrp.cbs.mac, MAC: model.brdgrp.cbs.mac,
MAC2: model.gidgrp.cbs.mac2, MAC2: model.brdgrp.cbs.mac2,
OPC2: model.gidgrp.cbs.opc2, OPC2: model.brdgrp.cbs.opc2,
CNF: model.gidgrp.cbs.cnf, CNF: model.brdgrp.cbs.cnf,
}, },
ptsList: ptsptaList, ptsList: ptsptaList,
transName: trnName, transName: trnName,
...@@ -67,7 +67,7 @@ export default { ...@@ -67,7 +67,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
}, },
...@@ -117,9 +117,9 @@ export default { ...@@ -117,9 +117,9 @@ 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.brdgrp.rec.objinr,
ownref: model.gidgrp.rec.ownref, ownref: model.brdgrp.rec.ownref,
}, },
}; };
return params return params
...@@ -128,10 +128,10 @@ export default { ...@@ -128,10 +128,10 @@ 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.brdgrp.rec.objinr,
ownref: model.gidgrp.rec.ownref, ownref: model.brdgrp.rec.ownref,
swiftflg: model.gitp.swiftflg, // swiftflg: model.gitp.swiftflg,
}, },
}; };
return params return params
......
...@@ -28,6 +28,11 @@ export default { ...@@ -28,6 +28,11 @@ export default {
...params, ...params,
transName: this.trnName, transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
brdgrp:{
rec:{
inr: '00000030'
}
},
}); });
if (!res.data) { if (!res.data) {
return return
...@@ -64,7 +69,7 @@ export default { ...@@ -64,7 +69,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, () => {
......
...@@ -18,11 +18,11 @@ export default { ...@@ -18,11 +18,11 @@ export default {
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"lidgrp.cbs.opn1.amt":[ // "lidgrp.cbs.opn1.amt":[
{type: "string", required: false, message: "必输项"}, // {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位" }
], // ],
"brdgrp.rec.shgref":[ "brdgrp.rec.shgref":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
...@@ -43,11 +43,11 @@ export default { ...@@ -43,11 +43,11 @@ export default {
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 40,message:"长度不能超过40"} {max: 40,message:"长度不能超过40"}
], ],
"brdgrp.cbs.max.amt":[ // "brdgrp.cbs.max.amt":[
{type: "string", required: false, message: "必输项"}, // {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位" }
], // ],
"brdgrp.apl.pts.ref":[ "brdgrp.apl.pts.ref":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
...@@ -56,11 +56,11 @@ export default { ...@@ -56,11 +56,11 @@ export default {
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"brdgrp.cbs.opn1.amt":[ // "brdgrp.cbs.opn1.amt":[
{type: "string", required: false, message: "必输项"}, // {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位" }
], // ],
"brdgrp.apl.pts.nam":[ "brdgrp.apl.pts.nam":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 40,message:"长度不能超过40"} {max: 40,message:"长度不能超过40"}
...@@ -122,11 +122,11 @@ export default { ...@@ -122,11 +122,11 @@ export default {
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
], ],
"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"}
......
...@@ -84,6 +84,7 @@ export default class Brtcsg { ...@@ -84,6 +84,7 @@ export default class Brtcsg {
brdgrp: { brdgrp: {
rec: { rec: {
inr:'',
shgref: '', shgref: '',
ownref: '', ownref: '',
nam: '' nam: ''
...@@ -138,8 +139,10 @@ export default class Brtcsg { ...@@ -138,8 +139,10 @@ export default class Brtcsg {
lidgrp: { lidgrp: {
rec: { rec: {
inr:'',
expdat: '', expdat: '',
ownref: '' ownref: '',
branchinr: "00000047",
}, },
cbs: { cbs: {
opn1: { opn1: {
......
...@@ -129,7 +129,9 @@ export default { ...@@ -129,7 +129,9 @@ export default {
} }
}, },
methods: {}, methods: {},
created: async function () { mounted () {
this.init()
// this.queryHndtypCodeTableList(this.trnName)
}, },
} }
</script> </script>
......
...@@ -28,7 +28,20 @@ export default { ...@@ -28,7 +28,20 @@ export default {
...params, ...params,
transName: this.trnName, transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
lidinr: this.$route.query.inr // lidinr: this.$route.query.inr
brdgrp:{
rec:{
inr:"00000049",
},
},
lidgrp:{
rec:{
inr:"00000072",
}
},
liaccv:{
concur:"CNY"
}
}); });
if (!res.data) { if (!res.data) {
return return
......
...@@ -27,7 +27,12 @@ export default { ...@@ -27,7 +27,12 @@ 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,
brdgrp:{
rec:{
inr: this.$route.query.inr
}
},
}); });
if (!res.data) { if (!res.data) {
return return
......
...@@ -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
......
...@@ -30,9 +30,9 @@ export default { ...@@ -30,9 +30,9 @@ export default {
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
lidgrp:{ lidgrp:{
rec:{ rec:{
inr:'00000342', inr: this.$route.query.inr
} }
} },
}); });
// debugger // debugger
if (!res.data) { if (!res.data) {
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<script> <script>
import Api from "~/service/Api"; import Api from "~/service/Api";
import event from "../event" import event from "../event"
import Coninfp from "~/views/Public/Coninfp"; import Coninfp from "~/components/business/coninfp/views";
export default { export default {
components: { components: {
......
<template>
<div class="eibs-tab">
<el-collapse v-model="activeNames">
<el-collapse-item title="跨境人民币申报" name="cnyp1">
<m-cnyp1 :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="2122跨境担保登记业务信息" name="voup" v-if="model.cnybop.vouflg == '1'">
<m-voup :model="model" :codes="codes" />
</el-collapse-item>
</el-collapse>
</div>
</template>
<script>
import event from '../event';
import Cnyp1 from "./Cnyp1";
import Voup from "./Voup";
export default {
components: {
"m-cnyp1": Cnyp1,
"m-voup": Voup,
},
inject: ["root"],
props: ["model", "codes"],
mixins: [event],
data() {
return {
activeNames: ["cnyp1"],
};
},
methods: {},
created: function () {},
};
</script>
<style>
</style>
...@@ -34,9 +34,7 @@ ...@@ -34,9 +34,7 @@
v-model="model.trtcre.trdgrp.rec.reccountrycode" v-model="model.trtcre.trdgrp.rec.reccountrycode"
maxlength="3" maxlength="3"
placeholder="" placeholder=""
@keyup.enter.native=" @keyup.enter.native="queryGridEtyPromptDialogData('PRB', 'B')"
showGridPromptDialog('trtcre.trdgrp.rec.reccountrycode')
"
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
......
...@@ -512,9 +512,7 @@ ...@@ -512,9 +512,7 @@
<c-input <c-input
:disabled="true" :disabled="true"
v-model="model.trtcre.trdgrp.fip.pts.extkey" v-model="model.trtcre.trdgrp.fip.pts.extkey"
@keyup.enter.native=" @keyup.enter.native="queryGridEtyPromptDialogData('PRB', 'B')"
showGridPromptDialog(`trtcre.trdgrp.fip.pts.extkey`)
"
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
......
...@@ -639,9 +639,7 @@ ...@@ -639,9 +639,7 @@
v-model="model.brdgrp.prb.pts.extkey" v-model="model.brdgrp.prb.pts.extkey"
maxlength="16" maxlength="16"
placeholder="请输入地址编码" placeholder="请输入地址编码"
@keyup.enter.native=" @keyup.enter.native="queryGridEtyPromptDialogData('PRB', 'B')"
showGridPromptDialog('brdgrp.prb.pts.extkey')
"
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
......
...@@ -71,18 +71,17 @@ ...@@ -71,18 +71,17 @@
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="备查/附言" name="addbcb"> <!--PD000000 -->
<c-content> <el-tab-pane label="备查/附言" name="coninfp">
<m-addbcb :model="model" :codes="codes" /> <m-coninfp :model="model" :codes="codes" />
</c-content> </el-tab-pane>
</el-tab-pane>
<!--PD000009 --> <!--PD000009 -->
<el-tab-pane label="申报信息" name="cfactlp,cnyp1"> <!-- <el-tab-pane label="申报信息" name="cfactlp,cnyp1">
<c-content> <c-content>
<m-cnyp :model="model" :codes="codes" /> <m-cnyp :model="model" :codes="codes" />
</c-content> </c-content>
</el-tab-pane> </el-tab-pane> -->
<!--PD000529 --> <!--PD000529 -->
<el-tab-pane label="报文/面函" name="docpan"> <el-tab-pane label="报文/面函" name="docpan">
......
...@@ -520,10 +520,6 @@ export default { ...@@ -520,10 +520,6 @@ export default {
route: '/business-new/brtdcr' route: '/business-new/brtdcr'
}, },
{ {
label:'接收不符点',
route:'/business-new/brtacp'
},
{
label:'承兑', label:'承兑',
route:'/business-new/brtudp' route:'/business-new/brtudp'
}, },
...@@ -551,6 +547,10 @@ export default { ...@@ -551,6 +547,10 @@ export default {
label:'单据注销', label:'单据注销',
route:'/business-new/brtcan' route:'/business-new/brtcan'
}, },
{
label:'接受不符点',
route:'/business-new/brtacp'
},
], ],
currentHandleRow: {}, currentHandleRow: {},
}; };
......
...@@ -357,7 +357,7 @@ export default { ...@@ -357,7 +357,7 @@ export default {
handlerDataList: [], handlerDataList: [],
btnRouteMap: [ btnRouteMap: [
{ {
label: '注销', label: '信用证注销',
route: '/business-new/litcan' route: '/business-new/litcan'
}, },
{ {
......
export default { export default {
buildPtspta(ptsptaObj) { buildPtspta (ptsptaObj) {
let pts = ptsptaObj.pts; let pts = ptsptaObj.pts;
let ptspta = { let ptspta = {
rol: pts.rol, rol: pts.rol,
...@@ -13,149 +13,113 @@ export default { ...@@ -13,149 +13,113 @@ export default {
dftfeecur: pts.dftfeecur, dftfeecur: pts.dftfeecur,
dftactptainr: pts.dftactptainr, dftactptainr: pts.dftactptainr,
glggrpflg: pts.glggrpflg, glggrpflg: pts.glggrpflg,
adrblk: pts.adrblk, adrblk: pts.adrblk
}; };
return ptspta; return ptspta;
}, },
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.ben.pts.extkey) { if (model.lidgrp.adv.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.gidgrp.ben)); ptsptaList.push(this.buildPtspta(model.lidgrp.adv));
}
if (model.lidgrp.ben.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.lidgrp.ben));
} }
let dataObj = { let dataObj = {
rec: { rec: {
objtyp: 'LID', objtyp: 'LID',
objinr: model.gidgrp.rec.objinr, ownref: model.lidgrp.rec.ownref,
ownref: model.gidgrp.rec.ownref, opndat: model.lidgrp.rec.opndat,
segtyp: model.gidgrp.rec.segtyp, expdat: model.lidgrp.rec.expdat,
fromflg: model.gidgrp.rec.fromflg, branchInr: model.lidgrp.rec.branchInr,
othersno: model.gidgrp.rec.othersno, hndtyp: model.lidgrp.rec.hndtyp,
sndto: model.gidgrp.rec.sndto, gartyp: model.lidgrp.rec.gartyp,
giduil: model.gidgrp.rec.giduil, fingua: model.lidgrp.rec.fingua,
purpos: model.gidgrp.rec.purpos, segtyp: model.lidgrp.ghd.segtyp,
revflg: model.gidgrp.rec.revflg, fromflg: model.lidgrp.rec.fromflg,
cnfsta: model.gidgrp.rec.cnfsta, 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: { cbsMap: {
MAX: model.gidgrp.cbs.max, MAX: model.lidgrp.cbs.max,
OPN1: model.gidgrp.cbs.opn1, OPN1: model.lidgrp.cbs.opn1,
MAC: model.gidgrp.cbs.mac, MAC: model.lidgrp.cbs.mac,
MAC2: model.gidgrp.cbs.mac2, MAC2: model.lidgrp.cbs.mac2,
OPC2: model.gidgrp.cbs.opc2, OPC2: model.lidgrp.cbs.opc2,
CNF: model.gidgrp.cbs.cnf, CNF: model.lidgrp.cbs.cnf,
}, },
ptsList: ptsptaList, ptsList: ptsptaList,
transName: trnName, transName: trnName,
userId: window.sessionStorage.userId userId: window.sessionStorage.userId ? window.sessionStorage.userId : 'ZL'
? window.sessionStorage.userId
: 'ZL',
}; };
return dataObj; return dataObj
}, },
buildSetfeg(model, trnName) { buildSetfeg (model, trnName) {
let params = { let params = {
...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
}, },
buildSetglg(model, trnName) { buildSetglg (model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
setfeg: model.setmod.setfeg, setfeg: model.setmod.setfeg,
liaall: model.liaall,
liaccv: model.liaccv,
}; };
return params; return params
}, },
buildGlentry(model, trnName) { buildGlentry (model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
rec: { liaallg: model.liaall.liaallg,
objtyp: 'LID', setfog: model.setmod.setfog,
segtyp: model.gidgrp.rec.segtyp, setfeg: model.setmod.setfeg,
fromflg: model.gidgrp.rec.fromflg, setglg: model.setmod.setglg,
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,
}; };
return params; return params
}, },
buildEngp(model, trnName) { buildEngp (model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
cbsMap: { liaallg: model.liaall.liaallg,
CNF: model.gidgrp.cbs.cnf,
},
liaccv: model.liaccv,
doceot: model.trnmod.trndoc.doceot,
transName: trnName,
}; };
params.rec = { return params
...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;
}, },
buildDocpan(model, trnName) { buildDocpan (model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...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 = { let params = {
...this.buildCommonData(model, trnName), ...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, liaccvg: model.liaccv.liaccvg,
oldamt: model.liaccv.oldamt, oldamt: model.liaccv.oldamt,
chgamt: model.liaccv.chgamt, chgamt: model.liaccv.chgamt,
concur: model.liaccv.concur, concur: model.liaccv.concur,
}; };
return params; return params
}, },
buildLimitbody (model, trnName) { buildLimitbody (model, trnName) {
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.lidgrp.rec.objinr,
ownref: model.gidgrp.rec.ownref, ownref: model.lidgrp.rec.ownref,
}, },
}; };
return params return params
...@@ -164,9 +128,9 @@ export default { ...@@ -164,9 +128,9 @@ 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.lidgrp.rec.objinr,
ownref: model.gidgrp.rec.ownref, ownref: model.lidgrp.rec.ownref,
swiftflg: model.gitp.swiftflg, swiftflg: model.gitp.swiftflg,
}, },
}; };
...@@ -180,4 +144,4 @@ export default { ...@@ -180,4 +144,4 @@ export default {
}; };
return params return params
} }
} }
\ No newline at end of file \ No newline at end of file
...@@ -6,7 +6,10 @@ import glentry from '~/components/business/glentry/event'; ...@@ -6,7 +6,10 @@ import glentry from '~/components/business/glentry/event';
import engp from '~/components/business/engp/event'; import engp from '~/components/business/engp/event';
import docpan from '~/components/business/docpan/event'; 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 doctre from '~/components/business/doctre/event';
import Utils from "~/utils" import Utils from "~/utils"
export default { export default {
mixins: [commonFunctions], mixins: [commonFunctions],
methods: { methods: {
...@@ -15,18 +18,22 @@ export default { ...@@ -15,18 +18,22 @@ export default {
...engp, ...engp,
...docpan, ...docpan,
...ccvpan, ...ccvpan,
...limitbody,
...doctre,
async init () { async init () {
const params = {
spt: JSON.parse(localStorage.getItem('row_' + this.trnName))
}
const res = await Api.post('/service/litcan/init', { const res = await Api.post('/service/litcan/init', {
...params,
transName: this.trnName, transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
gidInr: this.$route.query.inr,
// lidInr:'00006832',
lidgrp:{ lidgrp:{
rec:{ rec:{
// inr:this.$route.query.inr inr:this.$route.query.inr
inr:'00006829'
} }
} }
}); });
if (!res.data) { if (!res.data) {
return return
...@@ -63,7 +70,7 @@ export default { ...@@ -63,7 +70,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, () => {
...@@ -79,22 +86,20 @@ export default { ...@@ -79,22 +86,20 @@ export default {
this.processGlentry(glentryRequest); this.processGlentry(glentryRequest);
break; break;
case 'limitbody': case 'limitbody':
let limitbodyRequest = buildFn.buildLimitbody( let limitbodyRequest = buildFn.buildLimitbody(this.model, this.trnName);
this.model,
this.trnName
);
this.processLimitbody(limitbodyRequest); this.processLimitbody(limitbodyRequest);
break; break;
case 'doctre': case 'doctre':
let doctreRequest = buildFn.buildDoctre(this.model, this.trnName); let doctreRequest = buildFn.buildDoctre(this.model, this.trnName);
this.processDoctre(doctreRequest); this.processDoctre(doctreRequest);
break; break;
default: default:
return; return;
} }
}, },
// 点击获取按钮拉取当前key字段下的表单数据 // 点击获取按钮拉取当前key字段下的表单数据
queryFormData(key) { queryFormData(key) {
console.log(key); console.log(key);
}, },
// 业务信息=》基本信息=》保函编号-----获取保函编号 // 业务信息=》基本信息=》保函编号-----获取保函编号
...@@ -111,7 +116,7 @@ export default { ...@@ -111,7 +116,7 @@ export default {
this.model.gidgrp.rec.ownref = res.data; this.model.gidgrp.rec.ownref = res.data;
} }
}, },
// 获取gitopn弹框表格数据 // 获取litcan弹框表格数据
async queryGridEtyPromptDialogData(type, ptytyp) { async queryGridEtyPromptDialogData(type, ptytyp) {
let params = { let params = {
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
...@@ -125,7 +130,7 @@ export default { ...@@ -125,7 +130,7 @@ export default {
this.root.promptData.type = type; this.root.promptData.type = type;
} }
}, },
// 选中gitopn弹框表格的行数据 // 选中litcan弹框表格的行数据
async selectGridEtyPromptData(row) { async selectGridEtyPromptData(row) {
let params = { let params = {
...row, ...row,
...@@ -194,5 +199,5 @@ export default { ...@@ -194,5 +199,5 @@ export default {
return return
} }
} }
} },
} };
\ No newline at end of file
...@@ -3,13 +3,22 @@ import Pub from '~/components/business/commonModel/index.js'; ...@@ -3,13 +3,22 @@ import Pub from '~/components/business/commonModel/index.js';
export default class Litcan { export default class Litcan {
constructor() { constructor() {
this.data = { this.data = {
sndmsg: 'X', cbsMap:{
litapll1blk: '', MAX:{
litrmbl3blk: '', cur:''
litcanl1blk: '', }
},
gitp:{
swiftflg:'',
},
sndmsg: '',
lidgrp: { lidgrp: {
ghd:{
segtyp:'',
},
rec: { rec: {
branchinr: '00000047', inr:'',
branchinr: '',
ownref: '', // 参考号 .lidgrp.rec.ownref ownref: '', // 参考号 .lidgrp.rec.ownref
nam: '', // 名称 .lidgrp.rec.nam nam: '', // 名称 .lidgrp.rec.nam
avbby: '', // 兑付方式 .lidgrp.rec.avbby avbby: '', // 兑付方式 .lidgrp.rec.avbby
...@@ -31,15 +40,29 @@ export default class Litcan { ...@@ -31,15 +40,29 @@ export default class Litcan {
cur: '', // 信用证余额 .lidgrp.cbs.opn1.cur cur: '', // 信用证余额 .lidgrp.cbs.opn1.cur
amt: '', // Balance .lidgrp.cbs.opn1.amt amt: '', // Balance .lidgrp.cbs.opn1.amt
}, },
max: {
cur: '', // 信用证余额 .lidgrp.cbs.opn1.cur
amt: '', // Balance .lidgrp.cbs.opn1.amt
},
}, },
apl: { apl: {
pts: new Pts().data, pts: {
ref:'',
nam:'',
}
}, },
ben: { ben: {
pts: new Pts().data, pts: {
ref:'',
nam:'',
}
}, },
adv: { adv: {
pts: new Pts().data, pts: {
ref:'',
nam:'',
}
}, },
avbnam: '', // 指定银行 .lidgrp.avbnam avbnam: '', // 指定银行 .lidgrp.avbnam
}, },
...@@ -52,25 +75,7 @@ export default class Litcan { ...@@ -52,25 +75,7 @@ export default class Litcan {
strinf: '', // Narrative .litcanf.strinf strinf: '', // Narrative .litcanf.strinf
}, },
gcdgrp: { gcdgrp: {
prb: {
adrelc: '',
dbfadrblkcn: '',
namelc: '',
pts: new Pts().data,
},
rec: {
clmdat: '',
ownref: '',
payrol: '',
nam: '',
docprbrol: '',
},
oth: {
adrelc: '',
dbfadrblkcn: '',
namelc: '',
pts: new Pts().data,
},
cbs: { cbs: {
opn1: { opn1: {
cur: '', cur: '',
...@@ -95,23 +100,8 @@ export default class Litcan { ...@@ -95,23 +100,8 @@ export default class Litcan {
}, },
}, },
gidgrp: { gidgrp: {
rec: { rec:{
expdat: '', objinr:'',
liadat: '',
ownref: '',
gartyp: ''
},
ghd: {
wahnum: '',
remark: '',
bustyp: '',
segtyp: ''
},
cbs: {
opn1: {
cur: '',
amt: ''
}
}, },
ctr: { ctr: {
pts: new Pts().data, pts: new Pts().data,
...@@ -137,41 +127,11 @@ export default class Litcan { ...@@ -137,41 +127,11 @@ export default class Litcan {
apl: { apl: {
pts: new Pts().data, pts: new Pts().data,
}, },
cbs: {
max: '',
}
}, },
liaall: { 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: { con: {
pts: new Pts().data, pts: new Pts().data,
}, },
...@@ -189,69 +149,6 @@ export default class Litcan { ...@@ -189,69 +149,6 @@ export default class Litcan {
}, },
}, },
trnmod: { 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: { ctr: {
pts: new Pts().data, pts: new Pts().data,
}, },
......
...@@ -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 {
......
...@@ -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,
......
...@@ -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, () => {
......
...@@ -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: "输入正确的日期"}
......
...@@ -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,
......
...@@ -197,7 +197,9 @@ export default { ...@@ -197,7 +197,9 @@ export default {
}; };
}, },
methods: {}, methods: {},
created: async function () {}, mounted () {
this.init()
},
}; };
</script> </script>
<style> <style>
......
...@@ -28,7 +28,11 @@ export default { ...@@ -28,7 +28,11 @@ export default {
...params, ...params,
transName: this.trnName, transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
lidinr: this.$route.query.inr lidgrp:{
rec:{
inr: this.$route.query.inr
}
},
}); });
if (!res.data) { if (!res.data) {
......
...@@ -99,6 +99,7 @@ export default class Litdck { ...@@ -99,6 +99,7 @@ export default class Litdck {
utlnbr: '', utlnbr: '',
opndat: '', opndat: '',
redclsflg: '', redclsflg: '',
inr: '',
}, },
cbs: { cbs: {
opn1: { opn1: {
......
...@@ -21,13 +21,15 @@ export default { ...@@ -21,13 +21,15 @@ export default {
...doctre, ...doctre,
async init() { async init() {
const params = { const params = {
spt: JSON.parse(localStorage.getItem('row_' + this.trnName)) spt: JSON.parse(localStorage.getItem('review_' + this.trnName))
} }
const loading = this.loading();
const res = await Api.post('/service/litopn/init', { const res = await Api.post('/service/litopn/init', {
...params, ...params,
transName: this.trnName, transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
}); });
loading.close();
if (!res.data) { if (!res.data) {
return return
} }
...@@ -157,5 +159,6 @@ export default { ...@@ -157,5 +159,6 @@ export default {
handleChangePurpos() { handleChangePurpos() {
this.queryHndtypCodeTableList(this.root.trnName); this.queryHndtypCodeTableList(this.root.trnName);
}, },
}, },
}; };
...@@ -133,9 +133,10 @@ export default { ...@@ -133,9 +133,10 @@ export default {
this.$router.push({ this.$router.push({
// name: 'Review-new' + trnName.charAt(0).toUpperCase() + trnName.substring(1), // name: 'Review-new' + trnName.charAt(0).toUpperCase() + trnName.substring(1),
path: 'review-new/' + row['inifrm'].toLowerCase(), path: 'review-new/' + row['inifrm'].toLowerCase(),
query: { trn: row['inr'], operateId: 'operateId' }, query: { trn: row['inr'], operateId: operateId },
params: { prePageId: this.model.pageId }, params: { prePageId: this.model.pageId },
}); });
localStorage.setItem(`review_${row.inifrm.toLowerCase()}`, JSON.stringify(row))
}, },
async onRelrow(idx) { async onRelrow(idx) {
...@@ -144,20 +145,21 @@ export default { ...@@ -144,20 +145,21 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}).then(async () => { }).then(async () => {
const selIds = [idx + 1]; //rowno选中行 let params = {
const selDst = 'trncorco.trnstm'; //列表对应后台模型中的stream transName: 'trnrel',
userId: window.sessionStorage.userId || 'ZL',
let params = { selDst: selDst, selIds: selIds }; selirn: [this.$route.query.trn]
let rtnmsg = await this.executeRule('relrow', params); }
if (rtnmsg.respCode == SUCCESS) { let rtnmsg = await Api.post('/service/trnrel/relrow', params);
if (rtnmsg.respCode === SUCCESS) {
let errorMsg = ''; let errorMsg = '';
let fieldErrorsFlag = JSON.stringify(rtnmsg.fieldErrors) == '{}'; let fieldErrorsFlag = !rtnmsg.data.fieldErrors;
if (!fieldErrorsFlag) { if (!fieldErrorsFlag) {
let errorMsgkey = ''; let errorMsgkey = '';
let errorMsgVal = ''; let errorMsgVal = '';
for (const key in rtnmsg.fieldErrors) { for (const key in rtnmsg.data.fieldErrors) {
errorMsgkey = key; errorMsgkey = key;
errorMsgVal = rtnmsg.fieldErrors[key]; errorMsgVal = rtnmsg.data.fieldErrors[key];
} }
errorMsg = errorMsgkey + ':' + errorMsgVal; errorMsg = errorMsgkey + ':' + errorMsgVal;
this.$notify.error({ this.$notify.error({
...@@ -170,27 +172,22 @@ export default { ...@@ -170,27 +172,22 @@ export default {
message: '复核成功', message: '复核成功',
type: 'success', type: 'success',
}); });
// const that = this.root;
// that.executeRule("searow").then(res => {
// //TODO 处理数据逻辑
// that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
// this.model.trncorco.trnstm = res.data.trncorco_trnstm;
// })
this.$store.dispatch('TagsView/delView', this.$route); this.$store.dispatch('TagsView/delView', this.$route);
this.$router.history.push('/taskList', () => { this.$router.history.push('/taskList', () => {
this.$store.commit('setTaskListTabVal', 'trnrel'); this.$store.commit('setTaskListTabVal', 'trnrel');
this.handleSearch(); // 刷新表格
this.$store.commit('setLoadingFreshReview', true);
}); });
} }
} else { } else {
let errorMsg = ''; let errorMsg = '';
let fieldErrorsFlag = JSON.stringify(rtnmsg.fieldErrors) == '{}'; let fieldErrorsFlag = !rtnmsg.data.fieldErrors;
if (!fieldErrorsFlag) { if (!fieldErrorsFlag) {
let errorMsgkey = ''; let errorMsgkey = '';
let errorMsgVal = ''; let errorMsgVal = '';
for (const key in rtnmsg.fieldErrors) { for (const key in rtnmsg.data.fieldErrors) {
errorMsgkey = key; errorMsgkey = key;
errorMsgVal = rtnmsg.fieldErrors[key]; errorMsgVal = rtnmsg.data.fieldErrors[key];
errorMsg = errorMsg + errorMsgkey + ':' + errorMsgVal + ';'; errorMsg = errorMsg + errorMsgkey + ':' + errorMsgVal + ';';
} }
} else if (rtnmsg.respMsg) { } else if (rtnmsg.respMsg) {
...@@ -211,15 +208,21 @@ export default { ...@@ -211,15 +208,21 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}).then(async () => { }).then(async () => {
const selIds = [idx + 1]; //rowno选中行 let params = {
const selDst = 'trncorco.trnstm'; //列表对应后台模型中的stream trninr: this.$route.query.trn,
transName: 'trnrel',
let params = { selDst: selDst, selIds: selIds }; userId: sessionStorage.getItem('userId') || 'ZL',
pageId: this.model.pageId || '1',
let rtnmsg = await reprow(this.wrapper(params)); dflg: '',
relflg: '',
inidatfro: '',
inidattol: '',
};
let rtnmsg = await Api.post('/service/trnrel/reprow', params);
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
let errorMsg = ''; let errorMsg = '';
let fieldErrorsFlag = JSON.stringify(rtnmsg.fieldErrors) == '{}'; let fieldErrorsFlag =
!rtnmsg.fieldErrors || JSON.stringify(rtnmsg.fieldErrors) == '{}';
if (!fieldErrorsFlag) { if (!fieldErrorsFlag) {
let errorMsgkey = ''; let errorMsgkey = '';
let errorMsgVal = ''; let errorMsgVal = '';
...@@ -241,12 +244,14 @@ export default { ...@@ -241,12 +244,14 @@ export default {
this.$store.dispatch('TagsView/delView', this.$route); this.$store.dispatch('TagsView/delView', this.$route);
this.$router.history.push('/taskList', () => { this.$router.history.push('/taskList', () => {
this.$store.commit('setTaskListTabVal', 'trnrel'); this.$store.commit('setTaskListTabVal', 'trnrel');
this.handleSearch(); // 刷新表格
this.$store.commit('setLoadingFreshReview', true);
}); });
} }
} else { } else {
let errorMsg = ''; let errorMsg = '';
let fieldErrorsFlag = JSON.stringify(rtnmsg.fieldErrors) == '{}'; let fieldErrorsFlag =
!rtnmsg.fieldErrors || JSON.stringify(rtnmsg.fieldErrors) == '{}';
if (!fieldErrorsFlag) { if (!fieldErrorsFlag) {
let errorMsgkey = ''; let errorMsgkey = '';
let errorMsgVal = ''; let errorMsgVal = '';
......
...@@ -142,19 +142,19 @@ export default { ...@@ -142,19 +142,19 @@ export default {
}, },
}, },
watch: { watch: {
'model.trnmod.trndoc.doceot': { // 'model.trnmod.trndoc.doceot': {
handler(val, oldVal) { // handler(val, oldVal) {
var arr = []; // var arr = [];
let k = 0; // let k = 0;
for (let i = 0; i < val.length; i++) { // for (let i = 0; i < val.length; i++) {
if (val[i].role != '') { // if (val[i].role != '') {
arr[k++] = val[i]; // arr[k++] = val[i];
} // }
} // }
this.data1 = arr; // this.data1 = arr;
}, // },
immediate: true, // immediate: true,
}, // },
model: { model: {
handler (newVal) { handler (newVal) {
console.log('model', newVal) console.log('model', newVal)
......
...@@ -178,5 +178,11 @@ export default { ...@@ -178,5 +178,11 @@ export default {
} }
loading.close(); loading.close();
}, },
async handlePass(data) {
this.$store.state.Transaction.operateFuns[data.operateId]["pass"]()
},
async handleRefuse(data) {
this.$store.state.Transaction.operateFuns[data.operateId]["refuse"]()
},
} }
} }
\ No newline at end of file
<template>
<ReviewWrapper>
<Litopn></Litopn>
</ReviewWrapper>
</template>
<script>
import Litopn from "~/business/litopn/views";
import { ReviewWrapper } from "~/components/gj-common.min.js";
export default {
name: "ReviewLitopn",
components: { ReviewWrapper, Litopn },
created() {},
mounted() {},
};
</script>
<style></style>
...@@ -32,7 +32,6 @@ const Business = [ ...@@ -32,7 +32,6 @@ const Business = [
{ path: 'gitcom', component: () => import('~/business/gitcom/views'), name: 'gitcom', meta: { title: '进口保函定期收费' } }, { path: 'gitcom', component: () => import('~/business/gitcom/views'), name: 'gitcom', meta: { title: '进口保函定期收费' } },
{ path: 'brtdck', component: () => import('~/business/brtdck/views'), name: 'brtdck', meta: { title: '进口信用证单据单据改单/二次到单' } }, { path: 'brtdck', component: () => import('~/business/brtdck/views'), name: 'brtdck', meta: { title: '进口信用证单据单据改单/二次到单' } },
{ path: 'brtlat', component: () => import('~/business/brtlat/views'), name: 'brtlat', meta: { title: '进口信用证单据偿还垫款' } }, { path: 'brtlat', component: () => import('~/business/brtlat/views'), name: 'brtlat', meta: { title: '进口信用证单据偿还垫款' } },
{ path: 'brtacp', component: () => import('~/business/brtacp/views'), name: 'brtacp', meta: { title: '进口信用证单据接受不符点' } },
{ path: 'litsel', component: () => import('~/business/litsel/views'), name: 'litsel', meta: { title: '进口信用证入口交易' } }, { path: 'litsel', component: () => import('~/business/litsel/views'), name: 'litsel', meta: { title: '进口信用证入口交易' } },
{ path: 'litcan', component: () => import('~/business/litcan/views'), name: 'litcan', meta: { title: '进口信用证注销' } }, { path: 'litcan', component: () => import('~/business/litcan/views'), name: 'litcan', meta: { title: '进口信用证注销' } },
{ path: 'brtset', component: () => import('~/business/brtset/views'), name: 'brtset', meta: { title: '进口信用证单据进口付汇' } }, { path: 'brtset', component: () => import('~/business/brtset/views'), name: 'brtset', meta: { title: '进口信用证单据进口付汇' } },
......
const Business = [ const Business = [
{ path: 'gitopn', component: () => import('~/review/gitopn/views'), name: 'gitopn', meta: { title: '复核-Gitopn' } }, { path: 'gitopn', component: () => import('~/review/gitopn/views'), name: 'gitopn', meta: { title: '复核-Gitopn' } },
{ path: 'litopn', component: () => import('~/review/ReviewLitopn.vue'), name: 'litopn', meta: { title: '复核-Litopn' } },
] ]
export default Business export default Business
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