From 63731e9fde67510a69020b4078b5c2aae6001548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 22 Dec 2021 10:35:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8E=86=E5=8F=B2=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/jrbzhxh/step2.vue      |  2 +-
 .../pages/creatProcess/jrbzhxh/step3.vue      | 50 ++++++++++---------
 .../pages/creatProcess/jrbzhxh/step4.vue      | 50 ++++++++++---------
 .../pages/creatProcess/wbsm/step1-5.vue       |  2 +-
 .../pages/creatProcess/wbsm/step2.vue         |  2 +-
 .../pages/creatProcess/wbsm/step3.vue         |  2 +-
 .../pages/creatProcess/wbsm/step4.vue         |  2 +-
 .../pages/creatProcess/wbsm/step5.vue         |  2 +-
 8 files changed, 60 insertions(+), 52 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
index edfd581ec..3d030eea3 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
@@ -245,7 +245,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue
index e3712db8f..d80b7cf57 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue
@@ -198,7 +198,7 @@
         </el-table>
       </div>
       <el-collapse accordion>
-        <el-collapse-item title="回执说明">
+        <el-collapse-item title="审批意见">
           <div style="margin: 10px 0;">
             <el-input
               type="textarea"
@@ -212,7 +212,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
@@ -566,28 +566,32 @@ export default {
     },
     //流程驳回
     beforeBack(){
-      this.isSubmit = true
-      this.wbbzform.signFlag = '0',
-      this.wbbzform.passUser = this.$store.getters.userInfo.userId,
-      this.wbbzform.commentText = this.commentText;
-      this.wbbzform.participantsData = this.participantsData
-      this.wbbzform.associationData = this.associationData
-      var json = JSON.stringify( this.wbbzform)
-      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(!this.commentText){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.isSubmit = true
+        this.wbbzform.signFlag = '0',
+          this.wbbzform.passUser = this.$store.getters.userInfo.userId,
+          this.wbbzform.commentText = this.commentText;
+        this.wbbzform.participantsData = this.participantsData
+        this.wbbzform.associationData = this.associationData
+        var json = JSON.stringify( this.wbbzform)
+        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 => {
 
-      });
+        });
+      }
     },
   },
   mounted() {
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
index 0f9969045..d999dc6d1 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
@@ -198,7 +198,7 @@
         </el-table>
       </div>
       <el-collapse accordion>
-        <el-collapse-item title="回执说明">
+        <el-collapse-item title="审批意见">
           <div style="margin: 10px 0;">
             <el-input
               type="textarea"
@@ -212,7 +212,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
@@ -566,28 +566,32 @@ export default {
     },
     //流程驳回
     beforeBack(){
-      this.isSubmit = true
-      this.wbbzform.bzFlag = '2',
-      this.wbbzform.passUser = this.$store.getters.userInfo.userId,
-      this.wbbzform.commentText = this.commentText;
-      this.wbbzform.participantsData = this.participantsData
-      this.wbbzform.associationData = this.associationData
-      var json = JSON.stringify( this.wbbzform)
-      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(!this.commentText){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.isSubmit = true
+        this.wbbzform.bzFlag = '2',
+          this.wbbzform.passUser = this.$store.getters.userInfo.userId,
+          this.wbbzform.commentText = this.commentText;
+        this.wbbzform.participantsData = this.participantsData
+        this.wbbzform.associationData = this.associationData
+        var json = JSON.stringify( this.wbbzform)
+        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 => {
 
-      });
+        });
+      }
     },
   },
   mounted() {
diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue
index 0a73bf5d8..9cce7ecc6 100644
--- a/src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue
+++ b/src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue
@@ -74,7 +74,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue
index 447112c5d..dba26f53d 100644
--- a/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue
@@ -74,7 +74,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue
index da595c196..64cf82b95 100644
--- a/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue
@@ -74,7 +74,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue
index 5b4629154..78aeb55f5 100644
--- a/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue
@@ -74,7 +74,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue
index 24aca3580..6e45b3102 100644
--- a/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue
@@ -74,7 +74,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"