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/Cptopn/Event.js

@@ -222,7 +222,7 @@ export default {
         let rtnmsg = await this.executeRule("cptp.getref")
         if (rtnmsg.respCode == SUCCESS) {
             //TODO 处理数据逻辑
-            Utils.copyValueFromVO(this.model, rtnmsg.data);
+            this.updateModel(rtnmsg.data)
             this.$message({
                 type: 'success',
                 message: '获取成功！'

src/model/Cptopn/Pattern.js

@@ -607,7 +607,7 @@ export default {
         {max: 32,message:"长度不能超过32"}
     ],
     "bopmod.dbbgrp.bas.fcyamt":[
-        {type: "number", required: false, message: "必输项"}    ],
+        {type: "string", required: false, message: "必输项"}    ],
     "bopmod.dbbgrp.bas.fcyacc":[
         {type: "string", required: false, message: "必输项"},
         {max: 32,message:"长度不能超过32"}
@@ -681,7 +681,7 @@ export default {
         {type: "date", required: false, message: "输入正确的日期"}
     ],
     "cnybop.cnyout.fprepayeeamt":[
-        {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位" }
     ],
@@ -691,7 +691,7 @@ export default {
         {max: 3,message:"长度不能超过3"}
     ],
     "cnybop.cnyout.ftotalamt":[
-        {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位" }
     ],
@@ -700,32 +700,32 @@ export default {
         {max: 24,message:"长度不能超过24"}
     ],
     "cnybop.cnyout.fpayeeamt":[
-        {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位" }
     ],
     "cnybop.cnyout.fonshoreamt":[
-        {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位" }
     ],
     "cnybop.cnyout.fcustomsamt":[
-        {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位" }
     ],
     "cnybop.cnyout.foffshoreamt":[
-        {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位" }
     ],
     "cnybop.cnyout.frecordamt":[
-        {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位" }
     ],
     "cnybop.cnyout.fnogoodsamt":[
-        {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位" }
     ],