From 0329de5a2343a179be54a9c70844515db202a998 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 19 一月 2026 09:42:52 +0800
Subject: [PATCH] 细节调整1
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml | 234 ++++++++++++++++++++++++----------------------------------
1 files changed, 96 insertions(+), 138 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 4c1740d..50d9c56 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,7 +99,6 @@
<Property name="label">瀹屾垚鏁伴噺</Property>
<Property name="displayFormat">#0.0 KG</Property>
</PropertyDef>
-<<<<<<< HEAD
<PropertyDef name="auditStatus">
<Property></Property>
<Property name="label">瀹℃牳鐘舵��</Property>
@@ -108,7 +107,7 @@
<Property name="keyProperty">dictValue</Property>
<Property name="valueProperty">dictLabel</Property>
</Property>
-=======
+ </PropertyDef>
<PropertyDef name="auditUser">
<Property></Property>
<Property name="label">瀹℃牳浜�</Property>
@@ -116,7 +115,6 @@
<PropertyDef name="auditDate">
<Property name="dataType">DateTime</Property>
<Property name="label">瀹℃壒鏃堕棿</Property>
->>>>>>> da4b59346969e1622a66ce9fde637b1fac1c501b
</PropertyDef>
<PropertyDef name="completeStatus">
<Property></Property>
@@ -200,20 +198,20 @@
</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>
@@ -261,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>
@@ -290,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>
@@ -303,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>
@@ -319,15 +317,15 @@
</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>
@@ -337,14 +335,14 @@
</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>
+ 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>
@@ -353,12 +351,12 @@
<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>
+ 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>
@@ -447,16 +445,16 @@
<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){
- if(result.code != '200'){
- $alert(result.message);
- return;
- }
- $alert('鏁版嵁鎵ц鎴愬姛锛�');
- self.get("parent").hide();
-});</ClientEvent>
+ 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>
@@ -464,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>
@@ -513,10 +511,7 @@
<Property name="property">type</Property>
<Property name="trigger">autoMappingDropDown1</Property>
<Property name="editorType">RadioGroup</Property>
-<<<<<<< HEAD
<Property name="showHint">false</Property>
-=======
->>>>>>> da4b59346969e1622a66ce9fde637b1fac1c501b
<Editor/>
</AutoFormElement>
<AutoFormElement id="formItemBank">
@@ -547,53 +542,31 @@
<Property name="trigger">defaultYearDropDown</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
- <Property name="name">createTime</Property>
- <Property name="property">createTime</Property>
- <Property name="readOnly">true</Property>
+ <AutoFormElement id="formItemCustomerName" layoutConstraint="colSpan:2">
+ <Property name="name">customerName</Property>
+ <Property name="property">customerName</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
-<<<<<<< HEAD
- <Property name="name">customerName</Property>
- <Property name="property">customerName</Property>
-=======
<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>
->>>>>>> da4b59346969e1622a66ce9fde637b1fac1c501b
- <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>
- <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>
+ <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">
@@ -633,28 +606,13 @@
<AutoFormElement>
<Property name="name">auditStatus</Property>
<Property name="property">auditStatus</Property>
-<<<<<<< HEAD
-=======
- <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>
->>>>>>> da4b59346969e1622a66ce9fde637b1fac1c501b
<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.鍗曟嵁绫诲瀷=搴撳尯閫氱煡鍗曪紝琛ㄧず搴撳尯鑷繁浣滀笟涓氬姟锛屼笉鍙楃洃绠＄鐞嗐��<br>
+ 3.鍗曟嵁绫诲瀷=璐ㄦ娂鐩戠閫氱煡鍗曪紝鍗曟嵁蹇呴』濉啓鐩戠潱閾惰銆�</Property>
<Property name="exClassName">h-tip</Property>
<Property name="contentOverflow">hidden</Property>
</HtmlContainer>
@@ -665,17 +623,17 @@
</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>
+ 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>
--
Gitblit v1.9.3