From 786b5b76fee42107cef33892cbf7e3e8fab4f0e4 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:36:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-inout/src/main/java/com/ld/igds/m/view/PlanManage.view.xml |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage.view.xml
index a6308bf..fc77fa0 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage.view.xml
@@ -114,6 +114,7 @@
       <PropertyDef name="year">
         <Property></Property>
         <Property name="label">骞翠唤</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="type">
         <Property></Property>
@@ -137,6 +138,7 @@
       <PropertyDef name="foodType">
         <Property></Property>
         <Property name="label">绮鎬ц川</Property>
+        <Property name="required">true</Property>
         <Property name="mapping">
           <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}</Property>
           <Property name="keyProperty">code</Property>
@@ -146,6 +148,7 @@
       <PropertyDef name="foodLevel">
         <Property></Property>
         <Property name="label">绮绛夌骇</Property>
+        <Property name="required">true</Property>
         <Property name="mapping">
           <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_LEVEL_&quot;)}</Property>
           <Property name="keyProperty">code</Property>
@@ -156,6 +159,7 @@
         <Property name="dataType">Double</Property>
         <Property name="label">鏁伴噺</Property>
         <Property name="displayFormat">#.0  KG</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="updateTime">
         <Property name="dataType">Date</Property>
@@ -573,6 +577,12 @@
                     <Property name="name">foodLevel</Property>
                   </DataColumn>
                   <DataColumn>
+                    <Property name="property">year</Property>
+                    <Property name="align">center</Property>
+                    <Property name="name">year</Property>
+                    <Property name="trigger">yearDropDown1</Property>
+                  </DataColumn>
+                  <DataColumn>
                     <Property name="property">type</Property>
                     <Property name="align">center</Property>
                     <Property name="name">type</Property>

--
Gitblit v1.9.3