From f27f3ea5055888f7f1c797d0fd7fb26a2013c89c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 24 十月 2023 19:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml |   43 ++++++++++++++++++++++++++-----------------
 1 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml b/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml
index a32b34c..6b30a9d 100644
--- a/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml
@@ -125,7 +125,7 @@
       <Buttons>
         <Button>
           <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
-view.get(&quot;#uaAction&quot;).set(&quot;parameter&quot;,data).execute(function(result){&#xD;
+view.get(&quot;#uaAction&quot;).execute(function(result){&#xD;
 	if(result){&#xD;
 		$alert(result);&#xD;
 	}else{&#xD;
@@ -204,7 +204,7 @@
             <Editor/>
           </AutoFormElement>
           <Label>
-            <Property name="text">璐т綅鐘舵��=绌轰粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～</Property>
+            <Property name="text">璐т綅鐘舵��=灏佷粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～</Property>
             <Property name="style">
               <Property name="color">red</Property>
               <Property name="font-size">12px</Property>
@@ -216,9 +216,10 @@
             <Editor/>
           </AutoFormElement>
           <Label>
-            <Property name="text">璐т綅鐘舵��=绌轰粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～</Property>
+            <Property name="text">璐т綅鐘舵��=灏佷粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～</Property>
             <Property name="style">
-              <Property name="color">blue</Property>
+              <Property name="color">red</Property>
+              <Property name="font-size">12px</Property>
             </Property>
           </Label>
           <AutoFormElement>
@@ -228,9 +229,10 @@
             <Editor/>
           </AutoFormElement>
           <Label>
-            <Property name="text">璐т綅鐘舵��=绌轰粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～</Property>
+            <Property name="text">璐т綅鐘舵��=灏佷粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～</Property>
             <Property name="style">
-              <Property name="color">blue</Property>
+              <Property name="color">red</Property>
+              <Property name="font-size">12px</Property>
             </Property>
           </Label>
           <AutoFormElement>
@@ -241,7 +243,8 @@
           <Label>
             <Property name="text">蹇呭～锛岀┖浠�=0锛屽叆搴�/鍑哄簱鏁伴噺涔嬪拰</Property>
             <Property name="style">
-              <Property name="color">blue</Property>
+              <Property name="color">red</Property>
+              <Property name="font-size">12px</Property>
             </Property>
           </Label>
           <AutoFormElement>
@@ -252,7 +255,8 @@
           <Label>
             <Property name="text">蹇呭～锛岀┖浠�=0锛屽叆搴�/鍑哄簱缁撶畻鏁伴噺涔嬪拰</Property>
             <Property name="style">
-              <Property name="color">blue</Property>
+              <Property name="color">red</Property>
+              <Property name="font-size">12px</Property>
             </Property>
           </Label>
           <AutoFormElement>
@@ -261,9 +265,10 @@
             <Editor/>
           </AutoFormElement>
           <Label>
-            <Property name="text">璐т綅鐘舵��=绌轰粨/鍑哄簱涓紝蹇呭～</Property>
+            <Property name="text">璐т綅鐘舵��=灏佷粨/鍑哄簱涓紝蹇呭～</Property>
             <Property name="style">
-              <Property name="color">blue</Property>
+              <Property name="color">red</Property>
+              <Property name="font-size">12px</Property>
             </Property>
           </Label>
           <AutoFormElement>
@@ -272,9 +277,10 @@
             <Editor/>
           </AutoFormElement>
           <Label>
-            <Property name="text">璐т綅鐘舵��=绌轰粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～銆傜涓�杞﹀叆浠撴椂闂�</Property>
+            <Property name="text">璐т綅鐘舵��=灏佷粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～銆傜涓�杞﹀叆浠撴椂闂�</Property>
             <Property name="style">
-              <Property name="color">blue</Property>
+              <Property name="color">red</Property>
+              <Property name="font-size">12px</Property>
             </Property>
           </Label>
           <AutoFormElement>
@@ -285,7 +291,8 @@
           <Label>
             <Property name="text">璐т綅鐘舵��=绌轰粨锛屽繀濉�傛渶鍚庝竴杞︾伯椋熷嚭浠撴椂闂�</Property>
             <Property name="style">
-              <Property name="color">blue</Property>
+              <Property name="color">red</Property>
+              <Property name="font-size">12px</Property>
             </Property>
           </Label>
           <AutoFormElement>
@@ -294,9 +301,10 @@
             <Editor/>
           </AutoFormElement>
           <Label>
-            <Property name="text">璐т綅鐘舵��=婊′粨锛屽彲濉�</Property>
+            <Property name="text">璐т綅鐘舵��=灏佷粨锛屽彲濉�</Property>
             <Property name="style">
               <Property name="color">blue</Property>
+              <Property name="font-size">12px</Property>
             </Property>
           </Label>
           <AutoFormElement>
@@ -305,9 +313,10 @@
             <Editor/>
           </AutoFormElement>
           <Label>
-            <Property name="text">璐т綅鐘舵��=婊′粨锛屽彲濉�</Property>
+            <Property name="text">璐т綅鐘舵��=灏佷粨锛屽彲濉�</Property>
             <Property name="style">
               <Property name="color">blue</Property>
+              <Property name="font-size">12px</Property>
             </Property>
           </Label>
           <AutoFormElement layoutConstraint="colSpan:2">
@@ -339,8 +348,8 @@
       <Property name="minWidth">500</Property>
       <Container layout="regionPadding:5">
         <DataSet id="dsFoodOrigin">
-          <Property name="dataProvider">dicTriggerPR#pagFoodLocationData</Property>
-          <Property name="dataType">[dtFoodOrigin]</Property>
+          <Property name="dataProvider">dicAreaPR#pageList</Property>
+          <Property name="dataType">[dtArea]</Property>
           <Property name="parameter"></Property>
           <Property name="pageSize">30</Property>
         </DataSet>

--
Gitblit v1.9.3