From 25c18d63f3310b5d762b88c750b8007045c2a44d Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 12 三月 2026 10:34:14 +0800
Subject: [PATCH] 出入库配置查询，显示调整

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReport.view.xml |  170 +++++++++++++++++++++++++-------------------------------
 1 files changed, 75 insertions(+), 95 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 4338d2d..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
@@ -17,7 +17,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>
@@ -531,25 +531,48 @@
       </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>
+      <PropertyDef name="companyId">
+        <Property></Property>
+        <Property name="label">鏀跺偍鍏徃</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;companyPR#getCompanyByUserType&quot;).getResult()}</Property>
+          <Property name="keyProperty">id</Property>
+          <Property name="valueProperty">dwmc</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="deptId">
+        <Property></Property>
+        <Property name="label">鎵�灞炲簱鍖�</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getDeptByUserType&quot;).getResult()}</Property>
+          <Property name="keyProperty">id</Property>
+          <Property name="valueProperty">kqmc</Property>
+        </Property>
+      </PropertyDef>
       <PropertyDef name="depotId">
         <Property></Property>
-        <Property name="label">閫夋嫨浠撳簱锛�</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>
       </PropertyDef>
       <PropertyDef name="start">
         <Property name="dataType">Date</Property>
-        <Property name="label">妫�娴嬫棩鏈�</Property>
+        <Property name="label">寮�濮嬫椂闂�</Property>
       </PropertyDef>
       <PropertyDef name="end">
         <Property name="dataType">Date</Property>
-        <Property name="label">妫�娴嬫椂闂存埅鑷�</Property>
+        <Property name="label">鎴鏃堕棿</Property>
       </PropertyDef>
       <PropertyDef name="createUser">
         <Property name="label">鍒惰〃浜�</Property>
@@ -561,6 +584,7 @@
         <Property name="label">璇存槑锛�</Property>
       </PropertyDef>
       <PropertyDef name="createTime">
+        <Property name="dataType">DateTime</Property>
         <Property name="label">鍒惰〃鏃堕棿</Property>
       </PropertyDef>
       <PropertyDef name="timeDescLabel"/>
@@ -586,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;
@@ -617,14 +634,31 @@
       <Property name="dataType">dataTypeC</Property>
       <Property name="dataProvider">grainReportPR#getQuery</Property>
     </DataSet>
+    <DataSet id="dsDepotList">
+      <Property name="dataProvider">depotPR#getData</Property>
+      <Property name="userData">浠撳簱涓嬫媺鍒楄〃</Property>
+      <Property name="loadMode">manual</Property>
+      <Property name="dataType">[dtDepot]</Property>
+    </DataSet>
     <Container>
       <Property name="className">c-param</Property>
       <AutoForm>
-        <Property name="cols">*,*,*,90,90</Property>
+        <Property name="cols">*,*,280,280,90,90</Property>
         <Property name="dataSet">dataSetC</Property>
         <Property name="labelSeparator">锛�</Property>
         <Property name="labelAlign">right</Property>
         <Property name="labelWidth">110</Property>
+        <AutoFormElement>
+          <Property name="name">deptId</Property>
+          <Property name="property">deptId</Property>
+          <Editor/>
+        </AutoFormElement>
+        <AutoFormElement>
+          <Property name="name">depotId</Property>
+          <Property name="property">depotId</Property>
+          <Property name="trigger">dsDepotDropDown</Property>
+          <Editor/>
+        </AutoFormElement>
         <AutoFormElement>
           <Property name="name">start</Property>
           <Property name="property">start</Property>
@@ -633,12 +667,6 @@
         <AutoFormElement>
           <Property name="name">end</Property>
           <Property name="property">end</Property>
-          <Editor/>
-        </AutoFormElement>
-        <AutoFormElement>
-          <Property name="name">names</Property>
-          <Property name="property">names</Property>
-          <Property name="trigger">CDDDept</Property>
           <Editor/>
         </AutoFormElement>
         <Button>
@@ -660,12 +688,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">dataSetC</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>
@@ -680,15 +708,6 @@
           <Property name="name">timeDesc</Property>
           <Property name="property">timeDesc</Property>
           <Property name="editorType">Label</Property>
-          <Editor/>
-        </AutoFormElement>
-        <AutoFormElement>
-          <Property name="name">depotName</Property>
-          <Property name="property">depotName</Property>
-          <Property name="editorType">Label</Property>
-          <Property name="labelAlign">right</Property>
-          <Property name="labelWidth">80</Property>
-          <Property name="showLabel">false</Property>
           <Editor/>
         </AutoFormElement>
         <AutoFormElement>
