From d3553d8dd6fc00634ac32228e5b8e4d0624eda11 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 30 八月 2023 11:10:51 +0800
Subject: [PATCH] 调整Modbus配置-解决轴流风机与轴流窗不在同一个分机配置的问题

---
 igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml | 1799 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 995 insertions(+), 804 deletions(-)

diff --git a/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml b/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
index e9314de..3359796 100644
--- a/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
@@ -1,246 +1,334 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ViewConfig>
-    <Arguments/>
-    <Context/>
-    <Model>
-        <DataType name="dtMain">
-            <ClientEvent name="onDataChange">if(arg.property ==&quot;depotId&quot;){&#xD;
-                autoByDepot(arg.newValue);&#xD;
-                }&#xD;
-                if(arg.property ==&quot;foodVariety&quot;){&#xD;
-                checkByFood(arg.newValue);&#xD;
-                }
-            </ClientEvent>
-            <Property name="creationType">com.ld.igds.models.MQuality</Property>
-            <PropertyDef name="id">
-                <Property name="label">ID</Property>
-            </PropertyDef>
-            <PropertyDef name="companyId">
-                <Property name="label">缁勭粐缂栫爜</Property>
-            </PropertyDef>
-            <PropertyDef name="deptId">
-                <Property name="label">搴撳尯缂栫爜</Property>
-            </PropertyDef>
-            <PropertyDef name="depotId">
-                <Property name="mapping">
-                    <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}
-                    </Property>
-                    <Property name="keyProperty">id</Property>
-                    <Property name="valueProperty">name</Property>
-                </Property>
-                <Property name="label">妫�娴嬩粨搴�</Property>
-                <Property name="required">true</Property>
-            </PropertyDef>
-            <PropertyDef name="foodVariety">
-                <Property name="mapping">
-                    <Property name="mapValues">
-                        ${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_VARIETY_&quot;)}
-                    </Property>
-                    <Property name="keyProperty">code</Property>
-                    <Property name="valueProperty">name</Property>
-                </Property>
-                <Property name="label">绮鍝佺</Property>
-                <Property name="required">true</Property>
-            </PropertyDef>
-            <PropertyDef name="foodLevel">
-                <Property name="mapping">
-                    <Property name="mapValues">
-                        ${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_LEVEL_&quot;)}
-                    </Property>
-                    <Property name="keyProperty">code</Property>
-                    <Property name="valueProperty">name</Property>
-                </Property>
-                <Property name="label">绮绛夌骇</Property>
-            </PropertyDef>
-            <PropertyDef name="foodType">
-                <Property name="label">绮鎬ц川</Property>
-                <Property name="mapping">
-                    <Property name="mapValues">
-                        ${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}
-                    </Property>
-                    <Property name="keyProperty">code</Property>
-                    <Property name="valueProperty">name</Property>
-                </Property>
-            </PropertyDef>
-            <PropertyDef name="foodLocation">
-                <Property name="label">绮浜у湴</Property>
-            </PropertyDef>
-            <PropertyDef name="type">
-                <Property name="label">妫�楠岀被鍒�</Property>
-                <Property name="mapping">
-                    <Property name="mapValues">
-                        ${dorado.getDataProvider(&quot;qualityManagerPR#triggerType&quot;).getResult()}
-                    </Property>
-                    <Property name="keyProperty">code</Property>
-                    <Property name="valueProperty">name</Property>
-                </Property>
-                <Property name="required">true</Property>
-            </PropertyDef>
-            <PropertyDef name="standard">
-                <Property name="label">妫�楠屼緷鎹�</Property>
-                <Property name="required">true</Property>
-                <Property name="mapping">
-                    <Property name="mapValues">
-                        ${dorado.getDataProvider(&quot;qualityManagerPR#triggerStandard&quot;).getResult()}
-                    </Property>
-                    <Property name="keyProperty">code</Property>
-                    <Property name="valueProperty">name</Property>
-                </Property>
-            </PropertyDef>
-            <PropertyDef name="user">
-                <Property name="label">妫�楠屼汉</Property>
-            </PropertyDef>
-            <PropertyDef name="time">
-                <Property name="label">妫�楠屾椂闂�</Property>
-                <Property name="dataType">Date</Property>
-            </PropertyDef>
-            <PropertyDef name="result">
-                <Property name="label">妫�楠岀粨璁�</Property>
-            </PropertyDef>
-            <PropertyDef name="checkArea">
-                <Property name="label">鎵︽牱鍖哄煙</Property>
-            </PropertyDef>
-            <PropertyDef name="checkUser">
-                <Property name="label">鎵︽牱浜�</Property>
-            </PropertyDef>
-            <PropertyDef name="checkNum">
-                <Property name="label">鏍峰搧鏁伴噺</Property>
-                <Property name="displayFormat">0.0%</Property>
-                <Property name="dataType">Double</Property>
-            </PropertyDef>
-            <PropertyDef name="checkTime">
-                <Property name="label">鎵︽牱鏃堕棿</Property>
-                <Property name="dataType">Date</Property>
-            </PropertyDef>
-            <PropertyDef name="checkRepresent">
-                <Property name="label">鏍峰搧浠ｈ〃</Property>
-            </PropertyDef>
-            <PropertyDef name="checkLevel">
-                <Property name="label">鏍峰搧绛夌骇</Property>
-            </PropertyDef>
-            <PropertyDef name="normalYear">
-                <Property name="label">姝ｅ父瀛樺偍骞撮檺</Property>
-                <Property name="mapping">
-                    <Property name="keyProperty">code</Property>
-                    <Property name="valueProperty">name</Property>
-                    <Property name="mapValues">
-                        <Collection>
-                            <Entity>
-                                <Property name="name">鏄�</Property>
-                                <Property name="code">1</Property>
-                            </Entity>
-                            <Entity>
-                                <Property name="name">鍚�</Property>
-                                <Property name="code">0</Property>
-                            </Entity>
-                        </Collection>
-                    </Property>
-                </Property>
-            </PropertyDef>
-            <PropertyDef name="remark">
-                <Property name="label">澶囨敞淇℃伅</Property>
-            </PropertyDef>
-            <Reference name="checkItems">
-                <Property name="dataProvider">checkStandardPR#listCheckItemsByParam</Property>
-                <Property name="dataType">[dtCheckItems]</Property>
-                <Property name="parameter">
-                    <Entity>
-                        <Property name="checkId">$${this.id}</Property>
-                        <Property name="foodVariety">$${this.foodVariety}</Property>
-                        <Property name="deptId">$${this.deptId}</Property>
-                    </Entity>
-                </Property>
-            </Reference>
-        </DataType>
-        <DataType name="dtQualityParam">
-            <PropertyDef name="depotId">
-                <Property></Property>
-                <Property name="label">浠撳簱</Property>
-                <Property name="mapping">
-                    <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}
-                    </Property>
-                    <Property name="keyProperty">id</Property>
-                    <Property name="valueProperty">name</Property>
-                </Property>
-            </PropertyDef>
-            <PropertyDef name="type">
-                <Property name="label">妫�楠岀被鍒�</Property>
-                <Property name="mapping">
-                    <Property name="mapValues">
-                        ${dorado.getDataProvider(&quot;qualityManagerPR#triggerType&quot;).getResult()}
-                    </Property>
-                    <Property name="keyProperty">code</Property>
-                    <Property name="valueProperty">name</Property>
-                </Property>
-            </PropertyDef>
-            <PropertyDef name="start">
-                <Property name="dataType">Date</Property>
-                <Property name="label">妫�娴嬪紑濮嬫椂闂�</Property>
-            </PropertyDef>
-            <PropertyDef name="end">
-                <Property name="dataType">Date</Property>
-                <Property name="label">妫�娴嬫埅姝㈡椂闂�</Property>
-            </PropertyDef>
-        </DataType>
-        <DataType name="dtCheckItems">
-            <Property name="creationType">com.ld.igds.check.dto.CheckItemData</Property>
-            <PropertyDef name="updateTime">
-                <Property></Property>
-                <Property name="label">浠撳簱</Property>
-                <Property name="dataType">Date</Property>
-            </PropertyDef>
-            <PropertyDef name="checkId">
-                <Property name="label">妫�娴嬬紪鐮�</Property>
-            </PropertyDef>
-            <PropertyDef name="companyId">
-                <Property name="label">缁勭粐缂栫爜</Property>
-            </PropertyDef>
-            <PropertyDef name="standardId">
-                <Property name="label">妫�娴嬮」缂栫爜</Property>
-            </PropertyDef>
-            <PropertyDef name="standardName">
-                <Property name="label">妫�娴嬮」鍚嶇О</Property>
-            </PropertyDef>
-            <PropertyDef name="unit">
-                <Property name="label">鍗曚綅</Property>
-            </PropertyDef>
-            <PropertyDef name="upperLimit">
-                <Property name="label">鏍囧噯涓婇檺</Property>
-                <Property name="dataType">Double</Property>
-            </PropertyDef>
-            <PropertyDef name="lowerLimit">
-                <Property name="label">鏍囧噯涓嬮檺</Property>
-                <Property name="dataType">Double</Property>
-            </PropertyDef>
-            <PropertyDef name="value">
-                <Property name="label">妫�娴嬪��</Property>
-            </PropertyDef>
-            <PropertyDef name="remarks">
-                <Property name="label">鍖栭獙缁撴灉</Property>
-            </PropertyDef>
-        </DataType>
-        <DataType name="dataTypeUser">
-            <Property name="creationType">com.bstek.bdf2.core.model.DefaultUser</Property>
-            <PropertyDef name="password">
-                <Property name="dataType">String</Property>
-                <Property name="label">瀵嗙爜</Property>
-                <Property name="required">true</Property>
-                <Validator type="length">
-                    <Property name="minLength">6</Property>
-                </Validator>
-                <Validator type="custom">
-                    <ClientEvent name="onValidate">if (arg.entity.get(&quot;confirmPassword&quot;)){
+  <Arguments/>
+  <Context/>
+  <Model>
+    <DataType name="dtMain">
+      <ClientEvent name="onDataChange">if(arg.property ==&quot;depotId&quot;){&#xD;
+	autoByDepot(arg.newValue);&#xD;
+}&#xD;
+if(arg.property ==&quot;foodVariety&quot;){&#xD;
+	checkByFood(arg.newValue);&#xD;
+}       </ClientEvent>
+      <Property name="creationType">com.ld.igds.models.MQuality</Property>
+      <PropertyDef name="id">
+        <Property name="label">ID</Property>
+      </PropertyDef>
+      <PropertyDef name="companyId">
+        <Property name="label">缁勭粐缂栫爜</Property>
+      </PropertyDef>
+      <PropertyDef name="deptId">
+        <Property name="label">搴撳尯缂栫爜</Property>
+      </PropertyDef>
+      <PropertyDef name="depotId">
+        <Property name="label">妫�娴嬩粨搴�</Property>
+        <Property name="required">true</Property>
+        <Property name="mapping">
+          <Property name="keyProperty">id</Property>
+          <Property name="valueProperty">name</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="foodVariety">
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_VARIETY_&quot;)}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+        <Property name="label">绮鍝佺</Property>
+        <Property name="required">true</Property>
+      </PropertyDef>
+      <PropertyDef name="foodLevel">
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_LEVEL_&quot;)}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+        <Property name="label">绮绛夌骇</Property>
+      </PropertyDef>
+      <PropertyDef name="foodType">
+        <Property name="label">绮鎬ц川</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="foodLocation">
+        <Property name="label">绮浜у湴</Property>
+      </PropertyDef>
+      <PropertyDef name="type">
+        <Property name="label">妫�楠岀被鍒�</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;qualityManagerPR#triggerType&quot;).getResult()}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+        <Property name="required">true</Property>
+      </PropertyDef>
+      <PropertyDef name="standard">
+        <Property name="label">妫�楠屼緷鎹�</Property>
+        <Property name="required">true</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;qualityManagerPR#triggerStandard&quot;).getResult()}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="user">
+        <Property name="label">妫�楠屼汉</Property>
+      </PropertyDef>
+      <PropertyDef name="time">
+        <Property name="label">妫�楠屾椂闂�</Property>
+        <Property name="dataType">Date</Property>
+      </PropertyDef>
+      <PropertyDef name="result">
+        <Property name="label">妫�楠岀粨璁�</Property>
+      </PropertyDef>
+      <PropertyDef name="checkArea">
+        <Property name="label">鎵︽牱鍖哄煙</Property>
+      </PropertyDef>
+      <PropertyDef name="checkUser">
+        <Property name="label">鎵︽牱浜�</Property>
+      </PropertyDef>
+      <PropertyDef name="ypsl">
+        <Property name="label">鏍峰搧鏁伴噺</Property>
+        <Property name="dataType">Double</Property>
+        <Property name="displayFormat">0.## KG</Property>
+      </PropertyDef>
+      <PropertyDef name="checkTime">
+        <Property name="label">鎵︽牱鏃堕棿</Property>
+        <Property name="dataType">Date</Property>
+      </PropertyDef>
+      <PropertyDef name="dbsl">
+        <Property name="label">鏍峰搧浠ｈ〃鏁伴噺</Property>
+        <Property name="dataType">Double</Property>
+        <Property name="displayFormat">0.## KG</Property>
+      </PropertyDef>
+      <PropertyDef name="ypdj">
+        <Property name="label">鏍峰搧绛夌骇</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_LEVEL_&quot;)}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="normalYear">
+        <Property name="label">姝ｅ父瀛樺偍骞撮檺</Property>
+        <Property name="mapping">
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+          <Property name="mapValues">
+            <Collection>
+              <Entity>
+                <Property name="name">鏄�</Property>
+                <Property name="code">1</Property>
+              </Entity>
+              <Entity>
+                <Property name="name">鍚�</Property>
+                <Property name="code">0</Property>
+              </Entity>
+            </Collection>
+          </Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="remark">
+        <Property name="label">澶囨敞淇℃伅</Property>
+      </PropertyDef>
+      <PropertyDef name="storeDate">
+        <Property name="dataType">Date</Property>
+        <Property name="label">鍏ュ簱鏃ユ湡</Property>
+      </PropertyDef>
+      <PropertyDef name="unit">
+        <Property></Property>
+        <Property name="label">妫�楠屽崟浣�</Property>
+      </PropertyDef>
+      <PropertyDef name="zblb">
+        <Property></Property>
+        <Property name="label">鎸囨爣绫诲埆</Property>
+      </PropertyDef>
+      <PropertyDef name="qfrq">
+        <Property name="dataType">Date</Property>
+        <Property name="label">绛惧彂鏃ユ湡</Property>
+      </PropertyDef>
+      <PropertyDef name="bgcjsj">
+        <Property name="dataType">Date</Property>
+        <Property name="label">鎶ュ憡鍑哄叿鏃堕棿</Property>
+      </PropertyDef>
+      <PropertyDef name="shrxm">
+        <Property></Property>
+        <Property name="label">瀹℃牳浜哄鍚�</Property>
+      </PropertyDef>
+      <PropertyDef name="qydbh">
+        <Property></Property>
+        <Property name="label">鎵︽牱鍗曠紪鍙�</Property>
+      </PropertyDef>
+      <PropertyDef name="jdrxm">
+        <Property></Property>
+        <Property name="label">鐩戠潱浜哄鍚�</Property>
+      </PropertyDef>
+      <PropertyDef name="ypbh">
+        <Property></Property>
+        <Property name="label">鏍峰搧缂栧彿</Property>
+      </PropertyDef>
+      <PropertyDef name="updateTime">
+        <Property name="dataType">Date</Property>
+        <Property name="label">鏁版嵁鏇存柊鏃堕棿</Property>
+      </PropertyDef>
+      <Reference name="checkItems">
+        <Property name="dataProvider">checkStandardPR#listCheckItemsByParam</Property>
+        <Property name="dataType">[dtCheckItems]</Property>
+        <Property name="parameter">
+          <Entity>
+            <Property name="checkId">$${this.id}</Property>
+            <Property name="foodVariety">$${this.foodVariety}</Property>
+            <Property name="deptId">$${this.deptId}</Property>
+          </Entity>
+        </Property>
+      </Reference>
+    </DataType>
+    <DataType name="dtQualityParam">
+      <PropertyDef name="depotId">
+        <Property></Property>
+        <Property name="label">浠撳簱</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
+          <Property name="keyProperty">id</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="type">
+        <Property name="label">妫�楠岀被鍒�</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;qualityManagerPR#triggerType&quot;).getResult()}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="start">
+        <Property name="dataType">Date</Property>
+        <Property name="label">妫�娴嬪紑濮嬫椂闂�</Property>
+      </PropertyDef>
+      <PropertyDef name="end">
+        <Property name="dataType">Date</Property>
+        <Property name="label">妫�娴嬫埅姝㈡椂闂�</Property>
+      </PropertyDef>
+    </DataType>
+    <DataType name="dtCheckItems">
+      <Property name="creationType">com.ld.igds.check.dto.CheckItemData</Property>
+      <PropertyDef name="updateTime">
+        <Property></Property>
+        <Property name="label">浠撳簱</Property>
+        <Property name="dataType">Date</Property>
+      </PropertyDef>
+      <PropertyDef name="checkId">
+        <Property name="label">妫�娴嬬紪鐮�</Property>
+      </PropertyDef>
+      <PropertyDef name="companyId">
+        <Property name="label">缁勭粐缂栫爜</Property>
+      </PropertyDef>
+      <PropertyDef name="standardId">
+        <Property name="label">妫�娴嬮」缂栫爜</Property>
+      </PropertyDef>
+      <PropertyDef name="standardName">
+        <Property name="label">妫�娴嬮」鍚嶇О</Property>
+      </PropertyDef>
+      <PropertyDef name="unit">
+        <Property name="label">鍗曚綅</Property>
+      </PropertyDef>
+      <PropertyDef name="upperLimit">
+        <Property name="label">鏍囧噯涓婇檺</Property>
+        <Property name="dataType">Double</Property>
+      </PropertyDef>
+      <PropertyDef name="lowerLimit">
+        <Property name="label">鏍囧噯涓嬮檺</Property>
+        <Property name="dataType">Double</Property>
+      </PropertyDef>
+      <PropertyDef name="value">
+        <Property name="label">妫�娴嬪��</Property>
+      </PropertyDef>
+      <PropertyDef name="remarks">
+        <Property name="label">鍖栭獙缁撴灉</Property>
+      </PropertyDef>
+      <PropertyDef name="operaSymbolValue">
+        <Property></Property>
+      </PropertyDef>
+      <PropertyDef name="operaSymbol">
+        <Property></Property>
+        <Property name="label">杩愮畻绗﹀彿</Property>
+      </PropertyDef>
+      <PropertyDef name="ruleNum">
+        <Property name="dataType">Double</Property>
+        <Property name="label">鎵ｉ噸绯绘暟</Property>
+      </PropertyDef>
+      <PropertyDef name="ruleAdd">
+        <Property name="dataType">Double</Property>
+        <Property name="label">澧為噸%</Property>
+      </PropertyDef>
+      <PropertyDef name="ruleAddEnd">
+        <Property name="dataType">Double</Property>
+        <Property name="label">澧為噸涓婇檺%</Property>
+      </PropertyDef>
+      <PropertyDef name="ruleReduce">
+        <Property name="dataType">Double</Property>
+        <Property name="label">鎵ｉ噸鍊�%</Property>
+      </PropertyDef>
+      <PropertyDef name="rulePrice">
+        <Property name="dataType">Double</Property>
+        <Property name="label">鎵ｈ垂绯绘暟</Property>
+      </PropertyDef>
+      <PropertyDef name="ruleReducePrice">
+        <Property name="dataType">Double</Property>
+        <Property name="label">鎵ｈ垂</Property>
+      </PropertyDef>
+      <PropertyDef name="addNum">
+        <Property name="dataType">Double</Property>
+        <Property name="label">澧為噸</Property>
+      </PropertyDef>
+      <PropertyDef name="deNum">
+        <Property name="dataType">Double</Property>
+        <Property name="label">鎵ｉ噸</Property>
+      </PropertyDef>
+      <PropertyDef name="addPrice">
+        <Property name="dataType">Double</Property>
+        <Property name="label">澧炰环</Property>
+      </PropertyDef>
+      <PropertyDef name="dePrice">
+        <Property name="dataType">Double</Property>
+        <Property name="label">鎵ｄ环</Property>
+      </PropertyDef>
+      <PropertyDef name="result">
+        <Property></Property>
+        <Property name="label">妫�楠岀粨鏋�</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;inoutDataPR#triggerResult&quot;).getResult()}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+    </DataType>
+    <DataType name="dataTypeUser">
+      <Property name="creationType">com.bstek.bdf2.core.model.DefaultUser</Property>
+      <PropertyDef name="password">
+        <Property name="dataType">String</Property>
+        <Property name="label">瀵嗙爜</Property>
+        <Property name="required">true</Property>
+        <Validator type="length">
+          <Property name="minLength">6</Property>
+        </Validator>
+        <Validator type="custom">
+          <ClientEvent name="onValidate">if (arg.entity.get(&quot;confirmPassword&quot;)){
                         arg.entity.validate(&quot;confirmPassword&quot;);
                         }
                     </ClientEvent>
