审批历史高度

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"

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
+      if(!this.commentText){
-      this.wbbzform.signFlag = '0',
+        this.$message.warning('请填写审批意见')
-      this.wbbzform.passUser = this.$store.getters.userInfo.userId,
+      }else{
-      this.wbbzform.commentText = this.commentText;
+        this.isSubmit = true
-      this.wbbzform.participantsData = this.participantsData
+        this.wbbzform.signFlag = '0',
-      this.wbbzform.associationData = this.associationData
+          this.wbbzform.passUser = this.$store.getters.userInfo.userId,
-      var json = JSON.stringify( this.wbbzform)
+          this.wbbzform.commentText = this.commentText;
-      this.$http.post("lawss/activiti/completeTask", {
+        this.wbbzform.participantsData = this.participantsData
-        taskIds: this.taskIds,
+        this.wbbzform.associationData = this.associationData
-        userId: this.userId,
+        var json = JSON.stringify( this.wbbzform)
-        json: json
+        this.$http.post("lawss/activiti/completeTask", {
-      }, {
+          taskIds: this.taskIds,
-        _this: this
+          userId: this.userId,
-      }, res => {
+          json: json
-        if (res.success) {
+        }, {
-          this.$message.success(res.message);
+          _this: this
-          this.$router.push("/processCenter");
+        }, res => {
-        }
+          if (res.success) {
-        this.isSubmit = false
+            this.$message.success(res.message);
-      }, e => {
+            this.$router.push("/processCenter");
+          }
+          this.isSubmit = false
+        }, e => {
 
-      });
+        });
+      }
     },
   },
   mounted() {

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
+      if(!this.commentText){
-      this.wbbzform.bzFlag = '2',
+        this.$message.warning('请填写审批意见')
-      this.wbbzform.passUser = this.$store.getters.userInfo.userId,
+      }else{
-      this.wbbzform.commentText = this.commentText;
+        this.isSubmit = true
-      this.wbbzform.participantsData = this.participantsData
+        this.wbbzform.bzFlag = '2',
-      this.wbbzform.associationData = this.associationData
+          this.wbbzform.passUser = this.$store.getters.userInfo.userId,
-      var json = JSON.stringify( this.wbbzform)
+          this.wbbzform.commentText = this.commentText;
-      this.$http.post("lawss/activiti/completeTask", {
+        this.wbbzform.participantsData = this.participantsData
-        taskIds: this.taskIds,
+        this.wbbzform.associationData = this.associationData
-        userId: this.userId,
+        var json = JSON.stringify( this.wbbzform)
-        json: json
+        this.$http.post("lawss/activiti/completeTask", {
-      }, {
+          taskIds: this.taskIds,
-        _this: this
+          userId: this.userId,
-      }, res => {
+          json: json
-        if (res.success) {
+        }, {
-          this.$message.success(res.message);
+          _this: this
-          this.$router.push("/processCenter");
+        }, res => {
-        }
+          if (res.success) {
-        this.isSubmit = false
+            this.$message.success(res.message);
-      }, e => {
+            this.$router.push("/processCenter");
+          }
+          this.isSubmit = false
+        }, e => {
 
-      });
+        });
+      }
     },
   },
   mounted() {

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"

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"

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"

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"

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"