From 1cd2e610fdbd581f609e002e738b0e5cea97ad40 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 13 二月 2026 14:27:10 +0800
Subject: [PATCH] 报表问题修改
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml | 343 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 297 insertions(+), 46 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml
index 628173e..278207c 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml
@@ -16,38 +16,40 @@
</DataType>
</Model>
<View layout="padding:10">
- <ClientEvent name="onReady">// start 閫氳繃搴撳尯id鏉ュ姞杞戒粨鍌ㄦ暟鎹�
-/**
- * 閫氱敤宸ュ叿鍑芥暟锛氳幏鍙朥RL涓殑鎸囧畾鍙傛暟鍊�
- * @param {String} name 瑕佽幏鍙栫殑鍙傛暟鍚�
- * @returns {String/null} 鍙傛暟鍊硷紙鏃犲垯杩斿洖null锛�
- */
-function getUrlParam(name) {
- // 瑙ｆ瀽URL鐨勬煡璇㈠瓧绗︿覆锛�?鍚庨潰鐨勯儴鍒嗭級
- var search = window.location.search.substring(1);
- // 鍒嗗壊鎴愰敭鍊煎鏁扮粍
- var params = search.split("&");
- for (var i = 0; i < params.length; i++) {
- var pair = params[i].split("=");
- // 瑙ｇ爜鍙傛暟鍊硷紙澶勭悊涓枃/鐗规畩瀛楃锛�
- if (decodeURIComponent(pair[0]) === name) {
- return decodeURIComponent(pair[1] || "");
- }
- }
- return null;
-}; 
-
-
+ <ClientEvent name="onReady">

/**
* 鏌ヨ
*/
query = function(){
//閫氳繃搴撳尯id鏉ュ姞杞戒粨鍌ㄦ暟鎹�
- var parentId = getUrlParam("parentId");
+ var parentId = "${request.getParameter('parentId')}";
view.get("#dataSetdepot").set("parameter",{parentId: parentId}).flushAsync();
};
query();

