From 066365542c4e839a4a43c1533e410804d80aa22c Mon Sep 17 00:00:00 2001
From: "SERVERM-0FVHDNN\\Administrator" <942005050@qq.com>
Date: Wed, 29 Mar 2023 14:44:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=9B=E9=80=89=E4=BC=98=E5=8C=96=20?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=AD=9B=E9=80=89=E6=95=B0=E6=8D=AE=E5=B1=95?=
 =?UTF-8?q?=E7=8E=B0=E4=B8=8D=E5=90=8C=E8=BE=93=E5=85=A5=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=8F=8A=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/components/searchOverall/index.vue | 53 +++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/fe/PC/src/components/searchOverall/index.vue b/fe/PC/src/components/searchOverall/index.vue
index 2aee28a6a..4a7255db1 100644
--- a/fe/PC/src/components/searchOverall/index.vue
+++ b/fe/PC/src/components/searchOverall/index.vue
@@ -47,6 +47,7 @@
                     placeholder="请选择筛选对象"
                     :disabled="item.hide"
                     :filterable="true"
+                    @change="resetSelect(item)"
                   >
                     <el-option
                       v-for="(item, index) in tableColumnsOptions(tableColumns)"
@@ -71,8 +72,9 @@
                     placeholder="请选择条件"
                     :disabled="item.column == '' || item.hide ? true : false"
                   >
+                  <!-- moreListOptions.action -->
                     <el-option
-                      v-for="item in moreListOptions.action"
+                      v-for="item in formatMoreListOptions(item.column) "
                       :key="item.value"
                       :label="item.label"
                       :value="item.value"
@@ -109,6 +111,16 @@
                     >
                     </el-option>
                   </el-select>
+                  <!-- 日期时间 -->
+                  <el-date-picker
+                  v-else-if="getColumnType(item.column) == 'dateTime'"
+                    type="datetime"
+                    v-model="item.value"
+                    :placeholder="'选择日期时间'"
+                    style="width: 100%"
+                    format="yyyy-MM-dd HH:mm:ss"
+                    value-format="yyyy-MM-ddTHH:mm:ss"
+                  ></el-date-picker>
                   <el-input
                     v-else
                     v-model="item.value"
@@ -389,6 +401,45 @@ export default {
       })
       return data
     },
+    // 判断筛选类型是否是时间格式
+    getColumnType(val) {
+      var columnsType = this.tableColumns.filter(item => item.prop == val)
+      if (columnsType.length > 0) {
+        if (columnsType[0].type) {
+          return columnsType[0].type
+        } 
+      }  else {
+        return ''
+      }
+    },
+    // 筛选条件改变重置其他项
+    resetSelect(val) {
+      val.action = "=="
+      val.value = ""
+    },
+    // 根据数据内容约束条件选项
+    formatMoreListOptions(val) {
+      if (val) {
+        for(var i =0; i< this.tableColumns.length; i++) {
+          if (val == this.tableColumns[i].prop) {
+            if (this.tableColumns[i].filters) {
+              return this.moreListOptions.action.filter(item => item.value == '==' || item.value == '!=')
+            } else if (this.tableColumns[i].type == 'dateTime') {
+              return this.moreListOptions.action.filter(item => 
+                item.value == '==' || 
+                item.value == '!=' ||
+                item.value == '>' ||
+                item.value == '<' ||
+                item.value == '>=' ||
+                item.value == '<=' )
+            } else {
+              return this.moreListOptions.action
+            }
+          }
+        }
+      }
+      return this.moreListOptions.action
+    },
     // 设置moreList列表的内容项是input还是select
     inputOrSelect(val) {
       let data