~admin/igds-v4.git

			@@ -9,7 +9,8 @@
			}
			if(arg.property =="foodVariety"){
			checkByFood(arg.newValue);
			}</ClientEvent>
			}
			</ClientEvent>
			<Property name="creationType">com.ld.igds.models.MQuality</Property>
			<PropertyDef name="id">
			<Property name="label">ID</Property>
			@@ -22,7 +23,8 @@
			</PropertyDef>
			<PropertyDef name="depotId">
			<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>
			@@ -31,7 +33,9 @@
			</PropertyDef>
			<PropertyDef name="foodVariety">
			<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>
			@@ -40,7 +44,9 @@
			</PropertyDef>
			<PropertyDef name="foodLevel">
			<Property name="mapping">
			<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}</Property>
			<Property name="mapValues">
			${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}
			</Property>
			<Property name="keyProperty">code</Property>
			<Property name="valueProperty">name</Property>
			</Property>
			@@ -49,7 +55,9 @@
			<PropertyDef name="foodType">
			<Property name="label">粮食性质</Property>
			<Property name="mapping">
			<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property>
			<Property name="mapValues">
			${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}
			</Property>
			<Property name="keyProperty">code</Property>
			<Property name="valueProperty">name</Property>
			</Property>
			@@ -60,7 +68,9 @@
			<PropertyDef name="type">
			<Property name="label">检验类别</Property>
			<Property name="mapping">
			<Property name="mapValues">${dorado.getDataProvider("qualityManagerPR#triggerType").getResult()}</Property>
			<Property name="mapValues">
			${dorado.getDataProvider("qualityManagerPR#triggerType").getResult()}
			</Property>
			<Property name="keyProperty">code</Property>
			<Property name="valueProperty">name</Property>
			</Property>
			@@ -70,7 +80,9 @@
			<Property name="label">检验依据</Property>
			<Property name="required">true</Property>
			<Property name="mapping">
			<Property name="mapValues">${dorado.getDataProvider("qualityManagerPR#triggerStandard").getResult()}</Property>
			<Property name="mapValues">
			${dorado.getDataProvider("qualityManagerPR#triggerStandard").getResult()}
			</Property>
			<Property name="keyProperty">code</Property>
			<Property name="valueProperty">name</Property>
			</Property>
			@@ -129,7 +141,7 @@
			<Property name="label">备注信息</Property>
			</PropertyDef>
			<Reference name="checkItems">
			<Property name="dataProvider">checkStandardPR#listCheckItemsByCheckId</Property>
			<Property name="dataProvider">checkStandardPR#listCheckItemsByParam</Property>
			<Property name="dataType">[dtCheckItems]</Property>
			<Property name="parameter">
			<Entity>
			@@ -145,7 +157,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>
			@@ -153,7 +166,9 @@
			<PropertyDef name="type">
			<Property name="label">检验类别</Property>
			<Property name="mapping">
			<Property name="mapValues">${dorado.getDataProvider("qualityManagerPR#triggerType").getResult()}</Property>
			<Property name="mapValues">
			${dorado.getDataProvider("qualityManagerPR#triggerType").getResult()}
			</Property>
			<Property name="keyProperty">code</Property>
			<Property name="valueProperty">name</Property>
			</Property>
			@@ -216,7 +231,8 @@
			<Validator type="custom">
			<ClientEvent name="onValidate">if (arg.entity.get("confirmPassword")){
			arg.entity.validate("confirmPassword");
			}</ClientEvent>
			}
			</ClientEvent>
			</Validator>
			</PropertyDef>
			<PropertyDef name="confirmPassword">
			@@ -230,7 +246,8 @@
			arg.result = { state:"ok"}
			} else {
			arg.result = { state:"error", text: "两次密码不一致"};
			}</ClientEvent>
			}
			</ClientEvent>
			</Validator>
			</PropertyDef>
			<PropertyDef name="salt">
			@@ -319,7 +336,8 @@
			<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="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">
			@@ -355,7 +373,8 @@
			data.set("checkItems",result);
			}
			});
			};</ClientEvent>
			};
			</ClientEvent>
			<Property name="packages">font-awesome,css-common</Property>
			<DataSet id="dsMain">
			<Property name="loadMode">lazy</Property>
			@@ -381,7 +400,8 @@
			</Label>
			<Button layoutConstraint="left">
			<ClientEvent name="onClick">view.get("#dsMain").insert();
			view.get("#dialogMain").show();</ClientEvent>
			view.get("#dialogMain").show();
			</ClientEvent>
			<Property name="caption">新增</Property>
			<Property name="exClassName">btn-default</Property>
			<Property name="iconClass">fa fa-plus</Property>
			@@ -390,7 +410,8 @@
			<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
			if(data){
			view.get("#dialogMain").show();
			}</ClientEvent>
			}
			</ClientEvent>
			<Property name="caption">修改</Property>
			<Property name="exClassName">btn-warm</Property>
			<Property name="iconClass">fa fa-pencil</Property>
			@@ -407,7 +428,8 @@
			}else{
			data.remove();
			}
			});</ClientEvent>
			});
			</ClientEvent>
			<Property name="caption">删除</Property>
			<Property name="exClassName">btn-warn</Property>
			<Property name="iconClass">fa fa-minus</Property>
			@@ -451,7 +473,8 @@
			<Container layout="hbox regionPadding:15">
			<Button layoutConstraint="left">
			<ClientEvent name="onClick">var param = view.get("#dsParam.data");
			view.get("#dsMain").set("parameter",param.toJSON()).flushAsync();</ClientEvent>
			view.get("#dsMain").set("parameter",param.toJSON()).flushAsync();
			</ClientEvent>
			<Property name="caption">查询</Property>
			<Property name="exClassName">btn-default</Property>
			<Property name="iconClass">fa fa-refresh</Property>
			@@ -468,7 +491,8 @@
			<ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
			if(data){
			view.get("#dialogMain").show();
			}</ClientEvent>
			}
			</ClientEvent>
			<Property name="dataSet">dsMain</Property>
			<Property name="readOnly">true</Property>
			<RowNumColumn/>
			@@ -546,14 +570,16 @@
			}
			view.get("#uaAction").set("parameter",data).execute(function(){
			self.get("parent").hide();
			});</ClientEvent>
			});
			</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("#dsMain.data:#").cancel();
			self.get("parent").hide();</ClientEvent>
			self.get("parent").hide();
			</ClientEvent>
			<Property name="caption">取消</Property>
			<Property name="iconClass">fa fa-times</Property>
			<Property name="exClassName">btn-warn</Property>
			@@ -761,8 +787,8 @@
			<Property name="minWidth">360</Property>
			<Container layout="regionPadding:5">
			<DataSet id="dsFoodOrigin">
			<Property name="dataProvider">dicTriggerPR#pagFoodLocationData</Property>
			<Property name="dataType">[dtFoodOrigin]</Property>
			<Property name="dataProvider">dicAreaPR#pageList</Property>
			<Property name="dataType">[dtArea]</Property>
			<Property name="parameter"></Property>
			<Property name="pageSize">30</Property>
			</DataSet>
			@@ -773,7 +799,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>
			@@ -781,7 +808,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>
			@@ -790,7 +818,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">
			@@ -800,7 +829,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>

	igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml	84 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-core/src/main/java/com/ld/igds/view/Depot.view.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -480,10 +480,10 @@
			<Property name="minWidth">500</Property>
			<Container layout="regionPadding:5">
			<DataSet id="dsFoodOrigin">
			<Property name="dataProvider"></Property>
			<Property name="dataType">[dtFoodOrigin]</Property>
			<Property name="dataProvider">dicAreaPR#pageList</Property>
			<Property name="parameter"></Property>
			<Property name="pageSize">30</Property>
			<Property name="dataType">[dtArea]</Property>
			</DataSet>
			<Container layout="hbox regionPadding:5">
			<TextEditor id="key2">

			@@ -348,8 +348,8 @@
			<Property name="minWidth">500</Property>
			<Container layout="regionPadding:5">
			<DataSet id="dsFoodOrigin">
			<Property name="dataProvider">dicTriggerPR#pagFoodLocationData</Property>
			<Property name="dataType">[dtFoodOrigin]</Property>
			<Property name="dataProvider">dicAreaPR#pageList</Property>
			<Property name="dataType">[dtArea]</Property>
			<Property name="parameter"></Property>
			<Property name="pageSize">30</Property>
			</DataSet>