From e4cc4bde4c0fb11eb973f0bd99d52dd85bc4a3f5 Mon Sep 17 00:00:00 2001
From: Crudor <13581690280@163.com>
Date: Wed, 27 Nov 2024 21:39:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9index.vue.ftl,=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E7=94=9F=E6=88=90=E4=B8=8D=E5=87=86?=
 =?UTF-8?q?=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/maku-boot/vue/index.vue.ftl      | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/maku-generator-server/src/main/resources/template/maku-boot/vue/index.vue.ftl b/maku-generator-server/src/main/resources/template/maku-boot/vue/index.vue.ftl
index 5d8b610..47396f5 100644
--- a/maku-generator-server/src/main/resources/template/maku-boot/vue/index.vue.ftl
+++ b/maku-generator-server/src/main/resources/template/maku-boot/vue/index.vue.ftl
@@ -3,7 +3,7 @@
 		<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList()">
 		<#list queryList as field>
 			<el-form-item prop="${field.attrName}">
-			<#if field.formType == 'text' || field.formType == 'textarea' || field.formType == 'editor'>
+			<#if field.queryFormType == 'text' || field.queryFormType == 'textarea' || field.queryFormType == 'editor'>
 			  <el-input v-model="state.queryForm.${field.attrName}" placeholder="${field.fieldComment!}"></el-input>
 			<#elseif field.queryFormType == 'select'>
 			  <#if field.queryDict??>
@@ -22,17 +22,23 @@
 			  </el-radio-group>
 			  </#if>
 			<#elseif field.queryFormType == 'date'>
-			  <el-date-picker
-				v-model="daterange"
-				type="daterange"
-				value-format="yyyy-MM-dd">
-			  </el-date-picker>
-			<#elseif field.queryFormType == 'datetime'>
-			  <el-date-picker
-				v-model="datetimerange"
-				type="datetimerange"
-				value-format="yyyy-MM-dd HH:mm:ss">
-			  </el-date-picker>
+                <el-date-picker
+                        v-model="queryFormModel.${field.attrName}"
+                        type="daterange"
+                        format="YYYY-MM-DD"
+                        value-format="YYYY-MM-DD"
+                        clearable
+                >
+                </el-date-picker>
+            <#elseif field.queryFormType == 'datetime'>
+                <el-date-picker
+                        v-model="queryFormModel.${field.attrName}"
+                        type="datetimerange"
+                        format="YYYY-MM-DD HH:mm:ss"
+                        value-format="YYYY-MM-DD HH:mm:ss"
+                        clearable
+                >
+                </el-date-picker>
 			<#else>
 			  <el-input v-model="state.queryForm.${field.attrName}" placeholder="${field.fieldComment!}"></el-input>
 			</#if>
-- 
Gitee