From af8af24790cb7240da60c6752d47254d62533ffb Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 26 三月 2026 17:11:55 +0800
Subject: [PATCH] 出入库明细，导入导出，根据登录用户类型，以及搜索条件，做回显调整

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

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 eb4fb85..b50da89 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
@@ -185,7 +185,7 @@
         <Property></Property>
         <Property name="label">瑁呭嵏浠撳簱</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getData&quot;).getResult()}</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getDepotByUserType&quot;).getResult()}</Property>
           <Property name="keyProperty">id</Property>
           <Property name="valueProperty">name</Property>
         </Property>
@@ -325,7 +325,7 @@
         <Property></Property>
         <Property name="label">瑁呭嵏浠撳簱</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getData&quot;).getResult()}</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getDepotByUserType&quot;).getResult()}</Property>
           <Property name="keyProperty">id</Property>
           <Property name="valueProperty">name</Property>
         </Property>
@@ -525,7 +525,10 @@
     &quot;depotId&quot;:data.get(&quot;depotId&quot;),&#xD;
 	&quot;foodVariety&quot;:data.get(&quot;foodVariety&quot;),&#xD;
     &quot;start&quot;:data.get(&quot;start&quot;),&#xD;
-    &quot;end&quot;:data.get(&quot;end&quot;)&#xD;
+    &quot;end&quot;:data.get(&quot;end&quot;),&#xD;
+	&quot;timeDesc&quot;:data.get(&quot;timeDesc&quot;),&#xD;
+	&quot;createUser&quot;:data.get(&quot;createUser&quot;),&#xD;
+	&quot;createTime&quot;:data.get(&quot;createTime&quot;)&#xD;
 }&#xD;
 window.parent.$.table.exportExcelDorado(&quot;./export/inout-excel&quot;, &quot;鍏ュ簱鏁版嵁&quot;, param);</ClientEvent>
           <Property name="caption">瀵煎嚭EXCEL</Property>
@@ -595,7 +598,10 @@
     &quot;deptId&quot;:data.get(&quot;deptId&quot;),&#xD;
 	&quot;companyId&quot;:data.get(&quot;companyId&quot;),&#xD;
     &quot;start&quot;:data.get(&quot;start&quot;),&#xD;
-    &quot;end&quot;:data.get(&quot;end&quot;)&#xD;
+    &quot;end&quot;:data.get(&quot;end&quot;),&#xD;
+	&quot;timeDesc&quot;:data.get(&quot;timeDesc&quot;),&#xD;
+	&quot;createUser&quot;:data.get(&quot;createUser&quot;),&#xD;
+	&quot;createTime&quot;:data.get(&quot;createTime&quot;)&#xD;
 }&#xD;
 window.parent.$.table.exportExcelDorado(&quot;./export/inout-excel&quot;, &quot;鍏ュ簱鏁版嵁&quot;, param);</ClientEvent>
           <Property name="caption">瀵煎嚭EXCEL</Property>

--
Gitblit v1.9.3