Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

src/model/Cptopn/Pattern.js

@@ -22,14 +22,28 @@ export default {
         {type: "string", required: false, message: "必输项"},
         {max: 21,message:"长度不能超过21"}
     ],
-
-
+    "cpdgrp.rec.ischktyp":[
+        {type: "string", required: true, message: "必输项"},
+        {max: 21,message:"长度不能超过21"}
+    ],
+    "cpdgrp.rec.paytype":[
+        {type: "string", required: true, message: "必输项"},
+        {max: 21,message:"长度不能超过21"}
+    ],
+    "cpdgrp.rec.sztyp":[
+        {type: "string", required: true, message: "必输项"},
+        {max: 21,message:"长度不能超过21"}
+    ],
+    "cpdgrp.rec.swftyp":[
+        {type: "string", required: false, message: "必输项"},
+        {max: 21,message:"长度不能超过21"}
+    ],
 
 
 
 
     "cpdgrp.cbs.nom1.amt":[
-        {required: false, message: "必输项"},
+        {required: true, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
@@ -70,7 +84,7 @@ export default {
 
 
     "cptp.payeecountcode":[
-        {type: "string", required: false, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
         {max: 3,message:"长度不能超过3"}
     ],
 
@@ -83,7 +97,10 @@ export default {
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
 
-
+    "orcnam":[
+        {type: "string", required: true, message: "必输项"},
+        {max: 40,message:"长度不能超过40"}
+    ],
 
 
     "cptp.orcnam":[

src/views/Business/Cptopn/index.vue

@@ -182,6 +182,14 @@ export default {
       this.$notify.error({ title: "错误", message: "服务请求失败！" });
     }
   },
+  watch:{
+    "model.cpdgrp.cbs.nom1.amt": {
+      handler(val, oldVal) {
+        this.changeFormItemRequired("cpdgrp.rec.swftyp", val != '0.000');
+      },
+      immediate: true,
+    },
+  }
 };
 </script>
 <style>