From 363c67012fb885a4820d413994c06a2b8cdc4fdb Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 12 Aug 2021 18:05:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87=E5=87=86,?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2,=E5=BD=92=E5=8F=A3?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=83=A8=E9=97=A8=E6=94=B9=E4=B8=BA=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue | 35 +++++++++++--------
 .../foreignStandardsAndRegulations/index.vue  |  8 +++--
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index ae3f5ce8c..2ce701c52 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1356,8 +1356,10 @@
             </el-form-item>
             <!--            归口管理部门-->
             <el-form-item label="归口管理部门">
-              <el-input v-model="sarStandardsSearch.gkglbm" clearable placeholder="根据归口管理部门查找"
-                        @keyup.enter.native="btnSearch"></el-input>
+              <el-select v-model="sarStandardsSearch.gkglbm" placeholder="归口管理部门" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
             </el-form-item>
             <!--            起草单位-->
             <el-form-item label="起草单位">
@@ -1688,18 +1690,21 @@ export default {
       searching: false,
       stahndinfoList: [],
       tableFlag: '',
+      // sycpxOptions: [], // 适用产品线
+      syzrOptions: [], // 适用认证
+      // zrgcsOptions: [], // 责任工程师
+
       countryOptions: [],
-      cysdOptions: [], // 我司参与深度下拉框
+      regionOptions: [], // 区域
+      standSortOptions: [], // 标准类别下拉框
+      standSystemOptions: [], // 标准体系下拉框
       sycpxOptions: [], // 适用产品线下拉框
       zrbmOptions: [], // 责任部门下拉框
       zrgcsOptions: [], // 责任工程师下拉框
       txlbOptions: [], // 体系类别下拉框
-      regionOptions: [], // 区域
-      standSortOptions: [], // 标准类别下拉框
       standSortConfigOptions: [], // 标准类别下拉框
       applyArcticOptions: [], // 适用车型下拉框
-      standStateOptions: [], // 文本状态下拉框
-      standSystemOptions: [], // 标准体系下拉框
+      standStateOptions: [], // 标准状态下拉框
       standNatureOptions: [], // 标准性质下拉框
       adoptExtentOptions: [], // 采标程度下拉框
       emergyKindOptions: [], // 能源种类下拉框
@@ -1707,12 +1712,14 @@ export default {
       categoryOptions: [], // 所属类别下拉框
       categoryConfigOptions: [], // 所属类别下拉框
       assemClassOptions: [], // 总成分类下拉框
-      qcdwOptions: [], // 起草单位
-      nylxOptions: [], // 能源类型
-      // sycpxOptions: [], // 适用产品线
-      syzrOptions: [], // 适用认证
-      // zrbmOptions: [], // 责任部门
-      // zrgcsOptions: [], // 责任工程师
+      qcdwOptions:[],//起草单位下拉框
+      cysdOptions:[], //我司参与深度下拉框
+      nylxOptions:[],//能源类型下拉框
+      syrzOptions:[],//适用认证下拉框
+      gkglbmOptions:[],//归口管理部门下拉框
+
+
+
       standAttributeList: [],
       sarStandardsSearch: {
         page: 1,
@@ -4743,7 +4750,6 @@ export default {
         this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
         this.cysdOptions = res.data.WSCYSD // 我司参与深度
         this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
-        this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
         this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
         this.txlbOptions = res.data.TXLBCLASS // 体系类别
       this.qcdwOptions = res.data.QCDW // 起草单位
@@ -4752,6 +4758,7 @@ export default {
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
       this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
       this.syrzOptions = res.data.SYRZCLASS // 适用认证
+      this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
       this.getGzzOption()
       this.setMap(this.standStateOptions)
     }, e => {
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index dd6c766d3..1aec45cc7 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -423,8 +423,10 @@
             </el-form-item>
             <!--            归口管理部门-->
             <el-form-item label="归口管理部门">
-              <el-input v-model="sarStandardsSearch.gkglbm" clearable placeholder="根据归口管理部门查找"
-                        @keyup.enter.native="btnSearch"></el-input>
+              <el-select v-model="sarStandardsSearch.gkglbm" placeholder="归口管理部门" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
             </el-form-item>
             <!--            起草单位-->
             <el-form-item label="起草单位">
@@ -1523,6 +1525,7 @@ export default {
       cysdOptions:[], //我司参与深度下拉框
       nylxOptions:[],//能源类型下拉框
       syrzOptions:[],//适用认证下拉框
+      gkglbmOptions:[],//归口管理部门下拉框
       // 树形结构
       // tree function
       MoveTest: '',
@@ -4325,6 +4328,7 @@ export default {
       this.cysdOptions=res.data.WSCYSD;
       this.nylxOptions=res.data.NYLXCLASS;//能源类型
       this.syrzOptions=res.data.SYRZCLASS;//适用认证
+      this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
 
       this.getGzzOption()
       this.setMap(this.standStateOptions)