From cb248506e5944f49fef18c6e973fbd650b45dc03 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期三, 24 十二月 2025 17:35:19 +0800
Subject: [PATCH] 入库报表列宽调整，映射调整，查询调整，导出实现

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml |   77 +++++++++++++++++++++++++++-----------
 1 files changed, 55 insertions(+), 22 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 e4c9085..f224179 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
@@ -12,7 +12,12 @@
       </PropertyDef>
       <PropertyDef name="companyId">
         <Property></Property>
-        <Property name="label">缁勭粐缂栫爜</Property>
+        <Property name="label">鏀跺偍鍏徃</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;companyPR#getData&quot;).getResult()}</Property>
+          <Property name="keyProperty">id</Property>
+          <Property name="valueProperty">dwmc</Property>
+        </Property>
       </PropertyDef>
       <PropertyDef name="progress">
         <Property></Property>
@@ -180,7 +185,7 @@
         <Property></Property>
         <Property name="label">瑁呭嵏浠撳簱</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getData&quot;).getResult()}</Property>
           <Property name="keyProperty">id</Property>
           <Property name="valueProperty">name</Property>
         </Property>
@@ -315,7 +320,7 @@
         <Property></Property>
         <Property name="label">瑁呭嵏浠撳簱</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getData&quot;).getResult()}</Property>
           <Property name="keyProperty">id</Property>
           <Property name="valueProperty">name</Property>
         </Property>
@@ -358,15 +363,6 @@
         <Property name="label">鎴鏃堕棿</Property>
         <Property name="dataType">Date</Property>
       </PropertyDef>
-      <PropertyDef name="customerName">
-        <Property></Property>
-        <Property name="label">鍗曚綅</Property>
-        <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;companyPR#getData&quot;).getResult()}</Property>
-          <Property name="keyProperty">id</Property>
-          <Property name="valueProperty">dwmc</Property>
-        </Property>
-      </PropertyDef>
       <PropertyDef name="unit">
         <Property></Property>
         <Property name="label">鍗曚綅</Property>
@@ -380,6 +376,15 @@
       </PropertyDef>
       <PropertyDef name="none">
         <Property></Property>
+      </PropertyDef>
+      <PropertyDef name="companyId">
+        <Property></Property>
+        <Property name="label">鏀跺偍鍏徃</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;companyPR#getData&quot;).getResult()}</Property>
+          <Property name="keyProperty">id</Property>
+          <Property name="valueProperty">dwmc</Property>
+        </Property>
       </PropertyDef>
     </DataType>
   </Model>
@@ -471,6 +476,14 @@
           <Property name="caption">閲嶇疆</Property>
         </Button>
         <Button layoutConstraint="left">
+          <ClientEvent name="onClick">var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
+var param = {&#xD;
+    &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;
+}&#xD;
+window.parent.$.table.exportExcelDorado(&quot;./export/inReport-excel&quot;, &quot;鍏ュ簱鏁版嵁&quot;, param);</ClientEvent>
           <Property name="caption">瀵煎嚭EXCEL</Property>
           <Property name="exClassName">btn-q2</Property>
           <Property name="width">140</Property>
@@ -487,8 +500,8 @@
         <Property name="visible">false</Property>
         <Property name="hideMode">display</Property>
         <AutoFormElement>
-          <Property name="name">customerName</Property>
-          <Property name="property">customerName</Property>
+          <Property name="name">companyId</Property>
+          <Property name="property">companyId</Property>
           <Property name="label">鏀跺偍鍏徃</Property>
           <Editor/>
         </AutoFormElement>
@@ -523,6 +536,14 @@
           <Property name="caption">閲嶇疆</Property>
         </Button>
         <Button layoutConstraint="left">
+          <ClientEvent name="onClick">var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
+var param = {&#xD;
+    &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;
+}&#xD;
+window.parent.$.table.exportExcelDorado(&quot;./export/inReport-excel&quot;, &quot;鍏ュ簱鏁版嵁&quot;, param);</ClientEvent>
           <Property name="caption">瀵煎嚭EXCEL</Property>
           <Property name="exClassName">btn-q2</Property>
           <Property name="width">140</Property>
@@ -606,59 +627,67 @@
         <RowNumColumn/>
         <DataColumn name="id">
           <Property name="property">id</Property>
-          <Property name="width">130</Property>
+          <Property name="width">150</Property>
           <Property name="align">center</Property>
         </DataColumn>
         <DataColumn name="plateNum">
           <Property name="property">plateNum</Property>
           <Property name="align">center</Property>
+          <Property name="width">120</Property>
         </DataColumn>
         <DataColumn name="depotId">
           <Property name="property">depotId</Property>
           <Property name="caption">浠撳簱</Property>
