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/index.js

@@ -28,8 +28,10 @@ export default {
         ...params,
         transName: this.trnName,
         userId: window.sessionStorage.userId || 'ZL',
-        trnmod:{
-          trn:JSON.parse(localStorage.getItem('review_'+this.trnName))
+        brdgrp:{
+          rec:{
+            inr:this.$route.query.inr
+          }
         }
       });
       if (!res.data) {

src/business/brtdck/event/buildCommons.js

@@ -46,6 +46,7 @@ export default {
         revflg: model.brdgrp.rec.revflg,
         cnfsta: model.brdgrp.rec.cnfsta,
         mhtyp: model.mhtyp,
+        relgodflg:model.brdgrp.rec.relgodflg,
       },
       cbsMap: {
         MAX: model.brdgrp.cbs.max,

src/business/brteus/event/buildCommons.js

@@ -25,6 +25,9 @@ export default {
     if (model.brdgrp.ben.pts.extkey) {
       ptsptaList.push(this.buildPtspta(model.brdgrp.ben));
     }
+    if (model.brdgrp.prb.pts.extkey) {
+      ptsptaList.push(this.buildPtspta(model.brdgrp.prb));
+    }
     let dataObj = {
       rec: {
         objtyp: 'BRD',
@@ -49,7 +52,9 @@ export default {
       },
       cbsMap: {
         MAX: model.brdgrp.cbs.max,
+        MAX2: model.brdgrp.cbs.max2,
         OPN1: model.brdgrp.cbs.opn1,
+        OPN2: model.brdgrp.cbs.opn2,
         MAC: model.brdgrp.cbs.mac,
         MAC2: model.brdgrp.cbs.mac2,
         OPC2: model.brdgrp.cbs.opc2,

src/business/litrog/event/buildCommons.js

@@ -31,6 +31,7 @@ export default {
     let dataObj = {
       rec: {
         objtyp: 'LID',
+        objinr: model.lidgrp.rec.inr,
         ownref: model.lidgrp.rec.ownref,
         opndat: model.lidgrp.rec.opndat,
         expdat: model.lidgrp.rec.expdat,

src/business/litrog/model/index.js

@@ -36,11 +36,17 @@ export default class Litrog {
           tramod: '',
           nam: '',
           docprbrol: '',
+          branchinr: '',
+          inr: '',
         },
         cbs: {
           max: {
             cur: '',
-            amt: '',
+            amt: '0',
+          },
+          max2: {
+            cur: '',
+            amt: '0',
           }
         },
         shp: {
@@ -67,7 +73,8 @@ export default class Litrog {
     shpmar: '',
     lidgrp: {
       rec: {
-        branchinr: '00000047',
+        branchinr: '',
+        inr:'',
         revflg: '',
         expdat: '',
         expplc: '',