-                </Validator>
-            </PropertyDef>
-            <PropertyDef name="confirmPassword">
-                <Property name="dataType">String</Property>
-                <Property name="label">纭瀵嗙爜</Property>
-                <Property name="required">true</Property>
-                <Validator type="custom">
-                    <ClientEvent name="onValidate">var confirm = arg.data;&#xD;
+        </Validator>
+      </PropertyDef>
+      <PropertyDef name="confirmPassword">
+        <Property name="dataType">String</Property>
+        <Property name="label">纭瀵嗙爜</Property>
+        <Property name="required">true</Property>
+        <Validator type="custom">
+          <ClientEvent name="onValidate">var confirm = arg.data;&#xD;
                         var password = arg.entity.get(&quot;password&quot;);&#xD;
                         if (confirm ==password) {&#xD;
                         arg.result = { state:&quot;ok&quot;}&#xD;
@@ -248,176 +336,212 @@
                         arg.result = { state:&quot;error&quot;, text: &quot;涓ゆ瀵嗙爜涓嶄竴鑷�&quot;}; &#xD;
                         }
                     </ClientEvent>
-                </Validator>
-            </PropertyDef>
-            <PropertyDef name="salt">
-                <Property name="dataType">String</Property>
-            </PropertyDef>
-            <PropertyDef name="male">
-                <Property name="dataType">boolean</Property>
-                <Property name="label">鎬у埆</Property>
-                <Property name="mapping">
-                    <Property name="mapValues">
-                        <Collection>
-                            <Entity>
-                                <Property name="key">true</Property>
-                                <Property name="value">鐢�</Property>
-                            </Entity>
-                            <Entity>
-                                <Property name="key">false</Property>
-                                <Property name="value">濂�</Property>
-                            </Entity>
-                        </Collection>
+        </Validator>
+      </PropertyDef>
+      <PropertyDef name="salt">
+        <Property name="dataType">String</Property>
+      </PropertyDef>
+      <PropertyDef name="male">
+        <Property name="dataType">boolean</Property>
+        <Property name="label">鎬у埆</Property>
+        <Property name="mapping">
+          <Property name="mapValues">
+            <Collection>
+              <Entity>
+                <Property name="key">true</Property>
+                <Property name="value">鐢�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">false</Property>
+                <Property name="value">濂�</Property>
+              </Entity>
+            </Collection>
+          </Property>
+        </Property>
+        <Property name="defaultValue">true</Property>
+      </PropertyDef>
+      <PropertyDef name="enabled">
+        <Property name="dataType">boolean</Property>
+        <Property name="label">鏄惁鍙敤</Property>
+        <Property name="defaultValue">true</Property>
+      </PropertyDef>
+      <PropertyDef name="birthday">
+        <Property name="dataType">Date</Property>
+        <Property name="label">鍑虹敓鏃ユ湡</Property>
+      </PropertyDef>
+      <PropertyDef name="address">
+        <Property name="dataType">String</Property>
+        <Property name="label">鍦板潃</Property>
+        <Validator type="length">
+          <Property name="maxLength">120</Property>
+        </Validator>
+      </PropertyDef>
+      <PropertyDef name="username">
+        <Property name="dataType">String</Property>
+        <Property name="label">鐢ㄦ埛鍚�</Property>
+        <Property name="required">true</Property>
+        <Validator type="ajax">
+          <Property name="service">bdf2.userMaintain#userIsExists</Property>
+        </Validator>
+        <Validator type="length">
+          <Property name="maxLength">60</Property>
+        </Validator>
+      </PropertyDef>
+      <PropertyDef name="cname">
+        <Property name="dataType">String</Property>
+        <Property name="label">涓枃鍚�</Property>
+        <Property name="required">true</Property>
+        <Validator type="length">
+          <Property name="minLength">2</Property>
+          <Property name="maxLength">60</Property>
+        </Validator>
+      </PropertyDef>
+      <PropertyDef name="ename">
+        <Property name="dataType">String</Property>
+        <Property name="label">鑻辨枃鍚�</Property>
+        <Property name="required">true</Property>
+        <Validator type="length">
+          <Property name="maxLength">60</Property>
+        </Validator>
+      </PropertyDef>
+      <PropertyDef name="administrator">
+        <Property name="dataType">boolean</Property>
+        <Property name="label">鏄惁涓虹鐞嗗憳</Property>
+      </PropertyDef>
+      <PropertyDef name="mobile">
+        <Property name="dataType">String</Property>
+        <Property name="label">鎵嬫満</Property>
+        <Property name="required">true</Property>
+        <Validator type="length">
+          <Property name="maxLength">11</Property>
+          <Property name="minLength">11</Property>
+          <Property name="resultMessage">璇疯緭鍏�11浣嶆墜鏈哄彿鐮�</Property>
+        </Validator>
+      </PropertyDef>
+      <PropertyDef name="email">
+        <Property name="dataType">String</Property>
+        <Property name="label">閭</Property>
+        <Property name="required">true</Property>
+        <Validator type="regExp">
+          <Property name="resultMessage">閭鏍煎紡杈撳叆閿欒</Property>
+          <Property name="whiteRegExp">^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$
                     </Property>
