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

@@ -114,7 +114,7 @@ export default {
 
 
     "trdgrp.cbs.max.amt":[
-        {type: "number", required: true, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
@@ -181,7 +181,7 @@ export default {
 
 
     "trtmod.finmod.intamt":[
-        {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/Litrog/Shpdet.vue

@@ -144,7 +144,11 @@
         <c-col :span="24">
         <el-form-item label="船务公司" prop="brdgrp.shp.pts.extkey">
             <c-fullbox>
-            <c-input  v-model="model.brdgrp.shp.pts.extkey" maxlength="16"  placeholder="请输入地址编码"></c-input>
+            <c-input  v-model="model.brdgrp.shp.pts.extkey" maxlength="16"  placeholder="请输入地址编码"
+            @keyup.enter.native="
+            showGridPromptDialog('brdgrp.shp.pts.extkey')
+          "
+            ></c-input>
             <template slot="footer">
                 <c-button
                 style="margin: 0 5px 0 10px; padding: 0 12px"