From cac7ab84d3cb339d6d4e0961f48a104e268dbee4 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期六, 17 一月 2026 18:02:35 +0800
Subject: [PATCH] 代码合并修改2
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml | 375 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 238 insertions(+), 137 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 63df160..f0814cb 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>
@@ -102,24 +103,9 @@
<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">
@@ -174,24 +160,58 @@
<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">
<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>
@@ -203,6 +223,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>
@@ -233,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>
@@ -262,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>
@@ -275,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>
@@ -291,24 +317,55 @@
</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>
<Property name="width">100</Property>
<Property name="tip">瀹屾垚閲忛粯璁ょ粺璁″埌鏄ㄥぉ锛屾煡鐪嬪疄鏃跺畬鎴愰噺璇风偣鍑烩�滃疄鏃舵牳绠椻�濇寜閽�</Property>
+ <Property name="ignored">true</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>
+ <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>
<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 +380,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 +397,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>
@@ -354,22 +416,15 @@
<Property name="align">center</Property>
<Property name="width">100</Property>
</DataColumn>
+ <DataColumn name="auditStatus">
+ <Property name="property">auditStatus</Property>
+ <Property name="width">100</Property>
+ <Property name="align">center</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="align">center</Property>
- <Property name="name">updateTime</Property>
<Property name="width">160</Property>
</DataColumn>
</DataGrid>
@@ -384,18 +439,22 @@
<Dialog id="dialogMain">
<Property name="closeable">false</Property>
<Property name="caption">鍑哄簱閫氱煡鍗�</Property>
- <Property name="width">1200</Property>
+ <Property name="width">85%</Property>
+ <Property name="height">90%</Property>
<Property name="iconClass">fa fa-tasks</Property>
<Buttons>
<Button id="btnOk">
- <ClientEvent name="onClick">view.get("#updateSave").execute(function(result){
- if(result){
- $alert(result);
- return;
- }
- $notify("鏁版嵁鎵ц瀹屾垚锛侊紒");
- self.get("parent").hide();
- });</ClientEvent>
+ <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>
<Property name="caption">淇濆瓨</Property>
<Property name="iconClass">fa fa-check-circle</Property>
<Property name="exClassName">btn1</Property>
@@ -403,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>
@@ -442,7 +501,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/>
@@ -450,12 +509,26 @@
<AutoFormElement>
<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">
+ <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>
@@ -469,20 +542,37 @@
<Property name="trigger">defaultYearDropDown</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement id="formItemCustomerName" layoutConstraint="colSpan:2">
<Property name="name">customerName</Property>
<Property name="property">customerName</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>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">createTime</Property>
+ <Property name="property">createTime</Property>
+ <Property name="readOnly">true</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>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:3">
+ <Property name="name">remark</Property>
+ <Property name="property">remark</Property>
+ <Property name="editorType">TextArea</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -502,17 +592,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>
@@ -524,32 +603,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>
@@ -558,6 +621,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>
@@ -575,5 +663,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