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

@@ -72,13 +72,13 @@ export default {
         // { type: "string", required: false, message: "必输项" },
         // { max: 8, message: "长度不能超过8" },
         { type: "string", required: false},
-        { pattern: /^-?([0]|\d{1,3})(\.\d{1,5})?$/, message: '不在-999.9999~999.99999范围', trigger: "blur"},
+        { pattern: /^([0]|\d{1,3})(\.\d{1,5})?$/, message: '不在0~999.99999范围', trigger: "blur"},
     ],
     "dedgrp.rec.nomton": [
         // { type: "string", required: false, message: "必输项" },
         // { max: 8, message: "长度不能超过8" }
         { type: "string", required: false},
-        { pattern: /^-?([0]|\d{1,3})(\.\d{1,5})?$/, message: '不在-999.9999~999.99999范围', trigger: "blur"},
+        { pattern: /^([0]|\d{1,3})(\.\d{1,5})?$/, message: '不在0~999.99999范围', trigger: "blur"},
     ],
 
     "dedgrp.cbs.max.cur": [