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 | 224 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 147 insertions(+), 77 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 3025c67..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
@@ -9,13 +9,19 @@
<Property></Property>
<Property name="label">閫氱煡鍗曞彿</Property>
</PropertyDef>
- <PropertyDef name="companyId">
- <Property></Property>
- <Property name="label">缁勭粐缂栫爜</Property>
- </PropertyDef>
<PropertyDef name="deptId">
<Property></Property>
<Property name="label">鎵�灞炲垎搴�</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">id</Property>
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#getDeptByUserType").getResult()}</Property>
+ <Property name="valueProperty">kqmc</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property></Property>
+ <Property name="label">缁勭粐缂栫爜</Property>
</PropertyDef>
<PropertyDef name="name">
<Property></Property>
@@ -52,7 +58,7 @@
<Property></Property>
<Property name="label">鍑哄簱浠撳簱</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getData").getResult()}</Property>
<Property name="keyProperty">id</Property>
<Property name="valueProperty">name</Property>
</Property>
@@ -67,11 +73,6 @@
<Property></Property>
<Property name="label">鍙戣揣鍗曚綅</Property>
<Property name="required">false</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deptPR#getAllData").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">kqmc</Property>
- </Property>
</PropertyDef>
<PropertyDef name="foodVariety">
<Property></Property>
@@ -85,7 +86,7 @@
</PropertyDef>
<PropertyDef name="year">
<Property></Property>
- <Property name="label">骞翠唤</Property>
+ <Property name="label">绮骞翠唤</Property>
</PropertyDef>
<PropertyDef name="targetNumber">
<Property name="dataType">double</Property>
@@ -97,30 +98,6 @@
<Property name="dataType">double</Property>
<Property name="label">瀹屾垚鏁伴噺</Property>
<Property name="displayFormat">#0.0 KG</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>
<PropertyDef name="auditUser">
<Property></Property>
@@ -174,6 +151,40 @@
<Property></Property>
<Property name="label">鏇存柊浜�</Property>
</PropertyDef>
+ <PropertyDef name="bankId">
+ <Property></Property>
+ <Property name="label">鐩戠潱閾惰</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("bankPR#listAll").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <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>
<View layout="padding:10">
@@ -203,6 +214,12 @@
<Property name="dataType">dtNoticeParam</Property>
<Property name="dataProvider">inoutNoticePR#getYearQuery</Property>
<Property name="loadMode">manual</Property>
+ </DataSet>
+ <DataSet id="dsDepotList">
+ <Property name="dataProvider">depotPR#getData</Property>
+ <Property name="userData">浠撳簱鍒楄〃涓嬫媺妗�</Property>
+ <Property name="loadMode">manual</Property>
+ <Property name="dataType">[dtDepot]</Property>
</DataSet>
<Container>
<Property name="className">c-param</Property>
@@ -306,9 +323,25 @@
<Property name="width">100</Property>
<Property name="tip">瀹屾垚閲忛粯璁ょ粺璁″埌鏄ㄥぉ锛屾煡鐪嬪疄鏃跺畬鎴愰噺璇风偣鍑烩�滃疄鏃舵牳绠椻�濇寜閽�</Property>
</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>
+ <Property name="caption">瀵煎嚭Word</Property>
+ <Property name="exClassName">btn2</Property>
+ <Property name="width">120</Property>
+ <Property name="iconClass">fa fa-print</Property>
+ </ToolBarButton>
+ <Fill/>
</ToolBar>
<DataGrid id="dataGridMain" layoutConstraint="padding:8">
- <ClientEvent name="onDataRowDoubleClick">view.get("#dataGridMain").set("selection",arg.data);</ClientEvent>
+ <ClientEvent name="onDataRowClick">self.set("selection",arg.data);</ClientEvent>
<Property name="dataSet">dsMain</Property>
<Property name="readOnly">true</Property>
<Property name="selectionMode">singleRow</Property>
@@ -323,6 +356,11 @@
<Property name="width">200</Property>
<Property name="align">center</Property>
</DataColumn>
+ <DataColumn>
+ <Property name="property">deptId</Property>
+ <Property name="align">left</Property>
+ <Property name="name">deptId</Property>
+ </DataColumn>
<DataColumn name="name">
<Property name="property">name</Property>
<Property name="align">center</Property>
@@ -335,18 +373,18 @@
<DataColumn name="depotId">
<Property name="property">depotId</Property>
<Property name="align">center</Property>
- <Property name="width">150</Property>
+ <Property name="width">120</Property>
</DataColumn>
<DataColumn name="foodVariety">
<Property name="property">foodVariety</Property>
<Property name="align">center</Property>
- <Property name="width">150</Property>
+ <Property name="width">120</Property>
</DataColumn>
<DataColumn>
<Property name="property">targetNumber</Property>
<Property name="name">targetNumber</Property>
<Property name="align">center</Property>
- <Property name="width">200</Property>
+ <Property name="width">120</Property>
</DataColumn>
<DataColumn>
<Property name="property">completeStatus</Property>
@@ -355,21 +393,15 @@
<Property name="width">100</Property>
</DataColumn>
<DataColumn>
- <Property name="property">createTime</Property>
- <Property name="align">center</Property>
- <Property name="name">createTime</Property>
- <Property name="width">200</Property>
- </DataColumn>
- <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">updateTime</Property>
+ <Property name="property">createTime</Property>
<Property name="align">center</Property>
- <Property name="name">updateTime</Property>
+ <Property name="name">createTime</Property>
<Property name="width">160</Property>
</DataColumn>
</DataGrid>
@@ -390,13 +422,13 @@
<Buttons>
<Button id="btnOk">
<ClientEvent name="onClick">view.get("#updateSave").execute(function(result){
- if(result){
- $alert(result);
- return;
- }
- $notify("鏁版嵁鎵ц瀹屾垚锛侊紒");
- self.get("parent").hide();
- });</ClientEvent>
+ 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>
@@ -443,7 +475,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/>
@@ -451,12 +483,25 @@
<AutoFormElement>
<Property name="name">type</Property>
<Property name="property">type</Property>
+ <Property name="trigger">autoMappingDropDown1</Property>
<Property name="editorType">RadioGroup</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement id="formItemBank">
+ <Property name="name">bankId</Property>
+ <Property name="property">bankId</Property>
+ <Property name="hideMode">visibility</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
<Property name="name">depotId</Property>
<Property name="property">depotId</Property>
+ <Property name="trigger">dsDepotDropDown</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -476,14 +521,30 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <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>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">targetNumber</Property>
- <Property name="property">targetNumber</Property>
- <Property name="readOnly">false</Property>
+ <Property name="name">createBy</Property>
+ <Property name="property">createBy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <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>
@@ -503,17 +564,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>
@@ -525,15 +575,10 @@
</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>
+ <Property name="name">auditStatus</Property>
+ <Property name="property">auditStatus</Property>
+ <Property name="readOnly">true</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -559,6 +604,31 @@
</Children>
<Tools/>
</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>
+ <Property name="dataSet">dsDepotList</Property>
+ <Property name="height">450</Property>
+ <Property name="autoOpen">true</Property>
+ <Property name="assignmentMap">depotId=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>
<UpdateAction id="updateSave">
<Property name="dataResolver">inoutNoticePR#saveOut</Property>
<UpdateItem>
--
Gitblit v1.9.3