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 1/2] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E9=AB=98=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"

From ad001cbf72cba9670ec3868076eac58c01490e1e Mon Sep 17 00:00:00 2001
From: "wangxiahui@91isoft.com" <140316hui>
Date: Wed, 22 Dec 2021 10:59:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/newProcess/index.vue  | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index 2a698bdbd..d5429058e 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -80,7 +80,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="''">
+          <el-card shadow="hover" v-btn-permission="'344c9c97b581400718451e8b8a319382'">
             <div class="card-box" @click="handleCreateProcess('12')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -125,7 +125,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'90c7bae6308595f053c6f6f90167e493'">
+          <el-card shadow="hover" v-btn-permission="'a5694521151720f41a8b22d550bf435a'">
             <div class="card-box" @click="handleCreateProcess('13')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -140,7 +140,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'14f54ef4475d9210b1ee7872ab69eca8'">
             <div class="card-box" @click="handleCreateProcess('11')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -155,7 +155,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'9c8cc1b74b1caa16f34a47895b489833'">
             <div class="card-box" @click="handleCreateProcess('laws1')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -190,7 +190,7 @@
       <el-divider content-position="left"><h2>企业标准相关流程</h2></el-divider>
       <div class="process-box">
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="''">
+          <el-card shadow="hover" v-btn-permission="'7a53ef593e5401aab19485b937ce78a0'">
             <div class="card-box" @click="handleCreateProcess('buss1')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -205,7 +205,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'5af5073695c2e1d12ca3d5a6afae67b5'">
             <div class="card-box" @click="handleCreateProcess('23')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -220,7 +220,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'5104360fd3822e73b45e65d2337cf143'">
             <div class="card-box" @click="handleCreateProcess('24')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -235,7 +235,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'afa3d1aee5fd8027b18675621afdeff6'">
             <div class="card-box" @click="handleCreateProcess('25')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -256,7 +256,7 @@
       <el-divider content-position="left"><h2>标准化活动相关流程</h2></el-divider>
       <div class="process-box">
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'2e3f4c0aaf77629755533255f1335801'">
+          <el-card shadow="hover" v-btn-permission="'b196ef0253cebd1adfc3a8432a28e377'">
             <div class="card-box" @click="handleCreateProcess('17')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -271,7 +271,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'d415c764036a02559976b41b9dfe2cf1'">
+          <el-card shadow="hover" v-btn-permission="'2f2752bc8a37b87d6eaadae3fcfe61c4'">
             <div class="card-box" @click="handleCreateProcess('18')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -286,7 +286,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'7845345e5fa2b0a93eb0e021bd3486f1'">
             <div class="card-box" @click="handleCreateProcess('20')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -301,7 +301,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'321e497259b08734941a308960da2bae'">
             <div class="card-box" @click="handleCreateProcess('21')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -316,7 +316,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'8f65a365dd67634e29925098162ee8d5'">
             <div class="card-box" @click="handleCreateProcess('16')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -331,14 +331,14 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
-            <div class="card-box" @click="handleCreateProcess('15')">
+          <el-card shadow="hover" v-btn-permission="'0efd0f4b7a15fd1b687cc0ac36e9e7d9'">
+            <div class="card-box" @click="handleCreateProcess('14')">
               <div class="card-top">
                 <div class="card-top-left">
                   <img :src="getImg(Math.floor(Math.random() * 6))">
                 </div>
                 <div class="card-top-right">
-                  <div class="card-top-right-text">加入标准化协会信息提报流程</div>
+                  <div class="card-top-right-text">参与外部标准制修订信息提报流程</div>
                   <div class="card-top-right-line"></div>
                 </div>
               </div>
@@ -346,7 +346,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover">
+          <el-card shadow="hover" v-btn-permission="'e5217a4776525b1ba63511b730a2e02d'">
             <div class="card-box" @click="handleCreateProcess('15')">
               <div class="card-top">
                 <div class="card-top-left">