From 28c49925c98713465db8cd64899d984d6cd0f7ad Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 26 十二月 2025 17:56:59 +0800
Subject: [PATCH] Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml | 97 ++++++++++++++++++++++--------------------------
1 files changed, 44 insertions(+), 53 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 7d42514..fd4251a 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,17 +16,44 @@
</DataType>
</Model>
<View layout="padding:10">
- <ClientEvent name="onReady">
+ <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;
+}; 
+
+
+
/**
* 鏌ヨ
*/
query = function(){
- view.get("#dataSetdepot").flushAsync();
-}
</ClientEvent>
+ //閫氳繃搴撳尯id鏉ュ姞杞戒粨鍌ㄦ暟鎹�
+ var parentId = getUrlParam("parentId");
+ view.get("#dataSetdepot").set("parameter",{parentId: parentId}).flushAsync();
+};
query();
+
+</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>
@@ -80,12 +107,13 @@
<Property name="action">ajaxRefreshCache</Property>
</ToolBarButton>
<ToolBarButton>
- <ClientEvent name="onClick">var url = "com.fzzy.igds.sys.DepotStore.d";
+ <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>
@@ -154,7 +182,8 @@
<Dialog id="depotdialog" layout="regionPadding:8">
<Property name="iconClass">fa fa-tasks</Property>
<Property name="caption">浠撳簱淇℃伅</Property>
- <Property name="width">1200</Property>
+ <Property name="width">80%</Property>
+ <Property name="height">90%</Property>
<Property name="closeable">false</Property>
<Buttons>
<Button id="btnOK">
@@ -214,19 +243,14 @@
<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">storeType</Property>
- <Property name="property">storeType</Property>
+ <Property name="name">storageMax</Property>
+ <Property name="property">storageMax</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">createBy</Property>
- <Property name="property">createBy</Property>
+ <Property name="name">storeType</Property>
+ <Property name="property">storeType</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
@@ -241,11 +265,6 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">createTime</Property>
- <Property name="property">createTime</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">storeKeeperName</Property>
<Property name="property">storeKeeperName</Property>
<Property name="trigger">triggerUserList</Property>
@@ -254,6 +273,11 @@
<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">
@@ -296,11 +320,6 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">foodType</Property>
- <Property name="property">foodType</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">foodLevel</Property>
<Property name="property">foodLevel</Property>
<Editor/>
@@ -321,20 +340,6 @@
<Property name="property">storeDate</Property>
<Editor/>
</AutoFormElement>
- <Label>
- <Property name="text"></Property>
- <Property name="style">
- <Property name="color">blue</Property>
- <Property name="padding-left">50px</Property>
- </Property>
- </Label>
- <Label layoutConstraint="colSpan:3">
- <Property name="text">璇存槑锛�1銆佸疄闄呭偍閲忚皟鏁磋浣跨敤鈥滃簱瀛樼鐞嗏�濆姛鑳斤紱</Property>
- <Property name="style">
- <Property name="color">blue</Property>
- <Property name="padding-left">50px</Property>
- </Property>
- </Label>
</AutoForm>
</Children>
</FieldSet>
@@ -347,7 +352,7 @@
<Property name="readOnly">false</Property>
<Property name="labelSeparator"> : </Property>
<Property name="labelAlign">right</Property>
- <Property name="cols">*,*,*,*,*,*</Property>
+ <Property name="cols">*,*,*,*,*,*,*,*</Property>
<Property name="labelWidth">80</Property>
<AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">perWet</Property>
@@ -369,20 +374,6 @@
<Property name="property">checkDate</Property>
<Editor/>
</AutoFormElement>
- <Label>
- <Property name="text"></Property>
- <Property name="style">
- <Property name="color">blue</Property>
- <Property name="padding-left">50px</Property>
- </Property>
- </Label>
- <Label layoutConstraint="colSpan:3">
- <Property name="text">璇存槑锛氬偍澶囩伯璐ㄦ淇℃伅浼氭牴鎹川閲忕鐞� 鑷姩鍚屾鏇存柊</Property>
- <Property name="style">
- <Property name="color">blue</Property>
- <Property name="padding-left">50px</Property>
- </Property>
- </Label>
</AutoForm>
</Children>
</FieldSet>
--
Gitblit v1.9.3