From d161fcca36e08ac3665beaef2b4742ce39cdb0ba 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, 19 May 2022 10:09:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E6=A1=88=E6=97=A5=E6=9C=9F=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue   | 17 ++++++++++-------
 .../components/EnterpriseStandardDatabase.vue   | 16 ++++++++++------
 .../foreignStandardsAndRegulations/index.vue    | 15 +++++++--------
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index b95cd2768..151e33b6d 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1661,11 +1661,14 @@
                       </el-option>
                     </el-select>
                   </el-form-item>
-                  <!-- 备案日期 -->
-                  <el-form-item label="备案日期" class="add-form-item form-item-disabled">
+                  <!-- 备案日期   目前不确定是否需要 暂时隐藏 -->
+                  <el-form-item style="display: none" label="备案日期" class="add-form-item form-item-disabled">
                     <el-date-picker
                       v-model="advanceSearchMapping.BARQ"
-                      type="date"
+                      type="daterange"
+                      range-separator="-"
+                      start-placeholder="开始日期"
+                      end-placeholder="结束日期"
                       value-format="yyyy-MM-dd"
                       placeholder="根据备案日期查找">
                     </el-date-picker>
@@ -3763,8 +3766,8 @@ export default {
           advanceSearchVOList.push({
             connect: "and",
             field: key || '',
-            type: 'equals',
-            value: value
+            type: 'between',
+            value: value.join(',')
           });
         } else if (value !== null && value !== '' && (key === 'TXLBName')) {
         } else if (value !== null && value !== '') {
@@ -4618,8 +4621,8 @@ export default {
           advanceSearchVOList.push({
             connect: "and",
             field: key || '',
-            type: 'equals',
-            value: value
+            type: 'between',
+            value: value.join(',')
           });
         } else if (value !== null && value !== '' && (key === 'TXLBName')) {
         } else if (value !== null && value !== '') {
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 0a34999cb..55811ccb3 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -1155,13 +1155,15 @@
 
                 <!-- 备案日期 -->
                 <el-form-item label="备案日期" class="add-form-item form-item-disabled">
-                  <el-datePicker
-                    :editable="false"
+                  <el-date-picker
                     v-model="sarBussionessSearch.BARQ"
-                    type="date"
+                    type="daterange"
+                    range-separator="-"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
                     value-format="yyyy-MM-dd"
                     placeholder="根据备案日期查找">
-                  </el-datePicker>
+                  </el-date-picker>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -4358,6 +4360,7 @@ export default {
     // 清空搜索框
     clearAllSearch(flag) {
       if (flag === 'sarBussionessSearch') {
+        console.log('1');
         // 标准搜索
         this.sarBussionessSearch.applyCountry = ''
         this.sarBussionessSearch.standGenera = ''
@@ -4394,6 +4397,7 @@ export default {
         this.sarBussionessSearch.QCRBUSS = ''
         this.sarBussionessSearch.QCDW = ''
         this.sarBussionessSearch.FZRQBUSS = ''
+        this.sarBussionessSearch.BARQ = ''
         this.sarBussionessSearch.FSRQBUSS = ''
         this.sarBussionessSearch.DTQBBHBUSS = ''
         this.sarBussionessSearch.BDTQBBHBUSS = ''
@@ -4510,8 +4514,8 @@ export default {
                 advanceSearchVOList.push({
                     connect: "and",
                     field: item.attrField || "",
-                    type: 'EQUALS',
-                    value: value
+                    type: "between",
+                    value: (value ? value[0]+','+value[1] : "") || "",
                 });
             }else if (value !== undefined && value !== null && value !== "" && (item.attrField === 'FZRQBUSS' || item.attrField === 'FSRQBUSS')) {
               advanceSearchVOList.push({
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 852e70c08..d875787a2 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -510,8 +510,8 @@
 <!--                    </el-select>-->
 <!--                  </el-form-item>-->
 
-                  <!-- 备案日期 -->
-                  <el-form-item label="备案日期" class="add-form-item form-item-disabled">
+                  <!-- 备案日期 目前不确定是否需要 暂时隐藏 -->
+                  <el-form-item style="display: none" label="备案日期" class="add-form-item form-item-disabled">
                     <el-date-picker
                       v-model="advanceSearchMapping.BARQ"
                       type="date"
@@ -519,6 +519,11 @@
                       placeholder="根据备案日期查找">
                     </el-date-picker>
                   </el-form-item>
+                  <!--            标签-->
+                  <el-form-item label="标签" class="add-form-item form-item-disabled">
+                    <el-input v-model="advanceSearchMapping.GXHBQ" clearable
+                              placeholder="根据被标签查找"></el-input>
+                  </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <!--            标准类别-->
@@ -549,12 +554,6 @@
                       <el-option value="2" label="否"></el-option>
                     </el-select>
                   </el-form-item>
-                  <!--            标记-->
-                  <!--            标签-->
-                  <el-form-item label="标签" class="add-form-item form-item-disabled">
-                    <el-input v-model="advanceSearchMapping.GXHBQ" clearable
-                              placeholder="根据被标签查找"></el-input>
-                  </el-form-item>
                 </el-col>
               </el-row>
             </div>