Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/creatProcess/bzpg/step4.vue

@@ -424,27 +424,38 @@ export default {
     },
     //提交
     handleSubmit(){
+      let comFlag = false
        this.dataList.map(item => {
         delete item.termsConditions
       })
-      this.listForm.commentText = this.commentText
+      this.dataList.forEach(item => {
-      this.listForm.dataList = this.dataList
+        if(item.implementer){
-      const json = JSON.stringify(this.listForm);
+          comFlag = true
-      this.isSubmit = true
+          return
-      this.$http.post('lawss/activiti/completeTask', {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json,
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message)
-          this.$router.push('/processCenter')
         }
-        this.isSubmit = false
+      })
-      }, e => {
+      if(!comFlag){
-      });
+        this.$message.warning('请选择落实人')
+      }else{
+        this.listForm.commentText = this.commentText
+        this.listForm.dataList = this.dataList
+        const json = JSON.stringify(this.listForm);
+        this.isSubmit = true
+        this.$http.post('lawss/activiti/completeTask', {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json,
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message)
+            this.$router.push('/processCenter')
+          }
+          this.isSubmit = false
+        }, e => {
+        });
+      }
     },
     //确认转办
     checkedRole (data) {