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

@@ -28,6 +28,7 @@ export default {
     let dataObj = {
       rec: {
         objtyp: 'BED',
+        objinr: model.bedgrp.rec.inr,
         ownref: model.bedgrp.rec.ownref,
         opndat: model.bedgrp.rec.opndat,
         expdat: model.bedgrp.rec.expdat,
@@ -48,9 +49,9 @@ export default {
       cbsMap: {
         MAX: model.bedgrp.cbs.max,
         OPN1: model.bedgrp.cbs.opn1,
-        MAC: model.bedgrp.cbs.mac,
-        MAC2: model.bedgrp.cbs.mac2,
-        OPC2: model.bedgrp.cbs.opc2,
+        // MAC: model.bedgrp.cbs.mac,
+        // MAC2: model.bedgrp.cbs.mac2,
+        // OPC2: model.bedgrp.cbs.opc2,
         CNF: model.bedgrp.cbs.cnf,
       },
       ptsList: ptsptaList,
@@ -91,6 +92,8 @@ export default {
     let params = {
       ...this.buildCommonData(model, trnName),
       liaallg: model.liaall.liaallg,
+      doccur: model.setmod.doccur,
+      docamt: model.setmod.docamt,
     };
     return params
   },

src/business/betacc/model/index.js

@@ -128,6 +128,7 @@ export default class Betacc {
           },
          
             rec: {
+                inr: '',
                 predat: '',
                 rcvdat: '',
                 doctypcod: '',

src/business/betacc/views/Accp.vue

@@ -298,7 +298,7 @@
               v-model="model.setmod.doccur"
               maxlength="3"
               placeholder="请输入承兑金额"
-              disabled
+              
             ></c-input>
           </el-form-item>
         </c-col>
@@ -307,7 +307,7 @@
             <c-input-currency
               v-model="model.setmod.docamt"
               placeholder="请输入金额"
-              disabled
+              
             ></c-input-currency>
           </el-form-item>
         </c-col>

src/business/betacc/views/index.vue

@@ -49,7 +49,7 @@
             </el-tab-pane>
 
             <!--PD000027 -->
-            <el-tab-pane label="费用/账务" name="setpan">
+            <el-tab-pane label="费用/账务" name="setmod">
               <c-content>
                 <m-setmod
                   :model="model"