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 |   48 ++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 38 insertions(+), 10 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 bcb92bb..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">&#xD;
+    <ClientEvent name="onReady">// start 閫氳繃搴撳尯id鏉ュ姞杞戒粨鍌ㄦ暟鎹�&#xD;
+/**&#xD;
+ * 閫氱敤宸ュ叿鍑芥暟锛氳幏鍙朥RL涓殑鎸囧畾鍙傛暟鍊�&#xD;
+ * @param {String} name 瑕佽幏鍙栫殑鍙傛暟鍚�&#xD;
+ * @returns {String/null} 鍙傛暟鍊硷紙鏃犲垯杩斿洖null锛�&#xD;
+ */&#xD;
+function getUrlParam(name) {&#xD;
+    // 瑙ｆ瀽URL鐨勬煡璇㈠瓧绗︿覆锛�?鍚庨潰鐨勯儴鍒嗭級&#xD;
+    var search = window.location.search.substring(1);&#xD;
+    // 鍒嗗壊鎴愰敭鍊煎鏁扮粍&#xD;
+    var params = search.split(&quot;&amp;&quot;);&#xD;
+    for (var i = 0; i &lt; params.length; i++) {&#xD;
+        var pair = params[i].split(&quot;=&quot;);&#xD;
+        // 瑙ｇ爜鍙傛暟鍊硷紙澶勭悊涓枃/鐗规畩瀛楃锛�&#xD;
+        if (decodeURIComponent(pair[0]) === name) {&#xD;
+            return decodeURIComponent(pair[1] || &quot;&quot;);&#xD;
+        }&#xD;
+    }&#xD;
+    return null;&#xD;
+};  &#xD;
+&#xD;
+&#xD;
+&#xD;
 /**&#xD;
  * 鏌ヨ&#xD;
  */&#xD;
 query = function(){&#xD;
-    view.get(&quot;#dataSetdepot&quot;).flushAsync();&#xD;
-}&#xD;</ClientEvent>
+	//閫氳繃搴撳尯id鏉ュ姞杞戒粨鍌ㄦ暟鎹�&#xD;
+	var parentId = getUrlParam(&quot;parentId&quot;);&#xD;
+	view.get(&quot;#dataSetdepot&quot;).set(&quot;parameter&quot;,{parentId: parentId}).flushAsync();&#xD;
+};&#xD;query();&#xD;
+&#xD;
+</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 = &quot;com.fzzy.igds.sys.DepotStore.d&quot;;&#xD;
+          <ClientEvent name="onClick">var url = &quot;com.fzzy.igds.DepotStore.d&quot;;&#xD;
 var panelId = window.frameElement.getAttribute('data-id');
 window.parent.$.modal.openTab(&quot;搴撳瓨绠＄悊&quot;, 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>
@@ -155,7 +183,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">
@@ -215,11 +243,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>

--
Gitblit v1.9.3