~admin/igds-v4.git

			@@ -9,7 +9,8 @@
			}
			if(arg.property =="foodVariety"){
			checkByFood(arg.newValue);
			}</ClientEvent>
			}
			</ClientEvent>
			<PropertyDef name="price">
			<Property name="dataType">Double</Property>
			<Property name="label">粮食定价</Property>
			@@ -23,7 +24,7 @@
			<Property name="deptId">$${this.deptId}</Property>
			</Entity>
			</Property>
			<Property name="dataProvider">checkStandardPR#listCheckItemsByCheckId</Property>
			<Property name="dataProvider">checkStandardPR#listCheckItemsByParam</Property>
			<Property name="dataType">[dtCheckItems]</Property>
			</Reference>
			</DataType>
			@@ -40,7 +41,8 @@
			<Property></Property>
			<Property name="label">装卸仓库</Property>
			<Property name="mapping">
			<Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
			<Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}
			</Property>
			<Property name="keyProperty">id</Property>
			<Property name="valueProperty">name</Property>
			</Property>
			@@ -52,7 +54,9 @@
			<Property></Property>
			<Property name="label">粮食品种</Property>
			<Property name="mapping">
			<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
			<Property name="mapValues">
			${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}
			</Property>
			<Property name="keyProperty">code</Property>
			<Property name="valueProperty">name</Property>
			</Property>
			@@ -61,7 +65,9 @@
			<Property></Property>
			<Property name="label">流程进度</Property>
			<Property name="mapping">
			<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("PROCESS_STATUS_")}</Property>
			<Property name="mapValues">
			${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("PROCESS_STATUS_")}
			</Property>
			<Property name="keyProperty">code</Property>
			<Property name="valueProperty">name</Property>
			</Property>
			@@ -70,7 +76,9 @@
			<Property></Property>
			<Property name="label">数据状态</Property>
			<Property name="mapping">
			<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("RECORD_STATUS")}</Property>
			<Property name="mapValues">
			${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("RECORD_STATUS")}
			</Property>
			<Property name="keyProperty">code</Property>
			<Property name="valueProperty">name</Property>
			</Property>
			@@ -79,7 +87,9 @@
			<Property></Property>
			<Property name="label">是否合格</Property>
			<Property name="mapping">
			<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("CHECK_STATUS")}</Property>
			<Property name="mapValues">
			${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("CHECK_STATUS")}
			</Property>
			<Property name="keyProperty">code</Property>
			<Property name="valueProperty">name</Property>
			</Property>
			@@ -501,7 +511,8 @@
			}
			});
			return null;
			}</ClientEvent>
			}
			</ClientEvent>
			<Property name="packages">font-awesome,css-common</Property>
			<Property name="javaScriptFile">./static/plugins/lodop/LodopFuncs.js</Property>
			<DataSet id="dsMain">
			@@ -624,7 +635,8 @@
			<Button>
			<ClientEvent name="onClick">var type ="${request.getParameter('type')}";
			var deptId = window.parent.DEPT_ID;//父页面中的分库编码
			view.get("#dsQuery").setData({type:type,deptId:deptId});</ClientEvent>
			view.get("#dsQuery").setData({type:type,deptId:deptId});
			</ClientEvent>
			<Property name="exClassName">btn-warn</Property>
			<Property name="iconClass">fa fa-refresh</Property>
			<Property name="caption">重置</Property>
			@@ -646,14 +658,16 @@
			<DataColumn name="id">
			<ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
			arg.dom.style.color = "#f67d06";
			arg.processDefault = true;</ClientEvent>
			arg.processDefault = true;
			</ClientEvent>
			<Property name="property">id</Property>
			<Property name="align">center</Property>
			<Property name="width">150</Property>
			</DataColumn>
			<DataColumn name="plateNum">
			<ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
			arg.processDefault = true;</ClientEvent>
			arg.processDefault = true;
			</ClientEvent>
			<Property name="property">plateNum</Property>
			<Property name="align">center</Property>
			<Property name="width">150</Property>
			@@ -678,7 +692,8 @@
			</DataColumn>
			<DataColumn name="depotId">
			<ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
			arg.processDefault = true;</ClientEvent>
			arg.processDefault = true;
			</ClientEvent>
			<Property name="property">depotId</Property>
			<Property name="align">center</Property>
			<Property name="width">120</Property>
			@@ -710,14 +725,16 @@
			</DataColumn>
			<DataColumn name="settleWeight">
			<ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
			arg.processDefault = true;</ClientEvent>
			arg.processDefault = true;
			</ClientEvent>
			<Property name="property">settleWeight</Property>
			<Property name="align">center</Property>
			<Property name="width">100</Property>
			</DataColumn>
			<DataColumn>
			<ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
			arg.processDefault = true;</ClientEvent>
			arg.processDefault = true;
			</ClientEvent>
			<Property name="property">recordWeight</Property>
			<Property name="align">center</Property>
			<Property name="width">100</Property>
			@@ -726,7 +743,8 @@
			</DataColumn>
			<DataColumn name="progress">
			<ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
			arg.processDefault = true;</ClientEvent>
			arg.processDefault = true;
			</ClientEvent>
			<Property name="property">progress</Property>
			<Property name="align">center</Property>
			<Property name="width">100</Property>
			@@ -771,7 +789,8 @@
			}
			$notify("数据执行完成！！");
			self.get("parent").hide();
			});</ClientEvent>
			});
			</ClientEvent>
			<Property name="caption">确定保存</Property>
			<Property name="iconClass">fa fa-check</Property>
			<Property name="exClassName">btn-normal</Property>
			@@ -808,7 +827,8 @@
			view.get("#btnAddCheck").set("visible",true);
			}else{
			view.get("#btnAddCheck").set("visible",false);
			}</ClientEvent>
			}
			</ClientEvent>
			<ControlTab>
			<Property name="caption">基础信息</Property>
			<Property name="iconClass">fa fa-download</Property>
			@@ -947,7 +967,8 @@
			<ClientEvent name="onBlur">//id 规则 d_prop
			var id = self.getDom().id;
			var prop = id.substring(2,id.length);
			deAutoByWeight(prop);</ClientEvent>
			deAutoByWeight(prop);
			</ClientEvent>
			<Property name="name">emptyWeight</Property>
			<Property name="property">emptyWeight</Property>
			<Editor/>
			@@ -972,7 +993,8 @@
			<ClientEvent name="onBlur">//id 规则 d_prop
			var id = self.getDom().id;
			var prop = id.substring(2,id.length);
			deAutoByWeight(prop);</ClientEvent>
			deAutoByWeight(prop);
			</ClientEvent>
			<Property name="name">deImpurity</Property>
			<Property name="property">deImpurity</Property>
			<Property name="showHint">false</Property>
			@@ -992,7 +1014,8 @@
			<ClientEvent name="onBlur">//id 规则 d_prop
			var id = self.getDom().id;
			var prop = id.substring(2,id.length);
			deAutoByWeight(prop);</ClientEvent>
			deAutoByWeight(prop);
			</ClientEvent>
			<Property name="name">deWet</Property>
			<Property name="property">deWet</Property>
			<Property name="showHint">false</Property>
			@@ -1012,7 +1035,8 @@
			<ClientEvent name="onBlur">//id 规则 d_prop
			var id = self.getDom().id;
			var prop = id.substring(2,id.length);
			deAutoByWeight(prop);</ClientEvent>
			deAutoByWeight(prop);
			</ClientEvent>
			<Property name="name">deHandle</Property>
			<Property name="property">deHandle</Property>
			<Editor/>
			@@ -1021,7 +1045,8 @@
			<ClientEvent name="onBlur">//id 规则 d_prop
			var id = self.getDom().id;
			var prop = id.substring(2,id.length);
			deAutoByWeight(prop);</ClientEvent>
			deAutoByWeight(prop);
			</ClientEvent>
			<Property name="name">deOther</Property>
			<Property name="property">deOther</Property>
			<Editor/>
			@@ -1152,7 +1177,8 @@

			if(entity.get("standardId") =="C02"){//雜志
			inoutData.set("impurity",entity.get("value"));
			}</ClientEvent>
			}
			</ClientEvent>
			<Property name="dataSet">dsMain</Property>
			<Property name="dataPath">#.checkItems</Property>
			<Property name="highlightCurrentRow">false</Property>
			@@ -1334,7 +1360,8 @@
			</TextEditor>
			<Button>
			<ClientEvent name="onClick">var key = view.get("#key2.value");
			view.get("#dsFoodOrigin").set("parameter",{key:key}).flushAsync();</ClientEvent>
			view.get("#dsFoodOrigin").set("parameter",{key:key}).flushAsync();
			</ClientEvent>
			<Property name="caption">查询</Property>
			<Property name="iconClass">fa fa-search</Property>
			</Button>
			@@ -1342,7 +1369,8 @@
			<ClientEvent name="onClick">var data = view.get("#dsFoodOrigin.data:#");
			if(data){
			view.get("#ddFoodOrigin").close(data.toJSON());
			}</ClientEvent>
			}
			</ClientEvent>
			<Property name="iconClass">fa fa-check</Property>
			<Property name="caption">确定</Property>
			</Button>
			@@ -1351,7 +1379,8 @@
			<ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsFoodOrigin.data:#");
			if(data){
			view.get("#ddFoodOrigin").close(data.toJSON());
			}</ClientEvent>
			}
			</ClientEvent>
			<Property name="dataSet">dsFoodOrigin</Property>
			<Property name="readOnly">true</Property>
			<DataColumn name="code">
			@@ -1361,7 +1390,8 @@
			</DataColumn>
			<DataColumn name="name">
			<ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
			arg.processDefault = true;</ClientEvent>
			arg.processDefault = true;
			</ClientEvent>
			<Property name="property">name</Property>
			<Property name="readOnly">true</Property>
			<Property name="align">center</Property>
			@@ -1400,7 +1430,9 @@
			<Button>
			<ClientEvent name="onClick">var key = view.get("#key3.value");
			var type = "${request.getParameter('type')}";
			view.get("#dsNotice").set("parameter",{key: key,type: type}).flushAsync();</ClientEvent>
			view.get("#dsNotice").set("parameter",{key: key,type:
			type}).flushAsync();
			</ClientEvent>
			<Property name="caption">查询</Property>
			<Property name="iconClass">fa fa-search</Property>
			</Button>
			@@ -1408,7 +1440,8 @@
			<ClientEvent name="onClick">var data = view.get("#dsNotice.data:#");
			if(data){
			view.get("#ddNotice").close(data.toJSON());
			}</ClientEvent>
			}
			</ClientEvent>
			<Property name="iconClass">fa fa-check</Property>
			<Property name="caption">确定</Property>
			</Button>
			@@ -1417,7 +1450,8 @@
			<ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsNotice.data:#");
			if(data){
			view.get("#ddNotice").close(data.toJSON());
			}</ClientEvent>
			}
			</ClientEvent>
			<Property name="dataSet">dsNotice</Property>
			<Property name="readOnly">true</Property>
			<DataColumn>
			@@ -1441,7 +1475,8 @@
			<ClientEvent name="onClick">var html = view.get("#textAreaPrint.text");

			self.get("parent").hide();
			printBill(html);</ClientEvent>
			printBill(html);
			</ClientEvent>
			<Property name="caption">确定</Property>
			</Button>
			<Button>
			@@ -1468,7 +1503,8 @@
			printShipWeight();
			}else{
			printWeight();
			}</ClientEvent>
			}
			</ClientEvent>
			<Property name="caption">打印过磅单</Property>
			<Property name="iconClass">fa fa-print</Property>
			</MenuItem>