From 9d73280dd60b70014d926d8c23d989e9fd2a5f0e 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, 1 Jul 2021 10:51:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=EF=BC=8C=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1.vue       | 21 +++++++-------
 .../accessStandardsAndRegulations/index.vue   |  8 ++---
 .../page/listOfCountries.vue                  | 10 ++++---
 .../page/listProject.vue                      | 12 ++++----
 .../domesticStandardsAndRegulations/index.vue |  9 ++++--
 .../localProductsOrProjectLibrary/index.vue   | 13 +++++----
 .../nonConfomity/pages/businessDivision.vue   |  9 ++++--
 .../nonConfomity/pages/productDepartment.vue  |  9 ++++--
 .../searchCenter/pages/standardSearch.vue     | 29 ++++++++++---------
 9 files changed, 68 insertions(+), 52 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 6f9b6ffd5..4fce8a626 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -125,15 +125,6 @@
           </el-table-column>
         </el-table>
       </div>
-      <ProcessFooter
-        show-save
-        show-submit
-        :submitLoading="isSubmit"
-        :saveLoading="saveLoading"
-        @save="handleSave"
-        @submit="handleSubmit"
-      >
-      </ProcessFooter>
     </div>
     <div class="content" v-if="active == '2'">
       <div class="block" style="padding-top: 20px;">
@@ -485,6 +476,15 @@
         </el-table-column>
       </el-table>
     </el-drawer>
+    <ProcessFooter
+      show-save
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @save="handleSave"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
   </div>
 </template>
 
