From cac7ab84d3cb339d6d4e0961f48a104e268dbee4 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期六, 17 一月 2026 18:02:35 +0800
Subject: [PATCH] 代码合并修改2

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

diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
index 79e426e..77ff8a0 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
@@ -444,6 +444,12 @@
       <Property></Property>
       <Property name="loadMode">manual</Property>
     </DataSet>
+    <DataSet id="dsDeptList">
+      <Property name="dataProvider">deptPR#getDeptByUserType</Property>
+      <Property name="userData">搴撳尯鍒楄〃涓嬫媺妗�</Property>
+      <Property name="loadMode">manual</Property>
+      <Property name="dataType">[dtDept]</Property>
+    </DataSet>
     <Container>
       <Property name="className">c-param</Property>
       <AutoForm id="form1" layoutConstraint="top">
@@ -522,6 +528,7 @@
           <Property name="property">deptId</Property>
           <Property name="label">鎵�灞炲簱鍖�</Property>
           <Property name="hideMode">visibility</Property>
+          <Property name="trigger">dsDeptDropDown</Property>
           <Editor/>
         </AutoFormElement>
         <AutoFormElement>
@@ -536,7 +543,14 @@
         </AutoFormElement>
         <Button>
           <ClientEvent name="onClick">	var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
-	view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,data).flushAsync();</ClientEvent>
+	var deptId=data.get(&quot;deptId&quot;);&#xD;
+	var companyId=data.get(&quot;companyId&quot;);&#xD;
+	if(!companyId || !deptId){&#xD;
+		$alert(&quot;璇峰厛閫夋嫨鏀跺偍鍏徃鍜屽拰鎵�灞炲簱鍖�&quot;);&#xD;
+	}else{&#xD;
+		view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,data).flushAsync();&#xD;
+	}&#xD;
+</ClientEvent>
           <Property name="caption">鎼滅储</Property>
           <Property name="exClassName">btn-q1</Property>
           <Property name="iconClass">fa fa-search</Property>
@@ -811,5 +825,30 @@
       </Children>
       <Tools/>
     </Dialog>
+    <DataSetDropDown id="dsDeptDropDown">
+      <ClientEvent name="onOpen">&#xD;
+var entity = view.get(&quot;#dsQuery.data&quot;);&#xD;
+if(!entity){&#xD;
+    $alert(&quot;璇峰厛閫夋嫨鎵�灞炲叕鍙�&quot;);&#xD;
+}else{&#xD;
+    var deptId = entity.get(&quot;companyId&quot;);&#xD;
+    if(!deptId){&#xD;
+        $alert(&quot;璇峰厛閫夋嫨鎵�灞炲叕鍙�&quot;);&#xD;
+    }else{&#xD;
+        view.get(&quot;#dsDeptList&quot;).set(&quot;parameter&quot;,entity.get(&quot;companyId&quot;)).flushAsync();&#xD;
+    }&#xD;
+}</ClientEvent>
+      <Property name="dataSet">dsDeptList</Property>
+      <Property name="height">450</Property>
+      <Property name="autoOpen">true</Property>
+      <Property name="assignmentMap">deptId=id</Property>
+      <Property name="width">400</Property>
+      <DataColumn>
+        <Property name="align">center</Property>
+        <Property name="name">kqmc</Property>
+        <Property name="property">kqmc</Property>
+        <Editor/>
+      </DataColumn>
+    </DataSetDropDown>
   </View>
 </ViewConfig>

--
Gitblit v1.9.3