From dbbd8b7066092b3ce4eab44fa0e2b746dad16a95 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期五, 07 七月 2023 19:15:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
index e56f1c5..ab7e9dc 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
@@ -77,7 +77,7 @@
       <PropertyDef name="number">
         <Property name="dataType">Double</Property>
         <Property name="label">鍊掍粨鏁伴噺</Property>
-        <Property name="displayFormat">#.00</Property>
+        <Property name="displayFormat">#.00 KG</Property>
       </PropertyDef>
       <PropertyDef name="updateTime">
         <Property name="dataType">Date</Property>
@@ -88,15 +88,15 @@
         <Property name="label">鏇存柊浜�</Property>
       </PropertyDef>
       <PropertyDef name="dchwdm">
-        <Property/>
+        <Property></Property>
         <Property name="label">鍊掑嚭璐т綅浠ｇ爜</Property>
       </PropertyDef>
       <PropertyDef name="drhwdm">
-        <Property/>
+        <Property></Property>
         <Property name="label">鍊掑叆璐т綅浠ｇ爜</Property>
       </PropertyDef>
       <PropertyDef name="bzw">
-        <Property/>
+        <Property></Property>
         <Property name="label">鍖呰鐗�</Property>
         <Property name="mapping">
           <Property name="mapValues">${dorado.getDataProvider(&quot;stockChangePR#triggerBzw&quot;).getResult()}</Property>
@@ -105,7 +105,7 @@
         </Property>
       </PropertyDef>
       <PropertyDef name="czbz">
-        <Property/>
+        <Property></Property>
         <Property name="label">鎿嶄綔鏍囧織</Property>
         <Property name="readOnly">true</Property>
       </PropertyDef>
@@ -114,7 +114,7 @@
         <Property name="label">鏍囧噯鍖呬欢鏁�</Property>
       </PropertyDef>
       <PropertyDef name="zxzydw">
-        <Property/>
+        <Property></Property>
         <Property name="label">瑁呭嵏浣滀笟鍗曚綅</Property>
       </PropertyDef>
     </DataType>
@@ -306,11 +306,10 @@
       </DataPilot>
     </Container>
     <Dialog id="dialogMain" layout="padding:5;regionPadding:10">
-      <Property name="width">60%</Property>
+      <Property name="width">70%</Property>
       <Property name="caption">璇︾粏淇℃伅</Property>
       <Property name="iconClass">fa fa-flag-o</Property>
       <Property name="closeable">false</Property>
-      <Property name="height">80%</Property>
       <Buttons>
         <Button>
           <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;

--
Gitblit v1.9.3