From 2ebf9333d0a53949ff647444064a4c2b73c52fd3 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 07 二月 2026 10:29:30 +0800
Subject: [PATCH] 客户需求优化调整4

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityConf.view.xml |  104 +++++++++++++++++++++++++++++++--------------------
 1 files changed, 63 insertions(+), 41 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityConf.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityConf.view.xml
index 4ee057f..fc15a8b 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityConf.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityConf.view.xml
@@ -17,19 +17,22 @@
           <Property name="keyProperty">id</Property>
           <Property name="valueProperty">name</Property>
         </Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="deptId">
         <Property></Property>
         <Property name="label">鎵�灞炲垎搴�</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getAllData&quot;).getResult()}</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getDeptByUserType&quot;).getResult()}</Property>
           <Property name="keyProperty">id</Property>
           <Property name="valueProperty">kqmc</Property>
         </Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="name">
         <Property></Property>
         <Property name="label">璁惧鍚嶇О</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="sn">
         <Property></Property>
@@ -134,6 +137,17 @@
           <Property name="keyProperty">dictValue</Property>
           <Property name="valueProperty">dictLabel</Property>
         </Property>
+        <Property name="required">true</Property>
+      </PropertyDef>
+      <PropertyDef name="ptzType">
+        <Property></Property>
+        <Property name="label">浜戝彴鏂瑰紡</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#triggerPtzType&quot;).getResult()}</Property>
+          <Property name="keyProperty">dictValue</Property>
+          <Property name="valueProperty">dictLabel</Property>
+        </Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="urlIn">
         <Property></Property>
@@ -189,7 +203,6 @@
       <ToolBar>
         <ToolBarButton>
           <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).insert();&#xD;
