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,11 +30,12 @@ export default {
     }
     let dataObj = {
       rec: {
-        objtyp: 'LID',
-        ownref: model.lidgrp.rec.ownref,
-        opndat: model.lidgrp.rec.opndat,
-        expdat: model.lidgrp.rec.expdat,
-        branchInr: model.lidgrp.rec.branchInr,
+        objtyp: 'BRD',
+        objinr: model.brdgrp.rec.inr,
+        ownref: model.brdgrp.rec.ownref,
+        opndat: model.brdgrp.rec.opndat,
+        expdat: model.brdgrp.rec.expdat,
+        branchInr: model.brdgrp.rec.branchinr,
         hndtyp: model.lidgrp.rec.hndtyp,
         gartyp: model.lidgrp.rec.gartyp,
         fingua: model.lidgrp.rec.fingua,
@@ -49,15 +50,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/brtame/event/index.js

@@ -69,7 +69,7 @@ export default {
           let engpRequest = buildFn.buildEngp(this.model, this.trnName);
           this.processLiaall(engpRequest);
           break;
-        case 'setpan':
+        case 'setmod':
           let setfegRequest = buildFn.buildSetfeg(this.model, this.trnName);
           // 此处利用回调是为了等setfeg的接口调用完成后才去获取setglg参数，由于setglg参数依赖于setfeg函数的返回值
           this.processSetpan(setfegRequest, () => {

src/business/brtame/model/check.js

@@ -225,21 +225,7 @@ export default {
     {type: "string", required: false, message: "必输项"},
     {max: 20,message:"长度不能超过20"}
   ],
-  "mtabut.coninf.oitinf.oit.inftxt":[
-    //{type: "string", required: false, message: "必输项"},
-    //{max: 60,message:"长度不能超过60"}
-  ],
-  "mtabut.coninf.oitset.oit.inftxt":[
-    //{type: "string", required: false, message: "必输项"},
-    //{max: 60,message:"长度不能超过60"}
-  ],
-  "mtabut.coninf.conexedat":[
-    //{type: "date", required: false, message: "输入正确的日期"}
-  ],
-  "mtabut.coninf.usr.extkey":[
-    {type: "string", required: false, message: "必输项"},
-    {max: 8,message:"长度不能超过8"}
-  ],
+
   "trnmod.trndoc.advnam":[
     {type: "string", required: false, message: "必输项"},
     {max: 50,message:"长度不能超过50"}
@@ -345,7 +331,6 @@ export default {
   "liaall.limmod.limpts.wrk.pts.nam": null,
   "liaall.limmod.limpts.wrk.pts.extkey": null,
   "brdgrp.shp.adrelc": null,
-  "mtabut.coninf.conexedat": null,
   "liaall.limmod.limpts.nonrevflg1": null,
   "brdgrp.apl.pts.nam": null,
   "setmod.docamt": null,

src/business/brtcsg/event/index.js

@@ -38,7 +38,7 @@ export default {
         userId: window.sessionStorage.userId || 'ZL',
         brdgrp:{
           rec:{
-            inr: this.$route.query.inr
+            inr:this.$route.query.inr
           }
         },
       });

src/business/brtcsg/model/index.js

@@ -87,6 +87,7 @@ export default class Brtcsg {
           inr:'',
           shgref: '',
           ownref: '',
+          docsta:'',
           nam: ''
         },
         cbs: {
@@ -142,7 +143,7 @@ export default class Brtcsg {
           inr:'',
           expdat: '',
           ownref: '',
-          branchinr: "00000047",
+          branchinr: "",
         },
         cbs: {
           opn1: {