From 68fae8cc33d80553355997554b06f5ac1395ef2c Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 25 十二月 2025 11:39:37 +0800
Subject: [PATCH] 出库报表列宽调整,映射调整,查询调整,导出实现

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml |  245 +++++++++++++++++++++++++++++-------------------
 1 files changed, 146 insertions(+), 99 deletions(-)

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 dd06251..584341d 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
@@ -13,6 +13,11 @@
       <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>
       <PropertyDef name="progress">
         <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>
@@ -381,9 +377,18 @@
       <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>
-  <View layout="padding:5;regionPadding:5">
+  <View layout="padding:10">
     <ClientEvent name="onReady">//var TYPE = &quot;INOUT_DETAIL&quot;;&#xD;
 //椤甸潰灞曠ず绫诲瀷锛�1 姝e父鎶ヨ〃椤甸潰锛�2 鐩戠灞曠ず椤甸潰&#xD;
 var ViewType = &quot;${request.getParameter('viewType')}&quot;;&#xD;
@@ -391,12 +396,13 @@
 if(ViewType==1){&#xD;
  view.get(&quot;#form1&quot;).set(&quot;visible&quot;,true);&#xD;
  view.get(&quot;#dataGridMain1&quot;).set(&quot;visible&quot;,true);&#xD;
+  view.get(&quot;#tool&quot;).set(&quot;visible&quot;,true);&#xD;
 }&#xD;
 &#xD;
 if(ViewType==2){&#xD;
  view.get(&quot;#form2&quot;).set(&quot;visible&quot;,true);&#xD;
  view.get(&quot;#dataGridMain2&quot;).set(&quot;visible&quot;,true);&#xD;
-&#xD;
+  view.get(&quot;#tool&quot;).set(&quot;visible&quot;,true);&#xD;
 }&#xD;
 &#xD;
 var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�&#xD;
@@ -424,118 +430,134 @@
       <Property></Property>
       <Property name="loadMode">manual</Property>
     </DataSet>
-    <AutoForm id="form1" layoutConstraint="top">
-      <Property name="cols">*,*,*,*</Property>
-      <Property name="dataSet">dsQuery</Property>
-      <Property name="exClassName">bg-color</Property>
-      <Property name="labelWidth">100</Property>
-      <Property name="labelAlign">right</Property>
-      <Property name="hideMode">display</Property>
-      <Property name="visible">false</Property>
-      <AutoFormElement>
-        <Property name="name">depotId</Property>
-        <Property name="property">depotId</Property>
-        <Editor/>
-      </AutoFormElement>
-      <AutoFormElement>
-        <Property name="name">foodVariety</Property>
-        <Property name="property">foodVariety</Property>
-        <Editor/>
-      </AutoFormElement>
-      <AutoFormElement>
-        <Property name="name">start</Property>
-        <Property name="property">start</Property>
-        <Editor/>
-      </AutoFormElement>
-      <AutoFormElement>
-        <Property name="name">end</Property>
-        <Property name="property">end</Property>
-        <Editor/>
-      </AutoFormElement>
-      <Container layout="hbox regionPadding:15">
+    <Container>
+      <Property name="className">c-param</Property>
+      <AutoForm id="form1" layoutConstraint="top">
+        <Property name="cols">*,*,*,*,90,90,140</Property>
+        <Property name="dataSet">dsQuery</Property>
+        <Property name="exClassName">bg-color</Property>
+        <Property name="labelWidth">110</Property>
+        <Property name="labelAlign">right</Property>
+        <Property name="hideMode">display</Property>
+        <Property name="visible">false</Property>
+        <AutoFormElement>
+          <Property name="name">depotId</Property>
+          <Property name="property">depotId</Property>
+          <Editor/>
+        </AutoFormElement>
+        <AutoFormElement>
+          <Property name="name">foodVariety</Property>
+          <Property name="property">foodVariety</Property>
+          <Editor/>
+        </AutoFormElement>
+        <AutoFormElement>
+          <Property name="name">start</Property>
+          <Property name="property">start</Property>
+          <Editor/>
+        </AutoFormElement>
+        <AutoFormElement>
+          <Property name="name">end</Property>
+          <Property name="property">end</Property>
+          <Editor/>
+        </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>
-          <Property name="caption">鏌ヨ</Property>
-          <Property name="exClassName">btn1</Property>
+          <Property name="caption">鎼滅储</Property>
+          <Property name="exClassName">btn-q1</Property>
           <Property name="iconClass">fa fa-search</Property>
         </Button>
         <Button>
           <ClientEvent name="onClick">view.get(&quot;#dsQuery&quot;).flushAsync();</ClientEvent>
-          <Property name="exClassName">btn2</Property>
+          <Property name="exClassName">btn-q2</Property>
           <Property name="iconClass">fa fa-refresh</Property>
           <Property name="caption">閲嶇疆</Property>
         </Button>
         <Button layoutConstraint="left">
+          <ClientEvent name="onClick">var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
+var param = {&#xD;
+	&quot;type&quot;:&quot;OUT&quot;,&#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/inOutReport-excel&quot;, &quot;鍑哄簱鏁版嵁&quot;, param);</ClientEvent>
           <Property name="caption">瀵煎嚭EXCEL</Property>
-          <Property name="exClassName">btn4</Property>
+          <Property name="exClassName">btn-q2</Property>
+          <Property name="width">140</Property>
           <Property name="iconClass">fa fa-file-excel-o</Property>
-          <Property name="menu">menuExport</Property>
-          <Property name="action">exportExcel</Property>
         </Button>
-      </Container>
-    </AutoForm>
-    <AutoForm id="form2" layoutConstraint="top">
-      <Property name="cols">*,*,*,*</Property>
-      <Property name="dataSet">dsQuery</Property>
-      <Property name="exClassName">bg-color</Property>
-      <Property name="labelWidth">100</Property>
-      <Property name="labelAlign">right</Property>
-      <Property name="hideMode">display</Property>
-      <Property name="visible">false</Property>
-      <AutoFormElement>
-        <Property name="name">customerName</Property>
-        <Property name="property">customerName</Property>
-        <Property name="label">鏀跺偍鍏徃</Property>
-        <Editor/>
-      </AutoFormElement>
-      <AutoFormElement>
-        <Property name="name">deptId</Property>
-        <Property name="property">deptId</Property>
-        <Property name="label">鎵�灞炲簱鍖�</Property>
-        <Property name="hideMode">visibility</Property>
-        <Editor/>
-      </AutoFormElement>
-      <AutoFormElement>
-        <Property name="name">start</Property>
-        <Property name="property">start</Property>
-        <Editor/>
-      </AutoFormElement>
-      <AutoFormElement>
-        <Property name="name">end</Property>
-        <Property name="property">end</Property>
-        <Editor/>
-      </AutoFormElement>
-      <Container layout="hbox regionPadding:15">
+      </AutoForm>
+      <AutoForm id="form2" layoutConstraint="top">
+        <Property name="cols">*,*,*,*,90,90,140</Property>
+        <Property name="dataSet">dsQuery</Property>
+        <Property name="exClassName">bg-color</Property>
+        <Property name="labelWidth">110</Property>
+        <Property name="labelAlign">right</Property>
+        <Property name="hideMode">display</Property>
+        <Property name="visible">false</Property>
+        <AutoFormElement>
+          <Property name="name">companyId</Property>
+          <Property name="property">companyId</Property>
+          <Property name="label">鏀跺偍鍏徃</Property>
+          <Editor/>
+        </AutoFormElement>
+        <AutoFormElement>
+          <Property name="name">deptId</Property>
+          <Property name="property">deptId</Property>
+          <Property name="label">鎵�灞炲簱鍖�</Property>
+          <Property name="hideMode">visibility</Property>
+          <Editor/>
+        </AutoFormElement>
+        <AutoFormElement>
+          <Property name="name">start</Property>
+          <Property name="property">start</Property>
+          <Editor/>
+        </AutoFormElement>
+        <AutoFormElement>
+          <Property name="name">end</Property>
+          <Property name="property">end</Property>
+          <Editor/>
+        </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>
-          <Property name="caption">鏌ヨ</Property>
-          <Property name="exClassName">btn1</Property>
+          <Property name="caption">鎼滅储</Property>
+          <Property name="exClassName">btn-q1</Property>
           <Property name="iconClass">fa fa-search</Property>
         </Button>
         <Button>
           <ClientEvent name="onClick">view.get(&quot;#dsQuery&quot;).flushAsync();</ClientEvent>
-          <Property name="exClassName">btn2</Property>
+          <Property name="exClassName">btn-q2</Property>
           <Property name="iconClass">fa fa-refresh</Property>
           <Property name="caption">閲嶇疆</Property>
         </Button>
         <Button layoutConstraint="left">
+          <ClientEvent name="onClick">var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
+var param = {&#xD;
+	&quot;type&quot;:&quot;OUT&quot;,&#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/inOutReport-excel&quot;, &quot;鍑哄簱鏁版嵁&quot;, param);</ClientEvent>
           <Property name="caption">瀵煎嚭EXCEL</Property>
-          <Property name="exClassName">btn4</Property>
+          <Property name="exClassName">btn-q2</Property>
+          <Property name="width">140</Property>
           <Property name="iconClass">fa fa-file-excel-o</Property>
-          <Property name="menu">menuExport</Property>
-          <Property name="action">exportExcel</Property>
         </Button>
-      </Container>
-    </AutoForm>
+      </AutoForm>
+    </Container>
     <Container layoutConstraint="center">
-      <Property name="exClassName">bg-color</Property>
+      <Property name="className">c-data</Property>
       <AutoForm id="autoForm1" layoutConstraint="top">
         <Property name="cols">*,*,*,*,*,*,*</Property>
         <Property name="dataSet">dsQuery</Property>
         <Property name="labelAlign">right</Property>
         <Property name="showHint">false</Property>
+        <Property name="labelWidth">120</Property>
         <AutoFormElement layoutConstraint="colSpan:7">
           <Property name="name">title</Property>
           <Property name="property">title</Property>
@@ -588,7 +610,7 @@
           <Editor/>
         </AutoFormElement>
       </AutoForm>
-      <DataGrid id="dataGridMain1" layoutConstraint="center">
+      <DataGrid id="dataGridMain1" layoutConstraint="padding:8">
         <ClientEvent name="onRenderRow">if(arg.data.get('id') == '鍚堣'){&#xD;
 	//arg.dom.style.background = &quot;#fcc5c5&quot;;&#xD;
 	arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
@@ -599,65 +621,75 @@
         <Property name="highlightCurrentRow">false</Property>
         <Property name="hideMode">display</Property>
         <Property name="visible">true</Property>
+        <Property name="headerRowHeight">30</Property>
+        <Property name="rowHeight">50</Property>
         <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="center">
+      <DataGrid id="dataGridMain2" layoutConstraint="padding:8">
         <ClientEvent name="onRenderRow">if(arg.data.get('id') == '鍚堣'){&#xD;
 	//arg.dom.style.background = &quot;#fcc5c5&quot;;&#xD;
 	arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
@@ -668,59 +700,65 @@
         <Property name="highlightCurrentRow">false</Property>
         <Property name="visible">false</Property>
         <Property name="hideMode">display</Property>
+        <Property name="headerRowHeight">30</Property>
+        <Property name="rowHeight">50</Property>
         <RowNumColumn>
           <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>
@@ -731,6 +769,15 @@
           <Editor/>
         </DataColumn>
       </DataGrid>
+      <ToolBar id="tool" layoutConstraint="bottom">
+        <Property name="hideMode">display</Property>
+        <Property name="visible">false</Property>
+        <Fill/>
+        <DataPilot layoutConstraint="right">
+          <Property name="itemCodes">pageSize,pages</Property>
+          <Property name="dataSet">dsMain</Property>
+        </DataPilot>
+      </ToolBar>
     </Container>
   </View>
 </ViewConfig>

--
Gitblit v1.9.3