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/mixin/commonFuncs.js

@@ -4,12 +4,13 @@ export default {
   methods: {
 		// 表单提交
     async handleSubmit(rulePath) {
-      let result;
-      if(rulePath==""){
-        result = await this.save();
-      }else{
-        result = await this.executeRule(rulePath);
-      }
+      // let result;
+      // if(rulePath==""){
+      //   result = await this.save();
+      // }else{
+      //   result = await this.executeRule(rulePath);
+      // }
+      let result = await this.save();
       if (result.respCode == SUCCESS && Object.keys(result.fieldErrors).length == 0) {
         this.$notify({
           title: "成功",
@@ -117,13 +118,13 @@ export default {
     },
 		// 表单校验
     async handleCheck(rulePath) {
-      let result;
-      if(rulePath==""){
-        result = await this.checkAll();
-      }else{
-        result = await this.executeRule(rulePath);
-      }
-      //  let result = await this.checkAll();
+      // let result;
+      // if(rulePath==""){
+      //   result = await this.checkAll();
+      // }else{
+      //   result = await this.executeRule(rulePath);
+      // }
+       let result = await this.checkAll();
       if (result.respCode == SUCCESS) {
         const fieldErrors = result.fieldErrors;
         this.updateModel(result.data);