-                </Property>
-                <Property name="defaultValue">true</Property>
-            </PropertyDef>
-            <PropertyDef name="enabled">
-                <Property name="dataType">boolean</Property>
-                <Property name="label">鏄惁鍙敤</Property>
-                <Property name="defaultValue">true</Property>
-            </PropertyDef>
-            <PropertyDef name="birthday">
-                <Property name="dataType">Date</Property>
-                <Property name="label">鍑虹敓鏃ユ湡</Property>
-            </PropertyDef>
-            <PropertyDef name="address">
-                <Property name="dataType">String</Property>
-                <Property name="label">鍦板潃</Property>
-                <Validator type="length">
-                    <Property name="maxLength">120</Property>
-                </Validator>
-            </PropertyDef>
-            <PropertyDef name="username">
-                <Property name="dataType">String</Property>
-                <Property name="label">鐢ㄦ埛鍚�</Property>
-                <Property name="required">true</Property>
-                <Validator type="ajax">
-                    <Property name="service">bdf2.userMaintain#userIsExists</Property>
-                </Validator>
-                <Validator type="length">
-                    <Property name="maxLength">60</Property>
-                </Validator>
-            </PropertyDef>
-            <PropertyDef name="cname">
-                <Property name="dataType">String</Property>
-                <Property name="label">涓枃鍚�</Property>
-                <Property name="required">true</Property>
-                <Validator type="length">
-                    <Property name="minLength">2</Property>
-                    <Property name="maxLength">60</Property>
-                </Validator>
-            </PropertyDef>
-            <PropertyDef name="ename">
-                <Property name="dataType">String</Property>
-                <Property name="label">鑻辨枃鍚�</Property>
-                <Property name="required">true</Property>
-                <Validator type="length">
-                    <Property name="maxLength">60</Property>
-                </Validator>
-            </PropertyDef>
-            <PropertyDef name="administrator">
-                <Property name="dataType">boolean</Property>
-                <Property name="label">鏄惁涓虹鐞嗗憳</Property>
-            </PropertyDef>
-            <PropertyDef name="mobile">
-                <Property name="dataType">String</Property>
-                <Property name="label">鎵嬫満</Property>
-                <Property name="required">true</Property>
-                <Validator type="length">
-                    <Property name="maxLength">11</Property>
-                    <Property name="minLength">11</Property>
-                    <Property name="resultMessage">璇疯緭鍏�11浣嶆墜鏈哄彿鐮�</Property>
-                </Validator>
-            </PropertyDef>
-            <PropertyDef name="email">
-                <Property name="dataType">String</Property>
-                <Property name="label">閭</Property>
-                <Property name="required">true</Property>
-                <Validator type="regExp">
-                    <Property name="resultMessage">閭鏍煎紡杈撳叆閿欒</Property>
-                    <Property name="whiteRegExp">^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$
-                    </Property>
-                    <Property name="validateMode">whiteBlack</Property>
-                </Validator>
-                <Validator type="length">
-                    <Property name="maxLength">120</Property>
-                </Validator>
-            </PropertyDef>
-            <PropertyDef name="companyId">
-                <Property name="dataType">String</Property>
-            </PropertyDef>
-        </DataType>
-    </Model>
-    <View layout="padding:5;regionPadding:5">
-        <ClientEvent name="onReady">var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�&#xD;
-            &#xD;
-            //鏍规嵁浠撳簱鑷姩鍥炲～绮鍝佺锛岀櫥璁帮紝浜у湴鏂�&#xD;
-            autoByDepot = function(depotId){&#xD;
-            view.get(&quot;#ajaxGetDepot&quot;).set(&quot;parameter&quot;,depotId).execute(function(result){&#xD;
-            if(result){&#xD;
-            var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
-            data.set(&quot;foodLocation&quot;,result.foodLocation);&#xD;
-            data.set(&quot;foodLevel&quot;,result.foodLevel);&#xD;
-            data.set(&quot;foodVariety&quot;,result.foodVariety);&#xD;
-            data.set(&quot;foodType&quot;,result.foodType);&#xD;
-            }&#xD;
-            });&#xD;
-            };&#xD;
-            &#xD;
-            //鏍规嵁绮鍝佺鏌ヨ鍖栭獙椤瑰苟鍥炴樉&#xD;
-            checkByFood = function(foodVariety){&#xD;
-            view.get(&quot;#ajaxGetCheck&quot;).set(&quot;parameter&quot;,{foodVariety:foodVariety,deptId:deptId}).execute(function(result){&#xD;
-            if(result){&#xD;
-            var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
-            data.set(&quot;checkItems&quot;,result);&#xD;
-            }&#xD;
-            }); &#xD;
-            };
-        </ClientEvent>
-        <Property name="packages">font-awesome,css-common</Property>
-        <DataSet id="dsMain">
-            <Property name="loadMode">lazy</Property>
-            <Property name="dataProvider">qualityManagerPR#listQuality</Property>
-            <Property name="dataType">[dtMain]</Property>
-            <Property name="pageSize">15</Property>
-        </DataSet>
-        <DataSet id="dsParam">
-            <ClientEvent name="onReady">self.insert({});</ClientEvent>
-            <Property name="dataType">dtQualityParam</Property>
-        </DataSet>
-        <DataSet id="dataSetUser">
-            <Property name="dataType">[dataTypeUser]</Property>
-            <Property name="pageSize">100</Property>
-            <Property name="dataProvider">bdf2.userMaintain#loadUsers</Property>
-        </DataSet>
-        <Container layout="regionPadding:10" layoutConstraint="top">
-            <Property name="exClassName">bg-color</Property>
-            <Property name="contentOverflow">hidden</Property>
-            <Property name="height">55</Property>
-            <Label layoutConstraint="left">
-                <Property name="text">鑿滃崟鏍忥細</Property>
-            </Label>
-            <Button layoutConstraint="left">
-                <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).insert();&#xD;
-                    view.get(&quot;#dialogMain&quot;).show();
-                </ClientEvent>
-                <Property name="caption">鏂板</Property>
-                <Property name="exClassName">btn-default</Property>
-                <Property name="iconClass">fa fa-plus</Property>
-            </Button>
-            <Button layoutConstraint="left">
-                <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+          <Property name="validateMode">whiteBlack</Property>
+        </Validator>
+        <Validator type="length">
+          <Property name="maxLength">120</Property>
+        </Validator>
+      </PropertyDef>
+      <PropertyDef name="companyId">
+        <Property name="dataType">String</Property>
+      </PropertyDef>
+    </DataType>
+    <DataType name="dtMetrics">
+      <PropertyDef name="code"/>
+      <PropertyDef name="name"/>
+    </DataType>
+    <DataType name="dtResult">
+      <PropertyDef name="name"/>
+    </DataType>
+  </Model>
+  <View layout="padding:5;regionPadding:5">
+    <ClientEvent name="onReady">var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�&#xD;
+&#xD;
+//鏍规嵁浠撳簱鑷姩鍥炲～绮鍝佺锛岀櫥璁帮紝浜у湴鏂�&#xD;
+autoByDepot = function(depotId){&#xD;
+   view.get(&quot;#ajaxGetDepot&quot;).set(&quot;parameter&quot;,depotId).execute(function(result){&#xD;
+     if(result){&#xD;
+     var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+     data.set(&quot;foodLocation&quot;,result.foodLocation);&#xD;
+     data.set(&quot;foodLevel&quot;,result.foodLevel);&#xD;
+     data.set(&quot;foodVariety&quot;,result.foodVariety);&#xD;
+     data.set(&quot;foodType&quot;,result.foodType);&#xD;
+	}&#xD;
+});&#xD;
+};&#xD;
+//鏍规嵁绮鍝佺鏌ヨ鍖栭獙椤瑰苟鍥炴樉&#xD;
+checkByFood = function(foodVariety){&#xD;
+view.get(&quot;#ajaxGetCheck&quot;).set(&quot;parameter&quot;,{foodVariety:foodVariety,deptId:deptId}).execute(function(result){&#xD;
+if(result){&#xD;
+ var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+ data.set(&quot;checkItems&quot;,result);&#xD;
+	}&#xD;
+  }); &#xD;
+};      </ClientEvent>
+    <Property name="packages">font-awesome,css-common</Property>
+    <DataSet id="dsMain">
+      <Property name="loadMode">lazy</Property>
+      <Property name="dataProvider">qualityManagerPR#listQuality</Property>
+      <Property name="dataType">[dtMain]</Property>
+      <Property name="pageSize">15</Property>
+    </DataSet>
+    <DataSet id="dsParam">
+      <ClientEvent name="onReady">self.insert({});</ClientEvent>
+      <Property name="dataType">dtQualityParam</Property>
+    </DataSet>
+    <DataSet id="dataSetUser">
+      <Property name="dataType">[dataTypeUser]</Property>
+      <Property name="pageSize">100</Property>
+      <Property name="dataProvider">bdf2.userMaintain#loadUsers</Property>
+    </DataSet>
+    <DataSet id="dsMetrics">
+      <ClientEvent name="onCreate">var data = [ {&#xD;
+	name : &quot;1:璐ㄩ噺鎸囨爣妫�楠�&quot;&#xD;
+}, {&#xD;
+	name : &quot;2:鍌ㄥ瓨鍝佽川妫�楠�&quot;&#xD;
+}, {&#xD;
+	name : &quot;3:椋熷搧瀹夊叏妫�楠�&quot;&#xD;
+}]&#xD;
+self.setData(data);&#xD;
+</ClientEvent>
+      <Property name="dataType">[dtMetrics]</Property>
+    </DataSet>
+    <DataSet id="dsResult">
+      <ClientEvent name="onCreate">var data = [ {&#xD;
+	name : &quot;杈炬爣&quot;&#xD;
+}, {&#xD;
+	name : &quot;涓嶈揪鏍�&quot;&#xD;
+}, {&#xD;
+	name : &quot;瀹滃瓨&quot;&#xD;
+},{&#xD;
+	name : &quot;杞诲害涓嶅疁瀛�&quot;&#xD;
+},{&#xD;
+	name : &quot;閲嶅害涓嶅疁瀛�&quot;&#xD;
+}, {&#xD;
+	name : &quot;鍚堟牸&quot;&#xD;
+}, {&#xD;
+	name : &quot;涓嶅悎鏍�&quot;&#xD;
+}]&#xD;
+self.setData(data);&#xD;
+</ClientEvent>
+      <Property name="dataType">[dtResult]</Property>
+    </DataSet>
+    <Container layout="regionPadding:10" layoutConstraint="top">
+      <Property name="exClassName">bg-color</Property>
+      <Property name="contentOverflow">hidden</Property>
+      <Property name="height">55</Property>
+      <Label layoutConstraint="left">
+        <Property name="text">鑿滃崟鏍忥細</Property>
+      </Label>
+      <Button layoutConstraint="left">
+        <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).insert();&#xD;
+view.get(&quot;#dialogMain&quot;).show();              </ClientEvent>
+        <Property name="caption">鏂板</Property>
+        <Property name="exClassName">btn-default</Property>
+        <Property name="iconClass">fa fa-plus</Property>
+      </Button>
+      <Button layoutConstraint="left">
+        <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
                     if(data){&#xD;
                     view.get(&quot;#dialogMain&quot;).show();&#xD;
                     }
                 </ClientEvent>
-                <Property name="caption">淇敼</Property>
-                <Property name="exClassName">btn-warm</Property>
-                <Property name="iconClass">fa fa-pencil</Property>
-            </Button>
-            <Button layoutConstraint="left">
-                <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+        <Property name="caption">淇敼</Property>
+        <Property name="exClassName">btn-warm</Property>
+        <Property name="iconClass">fa fa-pencil</Property>
+      </Button>
+      <Button layoutConstraint="left">
+        <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
                     if(!data){&#xD;
                     return;&#xD;
                     }&#xD;
@@ -430,140 +554,146 @@
                     }&#xD;
                     });
                 </ClientEvent>
