From 172dde7d3f7c9aab63eaf7e0322e1496609ee0b6 Mon Sep 17 00:00:00 2001
From: dvadmin <1206709430@qq.com>
Date: Mon, 16 Aug 2021 06:28:27 +0000
Subject: [PATCH] =?UTF-8?q?CRUD=E7=BB=84=E4=BB=B6=E4=B8=AD=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=90=9C=E7=B4=A2bug=E4=BF=AE=E5=A4=8D=E5=92=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0cascader=E8=81=94=E7=BA=A7=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/ModelDisplay/index.vue     | 34 +++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/dvadmin-ui/src/components/ModelDisplay/index.vue b/dvadmin-ui/src/components/ModelDisplay/index.vue
index 408a2d1..3554a24 100644
--- a/dvadmin-ui/src/components/ModelDisplay/index.vue
+++ b/dvadmin-ui/src/components/ModelDisplay/index.vue
@@ -43,9 +43,30 @@
               :value.sync="queryParams[value.prop]"
               style="width: 150px;"
             />
+            <el-cascader
+              v-else-if="value.type === 'cascader' && value.select_data"
+              v-model="queryParams[value.prop]"
+              :placeholder="value.select_data.placeholder || '请选择'"
+              :options="modelSelect[value.prop] || []"
+              :clearable="value.select_data.clearable || false"
+              :filterable="value.select_data.filterable || false"
+              style="width: 100%"
+            />
             <el-date-picker
-              v-else-if="value.type==='date'|| value.type==='datetime'"
-              v-model="dateRange"
+              v-else-if="value.type === 'date'"
+              v-model="dateRange[value.prop + '__range']"
+              size="small"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+            ></el-date-picker>
+            <el-date-picker
+              v-else-if="value.type === 'datetime'"
+              v-model="dateRange[value.prop + '__range']"
               size="small"
               style="width: 240px"
               value-format="yyyy-MM-dd HH:mm:ss"
@@ -54,7 +75,14 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               :default-time="['00:00:00', '23:59:59']"
-            />
+            ></el-date-picker>
+            <el-time-select
+              v-else-if="value.type === 'time'"
+              v-model="dateRange[value.prop + '__range']"
+              :picker-options="value.options"
+              placeholder="选择时间"
+              :default-time="['00:00:00', '23:59:59']"
+            >
             <el-select
               v-else-if="value.type==='option' && value.option_key"
               v-model="queryParams[value.prop]"