From 43ce77a85d8297a53dc25430fff10ead57296167 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 04 十一月 2023 15:43:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml
index 642c3ca..6a4c300 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml
@@ -22,6 +22,11 @@
         <Property></Property>
         <Property name="label">鎵�灞炶鍒�</Property>
         <Property name="required">false</Property>
+        <Property name="mapping">
+          <Property name="keyProperty">id</Property>
+          <Property name="valueProperty">name</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;planManagePR#listPlan&quot;).getResult()}</Property>
+        </Property>
       </PropertyDef>
       <PropertyDef name="planName">
         <Property></Property>
@@ -715,8 +720,8 @@
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
-                <Property name="name">planName</Property>
-                <Property name="property">planName</Property>
+                <Property name="name">planId</Property>
+                <Property name="property">planId</Property>
                 <Property name="trigger">ddPlan</Property>
                 <Editor/>
               </AutoFormElement>
@@ -876,7 +881,7 @@
         <DataSet id="dsPlan">
           <Property name="dataProvider">planManagePR#pagePlan</Property>
           <Property name="dataType">[dtPlan]</Property>
-          <Property name="parameter"/>
+          <Property name="parameter"></Property>
           <Property name="pageSize">5</Property>
         </DataSet>
         <Container layout="hbox regionPadding:5">
@@ -952,7 +957,7 @@
         <DataSet id="dsContract">
           <Property name="dataProvider">contractManagePR#pageContract</Property>
           <Property name="dataType">[dtContract]</Property>
-          <Property name="parameter"/>
+          <Property name="parameter"></Property>
           <Property name="pageSize">5</Property>
         </DataSet>
         <Container layout="hbox regionPadding:5">

--
Gitblit v1.9.3