From 40671eb79c1805f661fd0e12061dd1b406af9b15 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期六, 17 一月 2026 17:10:58 +0800
Subject: [PATCH] Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml | 109 +++++++++++++++++++++++++++---------------------------
1 files changed, 55 insertions(+), 54 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 dcc468f..cfa1be9 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
@@ -99,14 +99,13 @@
<Property name="label">瀹屾垚鏁伴噺</Property>
<Property name="displayFormat">#0.0 KG</Property>
</PropertyDef>
- <PropertyDef name="auditStatus">
+ <PropertyDef name="auditUser">
<Property></Property>
- <Property name="label">瀹℃牳鐘舵��</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicPR#triggerStatusType").getResult()}</Property>
- <Property name="keyProperty">dictValue</Property>
- <Property name="valueProperty">dictLabel</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>
@@ -161,6 +160,30 @@
<Property name="valueProperty">name</Property>
</Property>
<Property name="visible">true</Property>
+ </PropertyDef>
+ <PropertyDef name="auditStatus">
+ <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>
</PropertyDef>
</DataType>
</Model>
@@ -299,7 +322,6 @@
<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">
@@ -315,20 +337,6 @@
<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>
@@ -384,10 +392,11 @@
<Property name="align">center</Property>
<Property name="width">100</Property>
</DataColumn>
- <DataColumn name="auditStatus">
- <Property name="property">auditStatus</Property>
- <Property name="width">100</Property>
+ <DataColumn>
+ <Property name="property">updateBy</Property>
<Property name="align">center</Property>
+ <Property name="name">updateBy</Property>
+ <Property name="width">120</Property>
</DataColumn>
<DataColumn>
<Property name="property">createTime</Property>
@@ -412,10 +421,7 @@
<Property name="iconClass">fa fa-tasks</Property>
<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){
+ <ClientEvent name="onClick">view.get("#updateSave").execute(function(result){
if(result.code != '200'){
$alert(result.message);
return;
@@ -479,7 +485,6 @@
<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">
@@ -510,13 +515,7 @@
<Property name="trigger">defaultYearDropDown</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
- <Property name="name">createTime</Property>
- <Property name="property">createTime</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">customerName</Property>
<Property name="property">customerName</Property>
<Editor/>
@@ -528,6 +527,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">unitName</Property>
+ <Property name="property">unitName</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">createBy</Property>
<Property name="property">createBy</Property>
<Editor/>
@@ -535,7 +539,6 @@
<AutoFormElement>
<Property name="name">createTime</Property>
<Property name="property">createTime</Property>
- <Property name="readOnly">true</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:3">
@@ -578,10 +581,21 @@
<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>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
<HtmlContainer layoutConstraint="colSpan:3">
- <Property name="content">1.鍏ュ簱閫氱煡鍗曚綔涓哄叆搴撲綔涓氱殑鍓嶇疆鏉′欢锛屽繀椤婚厤缃紝鍚﹀垯鏃犳硶杩涜鍏ュ簱浣滀笟銆�<br>
-2.鍗曟嵁绫诲瀷=搴撳尯閫氱煡鍗曪紝琛ㄧず搴撳尯鑷繁浣滀笟涓氬姟锛屼笉鍙楃洃绠＄鐞嗐��<br>
-3.鍗曟嵁绫诲瀷=璐ㄦ娂鐩戠閫氱煡鍗曪紝鍗曟嵁蹇呴』濉啓鐩戠潱閾惰銆�</Property>
+ <Property name="content">1.鍑哄簱閫氱煡鍗曚綔涓哄嚭搴撲綔涓氱殑鍓嶇疆鏉′欢锛屽繀椤婚厤缃紝鍚﹀垯鏃犳硶杩涜鍏ュ簱浣滀笟銆�<br>
+ 2.鍗曟嵁绫诲瀷=搴撳尯閫氱煡鍗曪紝琛ㄧず搴撳尯鑷繁浣滀笟涓氬姟锛屼笉鍙楃洃绠＄鐞嗐��</Property>
<Property name="exClassName">h-tip</Property>
<Property name="contentOverflow">hidden</Property>
</HtmlContainer>
@@ -632,18 +646,5 @@
<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