Merge remote-tracking branch 'origin/development-202206' into development-202206

src/model/Getfee/Pattern.js

@@ -21,7 +21,7 @@ export default {
         {max: 3,message:"长度不能超过3"}
     ],
     "gidgrp.cbs.max.amt":[
-        {type: "number", required: false, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
@@ -34,7 +34,7 @@ export default {
         {max: 3,message:"长度不能超过3"}
     ],
     "gidgrp.cbs.opn1.amt":[
-        {type: "number", required: false, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],

src/views/Business/Getfee/Gitsetp1.vue

@@ -154,10 +154,16 @@
           </c-select>
         </el-form-item>
       </c-col>
-      <c-col :span="8" class="centerLable">
-        <c-checkbox v-model="model.xxtfee.intmbu.umbflg"
+      <c-col :span="24">
+        <el-form-item
+          style="text-align: left"
+          label-width="0"
+          prop="xxtfee.intmbu.umbflg"
+        >
+        <c-checkbox v-model="model.xxtfee.intmbu.umbflg"  class=""
           >重新预定</c-checkbox
         >
+        </el-form-item>
       </c-col>
 
       <!-- <c-col :span="13" >