-                <Property name="caption">鍒犻櫎</Property>
-                <Property name="exClassName">btn-warn</Property>
-                <Property name="iconClass">fa fa-minus</Property>
-            </Button>
-            <Button layoutConstraint="left">
-                <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).flushAsync();&#xD;
+        <Property name="caption">鍒犻櫎</Property>
+        <Property name="exClassName">btn-warn</Property>
+        <Property name="iconClass">fa fa-minus</Property>
+      </Button>
+      <Button layoutConstraint="left">
+        <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).flushAsync();&#xD;
                 </ClientEvent>
-                <Property name="caption">鍒锋柊</Property>
-                <Property name="exClassName">btn-default</Property>
-                <Property name="iconClass">fa fa-refresh</Property>
-            </Button>
-        </Container>
-        <Container layout="regionPadding:10" layoutConstraint="center">
-            <Property name="exClassName">bg-color</Property>
-            <AutoForm>
-                <Property name="cols">*,*,*,*,*</Property>
-                <Property name="dataSet">dsParam</Property>
-                <Property name="labelAlign">right</Property>
-                <Property name="labelSeparator">锛�</Property>
-                <Property name="labelWidth">110</Property>
-                <AutoFormElement>
-                    <Property name="name">depotId</Property>
-                    <Property name="property">depotId</Property>
-                    <Editor/>
-                </AutoFormElement>
-                <AutoFormElement>
-                    <Property name="name">type</Property>
-                    <Property name="property">type</Property>
-                    <Editor/>
-                </AutoFormElement>
-                <AutoFormElement>
-                    <Property name="name">start</Property>
-                    <Property name="property">start</Property>
-                    <Editor/>
-                </AutoFormElement>
-                <AutoFormElement>
-                    <Property name="name">end</Property>
-                    <Property name="property">end</Property>
-                    <Editor/>
-                </AutoFormElement>
-                <Container layout="hbox regionPadding:15">
-                    <Button layoutConstraint="left">
-                        <ClientEvent name="onClick">var param = view.get(&quot;#dsParam.data&quot;);&#xD;
+        <Property name="caption">鍒锋柊</Property>
+        <Property name="exClassName">btn-default</Property>
+        <Property name="iconClass">fa fa-refresh</Property>
+      </Button>
+    </Container>
+    <Container layout="regionPadding:10" layoutConstraint="center">
+      <Property name="exClassName">bg-color</Property>
+      <AutoForm>
+        <Property name="cols">*,*,*,*,*</Property>
+        <Property name="dataSet">dsParam</Property>
+        <Property name="labelAlign">right</Property>
+        <Property name="labelSeparator">锛�</Property>
+        <Property name="labelWidth">110</Property>
+        <AutoFormElement>
+          <Property name="name">depotId</Property>
+          <Property name="property">depotId</Property>
+          <Editor/>
+        </AutoFormElement>
+        <AutoFormElement>
+          <Property name="name">type</Property>
+          <Property name="property">type</Property>
+          <Editor/>
+        </AutoFormElement>
+        <AutoFormElement>
+          <Property name="name">start</Property>
+          <Property name="property">start</Property>
+          <Editor/>
+        </AutoFormElement>
+        <AutoFormElement>
+          <Property name="name">end</Property>
+          <Property name="property">end</Property>
+          <Editor/>
+        </AutoFormElement>
+        <Container layout="hbox regionPadding:15">
+          <Button layoutConstraint="left">
+            <ClientEvent name="onClick">var param = view.get(&quot;#dsParam.data&quot;);&#xD;
                             view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,param.toJSON()).flushAsync();
                         </ClientEvent>
-                        <Property name="caption">鏌ヨ</Property>
-                        <Property name="exClassName">btn-default</Property>
-                        <Property name="iconClass">fa fa-refresh</Property>
-                    </Button>
-                    <Button>
-                        <ClientEvent name="onClick">view.get(&quot;#dsParam&quot;).setData({});</ClientEvent>
-                        <Property name="exClassName">btn-warn</Property>
-                        <Property name="iconClass">fa fa-refresh</Property>
-                        <Property name="caption">閲嶇疆</Property>
-                    </Button>
-                </Container>
-            </AutoForm>
-            <DataGrid layoutConstraint="center padding:5px">
-                <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
-                    if(data){&#xD;
-                    view.get(&quot;#dialogMain&quot;).show();&#xD;
-                    }
-                </ClientEvent>
-                <Property name="dataSet">dsMain</Property>
-                <Property name="readOnly">true</Property>
-                <RowNumColumn/>
-                <DataColumn>
-                    <Property name="property">depotId</Property>
-                    <Property name="align">center</Property>
-                    <Property name="name">depotId</Property>
-                </DataColumn>
-                <DataColumn>
-                    <Property name="property">type</Property>
-                    <Property name="align">center</Property>
-                    <Property name="name">type</Property>
-                </DataColumn>
-                <DataColumn>
-                    <Property name="property">foodVariety</Property>
-                    <Property name="align">center</Property>
-                    <Property name="name">foodVariety</Property>
-                </DataColumn>
-                <DataColumn>
-                    <Property name="property">foodType</Property>
-                    <Property name="align">center</Property>
-                    <Property name="name">foodType</Property>
-                </DataColumn>
-                <DataColumn>
-                    <Property name="property">foodLevel</Property>
-                    <Property name="align">center</Property>
-                    <Property name="name">foodLevel</Property>
-                </DataColumn>
-                <DataColumn>
-                    <Property name="property">standard</Property>
-                    <Property name="align">center</Property>
-                    <Property name="name">standard</Property>
-                </DataColumn>
-                <DataColumn>
-                    <Property name="property">user</Property>
-                    <Property name="align">center</Property>
-                    <Property name="name">user</Property>
-                </DataColumn>
-                <DataColumn>
-                    <Property name="property">time</Property>
-                    <Property name="align">center</Property>
-                    <Property name="name">time</Property>
-                </DataColumn>
-                <DataColumn>
-                    <Property name="property">result</Property>
-                    <Property name="align">center</Property>
-                    <Property name="name">result</Property>
-                </DataColumn>
-                <DataColumn>
-                    <Property name="property">normalYear</Property>
-                    <Property name="align">center</Property>
-                    <Property name="name">normalYear</Property>
-                </DataColumn>
-            </DataGrid>
+            <Property name="caption">鏌ヨ</Property>
+            <Property name="exClassName">btn-default</Property>
+            <Property name="iconClass">fa fa-refresh</Property>
+          </Button>
+          <Button>
+            <ClientEvent name="onClick">view.get(&quot;#dsParam&quot;).setData({});</ClientEvent>
+            <Property name="exClassName">btn-warn</Property>
+            <Property name="iconClass">fa fa-refresh</Property>
+            <Property name="caption">閲嶇疆</Property>
+          </Button>
         </Container>
-        <Container layout="regionPadding:10" layoutConstraint="bottom">
-            <Property name="exClassName">bg-color</Property>
-            <DataPilot layoutConstraint="right">
-                <Property name="itemCodes">pageSize,pages</Property>
-                <Property name="dataSet">dsMain</Property>
-            </DataPilot>
-        </Container>
-        <Dialog id="dialogMain">
-            <Property name="visible">false</Property>
-            <Property name="caption">璐ㄩ噺宸℃淇℃伅</Property>
-            <Property name="width">80%</Property>
-            <Property name="height">720</Property>
-            <Property name="closeable">false</Property>
-            <Buttons>
-                <Button>
-                    <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+      </AutoForm>
+      <DataGrid layoutConstraint="center padding:5px">
+        <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+if(data){&#xD;
+    view.get(&quot;#dialogMain&quot;).show();&#xD;
+}              </ClientEvent>
+        <Property name="dataSet">dsMain</Property>
+        <Property name="readOnly">true</Property>
+        <RowNumColumn/>
+        <DataColumn>
+          <Property name="property">depotId</Property>
+          <Property name="align">center</Property>
+          <Property name="name">depotId</Property>
+        </DataColumn>
+        <DataColumn>
+          <Property name="property">type</Property>
+          <Property name="align">center</Property>
+          <Property name="name">type</Property>
+        </DataColumn>
+        <DataColumn>
+          <Property name="property">foodVariety</Property>
+          <Property name="align">center</Property>
+          <Property name="name">foodVariety</Property>
+        </DataColumn>
+        <DataColumn>
+          <Property name="property">foodLevel</Property>
+          <Property name="align">center</Property>
+          <Property name="name">foodLevel</Property>
+        </DataColumn>
+        <DataColumn>
+          <Property name="property">standard</Property>
+          <Property name="align">center</Property>
+          <Property name="name">standard</Property>
+        </DataColumn>
+        <DataColumn>
+          <Property name="property">user</Property>
+          <Property name="align">center</Property>
+          <Property name="name">user</Property>
+        </DataColumn>
+        <DataColumn>
+          <Property name="property">time</Property>
+          <Property name="align">center</Property>
+          <Property name="name">time</Property>
+        </DataColumn>
+        <DataColumn>
+          <Property name="property">result</Property>
+          <Property name="align">center</Property>
+          <Property name="name">result</Property>
+        </DataColumn>
+        <DataColumn>
+          <Property name="property">normalYear</Property>
+          <Property name="align">center</Property>
+          <Property name="name">normalYear</Property>
+        </DataColumn>
+      </DataGrid>
+    </Container>
+    <Container layout="regionPadding:10" layoutConstraint="bottom">
+      <Property name="exClassName">bg-color</Property>
+      <DataPilot layoutConstraint="right">
+        <Property name="itemCodes">pageSize,pages</Property>
+        <Property name="dataSet">dsMain</Property>
+      </DataPilot>
+    </Container>
+    <Dialog id="dialogMain">
+      <ClientEvent name="beforeShow">var data = view.get(&quot;#dsMain.data:#&quot;)&#xD;
+var metricsBefore = data.get(&quot;zblb&quot;)&#xD;
+if(metricsBefore){&#xD;
+	var list = metricsBefore.split(&quot;#&quot;);&#xD;
+	var metrics =&quot;&quot; ;&#xD;
+	list.forEach(item=>{&#xD;
+		if(item == 1)metrics+=&quot;1:璐ㄩ噺鎸囨爣妫�楠�#&quot;;&#xD;
+		if(item == 2)metrics+=&quot;2:鍌ㄥ瓨鍝佽川妫�楠�#&quot;;&#xD;
+		if(item == 3)metrics+=&quot;3:椋熷搧瀹夊叏妫�楠�#&quot;;	&#xD;
+	});&#xD;
+	data.set(&quot;zblb&quot;, metrics.substring(0,metrics.length-1));&#xD;
+}</ClientEvent>
+      <Property name="visible">false</Property>
+      <Property name="caption">璐ㄩ噺宸℃淇℃伅</Property>
+      <Property name="width">80%</Property>
+      <Property name="height">720</Property>
+      <Property name="closeable">false</Property>
+      <Buttons>
+        <Button>
+          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
                         if(data.validate() != 'ok'){&#xD;
                         $notify(&quot;鏁版嵁鏍￠獙澶辫触锛侊紒&quot;);&#xD;
                         return;&#xD;
@@ -572,289 +702,350 @@
                         self.get(&quot;parent&quot;).hide();&#xD;
                         });
                     </ClientEvent>
-                    <Property name="caption">淇濆瓨</Property>
-                    <Property name="iconClass">fa fa-check</Property>
-                    <Property name="exClassName">btn-normal</Property>
-                </Button>
-                <Button>
-                    <ClientEvent name="onClick">view.get(&quot;#dsMain.data:#&quot;).cancel();&#xD;
+          <Property name="caption">淇濆瓨</Property>
+          <Property name="iconClass">fa fa-check</Property>
+          <Property name="exClassName">btn-normal</Property>
+        </Button>
+        <Button>
+          <ClientEvent name="onClick">view.get(&quot;#dsMain.data:#&quot;).cancel();&#xD;
                         self.get(&quot;parent&quot;).hide();
                     </ClientEvent>
-                    <Property name="caption">鍙栨秷</Property>
-                    <Property name="iconClass">fa fa-times</Property>
-                    <Property name="exClassName">btn-warn</Property>
-                </Button>
-            </Buttons>
-            <Children>
-                <FieldSet layout="padding:5">
-                    <Property name="caption">鍩虹淇℃伅</Property>
-                    <Buttons/>
-                    <Children>
-                        <AutoForm>
-                            <Property name="dataSet">dsMain</Property>
-                            <Property name="readOnly">false</Property>
-                            <Property name="labelSeparator">:</Property>
-                            <Property name="labelAlign">right</Property>
-                            <Property name="cols">*,*,*</Property>
-                            <Property name="labelWidth">120</Property>
-                            <AutoFormElement>
-                                <Property name="name">depotId</Property>
-                                <Property name="property">depotId</Property>
-                                <Editor/>
-                            </AutoFormElement>
-                            <AutoFormElement>
-                                <Property name="name">type</Property>
-                                <Property name="property">type</Property>
-                                <Editor/>
-                            </AutoFormElement>
-                            <AutoFormElement>
-                                <Property name="name">checkArea</Property>
-                                <Property name="property">checkArea</Property>
-                                <Editor/>
-                            </AutoFormElement>
-                            <AutoFormElement>
-                                <Property name="name">foodVariety</Property>
-                                <Property name="property">foodVariety</Property>
-                                <Editor/>
-                            </AutoFormElement>
-                            <AutoFormElement>
-                                <Property name="name">standard</Property>
-                                <Property name="property">standard</Property>
-                                <Editor/>
-                            </AutoFormElement>
-                            <AutoFormElement>
-                                <Property name="name">checkUser</Property>
-                                <Property name="property">checkUser</Property>
-                                <Property name="trigger">triggerUserList</Property>
-                                <Editor/>
-                            </AutoFormElement>
-                            <AutoFormElement>
-                                <Property name="name">foodType</Property>
-                                <Property name="property">foodType</Property>
-                                <Editor/>
-                            </AutoFormElement>
-                            <AutoFormElement>
-                                <Property name="name">user</Property>
-                                <Property name="property">user</Property>
-                                <Property name="trigger">triggerUserList1</Property>
-                                <Editor/>
-                            </AutoFormElement>
-                            <AutoFormElement>
-                                <Property name="name">checkNum</Property>
-                                <Property name="property">checkNum</Property>
-                                <Editor/>
-                            </AutoFormElement>
-                            <AutoFormElement>
-                                <Property name="name">foodLevel</Property>
-                                <Property name="property">foodLevel</Property>
-                                <Editor/>
-                            </AutoFormElement>
-                            <AutoFormElement>
-                                <Property name="name">time</Property>
-                                <Property name="property">time</Property>
-                                <Editor/>
-                            </AutoFormElement>
-                            <AutoFormElement>
-                                <Property name="name">checkTime</Property>
-                                <Property name="property">checkTime</Property>
-                                <Editor/>
-                            </AutoFormElement>
-                            <AutoFormElement>
-                                <Property name="name">foodLocation</Property>
-                                <Property name="property">foodLocation</Property>
-                                <Property name="trigger">ddFoodOrigin</Property>
-                                <Editor/>
-                            </AutoFormElement>
-                            <AutoFormElement>
-                                <Property name="name">checkRepresent</Property>
-                                <Property name="property">checkRepresent</Property>
-                                <Editor/>
-                            </AutoFormElement>
-                            <AutoFormElement>
-                                <Property name="name">checkLevel</Property>
-                                <Property name="property">checkLevel</Property>
-                                <Editor/>
-                            </AutoFormElement>
-                            <AutoFormElement>
-                                <Property name="name">normalYear</Property>
-                                <Property name="property">normalYear</Property>
-                                <Editor>
-                                    <RadioGroup>
-                                        <RadioButton>
-                                            <Property name="text">鍚�</Property>
-                                            <Property name="value">0</Property>
-                                        </RadioButton>
-                                        <RadioButton>
-                                            <Property name="text">鏄�</Property>
-                                            <Property name="value">1</Property>
-                                        </RadioButton>
-                                    </RadioGroup>
-                                </Editor>
-                            </AutoFormElement>
-                            <AutoFormElement layoutConstraint="colSpan:2">
-                                <Property name="name">result</Property>
-                                <Property name="property">result</Property>
-                                <Editor/>
-                            </AutoFormElement>
-                            <AutoFormElement layoutConstraint="colSpan:3">
-                                <Property name="name">remark</Property>
-                                <Property name="property">remark</Property>
-                                <Editor/>
-                            </AutoFormElement>
-                        </AutoForm>
-                    </Children>
-                </FieldSet>
-                <Control>
-                    <Property name="height">10</Property>
-                </Control>
-                <FieldSet layout="padding:5">
-                    <Property name="caption">妫�娴嬮」淇℃伅</Property>
-                    <Buttons/>
-                    <Children>
-                        <DataGrid id="dataGridCheckItem">
-                            <Property name="dataPath">#.checkItems</Property>
-                            <Property name="dataSet">dsMain</Property>
-                            <Property name="hideMode">display</Property>
-                            <Property name="highlightCurrentRow">false</Property>
-                            <Property name="visible">true</Property>
-                            <RowNumColumn/>
-                            <DataColumn>
-                                <Property name="name">standardName</Property>
-                                <Property name="property">standardName</Property>
-                                <Property name="align">center</Property>
-                                <Property name="readOnly">true</Property>
-                                <Editor/>
-                            </DataColumn>
-                            <DataColumn>
-                                <Property name="name">value</Property>
-                                <Property name="property">value</Property>
-                                <Property name="align">center</Property>
-                                <Editor/>
-                            </DataColumn>
-                            <DataColumn>
-                                <Property name="name">upperLimit</Property>
-                                <Property name="property">upperLimit</Property>
-                                <Property name="align">center</Property>
-                                <Property name="readOnly">true</Property>
-                                <Editor/>
-                            </DataColumn>
-                            <DataColumn>
-                                <Property name="name">lowerLimit</Property>
-                                <Property name="property">lowerLimit</Property>
-                                <Property name="align">center</Property>
-                                <Property name="readOnly">true</Property>
-                                <Editor/>
-                            </DataColumn>
-                            <DataColumn>
-                                <Property name="name">unit</Property>
-                                <Property name="property">unit</Property>
-                                <Property name="align">center</Property>
-                                <Property name="readOnly">true</Property>
-                                <Editor/>
-                            </DataColumn>
-                            <DataColumn>
-                                <Property name="name">remarks</Property>
-                                <Property name="property">remarks</Property>
-                                <Property name="align">center</Property>
-                                <Editor/>
-                            </DataColumn>
-                        </DataGrid>
-                    </Children>
-                </FieldSet>
-            </Children>
-            <Tools/>
-        </Dialog>
-        <UpdateAction id="uaAction">
-            <Property name="dataResolver">qualityManagerPR#saveQuality</Property>
-            <UpdateItem>
-                <Property name="dataSet">dsMain</Property>
-                <Property name="dataPath">[#current]</Property>
-            </UpdateItem>
-        </UpdateAction>
-        <AjaxAction id="ajaxDel">
-            <Property name="confirmMessage">纭畾瑕佸垹闄ゅ悧锛�</Property>
-            <Property name="service">qualityManagerPR#delQuality</Property>
-        </AjaxAction>
-        <AjaxAction id="ajaxGetDepot">
-            <Property name="service">depotPR#getDepot</Property>
-        </AjaxAction>
-        <AjaxAction id="ajaxGetCheck">
-            <Property name="service">checkStandardPR#listCheckItemsByFoodVariety</Property>
-        </AjaxAction>
-        <CustomDropDown id="ddFoodOrigin">
-            <Property name="minHeight">480</Property>
-            <Property name="assignmentMap">foodLocation=name</Property>
-            <Property name="minWidth">360</Property>
-            <Container layout="regionPadding:5">
-                <DataSet id="dsFoodOrigin">
-                    <Property name="dataProvider">dicAreaPR#pageList</Property>
-                    <Property name="dataType">[dtArea]</Property>
-                    <Property name="parameter"></Property>
-                    <Property name="pageSize">30</Property>
-                </DataSet>
-                <Container layout="hbox regionPadding:5">
-                    <TextEditor id="key2">
-                        <Property name="blankText">-- 缂栫爜鎴栬�呭悕绉� --</Property>
-                        <Property name="width">200</Property>
-                    </TextEditor>
-                    <Button>
-                        <ClientEvent name="onClick">var key = view.get(&quot;#key2.value&quot;);&#xD;
+          <Property name="caption">鍙栨秷</Property>
+          <Property name="iconClass">fa fa-times</Property>
+          <Property name="exClassName">btn-warn</Property>
+        </Button>
+      </Buttons>
+      <Children>
+        <FieldSet layout="padding:5">
+          <Property name="caption">鍩虹淇℃伅</Property>
+          <Buttons/>
+          <Children>
+            <AutoForm>
+              <Property name="dataSet">dsMain</Property>
+              <Property name="readOnly">false</Property>
+              <Property name="labelSeparator">:</Property>
+              <Property name="labelAlign">right</Property>
+              <Property name="cols">*,*,*</Property>
+              <Property name="labelWidth">120</Property>
+              <AutoFormElement>
+                <Property name="name">depotId</Property>
+                <Property name="property">depotId</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">type</Property>
+                <Property name="property">type</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">checkArea</Property>
+                <Property name="property">checkArea</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">foodVariety</Property>
+                <Property name="property">foodVariety</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">standard</Property>
+                <Property name="property">standard</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">checkUser</Property>
+                <Property name="property">checkUser</Property>
+                <Property name="trigger">triggerUserList</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">foodLevel</Property>
+                <Property name="property">foodLevel</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">user</Property>
+                <Property name="property">user</Property>
+                <Property name="trigger">triggerUserList1</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">ypsl</Property>
+                <Property name="property">ypsl</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">unit</Property>
+                <Property name="property">unit</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">time</Property>
+                <Property name="property">time</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">checkTime</Property>
+                <Property name="property">checkTime</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">shrxm</Property>
+                <Property name="property">shrxm</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">dbsl</Property>
+                <Property name="property">dbsl</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">ypdj</Property>
+                <Property name="property">ypdj</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">normalYear</Property>
+                <Property name="property">normalYear</Property>
+                <Editor>
+                  <RadioGroup>
+                    <RadioButton>
+                      <Property name="text">鍚�</Property>
+                      <Property name="value">0</Property>
+                    </RadioButton>
+                    <RadioButton>
+                      <Property name="text">鏄�</Property>
+                      <Property name="value">1</Property>
+                    </RadioButton>
+                  </RadioGroup>
+                </Editor>
+              </AutoFormElement>
+              <AutoFormElement layoutConstraint="colSpan:2">
+                <Property name="name">zblb</Property>
+                <Property name="property">zblb</Property>
+                <Editor>
+                  <TagEditor>
+                    <Property name="textSeperator">#</Property>
+                    <Property name="availableTagsDataSet">dsMetrics</Property>
+                    <Property name="availableTagsDataPath">.name</Property>
+                  </TagEditor>
+                </Editor>
+              </AutoFormElement>
+              <AutoFormElement layoutConstraint="colSpan:1">
+                <Property name="name">result</Property>
+                <Property name="property">result</Property>
+                <Editor>
+                  <TagEditor>
+                    <Property name="availableTagsDataPath">.name</Property>
+                    <Property name="availableTagsDataSet">dsResult</Property>
+                    <Property name="textSeperator">#</Property>
+                  </TagEditor>
+                </Editor>
+              </AutoFormElement>
+              <Label layoutConstraint="colSpan:2">
+                <Property name="text">璇存槑锛氬椤规寚鏍囨椂鎸夌収1:璐ㄩ噺鎸囨爣妫�楠�(杈炬爣,涓嶈揪鏍�)銆�2:鍌ㄥ瓨鍝佽川妫�楠�(瀹滃瓨,涓嶅疁瀛�)銆�3:椋熷搧瀹夊叏妫�楠�(鍚堟牸,涓嶅悎鏍�)杩欎釜椤哄簭濉啓妫�楠岀粨璁�</Property>
+                <Property name="style">
+                  <Property name="color">blue</Property>
+                </Property>
+              </Label>
+              <AutoFormElement layoutConstraint="colSpan:3">
+                <Property name="name">remark</Property>
+                <Property name="property">remark</Property>
+                <Editor/>
+              </AutoFormElement>
+            </AutoForm>
+          </Children>
+        </FieldSet>
+        <Control>
+          <Property name="height">10</Property>
+        </Control>
+        <FieldSet layout="padding:5">
+          <Property name="caption">妫�娴嬮」淇℃伅</Property>
+          <Buttons/>
+          <Children>
+            <DataGrid id="dataGridCheckItem">
+              <ClientEvent name="onCellValueEdit">var data = arg.entity&#xD;
+if (data) {&#xD;
+	//濉啓鐨勬暟鎹��;&#xD;
+	var newValue = data.get(&quot;value&quot;);&#xD;
+	//鏍囧噯鍊�;&#xD;
+	var limit = data.get(&quot;upperLimit&quot;);&#xD;
+	//杩愮畻绗�;&#xD;
+	var symbol = data.get(&quot;operaSymbol&quot;);&#xD;
+	if (symbol &amp;&amp; limit &amp;&amp; newValue) {&#xD;
+		if (&quot;>=&quot; == symbol) {&#xD;
+			if (newValue &lt; limit) {&#xD;
+				data.set(&quot;result&quot;, &quot;0&quot;);&#xD;
+			}&#xD;
+			else {&#xD;
+				data.set(&quot;result&quot;, &quot;1&quot;);&#xD;
+			}&#xD;
+		}&#xD;
+		if (&quot;&lt;=&quot; == symbol) {&#xD;
+			if (newValue > limit) {&#xD;
+				data.set(&quot;result&quot;, &quot;0&quot;);&#xD;
+			}&#xD;
+			else {&#xD;
+				data.set(&quot;result&quot;, &quot;1&quot;);&#xD;
+			}&#xD;
+		}&#xD;
+		if (&quot;==&quot; == symbol) {&#xD;
+			if (newValue != limit) {&#xD;
+				data.set(&quot;result&quot;, &quot;0&quot;);&#xD;
+			}&#xD;
+			else {&#xD;
+				data.set(&quot;result&quot;, &quot;1&quot;);&#xD;
+			}&#xD;
+		}&#xD;
+	}&#xD;
+}</ClientEvent>
+              <Property name="dataPath">#.checkItems</Property>
+              <Property name="dataSet">dsMain</Property>
+              <Property name="hideMode">display</Property>
+              <Property name="highlightCurrentRow">false</Property>
+              <Property name="visible">true</Property>
+              <RowNumColumn/>
+              <DataColumn name="standardName">
+                <Property name="property">standardName</Property>
+                <Property name="align">center</Property>
+              </DataColumn>
+              <DataColumn name="value">
+                <Property name="property">value</Property>
+                <Property name="align">center</Property>
+              </DataColumn>
+              <DataColumn name="unit">
+                <Property name="property">unit</Property>
+                <Property name="align">center</Property>
+                <Property name="readOnly">true</Property>
+              </DataColumn>
+              <DataColumn name="operaSymbolValue">
+                <Property name="property">operaSymbolValue</Property>
+                <Property name="align">center</Property>
+                <Property name="caption">鏍囧噯鍊�</Property>
+                <Property name="readOnly">true</Property>
+              </DataColumn>
+              <DataColumn name="deNum">
+                <Property name="property">deNum</Property>
+                <Property name="align">center</Property>
+              </DataColumn>
+              <DataColumn name="addNum">
+                <Property name="property">addNum</Property>
+                <Property name="align">center</Property>
+              </DataColumn>
+              <DataColumn name="dePrice">
+                <Property name="property">dePrice</Property>
+                <Property name="align">center</Property>
+              </DataColumn>
+              <DataColumn name="addPrice">
+                <Property name="property">addPrice</Property>
+                <Property name="align">center</Property>
+              </DataColumn>
+              <DataColumn name="result">
+                <Property name="property">result</Property>
+                <Property name="align">center</Property>
+                <Property name="readOnly">true</Property>
+              </DataColumn>
+              <DataColumn name="remarks">
+                <Property name="property">remarks</Property>
+                <Property name="align">center</Property>
+              </DataColumn>
+            </DataGrid>
+          </Children>
+        </FieldSet>
+      </Children>
+      <Tools/>
+    </Dialog>
+    <UpdateAction id="uaAction">
+      <Property name="dataResolver">qualityManagerPR#saveQuality</Property>
+      <UpdateItem>
+        <Property name="dataSet">dsMain</Property>
+        <Property name="dataPath">[#current]</Property>
+      </UpdateItem>
+    </UpdateAction>
+    <AjaxAction id="ajaxDel">
+      <Property name="confirmMessage">纭畾瑕佸垹闄ゅ悧锛�</Property>
+      <Property name="service">qualityManagerPR#delQuality</Property>
+    </AjaxAction>
+    <AjaxAction id="ajaxGetDepot">
+      <Property name="service">depotPR#getDepot</Property>
+    </AjaxAction>
+    <AjaxAction id="ajaxGetCheck">
+      <Property name="service">checkStandardPR#listCheckItemsByParam</Property>
+    </AjaxAction>
+    <CustomDropDown id="ddFoodOrigin">
+      <Property name="minHeight">480</Property>
+      <Property name="assignmentMap">foodLocation=name</Property>
+      <Property name="minWidth">360</Property>
+      <Container layout="regionPadding:5">
+        <DataSet id="dsFoodOrigin">
+          <Property name="dataProvider">dicAreaPR#pageList</Property>
+          <Property name="dataType">[dtArea]</Property>
+          <Property name="parameter"></Property>
+          <Property name="pageSize">30</Property>
+        </DataSet>
+        <Container layout="hbox regionPadding:5">
+          <TextEditor id="key2">
+            <Property name="blankText">-- 缂栫爜鎴栬�呭悕绉� --</Property>
+            <Property name="width">200</Property>
+          </TextEditor>
+          <Button>
+            <ClientEvent name="onClick">var key = view.get(&quot;#key2.value&quot;);&#xD;
                             view.get(&quot;#dsFoodOrigin&quot;).set(&quot;parameter&quot;,{key:key}).flushAsync();
                         </ClientEvent>
-                        <Property name="caption">鏌ヨ</Property>
-                        <Property name="iconClass">fa fa-search</Property>
-                    </Button>
-                    <Button>
-                        <ClientEvent name="onClick">var data = view.get(&quot;#dsFoodOrigin.data:#&quot;);&#xD;
+            <Property name="caption">鏌ヨ</Property>
+            <Property name="iconClass">fa fa-search</Property>
+          </Button>
+          <Button>
+            <ClientEvent name="onClick">var data = view.get(&quot;#dsFoodOrigin.data:#&quot;);&#xD;
                             if(data){&#xD;
                             view.get(&quot;#ddFoodOrigin&quot;).close(data.toJSON());&#xD;
                             }
                         </ClientEvent>
-                        <Property name="iconClass">fa fa-check</Property>
-                        <Property name="caption">纭畾</Property>
-                    </Button>
-                </Container>
-                <DataGrid>
-                    <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsFoodOrigin.data:#&quot;);&#xD;
+            <Property name="iconClass">fa fa-check</Property>
+            <Property name="caption">纭畾</Property>
+          </Button>
+        </Container>
+        <DataGrid>
+          <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsFoodOrigin.data:#&quot;);&#xD;
                         if(data){&#xD;
                         view.get(&quot;#ddFoodOrigin&quot;).close(data.toJSON());&#xD;
                         }
                     </ClientEvent>
-                    <Property name="dataSet">dsFoodOrigin</Property>
-                    <Property name="readOnly">true</Property>
-                    <DataColumn name="code">
-                        <Property name="property">code</Property>
-                        <Property name="readOnly">true</Property>
-                        <Property name="align">center</Property>
-                    </DataColumn>
-                    <DataColumn name="name">
-                        <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
+          <Property name="dataSet">dsFoodOrigin</Property>
+          <Property name="readOnly">true</Property>
+          <DataColumn name="code">
+            <Property name="property">code</Property>
+            <Property name="readOnly">true</Property>
+            <Property name="align">center</Property>
+          </DataColumn>
+          <DataColumn name="name">
+            <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
                             arg.processDefault = true;
                         </ClientEvent>
-                        <Property name="property">name</Property>
-                        <Property name="readOnly">true</Property>
-                        <Property name="align">center</Property>
-                    </DataColumn>
-                    <DataColumn name="simple">
-                        <Property name="property">simple</Property>
-                        <Property name="readOnly">true</Property>
-                        <Property name="align">center</Property>
-                    </DataColumn>
-                </DataGrid>
-                <DataPilot layoutConstraint="bottom">
-                    <Property name="dataSet">dsFoodOrigin</Property>
-                </DataPilot>
-            </Container>
-        </CustomDropDown>
-        <DataSetDropDown id="triggerUserList">
-            <Property name="dataSet">dataSetUser</Property>
-            <Property name="property">cname</Property>
-            <Property name="assignmentMap">checkUser=cname</Property>
-        </DataSetDropDown>
-        <DataSetDropDown id="triggerUserList1">
-            <Property name="dataSet">dataSetUser</Property>
-            <Property name="property">cname</Property>
-            <Property name="assignmentMap">user=cname</Property>
-        </DataSetDropDown>
-    </View>
+            <Property name="property">name</Property>
+            <Property name="readOnly">true</Property>
+            <Property name="align">center</Property>
+          </DataColumn>
+          <DataColumn name="simple">
+            <Property name="property">simple</Property>
+            <Property name="readOnly">true</Property>
+            <Property name="align">center</Property>
+          </DataColumn>
+        </DataGrid>
+        <DataPilot layoutConstraint="bottom">
+          <Property name="dataSet">dsFoodOrigin</Property>
+        </DataPilot>
+      </Container>
+    </CustomDropDown>
+    <DataSetDropDown id="triggerUserList">
+      <Property name="dataSet">dataSetUser</Property>
+      <Property name="property">cname</Property>
+      <Property name="assignmentMap">checkUser=cname</Property>
+    </DataSetDropDown>
+    <DataSetDropDown id="triggerUserList1">
+      <Property name="dataSet">dataSetUser</Property>
+      <Property name="property">cname</Property>
+      <Property name="assignmentMap">user=cname</Property>
+    </DataSetDropDown>
+  </View>
 </ViewConfig>

--
Gitblit v1.9.3