Merge remote-tracking branch 'origin/develop' into develop

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>

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"

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) => {