增加审批意见框 去除审批意见判定

src/pages/localTool/standardRecognition/index.vue

@@ -216,7 +216,7 @@
           :loading="isSubmit"
           >{{ btnName }}</el-button
         >
-        <!--          <el-button  @click="uploadSave" type="primary">转换</Button>-->
+        <!--<el-button  @click="uploadSave" type="primary">转换</Button>-->
       </div>
     </el-dialog>
   </div>

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

@@ -114,6 +114,21 @@
         </el-table>
       </div>
     </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 class="content" v-show="active === '2'">
       <div class="block" style="padding-top: 20px;">
         <el-timeline>

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

@@ -101,6 +101,21 @@
         </el-table>
       </div>
     </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 class="content" v-show="active === '2'">
       <div class="block" style="padding-top: 20px;">
         <el-timeline>
@@ -658,6 +673,7 @@ export default {
           this.$message.warning("请选择分发责任人");
         } else {
           this.isSubmit = true
+          this.listForm.commentText = this.commentText;
           var json = Object.assign(this.listForm, this.roleForm);
           this.$refs["listForm"].validate((valid) => {
             if (valid) {

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

@@ -336,9 +336,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      }else{
         this.listForm.commentText = this.commentText
         const json = JSON.stringify(this.listForm);
         this.isSubmit = true
@@ -356,7 +353,7 @@ export default {
           this.isSubmit = false
         }, e => {
         });
-      }
+
     },
     //标准表格选择框改变
     selectStandChange(data) {
@@ -459,9 +456,4 @@ export default {
     }
   }
 
-  .demo-drawer-content {
+  .dem
-    margin-top: 10px;
-  }
-}
-</style>
-

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

@@ -126,6 +126,21 @@
             </template>
           </el-table-column>
         </el-table>
+        <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>
         <!--    选择责任人-->
         <Role-tree
           check-box

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

@@ -246,21 +246,21 @@
           </el-table-column>
         </el-table>
       </div>
-<!--      <div>-->
+      <div>
-<!--        <el-collapse accordion>-->
+        <el-collapse accordion>
-<!--          <el-collapse-item title="填写评估反馈">-->
+          <el-collapse-item title="意见填写">
-<!--            <div style="margin: 10px 0;">-->
+            <div style="margin: 10px 0;">
-<!--              <el-input-->
+              <el-input
-<!--                type="textarea"-->
+                type="textarea"
-<!--                :rows="3"-->
+                :rows="3"
-<!--                resize="none"-->
+                resize="none"
-<!--                placeholder="请输入您的评估分析"-->
+                placeholder="请输入意见"
-<!--                v-model="commentText">-->
+                v-model="commentText">
-<!--              </el-input>-->
+              </el-input>
-<!--            </div>-->
+            </div>
-<!--          </el-collapse-item>-->
+          </el-collapse-item>
-<!--        </el-collapse>-->
+        </el-collapse>
-<!--      </div>-->
+      </div>
     </div>
 
     <div class="content" v-show="active === '3'">
@@ -611,10 +611,4 @@ export default {
     }
   }
 
-  .demo-drawer-content {
+  .demo-draw
-    margin-top: 10px;
-  }
-}
-</style>
-
-

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

@@ -447,9 +447,6 @@ export default {
     },
     //驳回事件
     beforeBack () {
-      if(this.commentText === null || this.commentText === undefined  || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      } else {
         this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
         this.listForm.commentText = this.commentText;
         this.listForm.dataList = this.dataList
@@ -468,17 +465,13 @@ export default {
           }
         }, e => {
         });
-      }
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      }else {
         this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
-        this.listForm.commentText = this.commentText;
         this.listForm.dataList = this.dataList
         this.listForm.fenFlag = '2'
+       this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
         this.isSubmit = true
         this.$http.post('lawss/activiti/completeTask', {
@@ -495,7 +488,7 @@ export default {
           this.isSubmit = false
         }, e => {
         });
-      }
+
     },
     //标准表格选择框改变
     selectStandChange(data) {
@@ -598,10 +591,4 @@ export default {
     }
   }
 
-  .demo-drawer-content {
+  .demo-
-    margin-top: 10px;
-  }
-}
-</style>
-
-

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

@@ -452,9 +452,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined  || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      } else {
         this.isSubmit = true
         this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
         this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
@@ -480,7 +477,7 @@ export default {
         }, e => {
 
         });
-      }
+
     },
     //标准表格选择框改变
     selectStandChange(data) {
@@ -583,10 +580,4 @@ export default {
     }
   }
 
-  .demo-drawer-content {
+  .demo-
-    margin-top: 10px;
-  }
-}
-</style>
-
-

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

@@ -451,9 +451,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined  || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      } else {
         this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
         this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
         this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
@@ -479,7 +476,6 @@ export default {
         }, e => {
 
         });
-      }
     },
     //标准表格选择框改变
     selectStandChange(data) {