~admin/igds-v4.git

			@@ -68,12 +68,12 @@
			<Property name="label">备注说明</Property>
			</PropertyDef>
			<PropertyDef name="jhxddw">
			<Property/>
			<Property></Property>
			<Property name="label">计划下达单位</Property>
			<Property name="required">true</Property>
			</PropertyDef>
			<PropertyDef name="jhxddwmc">
			<Property/>
			<Property></Property>
			<Property name="label">计划下达单位名称</Property>
			</PropertyDef>
			<PropertyDef name="jhxdsj">
			@@ -114,6 +114,7 @@
			<PropertyDef name="year">
			<Property></Property>
			<Property name="label">年份</Property>
			<Property name="required">true</Property>
			</PropertyDef>
			<PropertyDef name="type">
			<Property></Property>
			@@ -137,6 +138,7 @@
			<PropertyDef name="foodType">
			<Property></Property>
			<Property name="label">粮食性质</Property>
			<Property name="required">true</Property>
			<Property name="mapping">
			<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property>
			<Property name="keyProperty">code</Property>
			@@ -146,6 +148,7 @@
			<PropertyDef name="foodLevel">
			<Property></Property>
			<Property name="label">粮食等级</Property>
			<Property name="required">true</Property>
			<Property name="mapping">
			<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}</Property>
			<Property name="keyProperty">code</Property>
			@@ -156,6 +159,7 @@
			<Property name="dataType">Double</Property>
			<Property name="label">数量</Property>
			<Property name="displayFormat">#.0 KG</Property>
			<Property name="required">true</Property>
			</PropertyDef>
			<PropertyDef name="updateTime">
			<Property name="dataType">Date</Property>
			@@ -244,26 +248,28 @@
			</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();
			}else{
			$alert("请勾选需要修改的数据！");
			}</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>
			@@ -274,7 +280,7 @@
			<AutoForm>
			<Property name="cols">,,,,*</Property>
			<Property name="dataSet">dsParam</Property>
			<Property name="labelAlign">right</Property>
			<Property name="labelAlign">left</Property>
			<Property name="labelSeparator">：</Property>
			<Property name="labelWidth">100</Property>
			<AutoFormElement>
			@@ -322,9 +328,9 @@
			</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/>
			@@ -398,7 +404,7 @@
			</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-circle</Property>
			<Property name="width">90</Property>
			@@ -533,17 +539,17 @@
			</Button>
			<Button layoutConstraint="left">
			<ClientEvent name="onClick">var data = view.get("#dataGridDetail.currentEntity");
			if(!data){
			return;
			}
			view.get("#ajaxDelDetail").set("parameter",data).execute(function(result){
			if(result){
			$alert(result);
			return;
			}else{
			data.remove();
			}
			});</ClientEvent>
			if(!data){
			return;
			}
			view.get("#ajaxDelDetail").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>
			@@ -571,6 +577,12 @@
			<Property name="name">foodLevel</Property>
			</DataColumn>
			<DataColumn>
			<Property name="property">year</Property>
			<Property name="align">center</Property>
			<Property name="name">year</Property>
			<Property name="trigger">yearDropDown1</Property>
			</DataColumn>
			<DataColumn>
			<Property name="property">type</Property>
			<Property name="align">center</Property>
			<Property name="name">type</Property>