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/check/CheckStandard.view.xml | 67 +++++++++++----------------------
1 files changed, 22 insertions(+), 45 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/check/CheckStandard.view.xml b/igds-core/src/main/java/com/ld/igds/check/CheckStandard.view.xml
index 9423b6f..d84f9a1 100644
--- a/igds-core/src/main/java/com/ld/igds/check/CheckStandard.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/check/CheckStandard.view.xml
@@ -8,15 +8,10 @@
<PropertyDef name="id">
<Property></Property>
<Property name="label">id</Property>
- <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="companyId">
<Property></Property>
<Property name="label">缁勭粐缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="deptId">
- <Property></Property>
- <Property name="label">閮ㄩ棬缂栫爜</Property>
</PropertyDef>
<PropertyDef name="foodVariety">
<Property></Property>
@@ -33,40 +28,27 @@
<Property name="label">鍖栭獙椤圭紪鐮�</Property>
<Property name="required">true</Property>
</PropertyDef>
- <PropertyDef name="operaSymbol">
- <Property></Property>
- <Property name="label">鏍囧噯瑕佹眰</Property>
- <Property name="mapping">
- <Property name="mapValues"></Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="unit">
- <Property></Property>
- <Property name="label">鍗曚綅</Property>
- <Property name="required">false</Property>
- </PropertyDef>
<PropertyDef name="standardName">
<Property></Property>
<Property name="label">鍖栭獙椤�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="operaSymbol">
+ <Property></Property>
+ <Property name="label">鏍囧噯瑕佹眰</Property>
<Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="upperLimit">
<Property name="dataType">Double</Property>
<Property name="label">鍚堟牸浼愬��</Property>
</PropertyDef>
+ <PropertyDef name="unit">
+ <Property></Property>
+ <Property name="label">鍗曚綅</Property>
+ </PropertyDef>
<PropertyDef name="ruleNum">
<Property></Property>
- <Property name="label">鎵ｉ噸绯绘暟</Property>
- <Property name="dataType">Double</Property>
- </PropertyDef>
- <PropertyDef name="ruleAdd">
- <Property></Property>
- <Property name="label">澧為噸%</Property>
- <Property name="dataType">Double</Property>
- </PropertyDef>
- <PropertyDef name="ruleAddEnd">
- <Property></Property>
- <Property name="label">澧為噸涓婇檺%</Property>
+ <Property name="label">澧炴墸閲嶇郴鏁�</Property>
<Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="ruleReduce">
@@ -74,8 +56,14 @@
<Property name="label">鎵ｉ噸姣斾緥</Property>
<Property name="dataType">Double</Property>
</PropertyDef>
- <PropertyDef name="standardPrice">
- <Property name="label">鏍囧噯鍗曚环(鍏�/鏂�)</Property>
+ <PropertyDef name="ruleAdd">
+ <Property></Property>
+ <Property name="label">澧為噸姣斾緥</Property>
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="ruleAddEnd">
+ <Property></Property>
+ <Property name="label">澧為噸涓婇檺%</Property>
<Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="rulePrice">
@@ -312,11 +300,11 @@
<Property name="cols">*,*</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
- <Property name="labelWidth">120</Property>
+ <Property name="labelWidth">140</Property>
<AutoFormElement>
<Property name="name">ruleNum</Property>
<Property name="property">ruleNum</Property>
- <Property name="label">姣忛珮鍑烘爣鍑�</Property>
+ <Property name="label">姣忛珮鍑哄灏�</Property>
<Property name="labelAlign">right</Property>
<Editor/>
</AutoFormElement>
@@ -324,7 +312,7 @@
<Property name="name">ruleReduce</Property>
<Property name="property">ruleReduce</Property>
<Property name="labelAlign">right</Property>
- <Property name="label">鎵ｉ噸锛�%锛�</Property>
+ <Property name="label">鎵ｉ噸姣斾緥锛�%锛�</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
@@ -340,17 +328,6 @@
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
<Property name="labelWidth">140</Property>
- <AutoFormElement>
- <Property name="name">standardPrice</Property>
- <Property name="property">standardPrice</Property>
- <Editor/>
- </AutoFormElement>
- <Label>
- <Property name="text">娉ㄦ剰锛氱郴绲变粎浠ユ按鍒嗘爣鍑嗕环鏍间负鍑嗐��</Property>
- <Property name="style">
- <Property name="color">blue</Property>
- </Property>
- </Label>
<AutoFormElement>
<Property name="name">rulePrice</Property>
<Property name="property">rulePrice</Property>
@@ -459,7 +436,7 @@
</Container>
</CustomDropDown>
<ListDropDown id="listSymbol">
- <Property name="items">>=,<=,=</Property>
+ <Property name="items">>=,<=,==</Property>
</ListDropDown>
</View>
</ViewConfig>
--
Gitblit v1.9.3