Commit bf05f6c3 by 闫泽浩

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 08e4ad27 387919d5
...@@ -74,7 +74,7 @@ export default { ...@@ -74,7 +74,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, () => {
......
...@@ -27,9 +27,12 @@ export default { ...@@ -27,9 +27,12 @@ export default {
} }
let dataObj = { let dataObj = {
rec: { rec: {
objtyp: 'LID', objtyp: 'BRD',
objinr: model.brdgrp.rec.inr,
ownref: model.brdgrp.rec.ownref, ownref: model.brdgrp.rec.ownref,
expdat: model.lidgrp.rec.expdat, expdat: model.lidgrp.rec.expdat,
doccur: model.setmod.doccur,
docamt: model.setmod.docamt,
}, },
cbsMap: { cbsMap: {
......
...@@ -31,10 +31,11 @@ export default { ...@@ -31,10 +31,11 @@ export default {
let dataObj = { let dataObj = {
rec: { rec: {
objtyp: 'BRD', objtyp: 'BRD',
ownref: model.lidgrp.rec.ownref, objinr: model.brdgrp.rec.inr,
opndat: model.lidgrp.rec.opndat, ownref: model.brdgrp.rec.ownref,
expdat: model.lidgrp.rec.expdat, opndat: model.brdgrp.rec.opndat,
branchInr: model.lidgrp.rec.branchInr, expdat: model.brdgrp.rec.expdat,
branchInr: model.brdgrp.rec.branchinr,
hndtyp: model.lidgrp.rec.hndtyp, hndtyp: model.lidgrp.rec.hndtyp,
gartyp: model.lidgrp.rec.gartyp, gartyp: model.lidgrp.rec.gartyp,
fingua: model.lidgrp.rec.fingua, fingua: model.lidgrp.rec.fingua,
...@@ -50,17 +51,14 @@ export default { ...@@ -50,17 +51,14 @@ export default {
advtyp: model.brdgrp.rec.advtyp, advtyp: model.brdgrp.rec.advtyp,
}, },
cbsMap: { cbsMap: {
MAX: model.lidgrp.cbs.max, // MAX: model.lidgrp.cbs.max,
// OLDMAX: model.lidgrp.cbs.oldmax,
OLDMAX: model.lidgrp.cbs.oldmax, // MAX2: model.lidgrp.cbs.max2,
MAX2: model.lidgrp.cbs.max2, // NOM1: model.lidgrp.cbs.nom1,
NOM1: model.lidgrp.cbs.nom1, // OPN1: model.lidgrp.cbs.opn1,
MAX: model.brdgrp.cbs.max,
OPN1: model.lidgrp.cbs.opn1, MAX2: model.brdgrp.cbs.max2,
MAC: model.lidgrp.cbs.mac, OPN2: model.brdgrp.cbs.opn1,
MAC2: model.lidgrp.cbs.mac2,
OPC2: model.lidgrp.cbs.opc2,
CNF: model.lidgrp.cbs.cnf,
}, },
ptsList: ptsptaList, ptsList: ptsptaList,
transName: trnName, transName: trnName,
......
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