From ecfcf94804c8ba7aaf39645f3125ca4aa5ad6aa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Fri, 10 Nov 2023 18:01:07 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=AD=E6=B1=BD=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E3=80=91=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6=E5=8A=A0=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=AE=B5=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../standardWarning/StandardWarningList.vue   | 63 ++++++++++++++-----
 1 file changed, 48 insertions(+), 15 deletions(-)

diff --git a/src/views/documentTool/standardWarning/StandardWarningList.vue b/src/views/documentTool/standardWarning/StandardWarningList.vue
index 3d399f48..7244e7cb 100644
--- a/src/views/documentTool/standardWarning/StandardWarningList.vue
+++ b/src/views/documentTool/standardWarning/StandardWarningList.vue
@@ -49,19 +49,33 @@
               />
             </a-form-model-item>
           </a-col>
+          <template v-if="toggleSearchStatus">
+            <!--实施日期-->
+            <a-form-model-item :label="$t('enterpriseStandardLibrary.publicize.materialDate')"
+                               :labelCol="labelCol"
+                               :wrapperCol="wrapperCol">
+              <a-range-picker
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                v-model="queryParam.date"
+                :disabled="false"/>
+            </a-form-model-item>
+          </template>
 
-          <a-col :md="6" :sm="8">
-            <div style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary"
-                        @click="searchQuery"
-                        icon="search"
-                        style="margin-left: 8px"
-                        v-has="'standardWarning:search'">
-                {{ $t('query') }}
-              </a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" ghost>{{ $t('reset') }}</a-button>
-            </div>
-          </a-col>
+          <div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+            <a @click="handleToggleSearch">
+              {{ toggleSearchStatus ? $t('putAway') : $t('open') }}
+              <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
+            </a>
+            <a-button type="primary"
+                      @click="searchQuery"
+                      icon="search"
+                      style="margin-left: 8px"
+                      v-has="'standardWarning:search'">
+              {{ $t('query') }}
+            </a-button>
+            <a-button type="primary" @click="searchReset" icon="reload" ghost>{{ $t('reset') }}</a-button>
+          </div>
         </a-row>
       </a-form>
     </div>
@@ -110,6 +124,7 @@ import { queryDepartTreeList, ajaxGetDictItems } from '../../../api/api'
 import JTable from '../../../components/jero/JTable'
 import { mapGetters } from 'vuex'
 import { StandardSource } from '../../../enums/commonEnums'
+import { filterObj } from '../../../utils/util'
 
 export default {
   name: 'StandardWarningList',
@@ -126,20 +141,20 @@ export default {
         {
           dataIndex: 'source_dictText',
           title: this.$t('standardSelect.source'),
-          width: 150
+          width: 90
         },
         // 标准号
         {
           dataIndex: 'standardNumber',
           title: this.$t('standardNumber'),
-          width: 150,
+          width: 250,
           scopedSlots: { customRender: 'detail' }
         },
         // 标准名称
         {
           dataIndex: 'standardName',
           title: this.$t('standardName'),
-          width: 150,
+          width: 250,
           scopedSlots: { customRender: 'detail' }
         },
         // 新车型实施日期
@@ -262,6 +277,24 @@ export default {
       const text = option.componentOptions.propsData.title || option.componentOptions.propsData.label
       return text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     },
+    getQueryParams () {
+      // 获取查询条件
+      const sqp = {}
+      if (this.superQueryParams) {
+        sqp.superQueryParams = encodeURI(this.superQueryParams)
+        sqp.superQueryMatchType = this.superQueryMatchType
+      }
+      const param = Object.assign(sqp, this.queryParam, this.isorter, this.filters)
+      param.field = this.getQueryField()
+      param.pageNo = this.ipagination.current
+      param.pageSize = this.ipagination.pageSize
+      if (param.date && param.date.length > 0) {
+        param.startDate = param.date[0]
+        param.endDate = param.date[1]
+        delete param.date
+      }
+      return filterObj(param)
+    },
   }
 }
 </script>