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 |   51 +++++++++++++++++++++++----------------------------
 1 files changed, 23 insertions(+), 28 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 291836b..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
@@ -108,16 +108,6 @@
           <Property name="width">100</Property>
           <Property name="action">ajaxRefreshCache</Property>
         </ToolBarButton>
-        <ToolBarButton>
-          <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>
       <DataGrid id="dataGridDepot" layoutConstraint="padding:8">
         <ClientEvent name="onDataRowClick">view.get(&quot;#dataGridDepot&quot;).set(&quot;selection&quot;,arg.data);</ClientEvent>
@@ -280,16 +270,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/>
@@ -348,7 +328,7 @@
           </Children>
         </FieldSet>
         <FieldSet layout="padding:5">
-          <Property name="caption">璐ㄦ淇℃伅</Property>
+          <Property name="caption">鍏朵粬淇℃伅</Property>
           <Buttons/>
           <Children>
             <AutoForm>
@@ -357,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>
@@ -366,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">
@@ -395,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