修改判断

src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue

@@ -598,47 +598,48 @@ export default {
       })
       if(!fileFlag){
         this.$message.warning('请选择分解单来源')
+      }else{
+        if (this.listForm.dataList.length < 1) {
+          this.$message.warning("请选择带标准的项目");
+        } else {
+          this.listForm.commentText = this.commentText;
+          var json = Object.assign(this.listForm, this.roleForm);
+          json.prcCreateUser = this.$store.getters.userInfo.userId;
+          json.prcCreateUserName = this.$store.getters.userInfo.userName;
+          json.standId = this.listForm.standId;
+          this.$refs["listForm"].validate((valid) => {
+            if (valid) {
+              this.$refs["roleForm"].validate((valid) => {
+                if (valid) {
+                  this.isSubmit = true;
+                  this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
+                    _this: this
+                  }, res => {
+                    if (res.ok) {
+                      this.$http.post("lawss/activiti/completeTask", {
+                        taskIds: res.data,
+                        userId: this.$store.getters.userInfo.userId,
+                        json: JSON.stringify(json)
+                      }, {
+                        _this: this
+                      }, res => {
+                        if (res.success) {
+                          this.$message.success(res.message);
+                          this.$router.push("/processCenter");
+                        }
+                        this.isSubmit = false;
+                      });
+                    }
+                  });
+                } else {
+                  return this.$message.warning("请完善人员信息");
+                }
+              });
+            } else {
+              return this.$message.warning("请完善基础信息");
+            }
+          });
       }
-      if (this.listForm.dataList.length < 1) {
-        this.$message.warning("请选择带标准的项目");
-      } else {
-        this.listForm.commentText = this.commentText;
-        var json = Object.assign(this.listForm, this.roleForm);
-        json.prcCreateUser = this.$store.getters.userInfo.userId;
-        json.prcCreateUserName = this.$store.getters.userInfo.userName;
-        json.standId = this.listForm.standId;
-        this.$refs["listForm"].validate((valid) => {
-          if (valid) {
-            this.$refs["roleForm"].validate((valid) => {
-              if (valid) {
-                this.isSubmit = true;
-                this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
-                  _this: this
-                }, res => {
-                  if (res.ok) {
-                    this.$http.post("lawss/activiti/completeTask", {
-                      taskIds: res.data,
-                      userId: this.$store.getters.userInfo.userId,
-                      json: JSON.stringify(json)
-                    }, {
-                      _this: this
-                    }, res => {
-                      if (res.success) {
-                        this.$message.success(res.message);
-                        this.$router.push("/processCenter");
-                      }
-                      this.isSubmit = false;
-                    });
-                  }
-                });
-              } else {
-                return this.$message.warning("请完善人员信息");
-              }
-            });
-          } else {
-            return this.$message.warning("请完善基础信息");
-          }
-        });
       }
     },
     choiceZRR(type, title, id) {

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

@@ -615,47 +615,48 @@ export default {
         })
       if(!fileFlag){
          this.$message.warning('请选择分解单来源')
+      }else{
+        if (this.listForm.dataList.length < 1) {
+          this.$message.warning("请选择带标准的项目");
+        } else {
+          this.listForm.commentText = this.commentText;
+          var json = Object.assign(this.listForm, this.roleForm);
+          json.prcCreateUser = this.$store.getters.userInfo.userId;
+          json.prcCreateUserName = this.$store.getters.userInfo.userName;
+          json.standId = this.listForm.standId;
+          this.$refs["listForm"].validate((valid) => {
+            if (valid) {
+              this.$refs["roleForm"].validate((valid) => {
+                if (valid) {
+                  this.isSubmit = true;
+                  this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
+                    _this: this
+                  }, res => {
+                    if (res.ok) {
+                      this.$http.post("lawss/activiti/completeTask", {
+                        taskIds: res.data,
+                        userId: this.$store.getters.userInfo.userId,
+                        json: JSON.stringify(json)
+                      }, {
+                        _this: this
+                      }, res => {
+                        if (res.success) {
+                          this.$message.success(res.message);
+                          this.$router.push("/processCenter");
+                        }
+                        this.isSubmit = false;
+                      });
+                    }
+                  });
+                } else {
+                  return this.$message.warning("请完善人员信息");
+                }
+              });
+            } else {
+              return this.$message.warning("请完善基础信息");
+            }
+          });
       }
-      if (this.listForm.dataList.length < 1) {
-        this.$message.warning("请选择带标准的项目");
-      } else {
-        this.listForm.commentText = this.commentText;
-        var json = Object.assign(this.listForm, this.roleForm);
-        json.prcCreateUser = this.$store.getters.userInfo.userId;
-        json.prcCreateUserName = this.$store.getters.userInfo.userName;
-        json.standId = this.listForm.standId;
-        this.$refs["listForm"].validate((valid) => {
-          if (valid) {
-            this.$refs["roleForm"].validate((valid) => {
-              if (valid) {
-                this.isSubmit = true;
-                this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
-                  _this: this
-                }, res => {
-                  if (res.ok) {
-                    this.$http.post("lawss/activiti/completeTask", {
-                      taskIds: res.data,
-                      userId: this.$store.getters.userInfo.userId,
-                      json: JSON.stringify(json)
-                    }, {
-                      _this: this
-                    }, res => {
-                      if (res.success) {
-                        this.$message.success(res.message);
-                        this.$router.push("/processCenter");
-                      }
-                      this.isSubmit = false;
-                    });
-                  }
-                });
-              } else {
-                return this.$message.warning("请完善人员信息");
-              }
-            });
-          } else {
-            return this.$message.warning("请完善基础信息");
-          }
-        });
       }
     },
     // 点击查看