Skip to content

V
vue-gjjs
Commit 21d5aa68 by 闫泽浩
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 50cee4d3 1513d24f
Showing with 15 additions and 13 deletions
src/business/brtame/event/buildCommons.js
...@@ -30,8 +30,8 @@ export default { ...@@ -30,8 +30,8 @@ export default {
} }
let dataObj = { let dataObj = {
rec: { rec: {
objtyp: 'LID', objtyp: 'BRD',
ownref: model.lidgrp.rec.ownref, ownref: model.brdgrp.rec.ownref,
opndat: model.lidgrp.rec.opndat, opndat: model.lidgrp.rec.opndat,
expdat: model.lidgrp.rec.expdat, expdat: model.lidgrp.rec.expdat,
branchInr: model.lidgrp.rec.branchInr, branchInr: model.lidgrp.rec.branchInr,
...@@ -49,15 +49,16 @@ export default { ...@@ -49,15 +49,16 @@ export default {
cnfsta: model.lidgrp.rec.cnfsta, cnfsta: model.lidgrp.rec.cnfsta,
}, },
cbsMap: { cbsMap: {
MAX: model.lidgrp.cbs.max, MAX: model.brdgrp.cbs.max,
OLDMAX: model.lidgrp.cbs.oldmax, OLDMAX: model.brdgrp.cbs.oldmax,
MAX2: model.lidgrp.cbs.max2, OLDMAX2: model.brdgrp.cbs.oldmax2,
NOM1: model.lidgrp.cbs.nom1, MAX2: model.brdgrp.cbs.max2,
OPN1: model.lidgrp.cbs.opn1, NOM1: model.brdgrp.cbs.nom1,
MAC: model.lidgrp.cbs.mac, OPN1: model.brdgrp.cbs.opn1,
MAC2: model.lidgrp.cbs.mac2, MAC: model.brdgrp.cbs.mac,
OPC2: model.lidgrp.cbs.opc2, MAC2: model.brdgrp.cbs.mac2,
CNF: model.lidgrp.cbs.cnf, OPC2: model.brdgrp.cbs.opc2,
CNF: model.brdgrp.cbs.cnf,
}, },
ptsList: ptsptaList, ptsList: ptsptaList,
transName: trnName, transName: trnName,
......
src/business/brteus/event/buildCommons.js
...@@ -34,7 +34,7 @@ export default { ...@@ -34,7 +34,7 @@ export default {
ownref: model.brdgrp.rec.ownref, ownref: model.brdgrp.rec.ownref,
opndat: model.brdgrp.rec.opndat, opndat: model.brdgrp.rec.opndat,
expdat: model.brdgrp.rec.expdat, expdat: model.brdgrp.rec.expdat,
branchInr: model.brdgrp.rec.branchInr, branchInr: model.brdgrp.rec.branchinr,
hndtyp: model.brdgrp.rec.hndtyp, hndtyp: model.brdgrp.rec.hndtyp,
gartyp: model.brdgrp.rec.gartyp, gartyp: model.brdgrp.rec.gartyp,
fingua: model.brdgrp.rec.fingua, fingua: model.brdgrp.rec.fingua,
......
src/business/brteus/model/index.js
...@@ -81,7 +81,8 @@ export default class Brteus { ...@@ -81,7 +81,8 @@ export default class Brteus {
stadat: '', stadat: '',
matdat: '', matdat: '',
nam: '', nam: '',
inr:'' inr:'',
branchinr:"",
}, },
cbs: { cbs: {
opn1: { opn1: {
......
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