From d491a7503e9b33f26afa39834d8c456a673607bb Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 18 十二月 2025 17:43:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReport.view.xml |   38 ++++++++++++++++++++++++++++++--------
 1 files changed, 30 insertions(+), 8 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..afd6d0e 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
@@ -534,6 +534,24 @@
       <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#getData&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#getAllData&quot;).getResult()}</Property>
+          <Property name="keyProperty">id</Property>
+          <Property name="valueProperty">kqmc</Property>
+        </Property>
+      </PropertyDef>
       <PropertyDef name="depotId">
         <Property></Property>
         <Property name="label">閫夋嫨浠撳簱锛�</Property>
@@ -549,7 +567,7 @@
       </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>
@@ -620,11 +638,21 @@
     <Container>
       <Property name="className">c-param</Property>
       <AutoForm>
-        <Property name="cols">*,*,*,90,90</Property>
+        <Property name="cols">*,*,*,*,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">companyId</Property>
+          <Property name="property">companyId</Property>
+          <Editor/>
+        </AutoFormElement>
+        <AutoFormElement>
+          <Property name="name">deptId</Property>
+          <Property name="property">deptId</Property>
+          <Editor/>
+        </AutoFormElement>
         <AutoFormElement>
           <Property name="name">start</Property>
           <Property name="property">start</Property>
@@ -633,12 +661,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>

--
Gitblit v1.9.3