From 0f0cf4da61abdae52371420474bf0ebabc917f60 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期一, 09 三月 2026 10:05:36 +0800
Subject: [PATCH] 报表，搜索时间展示修改

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReport.view.xml     |   14 ++++++--------
 fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml  |   15 ++++++++++++++-
 fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportStore.view.xml     |    7 +++++++
 fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml |    5 +++++
 4 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReport.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReport.view.xml
index fad86b9..4ef8e81 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReport.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReport.view.xml
@@ -531,6 +531,11 @@
       </PropertyDef>
     </DataType>
     <DataType name="dataTypeC">
+      <ClientEvent name="onDataChange">var prop = arg.property;&#xD;
+if(prop =='start' || prop == 'end'){&#xD;
+	var entity = arg.entity;&#xD;
+	entity.set(&quot;timeDesc&quot;,entity.get('start').formatDate(&quot;Y-m-d&quot;) +&quot;   鑷�   &quot;+entity.get('end').formatDate(&quot;Y-m-d&quot;));&#xD;
+}</ClientEvent>
       <PropertyDef name="title">
         <Property name="label"> </Property>
       </PropertyDef>
@@ -605,14 +610,7 @@
       <Property name="mode">clientSide</Property>
     </Property>
     <DataSet id="dsMain">
-      <ClientEvent name="onLoadData">var hearder = view.get(&quot;#dataSetC.data&quot;);&#xD;
-&#xD;
-if(hearder.get(&quot;start&quot;) &amp;&amp; hearder.get(&quot;end&quot;)){&#xD;
-	hearder.set(&quot;timeDesc&quot;,hearder.get('start').formatDate(&quot;Y-m-d&quot;) +&quot; 鎴嚦锛�&quot;+hearder.get('end').formatDate(&quot;Y-m-d&quot;));&#xD;
-}&#xD;
-&#xD;
-&#xD;
-//鏍规嵁鍔犺浇瀹屾垚鐨勬暟鎹繘琛岄〉闈㈣皟鏁�&#xD;
+      <ClientEvent name="onLoadData">//鏍规嵁鍔犺浇瀹屾垚鐨勬暟鎹繘琛岄〉闈㈣皟鏁�&#xD;
 var list = self.getData();&#xD;
 if(!list) return;&#xD;
 var last = list.getLast();&#xD;
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
index 44064bf..eb4fb85 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
@@ -303,6 +303,11 @@
       </PropertyDef>
     </DataType>
     <DataType name="dtQuery">
+      <ClientEvent name="onDataChange">var prop = arg.property;&#xD;
+if(prop =='start' || prop == 'end'){&#xD;
+	var entity = arg.entity;&#xD;
+	entity.set(&quot;timeDesc&quot;,entity.get('start').formatDate(&quot;Y-m-d&quot;) +&quot;   鑷�   &quot;+entity.get('end').formatDate(&quot;Y-m-d&quot;));&#xD;
+}</ClientEvent>
       <Property name="creationType">com.fzzy.igds.data.InoutParam</Property>
       <PropertyDef name="type">
         <Property name="label">鍑哄叆搴撶被鍨�</Property>
@@ -358,10 +363,12 @@
       <PropertyDef name="start">
         <Property name="label">寮�濮嬫椂闂�</Property>
         <Property name="dataType">Date</Property>
+        <Property name="displayFormat">Y-m-d</Property>
       </PropertyDef>
       <PropertyDef name="end">
         <Property name="label">鎴鏃堕棿</Property>
         <Property name="dataType">Date</Property>
+        <Property name="displayFormat">Y-m-d</Property>
       </PropertyDef>
       <PropertyDef name="unit">
         <Property></Property>
@@ -494,7 +501,13 @@
         </AutoFormElement>
         <Button>
           <ClientEvent name="onClick">	var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
-	view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,data).flushAsync();</ClientEvent>
+	var start=data.getText(&quot;start&quot;);&#xD;
+	var end=data.getText(&quot;end&quot;);&#xD;
+	var timeDesc =start +&quot;   鑷�   &quot;+end;&#xD;
+	data.set(&quot;timeDesc&quot;,timeDesc);&#xD;
+	view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,data).flushAsync();&#xD;
+	&#xD;
+</ClientEvent>
           <Property name="caption">鎼滅储</Property>
           <Property name="exClassName">btn-q1</Property>
           <Property name="iconClass">fa fa-search</Property>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
index 9e53b97..fd508e7 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
@@ -303,6 +303,11 @@
       </PropertyDef>
     </DataType>
     <DataType name="dtQuery">
+      <ClientEvent name="onDataChange">var prop = arg.property;&#xD;
+if(prop =='start' || prop == 'end'){&#xD;
+	var entity = arg.entity;&#xD;
+	entity.set(&quot;timeDesc&quot;,entity.get('start').formatDate(&quot;Y-m-d&quot;) +&quot;   鑷�   &quot;+entity.get('end').formatDate(&quot;Y-m-d&quot;));&#xD;
+}</ClientEvent>
       <Property name="creationType">com.fzzy.igds.data.InoutParam</Property>
       <PropertyDef name="type">
         <Property name="label">鍑哄叆搴撶被鍨�</Property>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportStore.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportStore.view.xml
index 54459db..f1b9147 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportStore.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportStore.view.xml
@@ -66,6 +66,11 @@
       </PropertyDef>
     </DataType>
     <DataType name="dtQuery">
+      <ClientEvent name="onDataChange">var prop = arg.property;&#xD;
+if(prop =='start' || prop == 'end'){&#xD;
+	var entity = arg.entity;&#xD;
+	entity.set(&quot;timeDesc&quot;,entity.get('start').formatDate(&quot;Y-m-d&quot;) +&quot;   鑷�   &quot;+entity.get('end').formatDate(&quot;Y-m-d&quot;));&#xD;
+}</ClientEvent>
       <Property name="creationType">com.fzzy.igds.data.SuperInventoryReportParam</Property>
       <PropertyDef name="deptId">
         <Property></Property>
@@ -88,10 +93,12 @@
       <PropertyDef name="start">
         <Property name="label">寮�濮嬫椂闂�</Property>
         <Property name="dataType">Date</Property>
+        <Property name="displayFormat">Y-m-d</Property>
       </PropertyDef>
       <PropertyDef name="end">
         <Property name="label">鎴鏃堕棿</Property>
         <Property name="dataType">Date</Property>
+        <Property name="displayFormat">Y-m-d</Property>
       </PropertyDef>
       <PropertyDef name="customerId">
         <Property></Property>

--
Gitblit v1.9.3