From 9005fab8f1ef7b68557a670169331a17e74187d2 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 02 十一月 2023 16:08:46 +0800
Subject: [PATCH] 设备管理修改

---
 igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml |  121 ++++++++++++---------------------------
 1 files changed, 38 insertions(+), 83 deletions(-)

diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml b/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
index 83ea38b..b438f1c 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
@@ -5,48 +5,43 @@
   <Model>
     <DataType name="dtMain">
       <Property name="creationType">com.ld.igds.models.DeptDevice</Property>
-      <PropertyDef name="id">
-        <Property name="label">ID</Property>
+      <PropertyDef name="sbbh">
+        <Property/>
+        <Property name="label">璁惧缂栧彿</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
-      <PropertyDef name="kqdm">
-        <Property></Property>
-        <Property name="label">搴撳尯浠g爜</Property>
+      <PropertyDef name="companyId">
+        <Property/>
+        <Property name="label">缁勭粐缂栫爜</Property>
+      </PropertyDef>
+      <PropertyDef name="deptId">
+        <Property/>
+        <Property name="label">鎵�灞炲簱鍖�</Property>
+        <Property name="readOnly">false</Property>
+        <Property name="required">true</Property>
         <Property name="mapping">
           <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#loadParents&quot;).getResult()}</Property>
           <Property name="keyProperty">id</Property>
           <Property name="valueProperty">name</Property>
         </Property>
       </PropertyDef>
-      <PropertyDef name="companyId">
-        <Property></Property>
-        <Property name="label">缁勭粐缂栫爜</Property>
-      </PropertyDef>
-      <PropertyDef name="dwdm">
-        <Property></Property>
-        <Property name="label">鍗曚綅浠g爜</Property>
-      </PropertyDef>
-      <PropertyDef name="kqmc">
-        <Property></Property>
-        <Property name="label">搴撳尯鍚嶇О</Property>
-      </PropertyDef>
-      <PropertyDef name="sbbh">
-        <Property></Property>
-        <Property name="label">璁惧缂栧彿</Property>
-      </PropertyDef>
       <PropertyDef name="sbyqmc">
-        <Property></Property>
+        <Property/>
         <Property name="label">璁惧浠櫒鍚嶇О</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="sbyqdm">
-        <Property></Property>
+        <Property/>
         <Property name="label">璁惧浠櫒浠g爜</Property>
+        <Property name="readOnly">false</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="sbggxh">
-        <Property></Property>
+        <Property/>
         <Property name="label">璁惧瑙勬牸鍨嬪彿</Property>
       </PropertyDef>
       <PropertyDef name="sccj">
-        <Property></Property>
+        <Property/>
         <Property name="label">鐢熶骇鍘傚</Property>
       </PropertyDef>
       <PropertyDef name="scrq">
@@ -54,49 +49,24 @@
         <Property name="label">鐢熶骇鏃ユ湡</Property>
       </PropertyDef>
       <PropertyDef name="sbms">
-        <Property></Property>
+        <Property/>
         <Property name="label">璁惧鎻忚堪</Property>
       </PropertyDef>
       <PropertyDef name="sbzt">
-        <Property></Property>
+        <Property/>
         <Property name="label">璁惧鐘舵��</Property>
-        <Property name="mapping">
-          <Property name="keyProperty">key</Property>
-          <Property name="valueProperty">value</Property>
-          <Property name="mapValues">
-            <Collection>
-              <Entity>
-                <Property name="key">1</Property>
-                <Property name="value">1锛氬畬濂�</Property>
-              </Entity>
-              <Entity>
-                <Property name="key">2</Property>
-                <Property name="value">2锛氭姤搴�</Property>
-              </Entity>
-              <Entity>
-                <Property name="key">3</Property>
-                <Property name="value">3锛氬緟妫�淇�</Property>
-              </Entity>
-              <Entity>
-                <Property name="key">4</Property>
-                <Property name="value">4锛氬叾浠�</Property>
-              </Entity>
-            </Collection>
-          </Property>
-        </Property>
       </PropertyDef>
       <PropertyDef name="jdsj">
         <Property name="dataType">Date</Property>
         <Property name="label">妫�瀹氭椂闂�</Property>
       </PropertyDef>
       <PropertyDef name="jddw">