@@ -1266,69 +1285,30 @@
     <ListDropDown id="listHour">
       <Property name="items">6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22</Property>
     </ListDropDown>
-    <CustomDropDown id="CDDDept">
-      <Property name="minWidth">400</Property>
-      <Property name="minHeight">600</Property>
-      <Property name="assignmentMap">ids=ids,names=names</Property>
-      <Panel>
-        <Property name="showCaptionBar">false</Property>
-        <Buttons>
-          <Button>
-            <ClientEvent name="onClick">var selection = view.get(&quot;#dgDepotSelect&quot;).get(&quot;selection&quot;);&#xD;
-if(!selection || selection.length == 0){&#xD;
-	$alert(&quot;璇烽�夋嫨浠撳簱&quot;);&#xD;
-	return;&#xD;
-}&#xD;
-&#xD;
-var ids = &quot;&quot;,names=&quot;&quot;;&#xD;
-selection.each(function(item){&#xD;
-	ids += item.get(&quot;id&quot;)+&quot;,&quot;;&#xD;
-	names+=item.get(&quot;name&quot;)+&quot;,&quot;;&#xD;
-});&#xD;
-&#xD;
-view.get(&quot;#CDDDept&quot;).close({ids:ids,names:names});</ClientEvent>
-            <Property name="caption">纭閫夋嫨</Property>
-            <Property name="iconClass">fa fa-check-circle</Property>
-            <Property name="exClassName">btn1</Property>
-            <Property name="width">120</Property>
-          </Button>
-          <Button>
-            <ClientEvent name="onClick">view.get(&quot;#CDDDept&quot;).close({});&#xD;
-view.get(&quot;#dgDepotSelect&quot;).set(&quot;selection&quot;,null);</ClientEvent>
-            <Property name="caption">鍙栨秷鎿嶄綔</Property>
-            <Property name="exClassName">btn3</Property>
-            <Property name="iconClass">fa fa-times-circle</Property>
-            <Property name="width">120</Property>
-          </Button>
-        </Buttons>
-        <Children>
-          <DataSet id="dsDeptSelect">
-            <Property name="dataType">[dtDepot]</Property>
-            <Property name="dataProvider">depotPR#getAllCache</Property>
-          </DataSet>
-          <DataGrid id="dgDepotSelect">
-            <Property name="dataSet">dsDeptSelect</Property>
-            <Property name="selectionMode">multiRows</Property>
-            <RowSelectorColumn>
-              <Property name="caption">閫夋嫨</Property>
-              <Property name="width">50</Property>
-            </RowSelectorColumn>
-            <DataColumn name="name">
-              <Property name="property">name</Property>
-              <Property name="readOnly">true</Property>
-            </DataColumn>
-            <DataColumn name="id">
-              <Property name="property">id</Property>
-              <Property name="readOnly">true</Property>
-            </DataColumn>
-            <DataColumn name="depotType">
-              <Property name="property">depotType</Property>
-              <Property name="readOnly">true</Property>
-            </DataColumn>
-          </DataGrid>
-        </Children>
-        <Tools/>
-      </Panel>
-    </CustomDropDown>
+    <DataSetDropDown id="dsDepotDropDown">
+      <ClientEvent name="onOpen">&#xD;
+        var entity = view.get(&quot;#dataSetC.data:#&quot;);&#xD;
+        if(!entity){&#xD;
+        $alert(&quot;璇峰厛閫夋嫨鎵�灞炲簱鍖�&quot;);&#xD;
+        }else{&#xD;
+        var deptId = entity.get(&quot;deptId&quot;);&#xD;
+        if(!deptId){&#xD;
+        $alert(&quot;璇峰厛閫夋嫨鎵�灞炲簱鍖�&quot;);&#xD;
+        }else{&#xD;
+        view.get(&quot;#dsDepotList&quot;).set(&quot;parameter&quot;,entity.get(&quot;deptId&quot;)).flushAsync();&#xD;
+        }
+        }</ClientEvent>
+      <Property name="dataSet">dsDepotList</Property>
+      <Property name="height">450</Property>
+      <Property name="autoOpen">true</Property>
+      <Property name="assignmentMap">depotId=id</Property>
+      <Property name="width">400</Property>
+      <DataColumn>
+        <Property name="align">center</Property>
+        <Property name="name">name</Property>
+        <Property name="property">name</Property>
+        <Editor/>
+      </DataColumn>
+    </DataSetDropDown>
   </View>
 </ViewConfig>

--
Gitblit v1.9.3