Merge branch 'develop_new' into develop

src/pages/home2/components/todoList/index.vue

@@ -1698,6 +1698,17 @@ export default {
                 prcType: row.prcType
               }
             })
+          }else if(row.taskInfo === '技术标准起草') {
+            this.$router.push({
+              name: 'qbzxdjhgkStep6',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
           break;
         case "26":

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue

@@ -403,16 +403,14 @@ export default {
     })
   },
   methods: {
-    validateForm () {
-      let flag = null
+    validateForm (callback) {
       this.$refs['qbfsForm'].validate((valid) => {
         if (valid) {
-          flag = true
-        } else {
-          flag = false
+          callback && callback()
+        } else{
+          this.$message.warning("请完善基础信息");
         }
       })
-      return flag
     },
     choiceShow(){
       this.getStandDataBtn()

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue

@@ -425,16 +425,14 @@ export default {
     })
   },
   methods: {
-    validateForm () {
-      let flag = null
+    validateForm (callback) {
       this.$refs['qbfsForm'].validate((valid) => {
         if (valid) {
-          flag = true
-        } else {
-          flag = false
+          callback && callback()
+        } else{
+          this.$message.warning("请完善基础信息");
         }
       })
-      return flag
     },
     choiceShow(){
       this.getStandDataBtn()

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue

@@ -446,7 +446,6 @@ export default {
       }
     };
     const standNameVerify = async (rule, value, callback) => {
-      debugger
       if (value === '' || value === null) {
         return callback(new Error('请输入企标名称'))
       } else {
@@ -1021,16 +1020,14 @@ export default {
         this.$refs.qbfsForm.validateField('resPersonName');
       }
     },
-    validateForm () {
-      let flag = null
+    validateForm (callback) {
       this.$refs['qbfsForm'].validate((valid) => {
         if (valid) {
-          flag = true
-        } else {
-          flag = false
+          callback && callback()
+        } else{
+          this.$message.warning("请完善基础信息");
         }
       })
-      return flag
     }
   },
 };

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue

@@ -1021,16 +1021,14 @@ export default {
         this.$refs.qbfsForm.validateField('resPersonName');
       }
     },
-    validateForm () {
-      let flag = null
+    validateForm (callback) {
       this.$refs['qbfsForm'].validate((valid) => {
         if (valid) {
-          flag = true
-        } else {
-          flag = false
+          callback && callback()
+        } else{
+          this.$message.warning("请完善基础信息");
         }
       })
-      return flag
     },
     choiceShow(){
       this.showType = 'one'

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue

@@ -412,16 +412,14 @@ export default {
     })
   },
   methods: {
-    validateForm () {
-      let flag = null
+    validateForm (callback) {
       this.$refs['qbfsForm'].validate((valid) => {
         if (valid) {
-          flag = true
-        } else {
-          flag = false
+          callback && callback()
+        } else{
+          this.$message.warning("请完善基础信息");
         }
       })
-      return flag
     },
     choiceShow(){
       this.getStandDataBtn()

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue

@@ -527,9 +527,8 @@ export default {
           this.$message.warning('企标名称已存在,请更改!')
       }else {
           if (this.$route.query.prcNum === undefined) {
-            let flag = this.$refs["childForm"].validateForm();
-            let qbzxdFrom = this.$refs["childForm"].qbfsForm;
-            if (flag) {
+            this.$refs["childForm"].validateForm(()=>{
+              let qbzxdFrom = this.$refs["childForm"].qbfsForm;
               this.$refs["roleForm"].validate((valid) => {
                 if (valid) {
                   this.isSubmit = true;
@@ -578,13 +577,16 @@ export default {
                   this.$message.warning("请完善人员信息");
                 }
               });
-            } else {
-              this.$message.warning("请完善基础信息");
-            }
+            });
+
+            // if (flag) {
+            //
+            // } else {
+            //   this.$message.warning("请完善基础信息");
+            // }
           } else {
-            let flag = this.$refs["childForm"].validateForm();
-            let qbzxdFrom = this.$refs["childForm"].qbfsForm;
-            if (flag) {
+            let flag = this.$refs["childForm"].validateForm(() => {
+              let qbzxdFrom = this.$refs["childForm"].qbfsForm;
               this.$refs["roleForm"].validate((valid) => {
                 if (valid) {
                   this.isSubmit = true;
@@ -609,9 +611,13 @@ export default {
                   this.$message.warning("请完善人员信息");
                 }
               });
-            } else {
-              this.$message.warning("请完善基础信息");
-            }
+            });
+
+            // if (flag) {
+            //
+            // } else {
+            //   this.$message.warning("请完善基础信息");
+            // }
           }
         }
     },