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

@@ -88,8 +88,13 @@ export default class Brtcsg {
           shgref: '',
           ownref: '',
           docsta:'',
+<<<<<<< HEAD
           nam: '',
           branchinr: "",
+=======
+          branchinr:'',
+          nam: ''
+>>>>>>> 783b536c7717d88bb1fc6b8313d21fdd8f61e24a
         },
         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