清单发布流程 增加意见填写框 去掉意见填写判定

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

@@ -155,6 +155,21 @@
           </el-table-column>
         </el-table>
       </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
     </div>
     <div class="content" v-show="active === '2'">
       <div class="block" style="padding-top: 20px;">
@@ -735,6 +750,7 @@ export default {
         pageSizeNo: this.$store.getters.userInfo.configContent
       },
       standList: [], //新添加的标准
+      commentText: '',
       modalshowflag: false, // drawer开关
       modalshowflag2: false,
       nodeList2: [],
@@ -1052,6 +1068,7 @@ export default {
       if (this.dataList.length < 1) {
         this.$message.warning("标准不能为空");
       } else {
+        this.listForm.commentText = this.commentText
         var json = Object.assign(this.listForm, this.roleForm);
         this.$refs["qdfbForm"].validate((valid) => {
           if (valid) {

src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue

@@ -134,6 +134,21 @@
           </el-table-column>
         </el-table>
       </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
     </div>
     <div class="content" v-show="active === '3'">
       <div class="flow-list">
@@ -421,6 +436,7 @@ export default {
       totalNo: 0,
       prcNum: '',
       pageSizeNo: this.$store.getters.userInfo.configContent,
+      commentText:'',
       listForm: {
         listName: "", //清单名称
         // applyRegion: "", //适用区域
@@ -677,6 +693,7 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      this.listForm.commentText = this.commentText
       const json = JSON.stringify(this.listForm);
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,

src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue

@@ -384,14 +384,15 @@ export default {
     },
     //驳回事件
     beforeBack() {
-      this.listForm.approvalOpinion = "1";
-      this.handleSubmit();
-    },
-    //提交事件
-    handleSubmit() {
       if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
         this.$message.warning("请填写审批意见");
       } else {
+        this.listForm.approvalOpinion = "1";
+        this.handleSubmit();
+      }
+    },
+    //提交事件
+    handleSubmit() {
         this.isSubmit = true
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -408,7 +409,6 @@ export default {
           }
           this.isSubmit = false
         });
-      }
     },
     //选择标准取消事件
     closeDrawer() {

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

@@ -158,6 +158,21 @@
           </el-table-column>
         </el-table>
       </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
     </div>
     <div class="content" v-show="active === '2'">
       <div class="block" style="padding-top: 20px;">
@@ -712,6 +727,7 @@ export default {
         pageSizeNo: this.$store.getters.userInfo.configContent
       },
       standList: [], //新添加的标准
+      commentText: '',
       modalshowflag: false, // drawer开关
       modalshowflag2: false,
       nodeList2: [],
@@ -1024,6 +1040,7 @@ export default {
       if (this.dataList.length < 1) {
         this.$message.warning("标准不能为空");
       } else {
+        this.listForm.commentText = this.commentText
         var json = Object.assign(this.listForm, this.roleForm);
         this.$refs["qdfbForm"].validate((valid) => {
           if (valid) {

src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue

@@ -387,9 +387,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
-        this.$message.warning("请填写会签意见");
-      }else{
         this.isSubmit = true
         this.listForm.commentText = this.commentText;
         this.listForm.approvalOpinion = "";
@@ -410,7 +407,6 @@ export default {
         }, e => {
 
         });
-      }
     },
     //选择标准取消事件
     closeDrawer() {

src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue

@@ -149,6 +149,21 @@
           </el-table-column>
         </el-table>
       </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
     </div>
     <div class="content" v-show="active === '3'">
       <div class="flow-list">
@@ -392,6 +407,7 @@ export default {
       // 当前流程类型(1待办/2已办)
       processType: 1,
       searching: false,
+      commentText:'',
       standardTypeOptions: [
         {
           value: "INLAND",
@@ -711,6 +727,7 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      this.listForm.commentText = this.commentText
       const json = JSON.stringify(this.listForm);
       this.isSubmit = true
       this.$http.post('lawss/activiti/completeTask', {

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

@@ -401,9 +401,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
-        this.$message.warning("请填写审批意见");
-      } else {
         this.isSubmit = true
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -420,7 +417,6 @@ export default {
           }
           this.isSubmit = false
         });
-      }
     },
     //选择标准取消事件
     closeDrawer() {