fzzy-igdss.git - Gitblit

			@@ -231,8 +231,9 @@
			<Editor/>
			</AutoFormElement>
			<AutoFormElement>
			<Property name="name">status</Property>
			<Property name="property">status</Property>
			<Property name="name">depotNames</Property>
			<Property name="property">depotNames</Property>
			<Property name="trigger">CDDDept</Property>
			<Editor/>
			</AutoFormElement>
			<AutoFormElement>
			@@ -271,9 +272,8 @@
			<Editor/>
			</AutoFormElement>
			<AutoFormElement>
			<Property name="name">depotIds</Property>
			<Property name="property">depotIds</Property>
			<Property name="trigger">dsDepotDropDown</Property>
			<Property name="name">status</Property>
			<Property name="property">status</Property>
			<Editor/>
			</AutoFormElement>
			<AutoFormElement layoutConstraint="colSpan:3">
			@@ -345,30 +345,77 @@
			<Editor/>
			</DataColumn>
			</DataSetDropDown>
			<DataSetDropDown id="dsDepotDropDown">
			<CustomDropDown id="CDDDept">
			<ClientEvent name="onOpen">
			var entity = view.get("#dsMain.data:#");
			if(!entity){
			$alert("请先选择质押库区");
			}else{
			var pledgeDept = entity.get("pledgeDept");
			if(!pledgeDept){
			$alert("请先选择质押库区");
			}else{
			view.get("#dsDepotList").set("parameter",entity.get("pledgeDept")).flushAsync();
			}
			}</ClientEvent>
			<Property name="dataSet">dsDepotList</Property>
			<Property name="height">400</Property>
			<Property name="autoOpen">true</Property>
			<Property name="assignmentMap">depotIds=id</Property>
			<Property name="width">400</Property>
			<DataColumn>
			<Property name="align">center</Property>
			<Property name="name">name</Property>
			<Property name="property">name</Property>
			<Editor/>
			</DataColumn>
			</DataSetDropDown>
			var entity = view.get("#dsMain.data:#");
			if(!entity){
			$alert("请先选择质押库区");
			}else{
			var pledgeDept = entity.get("pledgeDept");
			if(!pledgeDept){
			$alert("请先选择质押库区");
			}else{
			view.get("#dsDeptSelect").set("parameter",entity.get("pledgeDept")).flushAsync();
			}
			}</ClientEvent>
			<Property name="minWidth">400</Property>
			<Property name="minHeight">400</Property>
			<Property name="assignmentMap">depotIds=depotIds,depotNames=depotNames</Property>
			<Panel>
			<Property name="showCaptionBar">false</Property>
			<Buttons>
			<Button>
			<ClientEvent name="onClick">var selection = view.get("#dgDepotSelect").get("selection");
			if(!selection \|\| selection.length == 0){
			$alert("请选择仓库");
			return;
			}

			var depotIds = "",depotNames="";
			selection.each(function(item){
			depotIds += item.get("id")+",";
			depotNames+=item.get("name")+",";
			});

			view.get("#CDDDept").close({depotIds:depotIds,depotNames:depotNames});</ClientEvent>
			<Property name="caption">确认选择</Property>
			</Button>
			<Button>
			<ClientEvent name="onClick">view.get("#CDDDept").close({});
			view.get("#dgDepotSelect").set("selection",null);</ClientEvent>
			<Property name="caption">取消操作</Property>
			</Button>
			</Buttons>
			<Children>
			<DataSet id="dsDeptSelect">
			<Property name="dataType">[dtDepot]</Property>
			<Property name="dataProvider">depotPR#getData</Property>
			<Property name="userData">库区列表下拉框</Property>
			<Property name="loadMode">manual</Property>
			</DataSet>
			<DataGrid id="dgDepotSelect">
			<Property name="dataSet">dsDeptSelect</Property>
			<Property name="selectionMode">multiRows</Property>
			<RowSelectorColumn>
			<Property name="caption">选择</Property>
			<Property name="width">50</Property>
			</RowSelectorColumn>
			<DataColumn name="name">
			<Property name="property">name</Property>
			<Property name="readOnly">true</Property>
			</DataColumn>
			<DataColumn name="id">
			<Property name="property">id</Property>
			<Property name="readOnly">true</Property>
			</DataColumn>
			<DataColumn name="depotType">
			<Property name="property">depotType</Property>
			<Property name="readOnly">true</Property>
			</DataColumn>
			</DataGrid>
			</Children>
			<Tools/>
			</Panel>
			</CustomDropDown>
			</View>
			</ViewConfig>

	fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PledgeContract.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContract.view.xml	105 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fzzy-igdss-view/src/main/java/models/core.model.xml	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -73,6 +73,10 @@
			@TableField("depot_ids")
			private String depotIds;

			@Column(name = "depot_names", columnDefinition = "varchar(200) COMMENT '质押仓库'")
			@TableField("depot_names")
			private String depotNames;

			@Column(name = "status", columnDefinition = "varchar(2) COMMENT '质押状态'")
			@TableField("status")
			private String status = Constant.YN_N;

			@@ -1076,11 +1076,10 @@
			<PropertyDef name="depotIds">
			<Property></Property>
			<Property name="label">质押仓库</Property>
			<Property name="mapping">
			<Property name="mapValues">${dorado.getDataProvider("depotPR#getDataByCompanyId").getResult()}</Property>
			<Property name="keyProperty">id</Property>
			<Property name="valueProperty">name</Property>
			</Property>
			</PropertyDef>
			<PropertyDef name="depotNames">
			<Property></Property>
			<Property name="label">质押仓库</Property>
			</PropertyDef>
			<PropertyDef name="pledgeBank">
			<Property></Property>