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/model/Gitcrq/Pattern.js

@@ -21,9 +21,9 @@ export default {
         {max: 3,message:"长度不能超过3"}
     ],
     "gidgrp.cbs.opn1.amt":[
-        {type: "number", required: false, message: "必输项"},
-        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+        {type: "string", required: false, message: "必输项"},
+        {max: 17,message:"整数位不能超过14位"},
+        // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
     "gcdgrp.rec.ownref":[
         {type: "string", required: false, message: "必输项"},
@@ -47,9 +47,9 @@ export default {
         {max: 3,message:"长度不能超过3"}
     ],
     "gcdgrp.cbs.max.amt":[
-        {type: "number", required: false, message: "必输项"},
-        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+        {type: "string", required: false, message: "必输项"},
+        {max: 17,message:"整数位不能超过14位"},
+        // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
 
     "gcdgrp.apl.pts.ref":[
@@ -61,9 +61,9 @@ export default {
         {max: 3,message:"长度不能超过3"}
     ],
     "gcdgrp.cbs.opn1.amt":[
-        {type: "number", required: false, message: "必输项"},
-        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+        {type: "string", required: false, message: "必输项"},
+        {max: 17,message:"整数位不能超过14位"},
+        // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
     "gcdgrp.apl.pts.nam":[
         {type: "string", required: false, message: "必输项"},
@@ -88,24 +88,15 @@ export default {
         {type: "date", required: false, message: "输入正确的日期"}
     ],
 
-    "gcdgrp.cbs.max.cur":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 3,message:"长度不能超过3"}
-    ],
-    "gcdgrp.cbs.max.amt":[
-        {type: "number", required: false, message: "必输项"},
-        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
-    ],
     "gcdgrp.prb.pts.ref":[
         {type: "string", required: false, message: "必输项"},
         {max: 16,message:"长度不能超过16"}
     ],
 
     "gcdgrp.cbs.max2.amt":[
-        {type: "number", required: false, message: "必输项"},
-        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+        {type: "string", required: false, message: "必输项"},
+        {max: 17,message:"整数位不能超过14位"},
+        // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
     "gctp.prbp.ptsget.sdamod.dadsnd":[
         {type: "string", required: false, message: "必输项"},
@@ -168,8 +159,8 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "payday":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 2,message:"长度不能超过2"}
+        {type: "number", required: false, message: "请输入数字"},
+        {type: "number", max: 99,message:"不能超过99"}
     ],
     "gcdgrp.oth.pts.adrblk":[
         {type: "string", required: true, message: "必输项"},

src/views/Business/Gitcrq/Gitsetp1.vue

@@ -66,7 +66,7 @@
       <c-col :span="24">
         <c-col :span="10">
           <c-form-item label="索赔金额" prop="gcdgrp.cbs.max.cur" previewLabel="信用证币种">
-            <c-input v-model="model.gcdgrp.cbs.max.cur" maxlength="3" disabled placeholder="请输入索赔金额"></c-input>
+            <c-select v-model="model.gcdgrp.cbs.max.cur" maxlength="3" disabled placeholder="请输入索赔金额" :code="codes.cur"></c-select>
           </c-form-item>
         </c-col>
         <c-col :span="9">
@@ -117,7 +117,7 @@
       <c-col :span="24">
         <c-col :span="12">
           <c-form-item label="索赔金额" prop="gcdgrp.cbs.max.cur" previewLabel="信用证币种">
-            <c-input v-model="model.gcdgrp.cbs.max.cur" maxlength="3" disabled placeholder="请输入索赔金额"></c-input>
+            <c-select v-model="model.gcdgrp.cbs.max.cur" maxlength="3" disabled placeholder="请输入索赔金额" :code="codes.cur"></c-select>
           </c-form-item>
         </c-col>
 
@@ -132,7 +132,7 @@
       <c-col :span="24">
         <c-col :span="12">
           <c-form-item label="提取附加金额" prop="gcdgrp.cbs.opn2.cur" previewLabel="信用证币种">
-            <c-input v-model="model.gcdgrp.cbs.opn2.cur" maxlength="3" disabled placeholder="请输入索赔金额"></c-input>
+            <c-select v-model="model.gcdgrp.cbs.opn2.cur" maxlength="3" disabled placeholder="请输入索赔金额" :code="codes.cur"></c-select>
           </c-form-item>
         </c-col>
 
@@ -173,7 +173,7 @@
       <c-col :span="24">
         <c-col :span="12">
           <el-form-item label="我行将于" prop="payday">
-            <c-input v-model="model.payday" placeholder=""> </c-input>
+            <c-input v-model.number="model.payday" placeholder=""> </c-input>
           </el-form-item>
         </c-col>
         <c-col :span="12">

src/views/Business/Letdrv/Drv.vue

@@ -308,7 +308,6 @@
               v-model="model.bedgrp.cbs.opn2.cur"
               style="width: 100%"
               placeholder="请输入附加金额"
-              disabled
               :code="codes.curtxt1"
             ></c-select>
           </el-form-item>
@@ -514,7 +513,7 @@
             placeholder="请选择发票类型"
           >
             <el-option
-              v-for="item in codes.invtyp1"
+              v-for="item in codes.invtyp"
               :key="item.value"
               :label="item.label"
               :value="item.value"