Commit ca029757 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 9fb9534e 7ad9279e
...@@ -29,7 +29,8 @@ export default { ...@@ -29,7 +29,8 @@ export default {
transName: this.trnName, transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
// lidInr:'00000013', // lidInr:'00000013',
lidInr:'00006821', // lidInr:'00006821',
brtinr:this.$route.query.inr
}); });
if (!res.data) { if (!res.data) {
...@@ -67,7 +68,7 @@ export default { ...@@ -67,7 +68,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, () => {
......
...@@ -87,14 +87,14 @@ export default { ...@@ -87,14 +87,14 @@ export default {
// {type: "number", required: false, message: "必输项"}, // {type: "number", required: false, message: "必输项"},
// {max: 3,message:"长度不能超过3"} // {max: 3,message:"长度不能超过3"}
// ], // ],
"brdgrp.prb.pts.ref":[ // "brdgrp.prb.pts.ref":[
{type: "string", required: true, message: "必输项"}, // {type: "string", required: true, message: "必输项"},
{max: 16,message:"长度不能超过16"} // {max: 16,message:"长度不能超过16"}
], // ],
"brdgrp.prb.pts.nam":[ // "brdgrp.prb.pts.nam":[
{type: "string", required: false, message: "必输项"}, // {type: "string", required: false, message: "必输项"},
{max: 40,message:"长度不能超过40"} // {max: 40,message:"长度不能超过40"}
], // ],
...@@ -283,6 +283,6 @@ export default { ...@@ -283,6 +283,6 @@ export default {
"brdgrp.prb.pts.ref" :null, "brdgrp.prb.pts.ref" :null,
"brdgrp.apl.pts.nam" :null, "brdgrp.apl.pts.nam" :null,
"setmod.docamt" :null, "setmod.docamt" :null,
"brdgrp.rec.totamt" :null,
} }
\ No newline at end of file
...@@ -11,7 +11,7 @@ export default class Brtacp { ...@@ -11,7 +11,7 @@ export default class Brtacp {
pts: new Pts().data, pts: new Pts().data,
}, },
rec: { rec: {
branchinr: '00000047', branchinr: '',
ownref: '', // Reference .gidgrp.rec.ownref ownref: '', // Reference .gidgrp.rec.ownref
purposin: '', // Incoming Purpose .gidgrp.rec.purposin purposin: '', // Incoming Purpose .gidgrp.rec.purposin
purpos: '', // Outgoing Purpose .gidgrp.rec.purpos purpos: '', // Outgoing Purpose .gidgrp.rec.purpos
...@@ -200,6 +200,7 @@ export default class Brtacp { ...@@ -200,6 +200,7 @@ export default class Brtacp {
dbfadrblkcn: '', dbfadrblkcn: '',
namelc: '', namelc: '',
pts: new Pts().data, pts: new Pts().data,
}, },
acb: { acb: {
adrelc: '', adrelc: '',
...@@ -226,6 +227,7 @@ export default class Brtacp { ...@@ -226,6 +227,7 @@ export default class Brtacp {
docdis: '' docdis: ''
}, },
rec: { rec: {
branchinr: '',
totcur: '', totcur: '',
ownref: '', ownref: '',
disdat: '', disdat: '',
...@@ -237,6 +239,19 @@ export default class Brtacp { ...@@ -237,6 +239,19 @@ export default class Brtacp {
docflg: '', docflg: '',
tenmaxday: '', tenmaxday: '',
docsta: '', docsta: '',
prb: {
modifySet: [],
ptsinr: '',
rol: '',
dbfadrblk: '',
pts: {
inr: '',
objtyp: '',
objinr: '',
rol: '',
},
maps: {}
},
}, },
matp: { matp: {
mattxtlab: '', mattxtlab: '',
...@@ -268,6 +283,7 @@ export default class Brtacp { ...@@ -268,6 +283,7 @@ export default class Brtacp {
}, },
lidgrp: { lidgrp: {
rec: { rec: {
branchinr: '',
expdat: '', expdat: '',
ownref: '' ownref: ''
}, },
...@@ -310,7 +326,7 @@ export default class Brtacp { ...@@ -310,7 +326,7 @@ export default class Brtacp {
inr: '', inr: '',
objtyp: '', objtyp: '',
objinr: '', objinr: '',
rol: 'PRB', rol: '',
ptainr: '', ptainr: '',
ptyinr: '', ptyinr: '',
extkey: '', extkey: '',
...@@ -347,6 +363,7 @@ export default class Brtacp { ...@@ -347,6 +363,7 @@ export default class Brtacp {
pts: new Pts().data, pts: new Pts().data,
}, },
rec: { rec: {
branchinr: '',
clmdat: '', clmdat: '',
ownref: '', ownref: '',
payrol: '', payrol: '',
...@@ -378,9 +395,6 @@ export default class Brtacp { ...@@ -378,9 +395,6 @@ export default class Brtacp {
adv: { adv: {
pts: new Pts().data, pts: new Pts().data,
}, },
apl: {
pts: new Pts().data,
},
}, },
setmod: new Pub().data.Setmod, setmod: new Pub().data.Setmod,
mtabut: new Pub().data.Mtabut, mtabut: new Pub().data.Mtabut,
......
...@@ -11,14 +11,11 @@ ...@@ -11,14 +11,11 @@
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000027 --> <!--PD000027 -->
<el-tab-pane label="费用/账务" name="setmod"> <el-tab-pane label="费用/账务" name="setmod">
<c-content> <c-content>
<m-setmod <m-setmod :model="model" :codes="codes" />
:model="model"
:codes="codes"
@changeSetmodModel="changeSetmodModel"
/>
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
......
...@@ -28,19 +28,7 @@ export default { ...@@ -28,19 +28,7 @@ export default {
...params, ...params,
transName: this.trnName, transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
lidgrp:{ lidinr: this.$route.query.inr
rec:{
inr:"00000026",
},
},
brdgrp:{
rec:{
inr:"00000049",
},
},
liaccv:{
concur:"CNY"
}
}); });
if (!res.data) { if (!res.data) {
return return
......
...@@ -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
......
...@@ -25,14 +25,9 @@ export default { ...@@ -25,14 +25,9 @@ export default {
spt: JSON.parse(localStorage.getItem('row_' + this.trnName)) spt: JSON.parse(localStorage.getItem('row_' + this.trnName))
} }
const res = await Api.post('/service/brtdcr/init', { const res = await Api.post('/service/brtdcr/init', {
...params,
transName: this.trnName, transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
brdgrp:{ lidinr: this.$route.query.inr
rec:{
inr: "00000030",
},
}
}); });
if (!res.data) { if (!res.data) {
return return
...@@ -69,7 +64,7 @@ export default { ...@@ -69,7 +64,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, () => {
......
...@@ -186,11 +186,11 @@ export default { ...@@ -186,11 +186,11 @@ export default {
], ],
"liaall.outamt":[ // "liaall.outamt":[
{type: "string", required: false, message: "必输项"}, // {type: "string", 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位" }
], // ],
"liaall.outpct":[ "liaall.outpct":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 6,message:"长度不能超过6"} {max: 6,message:"长度不能超过6"}
...@@ -199,34 +199,34 @@ export default { ...@@ -199,34 +199,34 @@ export default {
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"liaall.misamt":[ // "liaall.misamt":[
{type: "string", required: false, message: "必输项"}, // {type: "string", 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位" }
], // ],
"liaall.exttotoldamt":[ // "liaall.exttotoldamt":[
{type: "string", required: false, message: "必输项"}, // {type: "string", 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位" }
], // ],
"liaall.exttotamt":[ // "liaall.exttotamt":[
{type: "string", required: false, message: "必输项"}, // {type: "string", 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.ref":[ "setmod.ref":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
], ],
"setmod.docamt":[ // "setmod.docamt":[
{type: "string", required: false, message: "必输项"}, // {type: "string", 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位" }
], // ],
...@@ -332,11 +332,11 @@ export default { ...@@ -332,11 +332,11 @@ export default {
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"liaall.limmod.comamt":[ // "liaall.limmod.comamt":[
{type: "string", required: false, message: "必输项"}, // {type: "string", 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位" }
], // ],
"liaall.limmod.limpts.wrk.pts.nam":[ "liaall.limmod.limpts.wrk.pts.nam":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 40,message:"长度不能超过40"} {max: 40,message:"长度不能超过40"}
...@@ -345,11 +345,11 @@ export default { ...@@ -345,11 +345,11 @@ export default {
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 40,message:"长度不能超过40"} {max: 40,message:"长度不能超过40"}
], ],
"liaall.limmod.ccvamt":[ // "liaall.limmod.ccvamt":[
{type: "string", required: false, message: "必输项"}, // {type: "string", 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位" }
], // ],
...@@ -365,11 +365,11 @@ export default { ...@@ -365,11 +365,11 @@ export default {
], ],
"brdgrp.cbs.max2.amt":[ // "brdgrp.cbs.max2.amt":[
{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.blk.chaded":[ "brdgrp.blk.chaded":[
//{type: "string", required: false, message: "必输项"}, //{type: "string", required: false, message: "必输项"},
{max: 210,message:"长度不能超过210"} {max: 210,message:"长度不能超过210"}
...@@ -382,11 +382,11 @@ export default { ...@@ -382,11 +382,11 @@ export default {
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"brdgrp.rec.totamt":[ // "brdgrp.rec.totamt":[
{type: "string", required: false, message: "必输项"}, // {type: "string", 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位" }
], // ],
"brtp.acbp.ptsget.sdamod.dadsnd":[ "brtp.acbp.ptsget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
......
...@@ -78,6 +78,7 @@ export default class Brtdcr { ...@@ -78,6 +78,7 @@ export default class Brtdcr {
pts: new Pts().data, pts: new Pts().data,
}, },
rec: { rec: {
inr:"",
totcur: '', totcur: '',
advtyp: '', advtyp: '',
ownref: '', ownref: '',
...@@ -134,8 +135,10 @@ export default class Brtdcr { ...@@ -134,8 +135,10 @@ export default class Brtdcr {
advrefflg: '', advrefflg: '',
lidgrp: { lidgrp: {
rec: { rec: {
inr:'',
expdat: '', expdat: '',
ownref: '' ownref: '',
branchinr: "00000047",
}, },
cbs: { cbs: {
opn1: { opn1: {
......
...@@ -75,8 +75,10 @@ ...@@ -75,8 +75,10 @@
<c-grid-ety-prompt-dialog ref="doxpDialog" :isPty="false" :promptData="promptData"> <c-grid-ety-prompt-dialog ref="doxpDialog" :isPty="false" :promptData="promptData">
</c-grid-ety-prompt-dialog> </c-grid-ety-prompt-dialog>
<c-function-btn :handleSubmit="handleSubmit" :handleCheck="handleCheck" :handleStash="handleStash"> <c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash">
</c-function-btn> </c-function-btn>
</div> </div>
......
...@@ -28,7 +28,7 @@ export default { ...@@ -28,7 +28,7 @@ export default {
...params, ...params,
transName: this.trnName, transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
brdgrp:{ lidgrp:{
rec:{ rec:{
inr: "00000028", inr: "00000028",
} }
...@@ -70,7 +70,7 @@ export default { ...@@ -70,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, () => {
......
...@@ -490,8 +490,8 @@ let checkObj = { ...@@ -490,8 +490,8 @@ let checkObj = {
{ max: 22, message: '长度不能超过22' }, { max: 22, message: '长度不能超过22' },
], ],
'cfatrt.cda.cfeogudad': [ 'cfatrt.cda.cfeogudad': [
{ type: 'string', required: true, message: '必输项' }, // { type: 'string', required: true, message: '必输项' },
{ max: 32, message: '长度不能超过32' }, // { max: 32, message: '长度不能超过32' },
], ],
'bopmod.dbcgrp.bas.rptno': [ 'bopmod.dbcgrp.bas.rptno': [
......
...@@ -406,6 +406,7 @@ export default class Bctset { ...@@ -406,6 +406,7 @@ export default class Bctset {
}, },
lidgrp: { lidgrp: {
rec: { rec: {
branchinr:"00000014",
expdat: '', expdat: '',
ownref: '', ownref: '',
}, },
......
...@@ -64,7 +64,7 @@ export default { ...@@ -64,7 +64,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, () => {
......
...@@ -379,6 +379,10 @@ export default { ...@@ -379,6 +379,10 @@ export default {
{ {
label:'保证金收取', label:'保证金收取',
route:'/business-new/lctopn' route:'/business-new/lctopn'
},
{
label:'到单',
route:'/business-new/litdck'
} }
], ],
currentHandleRow: {} currentHandleRow: {}
......
...@@ -149,4 +149,35 @@ export default { ...@@ -149,4 +149,35 @@ export default {
}; };
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,
},
};
return params
},
buildDoctre (model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'GID',
objinr: model.gidgrp.rec.objinr,
ownref: model.gidgrp.rec.ownref,
swiftflg: model.gitp.swiftflg,
},
};
return params
},
// 公共组件setmod中dsp字段改变,触发联动时候的入参
buildSetgllAccts (model, trnName, setglg) {
let params = {
...this.buildCommonData(model, trnName),
setglg
};
return params
}
}
\ No newline at end of file
...@@ -50,7 +50,9 @@ export default { ...@@ -50,7 +50,9 @@ export default {
}) })
}, },
async tabClick(tab) { async tabClick(tab) {
console.log(tab) if (this.isInDisplay) {
return;
}
let name = tab.name; let name = tab.name;
switch (name) { switch (name) {
case 'ccvpan': case 'ccvpan':
...@@ -61,7 +63,7 @@ export default { ...@@ -61,7 +63,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 'setmod': case 'setpan':
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, () => {
...@@ -76,6 +78,17 @@ export default { ...@@ -76,6 +78,17 @@ export default {
let glentryRequest = buildFn.buildGlentry(this.model, this.trnName); let glentryRequest = buildFn.buildGlentry(this.model, this.trnName);
this.processGlentry(glentryRequest); this.processGlentry(glentryRequest);
break; 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: default:
return; return;
} }
......
import Pts from '~/components/business/commonModel/Pts'; import Pts from '~/components/business/commonModel/Pts';
import Pub from '~/components/business/commonModel/index.js'; import Pub from '~/components/business/commonModel/index.js';
export default class Litcan{ export default class Litcan {
constructor () { constructor() {
this.data = { this.data = {
litapll1blk:'', sndmsg: 'X',
litrmbl3blk:'', litapll1blk: '',
litcanl1blk:'', litrmbl3blk: '',
trnmod:new Pub().data.Trnmod, litcanl1blk: '',
liaccv: new Pub().data.Liaccv, lidgrp: {
setmod:new Pub().data.Setmod, rec: {
mtabut:new Pub().data.Mtabut, branchinr: '00000047',
docpan: new Pub().data.Docpan, ownref: '', // 参考号 .lidgrp.rec.ownref
liaall:new Pub().data.Liaall, nam: '', // 名称 .lidgrp.rec.nam
lidgrp:{ avbby: '', // 兑付方式 .lidgrp.rec.avbby
rec:{ redclsflg: '', // Red/Green Clause .lidgrp.rec.redclsflg
ownref:'', // 参考号 .lidgrp.rec.ownref opndat: '', // 开立日期 .lidgrp.rec.opndat
nam:'', // 名称 .lidgrp.rec.nam shpdat: '', // Shipment Date .lidgrp.rec.shpdat
avbby:'', // 兑付方式 .lidgrp.rec.avbby expdat: '', // 到期日 .lidgrp.rec.expdat
redclsflg:'', // Red/Green Clause .lidgrp.rec.redclsflg expplc: '', // 到期日 .lidgrp.rec.expplc
opndat:'', // 开立日期 .lidgrp.rec.opndat lcrtyp: '', // 信用证类型 .lidgrp.rec.lcrtyp
shpdat:'', // Shipment Date .lidgrp.rec.shpdat revflg: '', // Revolving Flag .lidgrp.rec.revflg
expdat:'', // 到期日 .lidgrp.rec.expdat advnam: '',
expplc:'', // 到期日 .lidgrp.rec.expplc },
lcrtyp:'', // 信用证类型 .lidgrp.rec.lcrtyp cbs: {
revflg:'', // Revolving Flag .lidgrp.rec.revflg nom1: {
advnam:'', 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: {
aammod: {
addamtflg: '', // Add. Amount .litp0.aammod.addamtflg
},
},
litcanf: {
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: '',
amt: ''
},
max: {
cur: '',
amt: ''
}
},
ben: {
pts: new Pts().data,
},
apl: {
pts: new Pts().data,
},
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: ''
}
}, },
cbs:{ ctr: {
nom1:{ pts: new Pts().data,
cur:'', // 开证金额 .lidgrp.cbs.nom1.cur
amt:'', // 开证金额 .lidgrp.cbs.nom1.amt
}, },
opn1:{ con: {
cur:'', // 信用证余额 .lidgrp.cbs.opn1.cur pts: new Pts().data,
amt:'', // Balance .lidgrp.cbs.opn1.amt
}, },
iss: {
pts: new Pts().data,
}, },
apl:{ ben: {
pts:new Pts().data, pts: new Pts().data,
}, },
ben:{ atb: {
pts:new Pts().data, pts: new Pts().data,
}, },
adv:{ avc: {
pts:new Pts().data, pts: new Pts().data,
}, },
avbnam:'', // 指定银行 .lidgrp.avbnam adv: {
pts: new Pts().data,
}, },
litp0:{ apl: {
aammod:{ pts: new Pts().data,
addamtflg:'', // Add. Amount .litp0.aammod.addamtflg
}, },
}, },
litcanf:{ liaall: {
strinf:'', // Narrative .litcanf.strinf concur: '',
liaccv: {
concur: '',
newamt: '',
dnfmod: {
zhruzh: '',
kehuzh: '',
intdsp: '',
lxzyzh: '',
pridsp: '',
yewudh: '',
qicuje: '',
ccvtyp: '',
tizamt: '',
zhqtyp: '',
stm8023: '',
zhhuye: '',
zhqucs: ''
}, },
byinst:'', // On Applicant instruction .byinst 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
pageId: '', // ctx的key pageId: '', // ctx的key
setmod: new Pub().data.Setmod,
mtabut: new Pub().data.Mtabut,
trnmod: new Pub().data.Trnmod,
liaall: new Pub().data.Liaall,
liaccv: new Pub().data.Liaccv,
docpan: new Pub().data.Docpan,
} }
} }
} }
\ No newline at end of file
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="费用/账务" name="setmod"> <el-tab-pane label="费用/账务" name="setmod">
<c-content> <c-content>
<m-setmod :model="model" :codes="codes" /> <m-setmod :model="model" :codes="codes" />
...@@ -45,10 +44,6 @@ ...@@ -45,10 +44,6 @@
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
</el-form> </el-form>
...@@ -61,8 +56,6 @@ ...@@ -61,8 +56,6 @@
<script> <script>
import event from '../event'; import event from '../event';
import operationFunc from '~/mixin/operationFunc'; import operationFunc from '~/mixin/operationFunc';
import Api from "~/service/Api";
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable"
import Litcan from "../model" import Litcan from "../model"
import Check from "../model/check" import Check from "../model/check"
......
...@@ -28,12 +28,8 @@ export default { ...@@ -28,12 +28,8 @@ 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
lidgrp:{
rec:{
inr:'00000122',
}
}
}); });
if (!res.data) { if (!res.data) {
return return
...@@ -120,7 +116,7 @@ export default { ...@@ -120,7 +116,7 @@ export default {
let params = { let params = {
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
ptytyp: ptytyp, ptytyp: ptytyp,
extkey: this.model.gidgrp[type.toLowerCase()].pts.extkey, extkey: this.model.brdgrp[type.toLowerCase()].pts.extkey,
}; };
let res = await Api.post('/service/ptspta/list', params); let res = await Api.post('/service/ptspta/list', params);
if (res.respCode == SUCCESS) { if (res.respCode == SUCCESS) {
...@@ -136,7 +132,7 @@ export default { ...@@ -136,7 +132,7 @@ export default {
}; };
let res = await Api.post('/service/ptspta/fetch', params); let res = await Api.post('/service/ptspta/fetch', params);
if (res.respCode == SUCCESS) { if (res.respCode == SUCCESS) {
this.$set(this.model.gidgrp, row.role.toLowerCase(), res.data); this.$set(this.model.brdgrp, row.role.toLowerCase(), res.data);
} }
}, },
// 业务信息=》基本信息=》支出目的 // 业务信息=》基本信息=》支出目的
...@@ -174,3 +170,5 @@ export default { ...@@ -174,3 +170,5 @@ export default {
}, },
}, },
}; };
...@@ -87,7 +87,7 @@ export default class Litdck { ...@@ -87,7 +87,7 @@ export default class Litdck {
invtyp: '', invtyp: '',
lidgrp: { lidgrp: {
rec: { rec: {
branchinr: '00000047', branchinr: '',
revflg: '', revflg: '',
expdat: '', expdat: '',
expplc: '', expplc: '',
......
...@@ -181,6 +181,7 @@ ...@@ -181,6 +181,7 @@
style="margin: 0 0" style="margin: 0 0"
size="small" size="small"
type="primary" type="primary"
@click="getBrdgrpOwnRef"
:disabled="model.brdgrp.rec.ownref !== ''" :disabled="model.brdgrp.rec.ownref !== ''"
> >
获取 获取
...@@ -491,6 +492,9 @@ ...@@ -491,6 +492,9 @@
maxlength="16" maxlength="16"
placeholder="请输入地址编码" placeholder="请输入地址编码"
:disabled="model.brdgrp.rec.docprbrol != 'PRB'" :disabled="model.brdgrp.rec.docprbrol != 'PRB'"
@keyup.enter.native="
queryGridEtyPromptDialogData('PRB', 'C')
"
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
......
...@@ -83,9 +83,7 @@ ...@@ -83,9 +83,7 @@
<!--PD000546 --> <!--PD000546 -->
<el-tab-pane label="附件信息" name="doctre"> <el-tab-pane label="附件信息" name="doctre">
<c-content>
<m-doctre :model="model" :codes="codes" /> <m-doctre :model="model" :codes="codes" />
</c-content>
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
...@@ -116,7 +114,7 @@ import Docpre from "./Docpre"; ...@@ -116,7 +114,7 @@ import Docpre from "./Docpre";
import Srmp from "./Srmp"; import Srmp from "./Srmp";
import Engp from "~/components/business/engp/views"; import Engp from "~/components/business/engp/views";
import Coninfp from "~/components/business/coninfp/views"; import Coninfp from "~/components/business/coninfp/views";
import Doctre from "~/components/business/doctre/views"; import Doctre from "~/views/Public/Doctre";
import Limitbody from "~/views/Public/Limitbody" import Limitbody from "~/views/Public/Limitbody"
import Setmod from "~/components/business/setmod/views"; import Setmod from "~/components/business/setmod/views";
import Glentry from "~/components/business/glentry/views"; import Glentry from "~/components/business/glentry/views";
......
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