From 96961602850c502f7eb69b7c2c4fcc83ab9f1907 Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Tue, 16 Aug 2022 11:48:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/vue/index-tree.vue.vm      | 15 ++++++++++-----
 .../src/main/resources/vue/index.vue.vm           | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/server/like-generator/src/main/resources/vue/index-tree.vue.vm b/server/like-generator/src/main/resources/vue/index-tree.vue.vm
index dbc16914..e0addf69 100644
--- a/server/like-generator/src/main/resources/vue/index-tree.vue.vm
+++ b/server/like-generator/src/main/resources/vue/index-tree.vue.vm
@@ -7,8 +7,8 @@
                 #if($column.htmlType=="datetime")
                 <el-form-item label="${column.columnComment}" prop="${column.javaField}">
                     <data-picker
-                        v-model:startTime="queryParams.startTime"
-                        v-model:endTime="queryParams.endTime"
+                        v-model:startTime="queryParams.${column.javaField}Start"
+                        v-model:endTime="queryParams.${column.javaField}End"
                     />
                 </el-form-item>
                 #elseif($column.htmlType=="select")
@@ -139,11 +139,16 @@
     const lists = ref<any[]>([])
     
     const queryParams = reactive({
-        #foreach ($column in $columns)
-        #if($column.isQuery)
+    #foreach ($column in $columns)
+    #if($column.isQuery)
+        #if($column.isHtmlType=="datetime")
+        ${column.javaField}Start: '',
+        ${column.javaField}End: '',
+        #else
         ${column.javaField}: '',
         #end
-        #end
+    #end
+    #end
     })
 
     const getLists = async () => {
diff --git a/server/like-generator/src/main/resources/vue/index.vue.vm b/server/like-generator/src/main/resources/vue/index.vue.vm
index 487c4fb1..128bed04 100644
--- a/server/like-generator/src/main/resources/vue/index.vue.vm
+++ b/server/like-generator/src/main/resources/vue/index.vue.vm
@@ -7,8 +7,8 @@
                 #if($column.htmlType=="datetime")
                 <el-form-item label="${column.columnComment}" prop="${column.javaField}">
                     <data-picker
-                        v-model:startTime="queryParams.startTime"
-                        v-model:endTime="queryParams.endTime"
+                        v-model:startTime="queryParams.${column.javaField}Start"
+                        v-model:endTime="queryParams.${column.javaField}End"
                     />
                 </el-form-item>
                 #elseif($column.htmlType=="select")
@@ -134,11 +134,16 @@
     const editRef = shallowRef<InstanceType<typeof EditPopup>>()
     const showEdit = ref(false)
     const queryParams = reactive({
-        #foreach ($column in $columns)
-        #if($column.isQuery)
+    #foreach ($column in $columns)
+    #if($column.isQuery)
+        #if($column.isHtmlType=="datetime")
+        ${column.javaField}Start: '',
+        ${column.javaField}End: '',
+        #else
         ${column.javaField}: '',
         #end
-        #end
+    #end
+    #end
     })
 
     const { pager, getLists, resetPage, resetParams } = usePaging({