~admin/igds-v4.git

			@@ -5,11 +5,12 @@
			<Model>
			<DataType name="dtMain">
			<ClientEvent name="onDataChange">if(arg.property =="depotId"){
			autoByDepot(arg.newValue);
			}
			if(arg.property =="foodVariety"){
			checkByFood(arg.newValue);
			}</ClientEvent>
			autoByDepot(arg.newValue);
			}
			if(arg.property =="foodVariety"){
			checkByFood(arg.newValue);
			}
			</ClientEvent>
			<Property name="creationType">com.ld.igds.models.MQuality</Property>
			<PropertyDef name="id">
			<Property name="label">ID</Property>
			@@ -21,13 +22,13 @@
			<Property name="label">库区编码</Property>
			</PropertyDef>
			<PropertyDef name="depotId">
			<Property name="mapping">
			<Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
			<Property name="keyProperty">id</Property>
			<Property name="valueProperty">name</Property>
			</Property>
			<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("depotPR#getAllCache").getResult()}</Property>
			</Property>
			</PropertyDef>
			<PropertyDef name="foodVariety">
			<Property name="mapping">
			@@ -129,7 +130,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>
			@@ -215,8 +216,9 @@
			</Validator>
			<Validator type="custom">
			<ClientEvent name="onValidate">if (arg.entity.get("confirmPassword")){
			arg.entity.validate("confirmPassword");
			}</ClientEvent>
			arg.entity.validate("confirmPassword");
			}
			</ClientEvent>
			</Validator>
			</PropertyDef>
			<PropertyDef name="confirmPassword">
			@@ -225,12 +227,13 @@
			<Property name="required">true</Property>
			<Validator type="custom">
			<ClientEvent name="onValidate">var confirm = arg.data;
			var password = arg.entity.get("password");
			if (confirm ==password) {
			arg.result = { state:"ok"}
			} else {
			arg.result = { state:"error", text: "两次密码不一致"};
			}</ClientEvent>
			var password = arg.entity.get("password");
			if (confirm ==password) {
			arg.result = { state:"ok"}
			} else {
			arg.result = { state:"error", text: "两次密码不一致"};
			}
			</ClientEvent>
			</Validator>
			</PropertyDef>
			<PropertyDef name="salt">
			@@ -319,7 +322,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">
			@@ -333,29 +337,30 @@
			</Model>
			<View layout="padding:5;regionPadding:5">
			<ClientEvent name="onReady">var deptId = window.parent.DEPT_ID;//父页面中的分库编码

			//根据仓库自动回填粮食品种，登记，产地新
			autoByDepot = function(depotId){
			view.get("#ajaxGetDepot").set("parameter",depotId).execute(function(result){
			if(result){
			var data = view.get("#dsMain.data:#");
			data.set("foodLocation",result.foodLocation);
			data.set("foodLevel",result.foodLevel);
			data.set("foodVariety",result.foodVariety);
			data.set("foodType",result.foodType);
			}
			});
			};

			//根据粮食品种查询化验项并回显
			checkByFood = function(foodVariety){
			view.get("#ajaxGetCheck").set("parameter",{foodVariety:foodVariety,deptId:deptId}).execute(function(result){
			if(result){
			var data = view.get("#dsMain.data:#");
			data.set("checkItems",result);
			}
			});
			};</ClientEvent>

			//根据仓库自动回填粮食品种，登记，产地新
			autoByDepot = function(depotId){
			view.get("#ajaxGetDepot").set("parameter",depotId).execute(function(result){
			if(result){
			var data = view.get("#dsMain.data:#");
			data.set("foodLocation",result.foodLocation);
			data.set("foodLevel",result.foodLevel);
			data.set("foodVariety",result.foodVariety);
			data.set("foodType",result.foodType);
			}
			});
			};

			//根据粮食品种查询化验项并回显
			checkByFood = function(foodVariety){
			view.get("#ajaxGetCheck").set("parameter",{foodVariety:foodVariety,deptId:deptId}).execute(function(result){
			if(result){
			var data = view.get("#dsMain.data:#");
			data.set("checkItems",result);
			}
			});
			};
			</ClientEvent>
			<Property name="packages">font-awesome,css-common</Property>
			<DataSet id="dsMain">
			<Property name="loadMode">lazy</Property>
			@@ -381,40 +386,43 @@
			</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>
			</Button>
			<Button layoutConstraint="left">
			<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
			if(data){
			view.get("#dialogMain").show();
			}</ClientEvent>
			if(data){
			view.get("#dialogMain").show();
			}
			</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("#dsMain.data:#");
			if(!data){
			return;
			}
			view.get("#ajaxDel").set("parameter",data).execute(function(result){
			if(result){
			$alert(result);
			return;
			}else{
			data.remove();
			}
			});</ClientEvent>
			if(!data){
			return;
			}
			view.get("#ajaxDel").set("parameter",data).execute(function(result){
			if(result){
			$alert(result);
			return;
			}else{
			data.remove();
			}
			});
			</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("#dsMain").flushAsync();
			</ClientEvent>
			</ClientEvent>
			<Property name="caption">刷新</Property>
			<Property name="exClassName">btn-default</Property>
			<Property name="iconClass">fa fa-refresh</Property>
			@@ -451,7 +459,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>
			@@ -466,9 +475,10 @@
			</AutoForm>
			<DataGrid layoutConstraint="center padding:5px">
			<ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
			if(data){
			view.get("#dialogMain").show();
			}</ClientEvent>
			if(data){
			view.get("#dialogMain").show();
			}
			</ClientEvent>
			<Property name="dataSet">dsMain</Property>
			<Property name="readOnly">true</Property>
			<RowNumColumn/>
			@@ -540,20 +550,22 @@
			<Buttons>
			<Button>
			<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
			if(data.validate() != 'ok'){
			$notify("数据校验失败！！");
			return;
			}
			view.get("#uaAction").set("parameter",data).execute(function(){
			self.get("parent").hide();
			});</ClientEvent>
			if(data.validate() != 'ok'){
			$notify("数据校验失败！！");
			return;
			}
			view.get("#uaAction").set("parameter",data).execute(function(){
			self.get("parent").hide();
			});
			</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>
			@@ -567,7 +579,7 @@
			<AutoForm>
			<Property name="dataSet">dsMain</Property>
			<Property name="readOnly">false</Property>
			<Property name="labelSeparator"> : </Property>
			<Property name="labelSeparator">:</Property>
			<Property name="labelAlign">right</Property>
			<Property name="cols">,,*</Property>
			<Property name="labelWidth">120</Property>
			@@ -753,7 +765,7 @@
			<Property name="service">depotPR#getDepot</Property>
			</AjaxAction>
			<AjaxAction id="ajaxGetCheck">
			<Property name="service">checkStandardPR#listCheckItemsByFoodVariety</Property>
			<Property name="service">checkStandardPR#listCheckItemsByParam</Property>
			</AjaxAction>
			<CustomDropDown id="ddFoodOrigin">
			<Property name="minHeight">480</Property>
			@@ -761,36 +773,39 @@
			<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>
			<Container layout="hbox regionPadding:5">
			<TextEditor id="key2">
			<Property name="blankText"> -- 编码或者名称 --</Property>
			<Property name="blankText">-- 编码或者名称 --</Property>
			<Property name="width">200</Property>
			</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>
			<Button>
			<ClientEvent name="onClick">var data = view.get("#dsFoodOrigin.data:#");
			if(data){
			view.get("#ddFoodOrigin").close(data.toJSON());
			}</ClientEvent>
			if(data){
			view.get("#ddFoodOrigin").close(data.toJSON());
			}
			</ClientEvent>
			<Property name="iconClass">fa fa-check</Property>
			<Property name="caption">确定</Property>
			</Button>
			</Container>
			<DataGrid>
			<ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsFoodOrigin.data:#");
			if(data){
			view.get("#ddFoodOrigin").close(data.toJSON());
			}</ClientEvent>
			if(data){
			view.get("#ddFoodOrigin").close(data.toJSON());
			}
			</ClientEvent>
			<Property name="dataSet">dsFoodOrigin</Property>
			<Property name="readOnly">true</Property>
			<DataColumn name="code">
			@@ -800,7 +815,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>