From 046a97925c84b5f8c8c16349a57638722fead578 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 15 八月 2023 19:06:13 +0800
Subject: [PATCH] 设备管理优化
---
igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml | 433 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 334 insertions(+), 99 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
index 38d7c30..55e88e2 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
@@ -7,11 +7,13 @@
<Property name="creationType">com.ld.igds.models.InoutVarietyChange</Property>
<PropertyDef name="id">
<Property></Property>
- <Property name="label">ID</Property>
+ <Property name="label">绮鎬ц川杞彉鍗曞彿</Property>
+ <Property name="readOnly">true</Property>
</PropertyDef>
<PropertyDef name="companyId">
<Property></Property>
<Property name="label">缁勭粐缂栫爜</Property>
+ <Property name="readOnly">true</Property>
</PropertyDef>
<PropertyDef name="approvalId">
<Property></Property>
@@ -39,28 +41,18 @@
</PropertyDef>
<PropertyDef name="foodVariety">
<Property></Property>
- <Property name="label">鍙樻洿鍓嶅搧绉�</Property>
- <Property name="required">false</Property>
+ <Property name="label">绮鍝佺</Property>
+ <Property name="required">true</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
- </PropertyDef>
- <PropertyDef name="newFoodVariety">
- <Property></Property>
- <Property name="label">鍙樻洿鍚庡搧绉�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="foodType">
<Property></Property>
<Property name="label">鍙樻洿鍓嶆�ц川</Property>
- <Property name="required">false</Property>
+ <Property name="required">true</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property>
<Property name="keyProperty">code</Property>
@@ -70,7 +62,7 @@
<PropertyDef name="newFoodType">
<Property></Property>
<Property name="label">鍙樻洿鍚庢�ц川</Property>
- <Property name="required">false</Property>
+ <Property name="required">true</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property>
<Property name="keyProperty">code</Property>
@@ -81,13 +73,15 @@
<Property></Property>
<Property name="label">绮鏁伴噺</Property>
<Property name="dataType">Double</Property>
- <Property name="displayFormat">#,##0.00 kG</Property>
+ <Property name="displayFormat">#,##0.00 KG</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="changeNumber">
<Property></Property>
<Property name="label">鍒掕浆鏁伴噺</Property>
<Property name="dataType">Double</Property>
- <Property name="displayFormat">#,##0.00 kG</Property>
+ <Property name="displayFormat">#,##0.00 KG</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="changeTime">
<Property name="dataType">Date</Property>
@@ -98,13 +92,79 @@
<Property name="dataType">DateTime</Property>
<Property name="label">鏇存柊鏃堕棿</Property>
</PropertyDef>
- <PropertyDef name="updateUser">
- <Property></Property>
- <Property name="label">鏇存柊浜�</Property>
- </PropertyDef>
<PropertyDef name="remark">
<Property></Property>
<Property name="label">澶囨敞</Property>
+ </PropertyDef>
+ <PropertyDef name="hwdm">
+ <Property></Property>
+ <Property name="label">璐т綅浠ｇ爜</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="ccshr">
+ <Property></Property>
+ <Property name="label">浠撳偍瀹℃牳浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="auditCcsh">
+ <Property></Property>
+ <Property name="label">瀹℃壒鐘舵��</Property>
+ </PropertyDef>
+ <PropertyDef name="InfoCcsh">
+ <Property></Property>
+ <Property name="label">瀹℃牳璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="zjshr">
+ <Property></Property>
+ <Property name="label">璐ㄦ瀹℃牳浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="auditZjsh">
+ <Property></Property>
+ <Property name="label">瀹℃壒鐘舵��</Property>
+ </PropertyDef>
+ <PropertyDef name="infoZjsh">
+ <Property></Property>
+ <Property name="label">瀹℃牳璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="tjshr">
+ <Property></Property>
+ <Property name="label">缁熻瀹℃牳浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="auditTjsh">
+ <Property></Property>
+ <Property name="label">瀹℃壒鐘舵��</Property>
+ </PropertyDef>
+ <PropertyDef name="infoTjsh">
+ <Property></Property>
+ <Property name="label">瀹℃牳璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="kjshr">
+ <Property></Property>
+ <Property name="label">浼氳瀹℃牳浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="auditKjsh">
+ <Property></Property>
+ <Property name="label">瀹℃壒鐘舵��</Property>
+ </PropertyDef>
+ <PropertyDef name="infoKjsh">
+ <Property></Property>
+ <Property name="label">瀹℃牳璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="ldshr">
+ <Property></Property>
+ <Property name="label">棰嗗瀹℃牳浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="auditLdsh">
+ <Property></Property>
+ <Property name="label">瀹℃壒鐘舵��</Property>
+ </PropertyDef>
+ <PropertyDef name="infoLdsh">
+ <Property></Property>
+ <Property name="label">瀹℃牳璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="czbz">
+ <Property></Property>
+ <Property name="label">鎿嶄綔鏍囧織</Property>
+ <Property name="readOnly">true</Property>
</PropertyDef>
</DataType>
<DataType name="dtParam">
@@ -204,6 +264,7 @@
<Property name="caption">鍒锋柊</Property>
<Property name="exClassName">btn-default</Property>
<Property name="iconClass">fa fa-refresh</Property>
+ <Property name="visible">false</Property>
</Button>
</Container>
<Container layout="regionPadding:10" layoutConstraint="center">
@@ -242,6 +303,12 @@
<Property name="dataSet">dsMain</Property>
<Property name="readOnly">true</Property>
<RowNumColumn/>
+ <DataColumn>
+ <Property name="align">center</Property>
+ <Property name="name">id</Property>
+ <Property name="property">id</Property>
+ <Editor/>
+ </DataColumn>
<DataColumn name="depotId">
<Property name="property">depotId</Property>
<Property name="align">center</Property>
@@ -250,20 +317,12 @@
<Property name="property">foodVariety</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="newFoodVariety">
- <Property name="property">newFoodVariety</Property>
- <Property name="align">center</Property>
- </DataColumn>
<DataColumn name="changeTime">
<Property name="property">changeTime</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="updateTime">
<Property name="property">updateTime</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="updateUser">
- <Property name="property">updateUser</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="remark">
@@ -279,10 +338,11 @@
</DataPilot>
</Container>
<Dialog id="dialogMain" layout="padding:5;regionPadding:10">
- <Property name="width">800</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("#dsMain.data:#");
@@ -306,75 +366,250 @@
</Button>
</Buttons>
<Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
- <Property name="labelWidth">120</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelSeparator">锛�</Property>
- <AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">approvalId</Property>
- <Property name="property">approvalId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodVariety</Property>
- <Property name="property">foodVariety</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">newFoodVariety</Property>
- <Property name="property">newFoodVariety</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodType</Property>
- <Property name="property">foodType</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">newFoodType</Property>
- <Property name="property">newFoodType</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">number</Property>
- <Property name="property">number</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">changeNumber</Property>
- <Property name="property">changeNumber</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">changeTime</Property>
- <Property name="property">changeTime</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">updateUser</Property>
- <Property name="property">updateUser</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">remark</Property>
- <Property name="property">remark</Property>
- <Property name="editorType">TextArea</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">updateTime</Property>
- <Property name="property">updateTime</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
+ <FieldSet>
+ <Property name="caption">鍩烘湰淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*</Property>
+ <Property name="labelWidth">140</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <AutoFormElement>
+ <Property name="name">id</Property>
+ <Property name="property">id</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">companyId</Property>
+ <Property name="property">companyId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">approvalId</Property>
+ <Property name="property">approvalId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">hwdm</Property>
+ <Property name="property">hwdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">changeTime</Property>
+ <Property name="property">changeTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">foodVariety</Property>
+ <Property name="property">foodVariety</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">foodType</Property>
+ <Property name="property">foodType</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">newFoodType</Property>
+ <Property name="property">newFoodType</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">number</Property>
+ <Property name="property">number</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">changeNumber</Property>
+ <Property name="property">changeNumber</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet>
+ <Property name="caption">瀹℃壒淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <FieldSet>
+ <Property name="caption">浠撳偍瀹℃壒</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="cols">*,*</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">100</Property>
+ <AutoFormElement>
+ <Property name="name">ccshr</Property>
+ <Property name="property">ccshr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">auditCcsh</Property>
+ <Property name="property">auditCcsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="rowSpan:2;colSpan:2">
+ <Property name="name">InfoCcsh</Property>
+ <Property name="property">InfoCcsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet>
+ <Property name="caption">璐ㄦ瀹℃壒</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="cols">*,*</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">100</Property>
+ <AutoFormElement>
+ <Property name="name">zjshr</Property>
+ <Property name="property">zjshr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">auditZjsh</Property>
+ <Property name="property">auditZjsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="rowSpan:2;colSpan:2">
+ <Property name="name">infoZjsh</Property>
+ <Property name="property">infoZjsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet>
+ <Property name="caption">缁熻瀹℃壒</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="cols">*,*</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="labelWidth">100</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelAlign">right</Property>
+ <AutoFormElement>
+ <Property name="name">tjshr</Property>
+ <Property name="property">tjshr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">auditTjsh</Property>
+ <Property name="property">auditTjsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2;rowSpan:2">
+ <Property name="name">infoTjsh</Property>
+ <Property name="property">infoTjsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet>
+ <Property name="caption">浼氳瀹℃壒</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="cols">*,*</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">100</Property>
+ <AutoFormElement>
+ <Property name="name">kjshr</Property>
+ <Property name="property">kjshr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">auditKjsh</Property>
+ <Property name="property">auditKjsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="rowSpan:2;colSpan:2">
+ <Property name="name">infoKjsh</Property>
+ <Property name="property">infoKjsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet>
+ <Property name="caption">棰嗗瀹℃壒</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="cols">*,*</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">100</Property>
+ <AutoFormElement>
+ <Property name="name">ldshr</Property>
+ <Property name="property">ldshr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">auditLdsh</Property>
+ <Property name="property">auditLdsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="rowSpan:2;colSpan:2">
+ <Property name="name">infoLdsh</Property>
+ <Property name="property">infoLdsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ </Children>
+ </FieldSet>
+ <FieldSet>
+ <Property name="caption">澶囨敞淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="cols">*,*</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">100</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">remark</Property>
+ <Property name="property">remark</Property>
+ <Property name="editorType">TextArea</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
</Children>
<Tools/>
</Dialog>
--
Gitblit v1.9.3