From 72a67eb9ba942e632c11906093c5cd14e364eed7 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 13 二月 2026 14:27:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml | 98 +++++++++++++++++++++++++++++++------------------
1 files changed, 62 insertions(+), 36 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 08559c7..7759d90 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
@@ -17,16 +17,45 @@
</Model>
<View layout="padding:10">
<ClientEvent name="onReady">
+
/**
* 鏌ヨ
*/
query = function(){
- view.get("#dataSetdepot").flushAsync();
-}
</ClientEvent>
+ //閫氳繃搴撳尯id鏉ュ姞杞戒粨鍌ㄦ暟鎹�
+ 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">
<Property name="dataProvider">depotPR#getData</Property>
<Property name="dataType">[dtDepot]</Property>
+ <Property name="loadMode">manual</Property>
</DataSet>
<DataSet id="dataSetUser">
<Property name="dataType">[dataTypeUser]</Property>
@@ -79,16 +108,6 @@
<Property name="width">100</Property>
<Property name="action">ajaxRefreshCache</Property>
</ToolBarButton>
- <ToolBarButton>
- <ClientEvent name="onClick">var url = "com.fzzy.igds.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="visible">false</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>
@@ -98,11 +117,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>
@@ -156,7 +177,7 @@
<Property name="iconClass">fa fa-tasks</Property>
<Property name="caption">浠撳簱淇℃伅</Property>
<Property name="width">80%</Property>
- <Property name="height">82%</Property>
+ <Property name="height">90%</Property>
<Property name="closeable">false</Property>
<Buttons>
<Button id="btnOK">
@@ -216,11 +237,11 @@
<Property name="property">deptId</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">storageMax</Property>
- <Property name="property">storageMax</Property>
- <Editor/>
- </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">storageMax</Property>
+ <Property name="property">storageMax</Property>
+ <Editor/>
+ </AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">storeType</Property>
<Property name="property">storeType</Property>
@@ -246,16 +267,6 @@
<AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">orderNum</Property>
<Property name="property">orderNum</Property>
- <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">
@@ -317,7 +328,7 @@
</Children>
</FieldSet>
<FieldSet layout="padding:5">
- <Property name="caption">璐ㄦ淇℃伅</Property>
+ <Property name="caption">鍏朵粬淇℃伅</Property>
<Buttons/>
<Children>
<AutoForm>
@@ -326,7 +337,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>
@@ -335,11 +366,6 @@
<AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">perImpurity</Property>
<Property name="property">perImpurity</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">bulkWeight</Property>
- <Property name="property">bulkWeight</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
@@ -364,7 +390,7 @@
</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