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

@@ -43,6 +43,7 @@ export default {
         purpos: model.bedgrp.rec.purpos,
         revflg: model.bedgrp.rec.revflg,
         cnfsta: model.bedgrp.rec.cnfsta,
+        snadat: model.snadat,
       },
       cbsMap: {
         MAX: model.bedgrp.cbs.max,

src/business/betacc/model/index.js

@@ -19,7 +19,10 @@ export default class Betacc {
                     cur: '',
                     amt: ''
                 }
-            }
+            },
+            rmb: {
+              pts: new Pts().data,
+            },
         },
 
         bedgrp: {

src/business/betrcl/event/buildCommons.js

@@ -28,6 +28,9 @@ export default {
     if (model.bedgrp.apl.pts.extkey) {
       ptsptaList.push(this.buildPtspta(model.bedgrp.apl));
     }
+    if (model.rmbclm.rmbrmb.pts.extkey) {
+      ptsptaList.push(this.buildPtspta(model.rmbclm.rmbrmb));
+    }
     let dataObj = {
       rec: {
         objtyp: 'BED',
@@ -41,7 +44,8 @@ export default {
         nam: model.bedgrp.rec.nam,
         docprbrol: model.bedgrp.rec.docprbrol,
         advdocflg: model.bedgrp.rec.advdocflg,
-
+        clmrmbflg: model.rmbclm.clmrmbflg,
+        rmbrol: model.rmbclm.rmbrol,
       },
       cbsMap: {
         MAX: model.bedgrp.cbs.max,

src/business/betrcl/model/index.js

@@ -8,7 +8,7 @@ export default class Betrcl {
             },
             ledgrp: {
                 rec: {
-                    ownref: ''
+                    ownref: '',
                 },
                 cbs: {
                     opn1: {

src/business/betrcl/views/Rclp.vue

@@ -223,11 +223,11 @@
         </c-col>
         <c-col :span="12">
           <el-form-item label="" label-width="5px" prop="ledgrp.cbs.opn1.amt">
-            <c-input
+            <c-input-currency
               v-model="model.ledgrp.cbs.opn1.amt"
               placeholder="请输入金额"
               disabled
-            ></c-input>
+            ></c-input-currency>
           </el-form-item>
         </c-col>
       </c-col>