From 7411561962ca6e45e32844d7a626a6e89b8292e5 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期六, 17 一月 2026 16:59:56 +0800
Subject: [PATCH] 调整出入库通知单功能
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml | 138 +++++++++++++++++++++++-----------------------
1 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
index 357dd74..dcc468f 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
@@ -103,33 +103,10 @@
<Property></Property>
<Property name="label">瀹℃牳鐘舵��</Property>
<Property name="mapping">
- <Property name="mapValues">
- <Collection>
- <Entity>
- <Property name="name">鐩戠瀹℃牳</Property>
- <Property name="code">10</Property>
- </Entity>
- <Entity>
- <Property name="name">閾惰瀹℃牳</Property>
- <Property name="code">20</Property>
- </Entity>
- <Entity>
- <Property name="name">宸插鏍�</Property>
- <Property name="code">30</Property>
- </Entity>
- </Collection>
- </Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
+ <Property name="mapValues">${dorado.getDataProvider("dicPR#triggerStatusType").getResult()}</Property>
+ <Property name="keyProperty">dictValue</Property>
+ <Property name="valueProperty">dictLabel</Property>
</Property>
- </PropertyDef>
- <PropertyDef name="auditUser">
- <Property></Property>
- <Property name="label">瀹℃牳浜�</Property>
- </PropertyDef>
- <PropertyDef name="auditDate">
- <Property name="dataType">DateTime</Property>
- <Property name="label">瀹℃壒鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="completeStatus">
<Property></Property>
@@ -322,6 +299,7 @@
<Property name="iconClass">fa fa-refresh</Property>
<Property name="width">100</Property>
<Property name="tip">瀹屾垚閲忛粯璁ょ粺璁″埌鏄ㄥぉ锛屾煡鐪嬪疄鏃跺畬鎴愰噺璇风偣鍑烩�滃疄鏃舵牳绠椻�濇寜閽�</Property>
+ <Property name="ignored">true</Property>
</ToolBarButton>
<ToolBarButton layoutConstraint="left">
<ClientEvent name="onClick">
@@ -337,6 +315,20 @@
<Property name="exClassName">btn2</Property>
<Property name="width">120</Property>
<Property name="iconClass">fa fa-print</Property>
+ </ToolBarButton>
+ <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>
+ <Property name="caption">瀹℃壒璁板綍</Property>
+ <Property name="exClassName">btn4</Property>
+ <Property name="iconClass">fa fa-th-list</Property>
+ <Property name="width">120</Property>
</ToolBarButton>
<Fill/>
</ToolBar>
@@ -392,11 +384,10 @@
<Property name="align">center</Property>
<Property name="width">100</Property>
</DataColumn>
- <DataColumn>
- <Property name="property">updateBy</Property>
+ <DataColumn name="auditStatus">
+ <Property name="property">auditStatus</Property>
+ <Property name="width">100</Property>
<Property name="align">center</Property>
- <Property name="name">updateBy</Property>
- <Property name="width">120</Property>
</DataColumn>
<DataColumn>
<Property name="property">createTime</Property>
@@ -421,7 +412,10 @@
<Property name="iconClass">fa fa-tasks</Property>
<Buttons>
<Button id="btnOk">
- <ClientEvent name="onClick">view.get("#updateSave").execute(function(result){
+ <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;
@@ -475,7 +469,7 @@
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
<Property name="labelWidth">120</Property>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
<Property name="name">name</Property>
<Property name="property">name</Property>
<Editor/>
@@ -484,6 +478,8 @@
<Property name="name">type</Property>
<Property name="property">type</Property>
<Property name="trigger">autoMappingDropDown1</Property>
+ <Property name="editorType">RadioGroup</Property>
+ <Property name="showHint">false</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement id="formItemBank">
@@ -514,20 +510,38 @@
<Property name="trigger">defaultYearDropDown</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">customerName</Property>
- <Property name="property">customerName</Property>
+ <AutoFormElement>
+ <Property name="name">createTime</Property>
+ <Property name="property">createTime</Property>
+ <Property name="readOnly">true</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">unitName</Property>
- <Property name="property">unitName</Property>
+ <Property name="name">customerName</Property>
+ <Property name="property">customerName</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
<Property name="name">targetNumber</Property>
<Property name="property">targetNumber</Property>
<Property name="readOnly">false</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">
+ <Property name="name">remark</Property>
+ <Property name="property">remark</Property>
+ <Property name="editorType">TextArea</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -547,17 +561,6 @@
<Property name="readOnly">false</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
- <Property name="name">createBy</Property>
- <Property name="property">createBy</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">auditStatus</Property>
- <Property name="property">auditStatus</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">contract</Property>
<Property name="property">contract</Property>
@@ -569,32 +572,16 @@
</Property>
<Property name="text">娉細鐩戠閫氱煡鍗曪紝鍙～鍐欒川鎶煎悎鍚屽悕绉�</Property>
</Label>
- <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">createTime</Property>
- <Property name="property">createTime</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>
+ <Property name="name">auditStatus</Property>
+ <Property name="property">auditStatus</Property>
<Property name="readOnly">true</Property>
<Editor/>
</AutoFormElement>
<HtmlContainer layoutConstraint="colSpan:3">
- <Property name="content">1.鍑哄簱閫氱煡鍗曚綔涓哄嚭搴撲綔涓氱殑鍓嶇疆鏉′欢锛屽繀椤婚厤缃紝鍚﹀垯鏃犳硶杩涜鍏ュ簱浣滀笟銆�<br>
- 2.鍗曟嵁绫诲瀷=搴撳尯閫氱煡鍗曪紝琛ㄧず搴撳尯鑷繁浣滀笟涓氬姟锛屼笉鍙楃洃绠＄鐞嗐��</Property>
+ <Property name="content">1.鍏ュ簱閫氱煡鍗曚綔涓哄叆搴撲綔涓氱殑鍓嶇疆鏉′欢锛屽繀椤婚厤缃紝鍚﹀垯鏃犳硶杩涜鍏ュ簱浣滀笟銆�<br>
+2.鍗曟嵁绫诲瀷=搴撳尯閫氱煡鍗曪紝琛ㄧず搴撳尯鑷繁浣滀笟涓氬姟锛屼笉鍙楃洃绠＄鐞嗐��<br>
+3.鍗曟嵁绫诲瀷=璐ㄦ娂鐩戠閫氱煡鍗曪紝鍗曟嵁蹇呴』濉啓鐩戠潱閾惰銆�</Property>
<Property name="exClassName">h-tip</Property>
<Property name="contentOverflow">hidden</Property>
</HtmlContainer>
@@ -645,5 +632,18 @@
<AjaxAction id="recalculate">
<Property name="service">inoutNoticePR#updateSumNoticeOut</Property>
</AjaxAction>
+ <Dialog id="dialogHis">
+ <Property name="width">80%</Property>
+ <Property name="height">80%</Property>
+ <Property name="iconClass">fa fa-th-list</Property>
+ <Property name="caption">瀹℃壒璁板綍</Property>
+ <Buttons/>
+ <Children>
+ <IFrame id="iFrameFlowHis">
+ <Property name="path">/work/flow-his?businessId=1</Property>
+ </IFrame>
+ </Children>
+ <Tools/>
+ </Dialog>
</View>
</ViewConfig>
--
Gitblit v1.9.3