From a6013fee1895815cda77bfdcb5e5b9f4d190640b Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期日, 05 十一月 2023 00:08:35 +0800
Subject: [PATCH] 结算页面

---
 igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml |   42 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
index bf6cbc1..9b2fa2e 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
@@ -14,6 +14,7 @@
       </PropertyDef>
       <PropertyDef name="userId">
         <Property name="label">韬唤璇佸彿</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="noticeId">
         <Property name="label">閫氱煡鍗曞彿</Property>
@@ -22,6 +23,15 @@
         <Property name="dataType">Double</Property>
         <Property name="label">绮瀹氫环</Property>
         <Property name="required">false</Property>
+      </PropertyDef>
+      <PropertyDef name="foodType">
+        <Property name="label">绮鎬ц川</Property>
+        <Property name="required">true</Property>
+        <Property name="mapping">
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}</Property>
+        </Property>
       </PropertyDef>
       <Reference name="checkItems">
         <Property name="parameter">
@@ -608,6 +618,11 @@
               <Editor/>
             </AutoFormElement>
             <AutoFormElement>
+              <Property name="name">foodType</Property>
+              <Property name="property">foodType</Property>
+              <Editor/>
+            </AutoFormElement>
+            <AutoFormElement>
               <Property name="name">sampleUser</Property>
               <Property name="property">sampleUser</Property>
               <Editor/>
@@ -862,7 +877,7 @@
     <CustomDropDown id="ddNotice">
       <Property name="minHeight">400</Property>
       <Property name="assignmentMap">noticeId=id,customerName=customerName</Property>
-      <Property name="minWidth">500</Property>
+      <Property name="minWidth">1000</Property>
       <Property name="autoOpen">true</Property>
       <Container layout="regionPadding:5">
         <DataSet id="dsNotice">
@@ -902,13 +917,34 @@
 }</ClientEvent>
           <Property name="dataSet">dsNotice</Property>
           <Property name="readOnly">true</Property>
+          <DataColumn name="name">
+            <Property name="property">name</Property>
+            <Property name="align">center</Property>
+            <Property name="width">100</Property>
+          </DataColumn>
           <DataColumn>
             <Property name="property">customerName</Property>
             <Property name="align">center</Property>
             <Property name="name">customerName</Property>
+            <Property name="width">240</Property>
           </DataColumn>
-          <DataColumn name="name">
-            <Property name="property">name</Property>
+          <DataColumn name="foodVariety">
+            <Property name="property">foodVariety</Property>
+            <Property name="align">center</Property>
+          </DataColumn>
+          <DataColumn name="year">
+            <Property name="property">year</Property>
+            <Property name="align">center</Property>
+          </DataColumn>
+          <DataColumn name="depotId">
+            <Property name="property">depotId</Property>
+            <Property name="align">center</Property>
+            <Property name="width">180</Property>
+          </DataColumn>
+          <DataColumn name="contractName">
+            <Property name="property">contractName</Property>
+            <Property name="align">center</Property>
+            <Property name="width">300</Property>
           </DataColumn>
         </DataGrid>
       </Container>

--
Gitblit v1.9.3