From 18127822f3cdb4778fb62ba0304bb8372dada516 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期三, 17 十二月 2025 09:11:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
index 31715db..b857adc 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
@@ -159,7 +159,7 @@
       </PropertyDef>
       <PropertyDef name="deptId">
         <Property></Property>
-        <Property name="label">鎵�灞炲垎搴�</Property>
+        <Property name="label">鎵�鍦ㄥ簱鍖�</Property>
         <Property name="mapping">
           <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getAllData&quot;).getResult()}</Property>
           <Property name="keyProperty">id</Property>
@@ -628,12 +628,19 @@
           <Property name="align">center</Property>
           <Property name="width">150</Property>
         </DataColumn>
+        <DataColumn name="deptId">
+          <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
+            arg.processDefault = true;</ClientEvent>
+          <Property name="property">deptId</Property>
+          <Property name="align">center</Property>
+          <Property name="width">250</Property>
+        </DataColumn>
         <DataColumn name="plateNum">
           <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
 arg.processDefault = true;</ClientEvent>
           <Property name="property">plateNum</Property>
           <Property name="align">center</Property>
-          <Property name="width">130</Property>
+          <Property name="width">120</Property>
         </DataColumn>
         <DataColumn>
           <Property name="property">customerName</Property>
@@ -712,7 +719,7 @@
       <Property name="iconClass">fa fa-tasks</Property>
       <Property name="caption">鍗曟嵁淇℃伅</Property>
       <Property name="width">1200</Property>
-      <Property name="showCaptionBar">false</Property>
+      <Property name="closeable">false</Property>
       <Buttons>
         <Button id="btnOK">
           <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
@@ -760,6 +767,12 @@
               <AutoFormElement>
                 <Property name="name">plateNum</Property>
                 <Property name="property">plateNum</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">deptId</Property>
+                <Property name="property">deptId</Property>
+                <Property name="readOnly">true</Property>
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
@@ -823,7 +836,7 @@
                 <Property name="trigger">ddNotice</Property>
                 <Editor/>
               </AutoFormElement>
-              <AutoFormElement layoutConstraint="colSpan:2">
+              <AutoFormElement>
                 <Property name="name">noticeId</Property>
                 <Property name="property">noticeId</Property>
                 <Editor/>

--
Gitblit v1.9.3