-          <Property name="width">80</Property>
           <Property name="align">center</Property>
         </DataColumn>
         <DataColumn>
           <Property name="name">foodVariety</Property>
           <Property name="property">foodVariety</Property>
           <Property name="align">center</Property>
+          <Property name="width">100</Property>
         </DataColumn>
         <DataColumn name="fullWeight">
           <Property name="property">fullWeight</Property>
           <Property name="caption">姣涢噸</Property>
           <Property name="align">center</Property>
+          <Property name="width">100</Property>
         </DataColumn>
         <DataColumn name="emptyWeight">
           <Property name="property">emptyWeight</Property>
           <Property name="caption">鐨噸</Property>
           <Property name="align">center</Property>
+          <Property name="width">100</Property>
         </DataColumn>
         <DataColumn name="netWeight">
           <Property name="property">netWeight</Property>
           <Property name="align">center</Property>
+          <Property name="width">100</Property>
         </DataColumn>
         <DataColumn>
           <Property name="name">deOther</Property>
           <Property name="property">deOther</Property>
           <Property name="align">center</Property>
+          <Property name="width">100</Property>
         </DataColumn>
         <DataColumn name="settleWeight">
           <Property name="property">settleWeight</Property>
           <Property name="caption">缁撶畻閲嶉噺</Property>
           <Property name="align">center</Property>
+          <Property name="width">100</Property>
         </DataColumn>
         <DataColumn>
           <Property name="property">recordWeight</Property>
           <Property name="align">center</Property>
           <Property name="name">recordWeight</Property>
           <Property name="caption">鍏ュ簱閲嶉噺</Property>
+          <Property name="width">100</Property>
         </DataColumn>
         <DataColumn>
           <Property name="property">completeTime</Property>
           <Property name="align">center</Property>
           <Property name="name">completeTime</Property>
           <Property name="caption">绂诲簱鏃堕棿</Property>
+          <Property name="width">150</Property>
         </DataColumn>
       </DataGrid>
       <DataGrid id="dataGridMain2" layoutConstraint="padding:8">
@@ -678,55 +707,59 @@
           <Property name="caption">搴忓彿</Property>
         </RowNumColumn>
         <DataColumn>
-          <Property name="property">customerName</Property>
+          <Property name="property">companyId</Property>
           <Property name="caption">鏀跺偍鍏徃</Property>
-          <Property name="width">80</Property>
           <Property name="align">center</Property>
-          <Property name="name">customerName</Property>
+          <Property name="name">companyId</Property>
         </DataColumn>
         <DataColumn>
           <Property name="property">deptId</Property>
           <Property name="caption">搴撳尯鍚嶇О</Property>
-          <Property name="width">80</Property>
+          <Property name="width">250</Property>
           <Property name="align">center</Property>
           <Property name="name">deptId</Property>
         </DataColumn>
         <DataColumn name="id">
           <Property name="property">id</Property>
-          <Property name="width">130</Property>
+          <Property name="width">150</Property>
           <Property name="align">center</Property>
         </DataColumn>
         <DataColumn name="plateNum">
           <Property name="property">plateNum</Property>
           <Property name="align">center</Property>
+          <Property name="width">120</Property>
         </DataColumn>
         <DataColumn name="depotId">
           <Property name="property">depotId</Property>
           <Property name="caption">浠撳簱</Property>
-          <Property name="width">80</Property>
+          <Property name="width">120</Property>
           <Property name="align">center</Property>
         </DataColumn>
         <DataColumn>
           <Property name="name">foodVariety</Property>
           <Property name="property">foodVariety</Property>
           <Property name="align">center</Property>
+          <Property name="width">100</Property>
         </DataColumn>
         <DataColumn name="settleWeight">
           <Property name="property">settleWeight</Property>
           <Property name="caption">缁撶畻閲嶉噺</Property>
           <Property name="align">center</Property>
+          <Property name="width">100</Property>
         </DataColumn>
         <DataColumn>
           <Property name="property">recordWeight</Property>
           <Property name="align">center</Property>
           <Property name="name">recordWeight</Property>
           <Property name="caption">鍏ュ簱閲嶉噺</Property>
+          <Property name="width">100</Property>
         </DataColumn>
         <DataColumn>
           <Property name="property">completeTime</Property>
           <Property name="align">center</Property>
           <Property name="name">completeTime</Property>
           <Property name="caption">绂诲簱鏃堕棿</Property>
+          <Property name="width">150</Property>
         </DataColumn>
         <DataColumn>
           <ClientEvent name="onRenderCell">//arg.dom.innerHTML = &quot;&lt;a href='javascript:;' onClick='detail()' class='a-btn1'>鏌ョ湅璇︽儏&lt;/a>&quot;;</ClientEvent>

--
Gitblit v1.9.3