From 205d330c1c9a291527276c6cbb9a9552cdb4826e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Wed, 15 Mar 2023 16:49:21 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20bug=E3=80=91=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=9A=84=E7=BB=84=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../${entityPackage}/vue/${entityName}List.vuei   | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
index 2c798e44..c5224db1 100644
--- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
+++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
@@ -69,12 +69,10 @@
           <#if query_field_no gt 1>  </#if><a-col :xl="10" :lg="11" :md="12" :sm="24">
             <#if query_field_no gt 1>  </#if><a-form-item label="${po.filedComment}">
 			<#if po.classType=='date'>
-			  <#assign date_flag=true>
               <#if query_field_no gt 1>  </#if><j-date showType="day" placeholder="请选择开始日期" class="query-group-cust" v-model="queryParam.${po.fieldName}_begin"></j-date>
               <#if query_field_no gt 1>  </#if><span class="query-group-split-cust"></span>
               <#if query_field_no gt 1>  </#if><j-date showType="day" placeholder="请选择结束日期" class="query-group-cust" v-model="queryParam.${po.fieldName}_end"></j-date>
 			<#elseif po.classType=='datetime'>
-			  <#assign date_flag=true>
               <#if query_field_no gt 1>  </#if><j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust" v-model="queryParam.${po.fieldName}_begin"></j-date>
               <#if query_field_no gt 1>  </#if><span class="query-group-split-cust"></span>
               <#if query_field_no gt 1>  </#if><j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" class="query-group-cust" v-model="queryParam.${po.fieldName}_end"></j-date>
@@ -408,15 +406,14 @@ export default {
       </#if>
       </#list>
     },
-    <#if date_flag>
-    test(){
-        <#list columns as po>
-        <#if po.classType=='datetime' || po.classType=='date'>
-        console.log("111" + ${po.fieldName})
-        </#if>
-        </#list>
+    <#list columns as po>
+    <#if po.classType=='datetime' || po.classType=='date'>
+    ${po.fieldName}OnOk () {
+      this.queryParam.${po.fieldName}_begin = this.queryParam.${po.fieldName}Range[0]
+      this.queryParam.${po.fieldName}_end = this.queryParam.${po.fieldName}Range[1]
     },
     </#if>
+    </#list>
     getSuperFieldList () {
       <#include "/common/utils.ftl">
       const fieldList = []