+
+showDlg=function(){
+ var select = view.get("#dataGridDepot").get("selection");
+ if(select){
+ view.get("#depotdialog").show();;
+ }else{
+ $notify("璇峰厛閫夋嫨鏁版嵁鈥︹��");
+ }
+};
+
+renderId = function(arg){
+ var txt = arg.data.getText("id");
+ if(!txt) return true;
+ var htm = "<a href='javascript:;' onClick='showDlg()' >"+txt+"</a>";
+ arg.dom.innerHTML = htm;
+}
+
+renderName = function(arg){
+ var txt = arg.data.getText("name");
+ if(!txt) return true;
+ var htm = "<a href='javascript:;' onClick='showDlg()' >"+txt+"</a>";
+ arg.dom.innerHTML = htm;
+}
</ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dataSetdepot">
@@ -81,8 +83,20 @@
}else{
$notify("璇烽�夋嫨闇�瑕佷慨鏀圭殑浠撳簱鈥︹��");
}</ClientEvent>
- <Property name="caption">淇敼</Property>
+ <Property name="caption">淇℃伅淇敼</Property>
<Property name="exClassName">btn2</Property>
+ <Property name="width">100</Property>
+ <Property name="iconClass">fa fa-pencil-square-o</Property>
+ </ToolBarButton>
+ <ToolBarButton>
+ <ClientEvent name="onClick">var select = view.get("#dataGridDepot").get("selection");
+ if(select){
+ view.get("#depotdialog2").show();
+ }else{
+ $notify("璇烽�夋嫨闇�瑕佷慨鏀圭殑浠撳簱鈥︹��");
+ }</ClientEvent>
+ <Property name="caption">搴撳瓨淇敼</Property>
+ <Property name="exClassName">btn4</Property>
<Property name="width">100</Property>
<Property name="iconClass">fa fa-pencil-square-o</Property>
</ToolBarButton>
@@ -106,15 +120,6 @@
<Property name="width">100</Property>
<Property name="action">ajaxRefreshCache</Property>
</ToolBarButton>
- <ToolBarButton>
- <ClientEvent name="onClick">var url = "com.fzzy.igds.sys.DepotStore.d";
-var panelId = window.frameElement.getAttribute('data-id');
-window.parent.$.modal.openTab("搴撳瓨绠＄悊", url, false, panelId);</ClientEvent>
- <Property name="caption">搴撳瓨绠＄悊</Property>
- <Property name="iconClass">fa fa-book</Property>
- <Property name="exClassName">btn1</Property>
- <Property name="width">100</Property>
- </ToolBarButton>
</ToolBar>
<DataGrid id="dataGridDepot" layoutConstraint="padding:8">
<ClientEvent name="onDataRowClick">view.get("#dataGridDepot").set("selection",arg.data);</ClientEvent>
@@ -124,11 +129,13 @@
<RowSelectorColumn/>
<RowNumColumn/>
<DataColumn name="id">
+ <ClientEvent name="onRenderCell">renderId(arg);</ClientEvent>
<Property name="property">id</Property>
<Property name="align">center</Property>
<Property name="width">120</Property>
</DataColumn>
<DataColumn name="name">
+ <ClientEvent name="onRenderCell">renderName(arg);</ClientEvent>
<Property name="property">name</Property>
<Property name="align">center</Property>
<Property name="width">120</Property>
@@ -275,16 +282,6 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:4">
- <Property name="name">pledgeBank</Property>
- <Property name="property">pledgeBank</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">updateBy</Property>
- <Property name="property">updateBy</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:4">
<Property name="name">remark</Property>
<Property name="property">remark</Property>
<Editor/>
@@ -343,7 +340,7 @@
</Children>
</FieldSet>
<FieldSet layout="padding:5">
- <Property name="caption">璐ㄦ淇℃伅</Property>
+ <Property name="caption">鍏朵粬淇℃伅</Property>
<Buttons/>
<Children>
<AutoForm>
@@ -352,7 +349,27 @@
<Property name="labelSeparator"> : </Property>
<Property name="labelAlign">right</Property>
<Property name="cols">*,*,*,*,*,*,*,*</Property>
- <Property name="labelWidth">80</Property>
+ <Property name="labelWidth">100</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">length</Property>
+ <Property name="property">length</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">width</Property>
+ <Property name="property">width</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">height</Property>
+ <Property name="property">height</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">bulkWeight</Property>
+ <Property name="property">bulkWeight</Property>
+ <Editor/>
+ </AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">perWet</Property>
<Property name="property">perWet</Property>
@@ -364,13 +381,238 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">checkDate</Property>
+ <Property name="property">checkDate</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <Dialog id="depotdialog2" layout="regionPadding:8">
+ <Property name="iconClass">fa fa-tasks</Property>
+ <Property name="caption">浠撳簱淇℃伅</Property>
+ <Property name="width">80%</Property>
+ <Property name="height">90%</Property>
+ <Property name="closeable">false</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">//鍚屾椂鎻愪氦鍘嗗彶涔�
+ var data = view.get("#dataSetdepot.data:#");
+ view.get("#updateactionSave2").execute(function(result){
+ if(result){
+ $notify(result);
+ }else{
+ self.get("parent").hide();
+ query();
+ }
+ });</ClientEvent>
+ <Property name="caption">淇濆瓨</Property>
+ <Property name="iconClass">fa fa-check-circle</Property>
+ <Property name="exClassName">btn1</Property>
+ <Property name="width">120</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var cur = view.get("#dataSetdepot.data:#");
+ if(cur) cur.cancel();
+ self.get("parent").hide();</ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="exClassName">btn3</Property>
+ <Property name="iconClass">fa fa-times-circle</Property>
+ <Property name="width">120</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <FieldSet layout="padding:5">
+ <Property name="caption">鍩烘湰淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dataSetdepot</Property>
+ <Property name="readOnly">false</Property>
+ <Property name="labelSeparator"> : </Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="cols">*,*,*,*,*,*</Property>
+ <Property name="labelWidth">80</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">id</Property>
+ <Property name="property">id</Property>
+ <Property name="readOnly">true</Property>
+ <Editor>
+ <TextEditor>
+ <Property name="blankText">-- 绯荤粺鑷姩鐢熸垚 --</Property>
+ </TextEditor>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">name</Property>
+ <Property name="property">name</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">storageMax</Property>
+ <Property name="property">storageMax</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">storeType</Property>
+ <Property name="property">storeType</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">depotStatus</Property>
+ <Property name="property">depotStatus</Property>
+ <Property name="trigger">autoMappingDropDown2</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">depotType</Property>
+ <Property name="property">depotType</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">storeKeeperName</Property>
+ <Property name="property">storeKeeperName</Property>
+ <Property name="trigger">triggerUserList</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">orderNum</Property>
+ <Property name="property">orderNum</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:4">
+ <Property name="name">remark</Property>
+ <Property name="property">remark</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet layout="padding:5">
+ <Property name="caption">鍌ㄧ伯淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dataSetdepot</Property>
+ <Property name="readOnly">false</Property>
+ <Property name="labelSeparator"> : </Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="cols">*,*,*,*,*,*</Property>
+ <Property name="labelWidth">80</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">storageReal</Property>
+ <Property name="property">storageReal</Property>
+ <Property name="readOnly">false</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">foodVariety</Property>
+ <Property name="property">foodVariety</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">foodLevel</Property>
+ <Property name="property">foodLevel</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">foodYear</Property>
+ <Property name="property">foodYear</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">foodLocation</Property>
+ <Property name="property">foodLocation</Property>
+ <Property name="trigger">ddFoodOrigin</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">storeDate</Property>
+ <Property name="property">storeDate</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet layout="padding:5">
+ <Property name="caption">鍏朵粬淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dataSetdepot</Property>
+ <Property name="readOnly">false</Property>
+ <Property name="labelSeparator"> : </Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="cols">*,*,*,*,*,*,*,*</Property>
+ <Property name="labelWidth">100</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">length</Property>
+ <Property name="property">length</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">width</Property>
+ <Property name="property">width</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">height</Property>
+ <Property name="property">height</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">bulkWeight</Property>
<Property name="property">bulkWeight</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">perWet</Property>
+ <Property name="property">perWet</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">perImpurity</Property>
+ <Property name="property">perImpurity</Property>
+ <Property name="readOnly">true</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">checkDate</Property>
<Property name="property">checkDate</Property>
+ <Property name="readOnly">true</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
@@ -388,9 +630,18 @@
<Property name="alias">data</Property>
</UpdateItem>
</UpdateAction>
+ <UpdateAction id="updateactionSave2">
+ <Property name="executingMessage">姝ｅ湪鎵ц涓�..</Property>
+ <Property name="dataResolver">depotPR#saveOrUpdate2</Property>
+ <UpdateItem>
+ <Property name="dataSet">dataSetdepot</Property>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="alias">data</Property>
+ </UpdateItem>
+ </UpdateAction>
<AjaxAction id="deleteAjaxAction">
<Property name="successMessage">鍒犻櫎鎴愬姛</Property>
- <Property name="service">depotPR#deletedepot</Property>
+ <Property name="service">depotPR#deleteDepot</Property>
<Property name="executingMessage">姝ｅ湪鍒犻櫎</Property>
</AjaxAction>
<AjaxAction id="ajaxRefreshCache">
--
Gitblit v1.9.3