From 4aff6ce5a44047245f86e776d3b6b67314aed70e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 26 十二月 2025 14:55:17 +0800
Subject: [PATCH] 增加库区配置，合并通知单、及流程和设备配置

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/Dept.view.xml |   61 +++++++++++++-----------------
 1 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Dept.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Dept.view.xml
index 9ec2abe..b5a11cb 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Dept.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Dept.view.xml
@@ -10,6 +10,16 @@
         <Property name="label">搴撳尯缂栫爜</Property>
         <Property name="readOnly">true</Property>
       </PropertyDef>
+      <PropertyDef name="parentId">
+        <Property></Property>
+        <Property name="label">鏀跺偍鍏徃</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;companyPR#getData&quot;).getResult()}</Property>
+          <Property name="keyProperty">id</Property>
+          <Property name="valueProperty">dwmc</Property>
+        </Property>
+        <Property name="readOnly">true</Property>
+      </PropertyDef>
       <PropertyDef name="companyId">
         <Property></Property>
         <Property name="label">缁勭粐缂栫爜</Property>
@@ -30,7 +40,7 @@
       </PropertyDef>
       <PropertyDef name="xzqhmc">
         <Property></Property>
-        <Property name="label">鍖哄垝鍚嶇О</Property>
+        <Property name="label">鎵�鍦ㄥ尯鍘�</Property>
       </PropertyDef>
       <PropertyDef name="kqcq">
         <Property></Property>
@@ -184,22 +194,16 @@
           <Property name="property">kqmc</Property>
           <Property name="align">left</Property>
         </DataColumn>
+        <DataColumn name="parentId">
+          <Property name="property">parentId</Property>
+          <Property name="align">left</Property>
+        </DataColumn>
         <DataColumn name="xzqhmc">
           <Property name="property">xzqhmc</Property>
           <Property name="align">center</Property>
         </DataColumn>
-        <DataColumn name="kqcq">
-          <Property name="property">kqcq</Property>
-          <Property name="align">center</Property>
-          <Property name="width">120</Property>
-        </DataColumn>
         <DataColumn name="yxcr">
           <Property name="property">yxcr</Property>
-          <Property name="align">center</Property>
-          <Property name="width">180</Property>
-        </DataColumn>
-        <DataColumn name="zdmj">
-          <Property name="property">zdmj</Property>
           <Property name="align">center</Property>
           <Property name="width">180</Property>
         </DataColumn>
@@ -223,7 +227,7 @@
     <Dialog id="dialogMain">
       <Property name="iconClass">fa fa-tasks</Property>
       <Property name="caption">搴撳尯淇℃伅</Property>
-      <Property name="width">70%</Property>
+      <Property name="width">65%</Property>
       <Property name="closeable">false</Property>
       <Buttons>
         <Button id="btnOk">
@@ -267,13 +271,8 @@
             <Editor/>
           </AutoFormElement>
           <AutoFormElement layoutConstraint="colSpan:2">
-            <Property name="name">kqdz</Property>
-            <Property name="property">kqdz</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">kqcq</Property>
-            <Property name="property">kqcq</Property>
+            <Property name="name">parentId</Property>
+            <Property name="property">parentId</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
@@ -281,9 +280,9 @@
             <Property name="property">yxcr</Property>
             <Editor/>
           </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">zdmj</Property>
-            <Property name="property">zdmj</Property>
+          <AutoFormElement layoutConstraint="colSpan:2">
+            <Property name="name">kqdz</Property>
+            <Property name="property">kqdz</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
@@ -302,17 +301,14 @@
             <Property name="property">xzqhdm</Property>
             <Editor/>
           </AutoFormElement>
-          <Label>
-            <Property name="text"></Property>
-          </Label>
           <AutoFormElement>
-            <Property name="name">createBy</Property>
-            <Property name="property">createBy</Property>
+            <Property name="name">zdmj</Property>
+            <Property name="property">zdmj</Property>
             <Editor/>
           </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">createTime</Property>
-            <Property name="property">createTime</Property>
+          <AutoFormElement layoutConstraint="colSpan:2">
+            <Property name="name">remark</Property>
+            <Property name="property">remark</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
@@ -371,11 +367,6 @@
             </Property>
             <Property name="text">甯姪锛氱偣鍑诲潗鏍囦綅缃嬀鍙�</Property>
           </Link>
-          <AutoFormElement layoutConstraint="colSpan:3">
-            <Property name="name">remark</Property>
-            <Property name="property">remark</Property>
-            <Editor/>
-          </AutoFormElement>
         </AutoForm>
       </Children>
       <Tools/>

--
Gitblit v1.9.3