Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206

src/assets/css/common.css

@@ -628,4 +628,8 @@ margin-left: 120px;
 
 /* .el-input__inner::placeholder {
   color: blue;
- } */
\ No newline at end of file
+ } */
+
+ .el-table__row .el-form-item__content .el-form-item__error {
+  position: unset !important;
+ }
\ No newline at end of file

src/model/Bttsnd/Pattern.js

@@ -41,7 +41,7 @@ export default {
     ],
 
     "btdgrp.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位" }
     ],
@@ -55,7 +55,7 @@ export default {
         {max: 3,message:"长度不能超过3"}
     ],
     "btdgrp.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/Bttsnd/Cnyp.vue

@@ -28,7 +28,7 @@
                   
        <c-col :span="18">
         <el-form-item label="是否报送跨境人名币2106表" prop="cnybop.libflg">
-            <c-select v-model="model.cnybop.libflg" style="width:100%" placeholder="不申报" :code="codes.cnyflg" disabled>
+            <c-select v-model="model.cnybop.libflg" style="width:100%" placeholder="不申报" :code="codes.cnyflg" :disabled="model.btdgrp.cbs.max.cur!='CNY'">
               </c-select>
         </el-form-item>
        </c-col>