From e69345c81150863c4a716819984693fd0487b419 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 07 二月 2026 11:52:25 +0800
Subject: [PATCH] 客户问题优化调整6-出入库详单取消入库重量，监管下出入库报表查询数据一样问题
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml | 217 ++++++++++++++++++++++++------------------------------
1 files changed, 96 insertions(+), 121 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml
index 5245c0d..37ff1ec 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml
@@ -4,25 +4,6 @@
<Context/>
<Model>
<DataType name="dtMain">
- <ClientEvent name="onDataChange">if(arg.property == 'type'){
- //搴撳尯鑷缓閫氱煡鍗�
- if(arg.newValue == '10'){
- view.get("#formItemBank").set("visible",false);
- var curData = view.get("#dsMain.data:#"); //褰撳墠閫夋嫨鐨勬暟鎹�
- curData.set("bankId",'-');
-
- }
- //璐ㄦ娂鐩戠閫氱煡鍗�
- if(arg.newValue == '20'){
- view.get("#formItemBank").set("visible",true);
- var curData = view.get("#dsMain.data:#"); //褰撳墠閫夋嫨鐨勬暟鎹�
- curData.set("bankId",null);
- }
-}
-
-
-
-</ClientEvent>
<Property name="creationType">com.fzzy.igds.domain.InoutNoticeIn</Property>
<PropertyDef name="id">
<Property></Property>
@@ -53,11 +34,11 @@
<Property name="mapValues">
<Collection>
<Entity>
- <Property name="name">搴撳尯鑷缓閫氱煡鍗�</Property>
+ <Property name="name">鑷敤閫氱煡鍗�</Property>
<Property name="code">10</Property>
</Entity>
<Entity>
- <Property name="name">璐ㄦ娂鐩戠閫氱煡鍗�</Property>
+ <Property name="name">鐩戠閫氱煡鍗�</Property>
<Property name="code">20</Property>
</Entity>
</Collection>
@@ -91,11 +72,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>
@@ -109,7 +85,7 @@
</PropertyDef>
<PropertyDef name="year">
<Property></Property>
- <Property name="label">骞翠唤</Property>
+ <Property name="label">绮骞翠唤</Property>
</PropertyDef>
<PropertyDef name="targetNumber">
<Property name="dataType">Double</Property>
@@ -130,14 +106,6 @@
<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>
@@ -223,7 +191,7 @@
<Property name="dataType">dtNoticeParam</Property>
</DataSet>
<DataSet id="dsDepotList">
- <Property name="dataProvider">depotPR#getDataByBankId</Property>
+ <Property name="dataProvider">depotPR#getData</Property>
<Property name="userData">浠撳簱鍒楄〃涓嬫媺妗�</Property>
<Property name="loadMode">manual</Property>
<Property name="dataType">[dtDepot]</Property>
@@ -298,15 +266,14 @@
<Property name="iconClass">fa fa-pencil-square-o</Property>
</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>
+ <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>
<Property name="caption">鍒犻櫎</Property>
<Property name="exClassName">btn3</Property>
<Property name="width">100</Property>
@@ -328,6 +295,7 @@
<Property name="iconClass">fa fa-refresh</Property>
<Property name="width">120</Property>
<Property name="tip">瀹屾垚閲忛粯璁ょ粺璁″埌鏄ㄥぉ锛屾煡鐪嬪疄鏃跺畬鎴愰噺璇风偣鍑烩�滃疄鏃舵牳绠椻�濇寜閽�</Property>
+ <Property name="ignored">true</Property>
</ToolBarButton>
<ToolBarButton layoutConstraint="left">
<ClientEvent name="onClick">
@@ -343,6 +311,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>
@@ -398,11 +380,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>
@@ -423,27 +404,21 @@
<Property name="closeable">false</Property>
<Property name="caption">鍏ュ簱閫氱煡鍗�</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">var entity = view.get("#dsMain.data:#");
-var bankId = entity.get("bankId");
-if(!bankId){
- $alert("璇峰厛閫夋嫨鐩戠閾惰");
-}else{
- view.get("#updateSave").execute(function(result){
- if(result){
- $alert(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;
}
- $notify("鏁版嵁鎵ц瀹屾垚锛侊紒");
+ $alert('鏁版嵁鎵ц鎴愬姛锛�');
self.get("parent").hide();
-});
-}
-
-
-</ClientEvent>
+});</ClientEvent>
<Property name="caption">淇濆瓨</Property>
<Property name="iconClass">fa fa-check-circle</Property>
<Property name="exClassName">btn1</Property>
@@ -490,7 +465,8 @@
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
<Property name="labelWidth">120</Property>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="showHint">true</Property>
+ <AutoFormElement>
<Property name="name">name</Property>
<Property name="property">name</Property>
<Editor/>
@@ -499,12 +475,20 @@
<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">display</Property>
+ <Property name="hideMode">visibility</Property>
+ <Property name="trigger">autoMappingDropDown2</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -530,14 +514,26 @@
<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">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>
@@ -557,17 +553,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>
@@ -579,32 +564,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>
+2.鍗曟嵁绫诲瀷=搴撳尯閫氱煡鍗曪紝琛ㄧず搴撳尯鑷繁浣滀笟涓氬姟锛屼笉鍙楃洃绠＄鐞嗐��<br>
+3.鍗曟嵁绫诲瀷=璐ㄦ娂鐩戠閫氱煡鍗曪紝鍗曟嵁蹇呴』濉啓鐩戠潱閾惰銆�</Property>
<Property name="exClassName">h-tip</Property>
<Property name="contentOverflow">hidden</Property>
</HtmlContainer>
@@ -614,25 +583,18 @@
<Tools/>
</Dialog>
<DataSetDropDown id="dsDepotDropDown">
- <ClientEvent name="onOpen"> 
- var entity = view.get("#dsMain.data:#");
- if(!entity){
- $alert("璇峰厛閫夋嫨鐩戠閾惰");
- }else{
- var typeData = entity.get("type");
- if(typeData=='20'){
- var bankId = entity.get("bankId");
- console.log(bankId);
- if(!bankId){
- $alert("璇峰厛閫夋嫨鐩戠閾惰");
- }else{
- view.get("#dsDepotList").set("parameter",entity.get("bankId")).flushAsync();
- }
- }else{
- view.get("#dsDepotList").set("parameter",null).flushAsync();
- }
- }
-</ClientEvent>
+ <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>
@@ -662,5 +624,18 @@
<AjaxAction id="recalculate">
<Property name="service">inoutNoticePR#updateSumNoticeIn</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