From fd5478b67c9d769553f1f805d66131c3702c98b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 24 Mar 2022 14:43:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/config/pages/roleManage/index.vue   |  7 ++++-
 .../pages/creatProcess/qbfz/step1-7.vue       | 26 +++++++++----------
 .../qbzxdjhgk/component/merge.vue             | 13 ----------
 3 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue
index c1f7211db..ba5a71b0c 100644
--- a/src/pages/config/pages/roleManage/index.vue
+++ b/src/pages/config/pages/roleManage/index.vue
@@ -311,7 +311,7 @@
             title="查看人员"
             :visible.sync="RoleModel"
             @close="RoleCancle"
-            size="1100px"
+            size="900px"
             class="not-footer-drawer"
     >
       <div class="demo-drawer-content">
@@ -358,6 +358,11 @@
                   height="100%"
                   :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
+            <el-table-column
+              align="center"
+              prop="institutionName"
+              label="所属部门">
+            </el-table-column>
             <el-table-column
                     align="center"
                     prop="uname"
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
index 1f23010b6..663d44b14 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
@@ -143,19 +143,19 @@
         </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>
+<!--        <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'">
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index 8e5d7073e..fb599e5ac 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -228,19 +228,6 @@
                     <el-option label="修订" value="修订"></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item prop="rqbName" v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-                  <el-input
-                    style="display: none;"
-                    v-model="qbfsForm.rqbJson">
-                  </el-input>
-                  <el-input
-                    clearable
-                    v-model="qbfsForm.rqbName"
-                    placeholder="请选择代替企标编号"
-                    readonly
-                    @click.native="choiceQYBZ">
-                  </el-input>
-                </el-form-item>
                 <el-form-item class="search-item btn-box">
                   <el-button
                     type="primary"