From f72d1bedb6e6647ecd4f15a457257b87a13cbe41 Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Mon, 27 Sep 2021 17:21:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E6=95=B4=E6=94=B9=E5=BA=93=E5=88=86=E9=A1=B5bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/addEdit.vue                           | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 03e821061..d3e9581b2 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -81,7 +81,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="标准名称" class="search-item">
+            <el-form-item label="标准号/标准名称" class="search-item">
               <el-input
                   v-model="sarAccessInfoSearch.standName"
                   placeholder="请输入"
@@ -605,6 +605,7 @@ export default {
   },
   data() {
     return {
+      // isAdvancedSearch: false,
       textStatusMap: {},
       countryAreaMap: {},
       typeApplicableMap: {},
@@ -951,6 +952,20 @@ export default {
       }
       this.selectLawsStands()
     },
+
+
+    // selectMoreBtn() {
+    //   this.isAdvancedSearch = true
+    //   this.standardFormList.standName = ''
+    //   this.standardFormList.typeApplicable = ''
+    //   this.standardFormList.nylx = ''
+    //   this.standardFormList.zrbm = ''
+    //   this.standardFormList.sycpx = ''
+    //   this.showTableFlag = false
+    //   this.page = 1
+    //   this.standardForm.page = 1
+    //   this.selectInfoMore()
+    // },
     // 法规维护人树
     getDept() {
       return new Promise((resolve, reject) => {

From 6ef0954ab67295820d6c8ee3fa0d89a6774fb942 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Mon, 27 Sep 2021 21:40:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/pages/mechanismManage/index.vue    | 33 +++++++++++++++++--
 src/pages/config/pages/postManage/index.vue   |  2 +-
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue
index db6253225..062ed60e8 100644
--- a/src/pages/config/pages/mechanismManage/index.vue
+++ b/src/pages/config/pages/mechanismManage/index.vue
@@ -65,15 +65,20 @@
           height="100%"
           :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+              prop="account"
+              label="账号"
+              width="100px">
+          </el-table-column>
           <el-table-column
             prop="uname"
             label="姓名"
-            width="170px">
+            width="100px">
           </el-table-column>
           <el-table-column
             prop="sex"
             label="性别"
-            width="170px">
+            width="50px">
             <template slot-scope="scope">
               <div v-if="scope.row.sex === '1'">男</div>
               <div v-if="scope.row.sex === '2'">女</div>
@@ -92,14 +97,36 @@
           <el-table-column
             prop="institutionName"
             label="所属部门">
+            <template slot-scope="scope">
+                <el-popover trigger="hover" placement="top">
+                  {{scope.row.institutionName}}
+                    <div slot="reference" class="name-wrapper">
+                          <p v-if="scope.row.institutionName.length<15">
+                            {{scope.row.institutionName}}
+                          </p>
+                         <p v-else> {{scope.row.institutionName.substring(0,15)}}...</p>
+                    </div>
+                </el-popover>
+            </template>
           </el-table-column>
           <el-table-column
             prop="NameList"
             label="所属岗位">
+            <template slot-scope="scope">
+              <el-popover trigger="hover" placement="top">
+                {{scope.row.NameList}}
+                <div slot="reference" class="name-wrapper">
+                  <p v-if="scope.row.NameList.length<15">
+                    {{scope.row.NameList}}
+                  </p>
+                  <p v-else> {{scope.row.NameList.substring(0,15)}}...</p>
+                </div>
+              </el-popover>
+            </template>
           </el-table-column>
           <el-table-column
             label="状态"
-            width="170px">
+            width="100px">
             <template slot-scope="scope">
               <div v-if="scope.row.disableFlag === '1'">已禁用</div>
               <div v-else>已启用</div>
diff --git a/src/pages/config/pages/postManage/index.vue b/src/pages/config/pages/postManage/index.vue
index 2d5af9288..f48d27bff 100644
--- a/src/pages/config/pages/postManage/index.vue
+++ b/src/pages/config/pages/postManage/index.vue
@@ -57,7 +57,7 @@
                 <el-table-column
                         prop="name"
                         label="岗位名称"
-                        width="170px">
+                        width="300px">
                 </el-table-column>
                 <el-table-column
                         prop="NameList"