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/brtudp/event/buildCommons.js

@@ -45,7 +45,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,
@@ -59,10 +59,17 @@ export default {
         cnfsta: model.brdgrp.rec.cnfsta,
         sftmt: model.sftmt,
         docprbrol: model.brdgrp.rec.docprbrol,
+        docamt: model.setmod.docamt,
+        doccur: model.setmod.doccur,
+        expdat: model.brdgrp.rec.expdat,
+        matdat: model.brdgrp.rec.matdat,
+        acpnowflg: model.brdgrp.rec.acpnowflg,
+        docflg: model.brdgrp.rec.docflg,
       },
       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/brtudp/model/index.js

@@ -70,6 +70,7 @@ export default class Brtudp {
                     advdat: '',
                     stadat: '',
                     dscinsflg: '',
+                    acpnowflg:'X',
                     branchinr:'',
                     inr:''
                 },

src/business/brtudp/views/index.vue

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