Merge remote-tracking branch 'origin/settle-test-20230110' 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/brtame/model/index.js

@@ -36,7 +36,9 @@ export default class Brtame {
           reltyp: '',
           tramod: '',
           nam: '',
+          inr:'',
           branchinr:''
+          
         },
         cbs: {
           max: {
@@ -77,6 +79,7 @@ export default class Brtame {
           redclsflg: '',
           branchinr:'',
           shppars18:'',
+          inr:'',
           shppar:''
 
         },

src/business/brtcan/event/buildCommons.js

@@ -27,7 +27,7 @@ export default {
     }
     let dataObj = {
       rec: {
-        objtyp: 'LID',
+        objtyp: 'BRD',
         ownref: model.brdgrp.rec.ownref,
         nam:model.brdgrp.rec.nam,
         rcvdat:model.brdgrp.rec.rcvdat,

src/business/brtcsg/event/buildCommons.js

@@ -50,7 +50,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/brtcsg/event/index.js

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

src/business/brtcsg/model/index.js

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

src/business/brtcsg/views/index.vue

@@ -26,6 +26,12 @@
 <!--            </c-content>-->
 <!--          </el-tab-pane>-->
           <!--PD000027 -->
+           <el-tab-pane label="表外记账" name="engp">
+          <c-content>
+            <!-- 表外记账 -->
+            <m-engp :model="model" :codes="codes" />
+          </c-content>
+        </el-tab-pane>
           <el-tab-pane label="费用/账务" name="setmod">
             <c-content>
               <m-setmod

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: {

src/business/brtset/event/buildCommons.js

@@ -73,6 +73,7 @@ export default {
       cbsMap: {
         MAX: model.brdgrp.cbs.max,
         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/litcan/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,
@@ -52,6 +53,7 @@ export default {
       cbsMap: {
         MAX: model.lidgrp.cbs.max,
         OPN1: model.lidgrp.cbs.opn1,
+        NOM1: model.lidgrp.cbs.nom1,
         MAC: model.lidgrp.cbs.mac,
         MAC2: model.lidgrp.cbs.mac2,
         OPC2: model.lidgrp.cbs.opc2,

src/components/business/docpan/views/index.vue

@@ -578,7 +578,7 @@ export default {
         trnmodVo: this.model.trnmod,
         addbcb: this.model.addbcb,
         cnybop: this.model.cnybop,
-        doceot: this.model.doceot,
+        doceot: this.model.docpan.doceot,
       };
       rtnmsg = await Api.post(
         `${this.requestPrefix}/executeDocpan`,