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

# Conflicts:
#	src/business/letdrv/model/index.js

src/business/betcan/model/check.js

@@ -26,11 +26,11 @@ export default {
         { type: 'string', required: false, message: '必输项' },
         { max: 3, message: '长度不能超过3' }
     ],
-    'ledgrp.cbs.opn1.amt': [
-        { type: 'string', required: false, message: '必输项' },
-        { max: 18, message: '整数位不能超过14位' },
-        { pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: '小数位不能超过3位' }
-    ],
+    // 'ledgrp.cbs.opn1.amt': [
+    //     { type: 'string', required: false, message: '必输项' },
+    //     { max: 18, message: '整数位不能超过14位' },
+    //     { pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: '小数位不能超过3位' }
+    // ],
     'betp0.recget.sdamod.dadsnd': [
         { type: 'string', required: false, message: '必输项' },
         { max: 16, message: '长度不能超过16' }
@@ -88,18 +88,18 @@ export default {
         { max: 40, message: '长度不能超过40' }
     ],
 
-    'bedgrp.rec.matdat': [
-        { type: 'date', required: false, message: '输入正确的日期' }
-    ],
-    'bedgrp.rec.orddat': [
-        { type: 'date', required: false, message: '输入正确的日期' }
-    ],
-    'bedgrp.rec.rcvdat': [
-        { type: 'date', required: false, message: '输入正确的日期' }
-    ],
-    'bedgrp.rec.predat': [
-        { type: 'date', required: false, message: '输入正确的日期' }
-    ],
+    // 'bedgrp.rec.matdat': [
+    //     { type: 'date', required: false, message: '输入正确的日期' }
+    // ],
+    // 'bedgrp.rec.orddat': [
+    //     { type: 'date', required: false, message: '输入正确的日期' }
+    // ],
+    // 'bedgrp.rec.rcvdat': [
+    //     { type: 'date', required: false, message: '输入正确的日期' }
+    // ],
+    // 'bedgrp.rec.predat': [
+    //     { type: 'date', required: false, message: '输入正确的日期' }
+    // ],
     'bedgrp.apl.pts.ref': [
         { type: 'string', required: false, message: '必输项' },
         { max: 16, message: '长度不能超过16' }
@@ -154,11 +154,11 @@ export default {
     ],
 
 
-    'setmod.docamt': [
-        { type: 'number', required: false, message: '必输项' },
-        { max: 18, message: '整数位不能超过14位' },
-        { pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: '小数位不能超过3位' }
-    ],
+    // 'setmod.docamt': [
+    //     { type: 'number', required: false, message: '必输项' },
+    //     { max: 18, message: '整数位不能超过14位' },
+    //     { pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: '小数位不能超过3位' }
+    // ],
 
 
 
@@ -170,20 +170,20 @@ export default {
 
 
 
-    'mtabut.coninf.oitinf.oit.inftxt': [
-        { type: 'string', required: true, message: '必输项' },
-        { max: 60, message: '长度不能超过60' }
-    ],
+    // 'mtabut.coninf.oitinf.oit.inftxt': [
+    //     { type: 'string', required: true, message: '必输项' },
+    //     { max: 60, message: '长度不能超过60' }
+    // ],
 
 
-    'mtabut.coninf.oitset.oit.inftxt': [
-        { type: 'string', required: true, message: '必输项' },
-        { max: 60, message: '长度不能超过60' }
-    ],
+    // 'mtabut.coninf.oitset.oit.inftxt': [
+    //     { type: 'string', required: true, message: '必输项' },
+    //     { max: 60, message: '长度不能超过60' }
+    // ],
 
-    'mtabut.coninf.conexedat': [
-        { type: 'date', required: false, message: '输入正确的日期' }
-    ],
+    // 'mtabut.coninf.conexedat': [
+    //     { type: 'date', required: false, message: '输入正确的日期' }
+    // ],
     'mtabut.coninf.usr.extkey': [
         { type: 'string', required: false, message: '必输项' },
         { max: 8, message: '长度不能超过8' }

src/business/betcan/model/index.js

@@ -164,7 +164,9 @@ export default class Betcan {
                     ownref: '',
                     orddat: '',
                     matdat: '',
-                    nam: ''
+                    nam: '',
+                    branchinr: '',
+                    clsdat: ''
                 },
                 cbs: {
                     opn1: {

src/business/betcan/views/Canp.vue

@@ -147,7 +147,7 @@
 
         <c-col :span="12">
           <el-form-item label="" label-width="5px" prop="ledgrp.cbs.opn1.amt">
-            <c-input v-model="model.ledgrp.cbs.opn1.amt" placeholder="请输入信用证余额" disabled class="m-input-currency">
+            <c-input v-model="model.ledgrp.cbs.opn1.amt" placeholder="请输入信用证余额" disabled >
             </c-input>
           </el-form-item>
         </c-col>

src/business/betsnd/views/Rgfp.vue

@@ -176,9 +176,9 @@
 
         <c-col :span="12">
           <el-form-item label="" label-width="5px" prop="ledgrp.cbs.opn1.amt">
-            <c-input-currency v-model="model.ledgrp.cbs.opn1.amt" placeholder="请输入信用证余额" disabled
-                     class="m-input-currency">
-            </c-input-currency>
+            <c-input v-model="model.ledgrp.cbs.opn1.amt" placeholder="请输入信用证余额" disabled
+                     >
+            </c-input>
           </el-form-item>
         </c-col>
       </c-col>

src/business/infbed/views/Infsea.vue

@@ -581,7 +581,7 @@ export default {
           route:'/business-new/betdcr'
         },
         {
-          label:'保兑',
+          label:'保兑额度释放',
           route:'/business-new/betamc'
         },
         {

src/business/letdrv/model/index.js

@@ -46,12 +46,13 @@ export default class Letdrv {
           avbby: '',
           nam: '',
           opndat: '',
-          utlnbr: '0'
+          utlnbr: '0',
+          branchinr:'',
         },
         cbs: {
           opn1: {
             cur: '',
-            amt: ''
+            amt: '0.00'
           },
           nom1: {
             cur: '',
@@ -70,6 +71,7 @@ export default class Letdrv {
           intdis: '',
         },
         rec: {
+          branchinr:'',
           rcvdat: '',
           doctypcod: '',
           shpdat: '',