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

src/business/brtame/event/buildCommons.js

@@ -30,8 +30,8 @@ export default {
     }
     let dataObj = {
       rec: {
-        objtyp: 'LID',
-        ownref: model.lidgrp.rec.ownref,
+        objtyp: 'BRD',
+        ownref: model.brdgrp.rec.ownref,
         opndat: model.lidgrp.rec.opndat,
         expdat: model.lidgrp.rec.expdat,
         branchInr: model.lidgrp.rec.branchInr,
@@ -49,15 +49,16 @@ export default {
         cnfsta: model.lidgrp.rec.cnfsta,
       },
       cbsMap: {
-        MAX: model.lidgrp.cbs.max,
-        OLDMAX: model.lidgrp.cbs.oldmax,
-        MAX2: model.lidgrp.cbs.max2,
-        NOM1: model.lidgrp.cbs.nom1,
-        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,
+        MAX: model.brdgrp.cbs.max,
+        OLDMAX: model.brdgrp.cbs.oldmax,
+        OLDMAX2: model.brdgrp.cbs.oldmax2,
+        MAX2: model.brdgrp.cbs.max2,
+        NOM1: model.brdgrp.cbs.nom1,
+        OPN1: model.brdgrp.cbs.opn1,
+        MAC: model.brdgrp.cbs.mac,
+        MAC2: model.brdgrp.cbs.mac2,
+        OPC2: model.brdgrp.cbs.opc2,
+        CNF: model.brdgrp.cbs.cnf,
       },
       ptsList: ptsptaList,
       transName: trnName,

src/business/brteus/event/buildCommons.js

@@ -34,7 +34,7 @@ export default {
         ownref: model.brdgrp.rec.ownref,
         opndat: model.brdgrp.rec.opndat,
         expdat: model.brdgrp.rec.expdat,
-        branchInr: model.brdgrp.rec.branchInr,
+        branchInr: model.brdgrp.rec.branchinr,
         hndtyp: model.brdgrp.rec.hndtyp,
         gartyp: model.brdgrp.rec.gartyp,
         fingua: model.brdgrp.rec.fingua,

src/business/brteus/model/index.js

@@ -81,7 +81,8 @@ export default class Brteus {
           stadat: '',
           matdat: '',
           nam: '',
-          inr:''
+          inr:'',
+          branchinr:"",
         },
         cbs: {
           opn1: {