From f363cdc459201b7dc1030635bab85a7705a79e67 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Thu, 16 Nov 2023 10:25:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83-=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E6=B7=BB=E5=8A=A0=E5=85=A5=E5=BA=93=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E3=80=81=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../searchCenter/pages/standardSearch.vue     | 35 ++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 94d218194..7619ce257 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -103,6 +103,7 @@
                                             tooltip-effect="dark"
                                             border
                                             style="width:100% !important;"
+                                            @sort-change="sortChange"
                                             :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
                     fontWeight: 'bold', height: '48px'}"
                                             height="100%"
@@ -132,9 +133,24 @@
                                                 <a class="jumpColor" style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{ selectIndex === 'laws' ? scope.row.lawsName : scope.row.nameshow }}</a>
                                             </template>
                                         </el-table-column>
+                                      <el-table-column
+                                          min-width="12%"
+                                          align="center"
+                                          prop="warehousingTime"
+                                          sortable
+                                          label="入库日期">
+                                        <template slot-scope="scope">
+                                          <div v-if="scope.row.warehousingTime !== null && scope.row.warehousingTime !== undefined">
+                                            {{ dateFormat2(scope.row.warehousingTime) }}
+                                          </div>
+                                          <div v-else></div>
+                                        </template>
+                                      </el-table-column>
                                         <el-table-column
-                                                min-width="12%"
-                                                align="center"
+                                            min-width="12%"
+                                            align="center"
+                                            prop="issueTime"
+                                            sortable
                                                 :label="$t('m.issueTime')">
                                             <template slot-scope="scope">
                                                 <div v-if="scope.row.issueTime !== null && scope.row.issueTime !== undefined">
@@ -146,6 +162,8 @@
                                         <el-table-column
                                                 align="center"
                                                 :label="(selectIndex === 'stand'||'bussstand') && selectIndex !== 'laws' ? $t('m.putTime') : '新车实施日期'"
+                                                prop="putTime"
+                                                sortable
                                                 min-width="12%">
                                             <template slot-scope="scope">
                                                 <div v-if="selectIndex === 'stand' || selectIndex === 'bussstand' ? (scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== '')
@@ -159,6 +177,8 @@
                                                 v-if="selectIndex !== 'msgdyinfo'"
                                                 align="center"
                                                 :label="selectIndex === 'stand'||'bussstand' ? $t('m.standStateShow') : (selectIndex === 'laws' ? $t('m.fileStatus') : $t('m.enterpriseStandardStatus'))"
+                                                prop="textStatusName"
+                                                sortable
                                                 min-width="12%">
                                             <template slot-scope="scope">
                                                 <!--                                                <span v-if="selectIndex === 'laws'">{{ getLawsState(scope.row.statecode) }}</span>-->
@@ -512,6 +532,13 @@
             }
         },
         methods: {
+          sortChange(sortObj){
+            const search = {
+              sortField: sortObj.prop,
+              sortMode: sortObj.order || ''
+            }
+            this.searchSarBykey(search)
+          },
             openStandSystemModel () {
               this.$refs.standSystemModelRef.open()
             },
@@ -1062,7 +1089,6 @@
                                     }
                                     nowdata[0].number = countAll
                                     console.log('aaaaa',nowdata)
-
                                 }
                             }
                         }
@@ -1496,7 +1522,7 @@
                     this.searchSarBykey()
                 }
             },
-            searchSarBykey () {
+            searchSarBykey (searchObj) {
                 console.log(this.searchOptions)
                 let searchCondition = this.searchCondition
                 let condition = {}
@@ -1531,6 +1557,7 @@
                 }
                 condition.selectType = this.selectType
                 condition.standSystem = this.standSystemKeys // 标准体系id
+                condition = Object.assign(condition, searchObj)
                 this.$http.post('search/searchCenter/searchSarBykey', condition, {
                     _this: this,
                     loading: 'resultLoading'