-        <Property></Property>
+        <Property/>
         <Property name="label">妫�瀹氬崟浣�</Property>
       </PropertyDef>
       <PropertyDef name="updateTime">
-        <Property name="dataType">Date</Property>
+        <Property name="dataType">DateTime</Property>
         <Property name="label">鏇存柊鏃堕棿</Property>
-        <Property name="readOnly">true</Property>
       </PropertyDef>
     </DataType>
     <DataType name="dtParam">
@@ -284,65 +254,50 @@
         <RowNumColumn>
           <Property name="caption">搴忓彿</Property>
         </RowNumColumn>
-        <DataColumn name="dwdm">
-          <Property name="property">dwdm</Property>
-          <Property name="align">center</Property>
+        <DataColumn name="sbbh">
+          <Property name="property">sbbh</Property>
           <Property name="readOnly">true</Property>
+          <Property name="align">center</Property>
         </DataColumn>
-        <DataColumn name="kqmc">
-          <Property name="property">kqmc</Property>
-          <Property name="align">center</Property>
+        <DataColumn name="deptId">
+          <Property name="property">deptId</Property>
           <Property name="readOnly">true</Property>
+          <Property name="align">center</Property>
         </DataColumn>
         <DataColumn name="sbyqmc">
           <Property name="property">sbyqmc</Property>
-          <Property name="align">center</Property>
           <Property name="readOnly">true</Property>
-        </DataColumn>
-        <DataColumn name="sbyqdm">
-          <Property name="property">sbyqdm</Property>
           <Property name="align">center</Property>
-          <Property name="readOnly">true</Property>
         </DataColumn>
         <DataColumn name="sbggxh">
           <Property name="property">sbggxh</Property>
-          <Property name="align">center</Property>
           <Property name="readOnly">true</Property>
-        </DataColumn>
-        <DataColumn name="sccj">
-          <Property name="property">sccj</Property>
           <Property name="align">center</Property>
-          <Property name="readOnly">true</Property>
         </DataColumn>
         <DataColumn name="scrq">
           <Property name="property">scrq</Property>
-          <Property name="align">center</Property>
           <Property name="readOnly">true</Property>
-        </DataColumn>
-        <DataColumn name="sbms">
-          <Property name="property">sbms</Property>
           <Property name="align">center</Property>
-          <Property name="readOnly">true</Property>
         </DataColumn>
         <DataColumn name="sbzt">
           <Property name="property">sbzt</Property>
-          <Property name="align">center</Property>
           <Property name="readOnly">true</Property>
+          <Property name="align">center</Property>
         </DataColumn>
         <DataColumn name="jdsj">
           <Property name="property">jdsj</Property>
-          <Property name="align">center</Property>
           <Property name="readOnly">true</Property>
+          <Property name="align">center</Property>
         </DataColumn>
         <DataColumn name="jddw">
           <Property name="property">jddw</Property>
-          <Property name="align">center</Property>
           <Property name="readOnly">true</Property>
+          <Property name="align">center</Property>
         </DataColumn>
         <DataColumn name="updateTime">
           <Property name="property">updateTime</Property>
-          <Property name="align">center</Property>
           <Property name="readOnly">true</Property>
+          <Property name="align">center</Property>
         </DataColumn>
       </DataGrid>
     </Container>
@@ -386,13 +341,13 @@
           <Property name="labelSeparator">锛�</Property>
           <Property name="labelWidth">150</Property>
           <AutoFormElement>
-            <Property name="name">kqdm</Property>
-            <Property name="property">kqdm</Property>
+            <Property name="name">sbbh</Property>
+            <Property name="property">sbbh</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
-            <Property name="name">sbbh</Property>
-            <Property name="property">sbbh</Property>
+            <Property name="name">deptId</Property>
+            <Property name="property">deptId</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>

--
Gitblit v1.9.3