-            view.get(&quot;#depotId&quot;).set(&quot;readOnly&quot;,false);&#xD;
             view.get(&quot;#dgMain&quot;).show();</ClientEvent>
           <Property name="caption">鏂板</Property>
           <Property name="exClassName">btn1</Property>
@@ -200,7 +213,6 @@
           <ClientEvent name="onClick">&#xD;
             var select = view.get(&quot;#dataGridMain&quot;).get(&quot;selection&quot;);&#xD;
             if(select){&#xD;
-            view.get(&quot;#depotId&quot;).set(&quot;readOnly&quot;,true)&#xD;
             view.get(&quot;#dgMain&quot;).show();&#xD;
             }else{&#xD;
             $notify(&quot;璇烽�夋嫨闇�瑕佷慨鏀圭殑鏁版嵁鈥︹��&quot;);&#xD;
@@ -312,8 +324,9 @@
       <ClientEvent name="onShow">//鏍规嵁浠撳簱绫诲瀷涓嶅悓锛屾樉绀轰笉鍚岀殑閰嶇疆淇℃伅</ClientEvent>
       <Property name="iconClass">fa fa-tasks</Property>
       <Property name="caption">鏁伴噺妫�娴嬪弬鏁�</Property>
-      <Property name="width">1100</Property>
+      <Property name="width">80%</Property>
       <Property name="closeable">false</Property>
+      <Property name="height">90%</Property>
       <Buttons>
         <Button>
           <ClientEvent name="onClick">view.get(&quot;#uaMain&quot;).execute(function(){&#xD;
@@ -334,13 +347,13 @@
         </Button>
       </Buttons>
       <Children>
-        <GroupBox layoutConstraint="padding:5">
+        <FieldSet layout="padding:5">
           <Property name="caption">鍩烘湰淇℃伅</Property>
           <Buttons/>
           <Children>
             <AutoForm>
               <Property name="dataSet">dsMain</Property>
-              <Property name="cols">*,*,*</Property>
+              <Property name="cols">*,*,*,*</Property>
               <Property name="labelSeparator">锛�</Property>
               <Property name="labelAlign">right</Property>
               <Property name="labelWidth">110</Property>
@@ -350,14 +363,13 @@
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
-                <Property name="name">sn</Property>
-                <Property name="property">sn</Property>
-                <Editor/>
-              </AutoFormElement>
-              <AutoFormElement id="depotId">
                 <Property name="name">depotId</Property>
                 <Property name="property">depotId</Property>
-                <Property name="readOnly">false</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement layoutConstraint="colSpan:2">
+                <Property name="name">deptId</Property>
+                <Property name="property">deptId</Property>
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
@@ -370,6 +382,11 @@
                 <Property name="property">port</Property>
                 <Editor/>
               </AutoFormElement>
+              <AutoFormElement layoutConstraint="colSpan:2">
+                <Property name="name">sn</Property>
+                <Property name="property">sn</Property>
+                <Editor/>
+              </AutoFormElement>
               <AutoFormElement>
                 <Property name="name">protocol</Property>
                 <Property name="property">protocol</Property>
@@ -380,21 +397,16 @@
                 <Property name="property">status</Property>
                 <Editor/>
               </AutoFormElement>
-              <AutoFormElement layoutConstraint="colSpan:2">
-                <Property name="name">remark</Property>
-                <Property name="property">remark</Property>
-                <Editor/>
-              </AutoFormElement>
             </AutoForm>
           </Children>
-        </GroupBox>
-        <GroupBox layoutConstraint="padding:5">
+        </FieldSet>
+        <FieldSet layout="padding:5">
           <Property name="caption">鎽勫儚澶撮厤缃�</Property>
           <Buttons/>
           <Children>
             <AutoForm>
               <Property name="dataSet">dsMain</Property>
-              <Property name="cols">*,*,*</Property>
+              <Property name="cols">*,*,*,*</Property>
               <Property name="labelSeparator">锛�</Property>
               <Property name="labelAlign">right</Property>
               <Property name="labelWidth">110</Property>
@@ -414,6 +426,11 @@
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
+                <Property name="name">chanNum</Property>
+                <Property name="property">chanNum</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
                 <Property name="name">loginId</Property>
                 <Property name="property">loginId</Property>
                 <Property name="readOnly">false</Property>
@@ -425,18 +442,8 @@
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
-                <Property name="name">chanNum</Property>
-                <Property name="property">chanNum</Property>
-                <Editor/>
-              </AutoFormElement>
-              <AutoFormElement>
                 <Property name="name">playType</Property>
                 <Property name="property">playType</Property>
-                <Editor/>
-              </AutoFormElement>
-              <AutoFormElement layoutConstraint="colSpan:2">
-                <Property name="name">urlIn</Property>
-                <Property name="property">urlIn</Property>
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
@@ -444,17 +451,12 @@
                 <Property name="property">snapType</Property>
                 <Editor/>
               </AutoFormElement>
-              <AutoFormElement layoutConstraint="colSpan:2">
-                <Property name="name">urlOut</Property>
-                <Property name="property">urlOut</Property>
-                <Editor/>
-              </AutoFormElement>
               <AutoFormElement>
-                <Property name="name">cameraSn</Property>
-                <Property name="property">cameraSn</Property>
+                <Property name="name">ptzType</Property>
+                <Property name="property">ptzType</Property>
                 <Editor/>
               </AutoFormElement>
-              <AutoFormElement layoutConstraint="colSpan:2">
+              <AutoFormElement layoutConstraint="colSpan:3">
                 <Property name="name">mediaAddr</Property>
                 <Property name="property">mediaAddr</Property>
                 <Property name="trigger">triggerMedia</Property>
@@ -464,10 +466,30 @@
                   </TextEditor>
                 </Editor>
               </AutoFormElement>
+              <AutoFormElement layoutConstraint="colSpan:2">
+                <Property name="name">urlIn</Property>
+                <Property name="property">urlIn</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement layoutConstraint="colSpan:2">
+                <Property name="name">urlOut</Property>
+                <Property name="property">urlOut</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement layoutConstraint="colSpan:2">
+                <Property name="name">cameraSn</Property>
+                <Property name="property">cameraSn</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement layoutConstraint="colSpan:2">
+                <Property name="name">remark</Property>
+                <Property name="property">remark</Property>
+                <Editor/>
+              </AutoFormElement>
             </AutoForm>
           </Children>
-        </GroupBox>
-        <GroupBox layoutConstraint="padding:5">
+        </FieldSet>
+        <FieldSet layout="padding:5">
           <Property name="caption">鏁伴噺妫�娴嬪弬鏁�</Property>
           <Buttons/>
           <Children>
@@ -514,7 +536,7 @@
               </AutoFormElement>
             </AutoForm>
           </Children>
-        </GroupBox>
+        </FieldSet>
       </Children>
       <Tools/>
     </Dialog>

--
Gitblit v1.9.3