@@ -588,7 +588,6 @@ export default {
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
-
 .bzqdfb-step1 {
   /deep/ .el-drawer__container {
     .prc-content-border {
@@ -633,7 +632,7 @@ export default {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
-    height: calc(~'100% - 55px');
+    height: calc(~'100% - 103px');
     overflow: auto;
 
     .tableTitle {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
index 5ac76fe7c..c75645bee 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
@@ -47,22 +47,22 @@
       var list = []
       const menuList = this.$store.getters.getMenuList
       menuList.forEach(item => {
-        if (item.id === '8e3894cbd5507008aaf949394b7d198b') {
+        if (item.id === 'b05b562950cb6d0aef539fad30b7386a') {
           list.push({
             label: '国家/地区清单',
             name: 'listOfCountries'
           })
-        } else if (item.id === 'f4f95a8b9a02845c8dc0331dbe41e80c') {
+        } else if (item.id === '63e05705d0c8013162caa34f9fe52865') {
           list.push({
             label: '项目类清单',
             name: 'listProject'
           })
-        } else if (item.id === 'df227899442db20b31b7cb0b2ac6f5e7') {
+        } else if (item.id === '418123d180abf67bd2c46d5a694baaa5') {
           list.push({
             label: '重点标准跟踪清单',
             name: 'listTracking'
           })
-        } else if (item.id === 'f19255f8e94f04fd85a33a23f4d1fc85') {
+        } else if (item.id === '5a75523729b04102a565167004d640e9') {
           list.push({
             label: '其他清单',
             name: 'listOther'
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index 4dc533b3d..c77d00327 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -31,6 +31,7 @@
               type="primary"
               class="common-button-primary"
               size="small"
+              v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
               @click="searchSarAccess">
               查询
             </el-button>
@@ -39,6 +40,7 @@
             <el-button
               class="common-button-default"
               size="small"
+              v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
               @click="clearSearch">清空
             </el-button>
           </el-form-item>
@@ -51,7 +53,7 @@
         class="common-button-primary add-button"
         size="mini"
         @click="openModal(null,'addOpt')"
-        v-btn-permission="'db44de86c8a30b037335bb35ded9f40e'"
+        v-btn-permission="'7aaf236bdf6b1657c615380f7f34b8a8'"
       ><i class="iconfont">&#xe84e;</i>新增
       </el-button>
       <el-button
@@ -144,11 +146,11 @@
               <el-dropdown trigger="click" @command="handleCommand">
                 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'f4bf556d10c3600390bec6e8447b92cc'">查看
+                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'b736f2469d49b3214cc8087419a24b60'">查看
                   </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'591151a039d0fb454578776cee513524'">编辑
+                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'4733577057bf2470fc5c1f88d81eaf1d'">编辑
                   </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'e7719eb059163fc634a2109981bd1367'">删除
+                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'ff411226afb759fd2f4a2798ceac322a'">删除
                   </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
index e6af17365..643681c8b 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
@@ -22,6 +22,7 @@
               type="primary"
               class="common-button-primary"
               size="small"
+              v-btn-permission="'28a917b40ab7c9cc319aafe0e23bd535'"
               @click="searchSarAccess">
               查询
             </el-button>
@@ -30,6 +31,7 @@
             <el-button
               class="common-button-default"
               size="small"
+              v-btn-permission="'c1bed997a716e13dabade0f4864cdbf7'"
               @click="clearSearch">清空
             </el-button>
           </el-form-item>
@@ -42,7 +44,7 @@
         class="common-button-primary add-button"
         size="mini"
         @click="openModal(null,'addOpt')"
-        v-btn-permission="'00139623434e23209d184eb8f753c980'"
+        v-btn-permission="'2dd158ffb07ddcc89ed41468b196b451'"
       ><i class="iconfont">&#xe84e;</i>新增
       </el-button>
       <el-button
@@ -50,7 +52,7 @@
         :loading="delLoading"
         size="mini"
         @click="deleteSarAccess('demore',null)"
-        v-btn-permission="'d9ba629448d5a48dee0b2a2659a719c7'"
+        v-btn-permission="'2d9402bd81545e391aef735733051627'"
       ><i class="iconfont">&#xe61b;</i>批量删除
       </el-button>
     </div>
@@ -135,11 +137,11 @@
               <el-dropdown trigger="click" @command="handleCommand">
                 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'2b2b6e7673d70b2e63ffd4dacacca7ce'">查看
+                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'cfe3ce86cd64c5924c2e6d13e7f7ea31'">查看
                   </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'363482802f1b46d022057d117678ce75'">编辑
+                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'9d0783096e61390a54e0fea1eda461dc'">编辑
                   </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'21f363e9a0907c09ba81b7f9fc406116'">删除
+                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'4136d025d20d4c9b55c732b74dfa581d'">删除
                   </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 1e14d387e..66c1c4855 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -65,14 +65,17 @@
                     type="primary"
                     size="mini"
                     class="common-button-primary"
+                    v-btn-permission="'967c8b1402459951b5f75fcd1c548665'"
                     @click="searchBtnClick(standCommonlySearch)">
-                    搜索
+                    查询
                   </el-button>
                   <el-button
                     size="mini"
                     class="common-button-default"
+                    v-btn-permission="'d38fea2d0d992615f9e1c4dfb6dc76f3'"
                     @click="clearAllSearch('standCommonlySearch')">清空</el-button>
-                  <el-button size="mini" type="primary" class="common-button-primary"  @click="selectMoreBtn"><i class="iconfont">&#xe7a5;</i>高级检索</el-button>
+                  <el-button size="mini" type="primary" class="common-button-primary"
+                             v-btn-permission="'c9cb749aacefc52347f1250d0f98272a'"  @click="selectMoreBtn"><i class="iconfont">&#xe7a5;</i>高级检索</el-button>
                 </el-form-item>
               </el-form>
             </div>
@@ -96,7 +99,7 @@
         <el-button class="common-button-default export-button"
                    @click="exportStandard()"
                    size="mini"
-                   v-btn-permission="'b17f1d035219c47344032e261342d87d'"
+                   v-btn-permission="'84035c53f4e7c3e2f343a83e6c6e291d'"
                    title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"><i class="iconfont">&#xe6e9;</i>导出</el-button>
         <el-button class="common-button-default delete-button"
                    :loading="delLoading"
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index f55f7c7cc..fe62cd53e 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -45,24 +45,25 @@
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
-              icon="el-icon-search"
               type="primary"
               class="common-button-primary"
               size="small"
-              @click="getLocalProductTableBtn"></el-button>
+              v-btn-permission="'d1b1bffb39a67dea0d452a8ba4e3ae35'"
+              @click="getLocalProductTableBtn">查询</el-button>
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
               class="common-button-default"
-              icon="el-icon-refresh-left"
               size="small"
-              @click="clearAllSearch"></el-button>
+              v-btn-permission="'10e3fdd2d816d64022f2928cd65b9bb1'"
+              @click="clearAllSearch">清空</el-button>
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
               type="primary"
               class="common-button-primary"
               size="mini"
+              v-btn-permission="'e5ca15122f554414e6365eb09efac5c4'"
               @click="selectMoreBtn"
             ><i class="iconfont">&#xe7a5;</i>高级查询</el-button>
           </el-form-item>
@@ -185,8 +186,8 @@
               <el-dropdown trigger="click" @command="handleCommand">
                 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'XTR2AJYDAN4J7GALXDW9'">查看</el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'Q645GH8EJY9274GVX2QS'">删除</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'633e82816590af9027dc2fddc562d046'">查看</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'0b59eceb360b7bd7ae6f64835a8c4514'">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue b/src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue
index 9df8aa8ca..079a0a337 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue
@@ -51,6 +51,7 @@
               type="primary"
               class="common-button-primary"
               size="mini"
+              v-btn-permission="'aff4a409c3c3856986c535a5f4782b13'"
               @click="getTableByPage('')">
               查询
             </el-button>
@@ -59,6 +60,7 @@
             <el-button
               class="common-button-default"
               size="mini"
+              v-btn-permission="'66fa37fc93e298b03d272fe17aeca6de'"
               @click="clearAllSearch">清空</el-button>
           </el-form-item>
         </el-form>
@@ -69,6 +71,7 @@
         class="common-button-primary"
         type="primary"
         size="mini"
+        v-btn-permission="'13dc790d5438d2fa93a03eabf641318'"
         title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
       ><i class="iconfont">&#xe6e9;</i>导出</el-button>
       <el-button
@@ -76,11 +79,13 @@
         class="common-button-primary"
         type="primary"
         size="mini"
+        v-btn-permission="'fde586188a364382cf67a0efa62a586c'"
       ><i class="iconfont">&#xe61b;</i>批量关闭</el-button>
       <el-button
         class="common-button-primary"
         size="mini"
         type="primary"
+        v-btn-permission="'9b68b46455c5af042d430e05e6579b27'"
         @click="historyClick"
         style="float: right; margin-right: 10px"
       >历史数据</el-button>
@@ -170,9 +175,7 @@
                   <el-dropdown trigger="click" @command="handleCommand">
                     <i class="iconfont">&#xe61e;</i>
                     <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'R4FTCUQSXFUZPUSN3W63'">查看</el-dropdown-item>
-                      <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'G7GL8ZAZ5EYK6LRXW5MT'">编辑</el-dropdown-item>
-                      <el-dropdown-item :command="[scope.row, '关闭']" v-btn-permission="'Q8GPXE8L36KN2XVMZ6Y4'">关闭</el-dropdown-item>
+                      <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'887ec926ad9a2b85395159db38885d96'">查看</el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
                 </div>
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/productDepartment.vue b/src/pages/regulatoryRepository/nonConfomity/pages/productDepartment.vue
index e7dc9ae21..e91b91a2f 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/productDepartment.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/productDepartment.vue
@@ -51,6 +51,7 @@
             type="primary"
             class="common-button-primary"
             size="mini"
+            v-btn-permission="'4a65b081ccf9bf992014adba1c73a78f'"
             @click="getTableByPage('')">
             查询
           </el-button>
@@ -59,6 +60,7 @@
           <el-button
             class="common-button-default"
             size="mini"
+            v-btn-permission="'c6a1f3e31357ae2e02ac643f50c40c1c'"
             @click="clearAllSearch">清空</el-button>
         </el-form-item>
       </el-form>
@@ -69,6 +71,7 @@
       class="common-button-primary"
       type="primary"
       size="mini"
+      v-btn-permission="'1ae29971a6f4b30f527e6ed2f8b3dd51'"
       title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
     ><i class="iconfont">&#xe6e9;</i>导出</el-button>
     <el-button
@@ -76,6 +79,7 @@
       class="common-button-primary"
       type="primary"
       size="mini"
+      v-btn-permission="'351d1b7b07ca6ca76dc37f11dd389f91'"
     ><i class="iconfont">&#xe61b;</i>批量关闭</el-button>
     <el-button
       class="common-button-primary"
@@ -83,6 +87,7 @@
       size="mini"
       type="primary"
       @click="historyClick"
+      v-btn-permission="'5eba31766fdc0521461684d2d6bf66c4'"
     >历史数据</el-button>
   </div>
   <div class="container">
@@ -168,9 +173,7 @@
             <el-dropdown trigger="click" @command="handleCommand">
               <i class="iconfont">&#xe61e;</i>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'R4FTCUQSXFUZPUSN3W63'">查看</el-dropdown-item>
-                <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'G7GL8ZAZ5EYK6LRXW5MT'">编辑</el-dropdown-item>
-                <el-dropdown-item :command="[scope.row, '关闭']" v-btn-permission="'Q8GPXE8L36KN2XVMZ6Y4'">关闭</el-dropdown-item>
+                <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'c083653097fb63aef0d9a424b0e7c88e'">查看</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </div>
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 875e7bc49..62876a7b3 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -34,8 +34,8 @@
                 {{ toggleConditionTips }}
               </div>
               <div class="condition-content">
-                <div class="condition-item" v-for="(condition, key) of searchOptions" :key="condition.dicId"
-                     v-if="key < 5|| showAllSearchOption">
+                <div class="condition-item" v-for="(condition, index) of searchOptions" :key="condition.dicId"
+                     v-if=" index < 5 || showAllSearchOption">
                   <div class="condition-item-title">{{ condition.dictionaryName }}</div>
                   <ul>
                     <li v-for="(conditionOpt, optIndex) in condition.menuTypes" :key="conditionOpt.id">
@@ -189,6 +189,7 @@ export default {
       selectedOptions: {
         list: ["stand"]
       },
+      titleName: ["标准类别", "标准/政策状态", "参与深度",  "适用车辆类型","采标程度",],
       resultLoading: false,
       total: 0,
       page: 1,
@@ -214,7 +215,7 @@ export default {
       this.$http.post("search/searchCenter/getMenu", {}, {
         _this: this
       }, res => {
-        _this.searchOptions = [
+        _this.searchData = [
           {
             dicId: "ZYLX",
             dictionaryName: "资源类型",
@@ -242,11 +243,15 @@ export default {
             ]
           }
         ];
-        _this.searchData = res.data;
-        for (let i = 0; i < res.data.length; i++) {
-          if (_this.searchOptions.length >= 6) break;
-          _this.searchOptions.push(res.data[i]);
-        }
+        _this.titleName.forEach(item => {
+          for (let i = 0; i < res.data.length; i++) {
+            if (res.data[i].dictionaryName == item) {
+              _this.searchData.push(res.data[i]);
+              break;
+            }
+          }
+        });
+        _this.searchOptions = JSON.parse(JSON.stringify(_this.searchData));
       }, e => {
       });
     },
@@ -267,17 +272,15 @@ export default {
           this.AllCheck = true;
           //点击全部显示分页
           this.AllPage = true;
-          this.searchOptions = [condition]
+          this.searchOptions = [condition];
           this.searchCondition.selectIndex = ["All"];
           this.searchSarByInputKey();
         } else {
           this.AllPage = false;
           this.Allitems = [];
           this.AllCheck = false;
-          for (let i = 0; i < this.searchData.length; i++) {
-            if (this.searchOptions.length >= 6) break;
-            this.searchOptions.push(this.searchData[i]);
-          }
+          this.searchOptions = [];
+          this.searchOptions.push(...this.searchData);
         }
       } else {
         this.AllPage = false;