fzzy-igdss.git - Gitblit

			@@ -99,7 +99,6 @@
			<Property name="label">完成数量</Property>
			<Property name="displayFormat">#0.0 KG</Property>
			</PropertyDef>
			<<<<<<< HEAD
			<PropertyDef name="auditStatus">
			<Property></Property>
			<Property name="label">审核状态</Property>
			@@ -108,7 +107,7 @@
			<Property name="keyProperty">dictValue</Property>
			<Property name="valueProperty">dictLabel</Property>
			</Property>
			=======
			</PropertyDef>
			<PropertyDef name="auditUser">
			<Property></Property>
			<Property name="label">审核人</Property>
			@@ -116,7 +115,6 @@
			<PropertyDef name="auditDate">
			<Property name="dataType">DateTime</Property>
			<Property name="label">审批时间</Property>
			>>>>>>> da4b59346969e1622a66ce9fde637b1fac1c501b
			</PropertyDef>
			<PropertyDef name="completeStatus">
			<Property></Property>
			@@ -200,20 +198,20 @@
			</Model>
			<View layout="padding:10">
			<ClientEvent name="onReady">var deptId = window.parent.deptId;//父页面中的分库编码
			var TYPE = "NOTICE_OUT";
			query = function(){
			view.get("#dsQuery").set("parameter",{deptId:deptId}).flushAsync();
			};
			query();

			//新增
			add = function(){
			view.get("#ajaxInitAdd").execute(function(data){
			view.get("#dsMain").insert(data);
			view.get("#dialogMain").show();
			});
			};
			</ClientEvent>
			var TYPE = "NOTICE_OUT";
			query = function(){
			view.get("#dsQuery").set("parameter",{deptId:deptId}).flushAsync();
			};
			query();

			//新增
			add = function(){
			view.get("#ajaxInitAdd").execute(function(data){
			view.get("#dsMain").insert(data);
			view.get("#dialogMain").show();
			});
			};
			</ClientEvent>
			<Property name="packages">font-awesome,css-common</Property>
			<DataSet id="dsMain">
			<Property name="dataType">[dtMain]</Property>
			@@ -261,11 +259,11 @@
			</AutoFormElement>
			<Button>
			<ClientEvent name="onClick">var data = view.get("#dsQuery.data");
			if(data){
			view.get("#dsMain").set("parameter",data.toJSON()).flushAsync();
			}else{
			view.get("#dsMain").flushAsync();
			}</ClientEvent>
			if(data){
			view.get("#dsMain").set("parameter",data.toJSON()).flushAsync();
			}else{
			view.get("#dsMain").flushAsync();
			}</ClientEvent>
			<Property name="caption">搜索</Property>
			<Property name="iconClass">fa fa-search</Property>
			<Property name="exClassName">btn-q1</Property>
			@@ -290,12 +288,12 @@
			</ToolBarButton>
			<ToolBarButton layoutConstraint="left">
			<ClientEvent name="onClick">
			var select = view.get("#dataGridMain").get("selection");
			if(select){
			view.get("#dialogMain").show();
			}else{
			$notify("请选择需要修改的数据……");
			}</ClientEvent>
			var select = view.get("#dataGridMain").get("selection");
			if(select){
			view.get("#dialogMain").show();
			}else{
			$notify("请选择需要修改的数据……");
			}</ClientEvent>
			<Property name="caption">修改</Property>
			<Property name="exClassName">btn2</Property>
			<Property name="width">100</Property>
			@@ -303,15 +301,15 @@
			</ToolBarButton>
			<ToolBarButton layoutConstraint="left">
			<ClientEvent name="onClick">
			var select = view.get("#dataGridMain").get("selection");
			if(select){
			view.get("#ajaxDel").set("parameter",select).execute(function(result){
			select.remove();
			});
			}else{
			$notify("请选择需要删除的仓库……");
			}
			</ClientEvent>
			var select = view.get("#dataGridMain").get("selection");
			if(select){
			view.get("#ajaxDel").set("parameter",select).execute(function(result){
			select.remove();
			});
			}else{
			$notify("请选择需要删除的仓库……");
			}
			</ClientEvent>
			<Property name="caption">删除</Property>
			<Property name="exClassName">btn3</Property>
			<Property name="width">100</Property>
			@@ -319,15 +317,15 @@
			</ToolBarButton>
			<ToolBarButton layoutConstraint="left">
			<ClientEvent name="onClick">view.get("#recalculate").execute(function(result){
			if(result == 'success'){
			$notify("数据更新完成！！");

			var data = view.get("#dsQuery.data");
			view.get("#dsMain").set("parameter",data.toJSON()).flushAsync();
			}else{
			$notify("数据更新失败！！");
			}
			});</ClientEvent>
			if(result == 'success'){
			$notify("数据更新完成！！");

			var data = view.get("#dsQuery.data");
			view.get("#dsMain").set("parameter",data.toJSON()).flushAsync();
			}else{
			$notify("数据更新失败！！");
			}
			});</ClientEvent>
			<Property name="caption">实时核算</Property>
			<Property name="exClassName">btn4</Property>
			<Property name="iconClass">fa fa-refresh</Property>
			@@ -337,14 +335,14 @@
			</ToolBarButton>
			<ToolBarButton layoutConstraint="left">
			<ClientEvent name="onClick">
			var select = view.get("#dataGridMain").get("selection");
			if(select){
			var bizId = select.get("id");
			var url = "/export/download-word?bizId="+bizId + "&entityName=InoutNoticeOut";
			window.open(url);
			}else{
			$notify("请选择需要导出的通知单……");
			}</ClientEvent>
			var select = view.get("#dataGridMain").get("selection");
			if(select){
			var bizId = select.get("id");
			var url = "/export/download-word?bizId="+bizId + "&entityName=InoutNoticeOut";
			window.open(url);
			}else{
			$notify("请选择需要导出的通知单……");
			}</ClientEvent>
			<Property name="caption">导出Word</Property>
			<Property name="exClassName">btn2</Property>
			<Property name="width">120</Property>
			@@ -353,12 +351,12 @@
			<Separator/>
			<ToolBarButton layoutConstraint="left">
			<ClientEvent name="onClick">var select = view.get("#dataGridMain").get("selection");
			if(select){
			view.get("#iFrameFlowHis").set("path","/work/flow-his2?businessId="+select.get("id"));
			view.get("#dialogHis").show();
			}else{
			$notify("请选择需要查看的数据……");
			}</ClientEvent>
			if(select){
			view.get("#iFrameFlowHis").set("path","/work/flow-his2?businessId="+select.get("id"));
			view.get("#dialogHis").show();
			}else{
			$notify("请选择需要查看的数据……");
			}</ClientEvent>
			<Property name="caption">审批记录</Property>
			<Property name="exClassName">btn4</Property>
			<Property name="iconClass">fa fa-th-list</Property>
			@@ -447,16 +445,16 @@
			<Buttons>
			<Button id="btnOk">
			<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
			data.set('unitName',data.getText('deptId'));

			view.get("#updateSave").execute(function(result){
			if(result.code != '200'){
			$alert(result.message);
			return;
			}
			$alert('数据执行成功！');
			self.get("parent").hide();
			});</ClientEvent>
			data.set('unitName',data.getText('deptId'));

			view.get("#updateSave").execute(function(result){
			if(result.code != '200'){
			$alert(result.message);
			return;
			}
			$alert('数据执行成功！');
			self.get("parent").hide();
			});</ClientEvent>
			<Property name="caption">保存</Property>
			<Property name="iconClass">fa fa-check-circle</Property>
			<Property name="exClassName">btn1</Property>
			@@ -464,7 +462,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="exClassName">btn3</Property>
			<Property name="iconClass">fa fa-times-circle</Property>
			@@ -513,10 +511,7 @@
			<Property name="property">type</Property>
			<Property name="trigger">autoMappingDropDown1</Property>
			<Property name="editorType">RadioGroup</Property>
			<<<<<<< HEAD
			<Property name="showHint">false</Property>
			=======
			>>>>>>> da4b59346969e1622a66ce9fde637b1fac1c501b
			<Editor/>
			</AutoFormElement>
			<AutoFormElement id="formItemBank">
			@@ -554,19 +549,16 @@
			<Editor/>
			</AutoFormElement>
			<AutoFormElement>
			<<<<<<< HEAD
			<Property name="name">customerName</Property>
			<Property name="property">customerName</Property>
			=======
			<Property name="name">targetNumber</Property>
			<Property name="property">targetNumber</Property>
			<Property name="readOnly">false</Property>
			<Editor/>
			</AutoFormElement>
			<AutoFormElement>
			<Property name="name">unitName</Property>
			<Property name="property">unitName</Property>
			>>>>>>> da4b59346969e1622a66ce9fde637b1fac1c501b
			<Property name="name">targetNumber</Property>
			<Property name="property">targetNumber</Property>
			<Editor/>
			</AutoFormElement>
			<AutoFormElement>
			@@ -577,23 +569,6 @@
			<AutoFormElement>
			<Property name="name">createTime</Property>
			<Property name="property">createTime</Property>
			<Editor/>
			</AutoFormElement>
			<AutoFormElement layoutConstraint="colSpan:3">
			<Property name="name">remark</Property>
			<Property name="property">remark</Property>
			<Property name="editorType">TextArea</Property>
			<Editor/>
			</AutoFormElement>
			<AutoFormElement>
			<Property name="name">createBy</Property>
			<Property name="property">createBy</Property>
			<Editor/>
			</AutoFormElement>
			<AutoFormElement>
			<Property name="name">createTime</Property>
			<Property name="property">createTime</Property>
			<Property name="readOnly">true</Property>
			<Editor/>
			</AutoFormElement>
			<AutoFormElement layoutConstraint="colSpan:3">
			@@ -633,28 +608,13 @@
			<AutoFormElement>
			<Property name="name">auditStatus</Property>
			<Property name="property">auditStatus</Property>
			<<<<<<< HEAD
			=======
			<Property name="readOnly">true</Property>
			<Editor/>
			</AutoFormElement>
			<AutoFormElement>
			<Property name="name">auditUser</Property>
			<Property name="property">auditUser</Property>
			<Property name="readOnly">true</Property>
			<Editor/>
			</AutoFormElement>
			<AutoFormElement>
			<Property name="name">auditDate</Property>
			<Property name="property">auditDate</Property>
			>>>>>>> da4b59346969e1622a66ce9fde637b1fac1c501b
			<Property name="readOnly">true</Property>
			<Editor/>
			</AutoFormElement>
			<HtmlContainer layoutConstraint="colSpan:3">
			<Property name="content">1.入库通知单作为入库作业的前置条件，必须配置，否则无法进行入库作业。<br>
			2.单据类型=库区通知单，表示库区自己作业业务，不受监管管理。<br>
			3.单据类型=质押监管通知单，单据必须填写监督银行。</Property>
			2.单据类型=库区通知单，表示库区自己作业业务，不受监管管理。<br>
			3.单据类型=质押监管通知单，单据必须填写监督银行。</Property>
			<Property name="exClassName">h-tip</Property>
			<Property name="contentOverflow">hidden</Property>
			</HtmlContainer>
			@@ -665,17 +625,17 @@
			</Dialog>
			<DataSetDropDown id="dsDepotDropDown">
			<ClientEvent name="onOpen">
			var entity = view.get("#dsMain.data:#");
			if(!entity){
			$alert("请先选择所属分库");
			}else{
			var deptId = entity.get("deptId");
			if(!deptId){
			$alert("请先选择所属分库");
			}else{
			view.get("#dsDepotList").set("parameter",entity.get("deptId")).flushAsync();
			}
			}</ClientEvent>
			var entity = view.get("#dsMain.data:#");
			if(!entity){
			$alert("请先选择所属分库");
			}else{
			var deptId = entity.get("deptId");
			if(!deptId){
			$alert("请先选择所属分库");
			}else{
			view.get("#dsDepotList").set("parameter",entity.get("deptId")).flushAsync();
			}
			}</ClientEvent>
			<Property name="dataSet">dsDepotList</Property>
			<Property name="height">450</Property>
			<Property name="autoOpen">true</Property>