标准合规结果限制

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

@@ -23,6 +23,8 @@
           <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="调整类型" class="add-form-item form-item-disabled">
+                <el-button size="small" type="primary" style="margin: 10px;" @click="toggleComName('establish')">立项
+                </el-button>
                 <el-button size="small" type="primary" style="margin: 10px;" @click="toggleComName('merge')">合并
                 </el-button>
                 <el-button size="small" type="primary" style="margin: 10px;" @click="toggleComName('delay')">延期
@@ -31,8 +33,6 @@
                 </el-button>
                 <el-button size="small" type="primary" style="margin: 10px;" @click="toggleComName('rename')">更名
                 </el-button>
-                <el-button size="small" type="primary" style="margin: 10px;" @click="toggleComName('establish')">立项
-                </el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -270,11 +270,11 @@ export default {
   },
   data() {
     return {
-      toggleType: '1',
+      toggleType: '5',
       comFlag: 1,
       active: "1",
       commentText: "",
-      comName: "merge",
+      comName: "establish",
       qbfsForm: {},
       formLoading: false,
       approvalFlag: false,

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

@@ -738,7 +738,6 @@ export default {
               this.$set(item,'countermeasures', '')
               this.$set(item,'completionTime', '')
             })
-
           } else {
             this.dataList = item.dataList;
             this.dataList.forEach(item => {
@@ -811,33 +810,45 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      this.handlePrice()
+      let submitFlag = 0;
-      if(this.comFlag > 0) {
+      this.dataList.forEach(item => {
-        this.$message.warning('请填写完整的不符合项信息')
+       if(item.complianceReasons || item.noCompliance){
-        this.comFlag = 0
+         submitFlag = 1
+       }
+        return
+      })
+      if(submitFlag === 0 ){
+        this.$message.warning('请至少对一条信息进行评估')
       }else{
-        this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+        this.handlePrice()
-        this.listForm.commentText = this.commentText;
+        if(this.comFlag > 0) {
-        this.listForm.approvalOpinion = "";
+          this.$message.warning('请填写完整的不符合项信息')
-        this.listForm.signFlag = "";
+          this.comFlag = 0
-        this.listForm.dataList = this.dataList;
+        }else{
-        const json = JSON.stringify(this.listForm);
+          this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-        this.isSubmit = true;
+          this.listForm.commentText = this.commentText;
-        this.$http.post("lawss/activiti/completeTask", {
+          this.listForm.approvalOpinion = "";
-          taskIds: this.taskIds,
+          this.listForm.signFlag = "";
-          userId: this.userId,
+          this.listForm.dataList = this.dataList;
-          json: json
+          const json = JSON.stringify(this.listForm);
-        }, {
+          this.isSubmit = true
-          _this: this
+          return
-        }, res => {
+          this.$http.post("lawss/activiti/completeTask", {
-          if (res.success) {
+            taskIds: this.taskIds,
-            this.$message.success(res.message);
+            userId: this.userId,
-            this.$router.push("/processCenter");
+            json: json
-          }
+          }, {
-          this.isSubmit = false;
+            _this: this
-        }, e => {
+          }, res => {
+            if (res.success) {
+              this.$message.success(res.message);
+              this.$router.push("/processCenter");
+            }
+            this.isSubmit = false;
+          }, e => {
 
-        });
+          });
+        }
       }
     },
     //批量编辑

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

@@ -794,33 +794,44 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      this.handlePrice()
+      let submitFlag = 0;
-      if(this.comFlag > 0) {
+      this.dataList.forEach(item => {
-        this.$message.warning('请填写完整的不符合项信息')
+        if(item.complianceReasons || item.noCompliance){
-        this.comFlag = 0
+          submitFlag = 1
+        }
+        return
+      })
+      if(submitFlag === 0 ){
+        this.$message.warning('请至少对一条信息进行评估')
       }else{
-        this.listForm.dataList.forEach(item => {
+        this.handlePrice()
-           if(item.workPeople === '请选择责任人'){
+        if(this.comFlag > 0) {
-             item.workPeople = ''
+          this.$message.warning('请填写完整的不符合项信息')
-           }
+          this.comFlag = 0
-        })
+        }else{
-        this.isSubmit = true;
+          this.listForm.dataList.forEach(item => {
-        this.listForm.commentText = this.commentText;
+            if(item.workPeople === '请选择责任人'){
-        const json = JSON.stringify(this.listForm);
+              item.workPeople = ''
-        this.$http.post("lawss/activiti/completeTask", {
+            }
-          taskIds: this.taskIds,
+          })
-          userId: this.userId,
+          this.isSubmit = true;
-          json: json
+          this.listForm.commentText = this.commentText;
-        }, {
+          const json = JSON.stringify(this.listForm);
-          _this: this
+          this.$http.post("lawss/activiti/completeTask", {
-        }, res => {
+            taskIds: this.taskIds,
-          if (res.success) {
+            userId: this.userId,
-            this.$message.success(res.message);
+            json: json
-            this.$router.push("/processCenter");
+          }, {
-          }
+            _this: this
-          this.isSubmit = false;
+          }, res => {
-        }, e => {
+            if (res.success) {
-        });
+              this.$message.success(res.message);
+              this.$router.push("/processCenter");
+            }
+            this.isSubmit = false;
+          }, e => {
+          });
+        }
       }
     },
     //标准表格选择框改变