Merge remote-tracking branch 'origin/settle-test-20230110' into settle-test-20230110

# Conflicts:
#	src/business/letamc/model/check.js

src/business/letamc/event/buildCommons.js

@@ -56,6 +56,7 @@ export default {
       cbsMap: {
         MAX: model.ledgrp.cbs.max,
         OPN1: model.ledgrp.cbs.opn1,
+        NOM1: model.ledgrp.cbs.nom1,
         MAC: model.ledgrp.cbs.mac,
         MAC2: model.ledgrp.cbs.mac2,
         OPC2: model.ledgrp.cbs.opc2,

src/business/letamc/views/Conp.vue

@@ -28,12 +28,12 @@
         </c-col>
         <c-col :span="7">
           <el-form-item label="" label-width="5px" prop="ledgrp.cbs.nom1.amt">
-            <c-input
+            <c-input-currency
                 v-model="model.ledgrp.cbs.nom1.amt"
                 class="m-input-currency"
                 placeholder="请输入金额"
                 disabled
-            ></c-input>
+            ></c-input-currency>
           </el-form-item>
         </c-col>
         <c-col :span="3" :offset="1">
@@ -58,12 +58,12 @@
         </c-col>
         <c-col :span="7">
           <el-form-item label="" label-width="5px" prop="ledgrp.cbs.opn1.amt">
-            <c-input
+            <c-input-currency
                 v-model="model.ledgrp.cbs.opn1.amt"
                 class="m-input-currency"
                 placeholder="请输入金额"
                 disabled
-            ></c-input>
+            ></c-input-currency>
           </el-form-item>
         </c-col>
         <c-col :span="3" :offset="1">
@@ -215,12 +215,12 @@
         </c-col>
         <c-col :span="8">
           <el-form-item label="" label-width="5px" prop="ledgrp.cbs.cnf.amt">
-            <c-input
+            <c-input-currency
                 v-model="model.ledgrp.cbs.cnf.amt"
                 class="m-input-currency"
                 placeholder="请输入金额"
                 @keyup.enter.native="$event.target.blur()"
-            ></c-input>
+            ></c-input-currency>
           </el-form-item>
         </c-col>
         <c-col :span="4">

src/business/letdav/model/check.js

@@ -102,6 +102,7 @@ export default {
         { required: false, message: "输入正确的日期"}
     ],
     "bedgrp.rec.disdat":[
+        {type: "string", required: true, message: "必输项"},
         { required: false, message: "输入正确的日期"}
     ],
     "betp.oth.pts.ref":[