From b4c9475132c5075964a1c3137e70c22863e68fc3 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sun, 7 Nov 2021 14:52:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7,=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=88=86=E5=BC=80=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue | 35 ++++++++++++-------
 .../foreignStandardsAndRegulations/index.vue  | 33 ++++++++++-------
 2 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index efdb5d22c..614be7aaf 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -73,19 +73,27 @@
             <div class="left">
               <el-form :modal="standCommonlySearch" :inline="true" class="label-input-form"
                        @keyup.enter.native="searchBtnClick(standCommonlySearch)">
-                <el-form-item label="标准类别" class="search-item" style="margin-top:1px;">
-                  <el-select v-model="standCommonlySearch.standSort" filterable>
-                    <el-option
-                      v-for="item in standSortOptions"
-                      :key="item.value"
-                      :value="item.value"
-                      :label="item.label"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="标准号/名称" class="search-item search-item-last">
+<!--                <el-form-item label="标准==类别" class="search-item" style="margin-top:1px;">-->
+<!--                  <el-select v-model="standCommonlySearch.standSort" filterable>-->
+<!--                    <el-option-->
+<!--                      v-for="item in standSortOptions"-->
+<!--                      :key="item.value"-->
+<!--                      :value="item.value"-->
+<!--                      :label="item.label"-->
+<!--                    ></el-option>-->
+<!--                  </el-select>-->
+<!--                </el-form-item>-->
+                <el-form-item label="标准号" class="search-item search-item-last">
                   <el-input v-model="standCommonlySearch.standNumber"
-                            placeholder="请输入"
+                            placeholder="请输入标准号"
+                            clearable
+                            @keyup.enter="searchBtnClick(standCommonlySearch)"
+                            :maxlength="100"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="标准名称" class="search-item search-item-last">
+                  <el-input v-model="standCommonlySearch.standName"
+                            placeholder="请输入标准名称"
                             clearable
                             @keyup.enter="searchBtnClick(standCommonlySearch)"
                             :maxlength="100"
@@ -1843,7 +1851,8 @@ export default {
         standType: 'INLAND',
         validFlag: '0',
         standSort: '',
-        standNumber: ''
+        standNumber: '',
+        standName:''
       },
       defaultCheckedKeys1: [],
       defaultCheckedKeys2: [],
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index bc9cfcedd..970197d23 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -70,19 +70,27 @@
           <div class="search-area">
             <div class="left">
               <el-form :modal="standCommonlySearch" inline class="label-input-form" @keyup.enter.native="searchBtnClick(standCommonlySearch)">
-                <el-form-item label="标准类别" class="search-item">
-                  <el-select v-model="standCommonlySearch.standSort" filterable>
-                    <el-option
-                      v-for="item in standSortOptions"
-                      :key="item.value"
-                      :value="item.value"
-                      :label="item.label"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="标准号/名称" class="search-item search-item-last">
+<!--                <el-form-item label="标准类别" class="search-item">-->
+<!--                  <el-select v-model="standCommonlySearch.standSort" filterable>-->
+<!--                    <el-option-->
+<!--                      v-for="item in standSortOptions"-->
+<!--                      :key="item.value"-->
+<!--                      :value="item.value"-->
+<!--                      :label="item.label"-->
+<!--                    ></el-option>-->
+<!--                  </el-select>-->
+<!--                </el-form-item>-->
+                <el-form-item label="标准号" class="search-item search-item-last">
                   <el-input v-model="standCommonlySearch.standNumber"
-                            placeholder="请输入"
+                            placeholder="请输入标准号"
+                            clearable
+                            @keyup.enter="searchBtnClick(standCommonlySearch)"
+                            :maxlength="100"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="标准名称" class="search-item search-item-last">
+                  <el-input v-model="standCommonlySearch.standName"
+                            placeholder="请输入标准名称"
                             clearable
                             @keyup.enter="searchBtnClick(standCommonlySearch)"
                             :maxlength="100"
@@ -1730,6 +1738,7 @@ export default {
         validFlag: '0',
         standSort: '',
         standNumber: '',
+        standName:'',
         menuId: '',
         sarStandardsSearch: ''
       },