From 5ffc5c22b0833d8f569e99eb775d08ca28676c7d Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 19 一月 2026 14:37:16 +0800
Subject: [PATCH] 细节调整2

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReport.view.xml |   94 +++++++++++++++++++++++++++++++++++++---------
 1 files changed, 75 insertions(+), 19 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReport.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReport.view.xml
index 7e7a9cc..91a8f2b 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReport.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReport.view.xml
@@ -5,7 +5,7 @@
   <Model>
     <DataType name="dtMain">
       <Property name="creationType">com.fzzy.igds.data.SuperInventoryReportData</Property>
-      <PropertyDef name="customerName">
+      <PropertyDef name="customerId">
         <Property name="label">鏀跺偍鍏徃</Property>
         <Property name="mapping">
           <Property name="mapValues">${dorado.getDataProvider(&quot;companyPR#getData&quot;).getResult()}</Property>
@@ -24,7 +24,7 @@
       <PropertyDef name="depotId">
         <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>
@@ -80,7 +80,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>
@@ -93,7 +93,7 @@
         <Property name="label">鎴鏃堕棿</Property>
         <Property name="dataType">Date</Property>
       </PropertyDef>
-      <PropertyDef name="customerName">
+      <PropertyDef name="customerId">
         <Property></Property>
         <Property name="label">鏀跺偍鍏徃</Property>
         <Property name="mapping">
@@ -104,7 +104,7 @@
       </PropertyDef>
       <PropertyDef name="timeDesc">
         <Property></Property>
-        <Property name="label">鏃堕棿</Property>
+        <Property name="label">鏌ヨ鏃堕棿</Property>
       </PropertyDef>
       <PropertyDef name="title">
         <Property></Property>
@@ -113,7 +113,8 @@
         <Property name="label">鍒涘缓浜�</Property>
       </PropertyDef>
       <PropertyDef name="createTime">
-        <Property name="label">鍒涘缓鏃堕棿</Property>
+        <Property name="dataType">DateTime</Property>
+        <Property name="label">鍒惰〃鏃堕棿</Property>
       </PropertyDef>
     </DataType>
   </Model>
@@ -143,22 +144,29 @@
       <Property name="loadMode">manual</Property>
       <Property name="dataProvider">superInventoryReportPR#getQuery</Property>
     </DataSet>
+    <DataSet id="dsDeptList">
+      <Property name="dataProvider">deptPR#getDeptByUserType</Property>
+      <Property name="userData">搴撳尯鍒楄〃涓嬫媺妗�</Property>
+      <Property name="loadMode">manual</Property>
+      <Property name="dataType">[dtDept]</Property>
+    </DataSet>
     <Container>
       <Property name="className">c-param</Property>
       <AutoForm>
-        <Property name="cols">*,*,*,*,90,90,140</Property>
+        <Property name="cols">*,*,280,280,90,90,140</Property>
         <Property name="dataSet">dsQuery</Property>
         <Property name="labelSeparator">锛�</Property>
         <Property name="labelAlign">right</Property>
         <Property name="labelWidth">110</Property>
         <Property name="exClassName">bg-color</Property>
         <AutoFormElement>
-          <Property name="property">customerName</Property>
-          <Property name="name">customerName</Property>
+          <Property name="property">customerId</Property>
+          <Property name="name">customerId</Property>
         </AutoFormElement>
         <AutoFormElement>
           <Property name="name">deptId</Property>
           <Property name="property">deptId</Property>
+          <Property name="trigger">dsDeptDropDown</Property>
           <Editor/>
         </AutoFormElement>
         <AutoFormElement>
@@ -185,6 +193,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;customerId&quot;:data.get(&quot;customerId&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/superInventoryReport-excel&quot;, &quot;搴撳瓨鏁版嵁&quot;, param);</ClientEvent>
           <Property name="caption">瀵煎嚭EXCEL</Property>
           <Property name="exClassName">btn-q2</Property>
           <Property name="width">140</Property>
@@ -195,12 +211,12 @@
     <Container>
       <Property name="className">c-data</Property>
       <AutoForm id="autoForm1" layoutConstraint="top">
-        <Property name="cols">*,*,*,*</Property>
+        <Property name="cols">*,*,300</Property>
         <Property name="dataSet">dsQuery</Property>
         <Property name="labelAlign">right</Property>
         <Property name="showHint">false</Property>
         <Property name="labelWidth">120</Property>
-        <AutoFormElement layoutConstraint="colSpan:4">
+        <AutoFormElement layoutConstraint="colSpan:3">
           <Property name="name">title</Property>
           <Property name="property">title</Property>
           <Property name="showLabel">false</Property>
@@ -215,12 +231,6 @@
           <Property name="name">timeDesc</Property>
           <Property name="property">timeDesc</Property>
           <Property name="editorType">Label</Property>
-          <Editor/>
-        </AutoFormElement>
-        <AutoFormElement>
-          <Property name="visible">false</Property>
-          <Property name="name">depotId</Property>
-          <Property name="property">depotId</Property>
           <Editor/>
         </AutoFormElement>
         <AutoFormElement>
@@ -244,35 +254,56 @@
         <Property name="headerRowHeight">30</Property>
         <Property name="rowHeight">50</Property>
         <RowNumColumn/>
-        <DataColumn name="customerName">
-          <Property name="property">customerName</Property>
+        <DataColumn>
+          <Property name="property">customerId</Property>
+          <Property name="width">326</Property>
+          <Property name="name">customerId</Property>
+          <Property name="align">center</Property>
         </DataColumn>
         <DataColumn name="deptId">
           <Property name="property">deptId</Property>
+          <Property name="width">250</Property>
+          <Property name="align">center</Property>
         </DataColumn>
         <DataColumn name="depotId">
           <Property name="property">depotId</Property>
+          <Property name="width">326</Property>
+          <Property name="align">center</Property>
         </DataColumn>
         <DataColumn name="initialWeight">
           <Property name="property">initialWeight</Property>
+          <Property name="width">100</Property>
+          <Property name="align">center</Property>
         </DataColumn>
         <DataColumn name="recordInWeight">
           <Property name="property">recordInWeight</Property>
+          <Property name="width">100</Property>
+          <Property name="align">center</Property>
         </DataColumn>
         <DataColumn name="changeInWeight">
           <Property name="property">changeInWeight</Property>
+          <Property name="width">100</Property>
+          <Property name="align">center</Property>
         </DataColumn>
         <DataColumn name="recordOutWeight">
           <Property name="property">recordOutWeight</Property>
+          <Property name="width">100</Property>
+          <Property name="align">center</Property>
         </DataColumn>
         <DataColumn name="changeOutWeight">
           <Property name="property">changeOutWeight</Property>
+          <Property name="width">100</Property>
+          <Property name="align">center</Property>
         </DataColumn>
         <DataColumn name="lossWeight">
           <Property name="property">lossWeight</Property>
+          <Property name="width">100</Property>
+          <Property name="align">center</Property>
         </DataColumn>
         <DataColumn name="finalWeight">
           <Property name="property">finalWeight</Property>
+          <Property name="width">100</Property>
+          <Property name="align">center</Property>
         </DataColumn>
       </DataGrid>
       <ToolBar id="tool" layoutConstraint="bottom">
@@ -283,5 +314,30 @@
         </DataPilot>
       </ToolBar>
     </Container>
+    <DataSetDropDown id="dsDeptDropDown">
+      <ClientEvent name="onOpen">&#xD;
+var entity = view.get(&quot;#dsQuery.data&quot;);&#xD;
+if(!entity){&#xD;
+    $alert(&quot;璇峰厛閫夋嫨鎵�灞炲叕鍙�&quot;);&#xD;
+}else{&#xD;
+    var deptId = entity.get(&quot;customerId&quot;);&#xD;
+    if(!deptId){&#xD;
+        $alert(&quot;璇峰厛閫夋嫨鎵�灞炲叕鍙�&quot;);&#xD;
+    }else{&#xD;
+        view.get(&quot;#dsDeptList&quot;).set(&quot;parameter&quot;,entity.get(&quot;customerId&quot;)).flushAsync();&#xD;
+    }&#xD;
+}</ClientEvent>
+      <Property name="dataSet">dsDeptList</Property>
+      <Property name="height">450</Property>
+      <Property name="autoOpen">true</Property>
+      <Property name="assignmentMap">deptId=id</Property>
+      <Property name="width">400</Property>
+      <DataColumn>
+        <Property name="align">center</Property>
+        <Property name="name">kqmc</Property>
+        <Property name="property">kqmc</Property>
+        <Editor/>
+      </DataColumn>
+    </DataSetDropDown>
   </View>
 </ViewConfig>

--
Gitblit v1.9.3