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

src/business/brtacp/model/index.js

@@ -58,10 +58,11 @@ export default class Brtacp {
             },
             max: {
                 cur: '',
-                amt: ''
+                amt: '0.0'
             },
             max2: {
-                amt: ''
+              cur: '',
+              amt: '0.0'
             }
         },
         matp: {

src/business/brtacp/views/Mt750p.vue

@@ -29,7 +29,7 @@
                 </c-col>
                 <c-col :span="11">
                     <el-form-item label="" label-width="5px" prop="brdgrp.cbs.opn1.amt">
-                        <c-input v-model="model.brdgrp.cbs.max2.amt" placeholder="请输入附加金额" disabled></c-input>
+                        <c-input v-model="model.brdgrp.cbs.op1.amt" placeholder="请输入附加金额" disabled></c-input>
                     </el-form-item>
                 </c-col>
             </c-col>

src/business/brtudp/model/check.js

@@ -243,9 +243,9 @@ export default {
         { max: 3, message: '长度不能超过3' }
     ],
     'brdgrp.rec.totamt': [
-        { type: 'string', required: false, message: '必输项' },
-        { max: 18, message: '整数位不能超过14位' },
-        { pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: '小数位不能超过3位' }
+        // { type: 'string', required: false, message: '必输项' },
+        // { max: 18, message: '整数位不能超过14位' },
+        // { pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: '小数位不能超过3位' }
     ],
     'brtp.acbp.ptsget.sdamod.dadsnd': [
         { type: 'string', required: false, message: '必输项' },

src/business/brtudp/model/index.js

@@ -69,7 +69,9 @@ export default class Brtudp {
                     matdat: '',
                     advdat: '',
                     stadat: '',
-                    dscinsflg: ''
+                    dscinsflg: '',
+                    branchinr:'',
+                    inr:''
                 },
                 cbs: {
                     opn1: {
@@ -158,7 +160,9 @@ export default class Brtudp {
             lidgrp: {
                 rec: {
                     expdat: '',
-                    ownref: ''
+                    ownref: '',
+                    branchinr:'',
+                    inr:''
                 },
                 cbs: {
                     opn1: {