From 878b6958363308a7d07b7b8197dc19662f3e1198 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 27 三月 2026 15:40:22 +0800
Subject: [PATCH] 获取出入库id，逻辑优化调整

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml |   53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml
index 5259831..e2f54b5 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml
@@ -72,9 +72,11 @@
 patrolMap = function(){&#xD;
     var select = view.get(&quot;#dataGridMain&quot;).get(&quot;selection&quot;);&#xD;
     if(select){&#xD;
-        var patrolId = select.get(&quot;id&quot;);&#xD;
-        &#xD;
-        var url = &quot;/security/patrol/patrolRecord/&quot;+patrolId+&quot;?time=&quot;+ new Date().getTime();&#xD;
+        var patrolId = select.get(&quot;id&quot;);
+		var userId = select.get(&quot;userId&quot;);
+        var confId = select.get(&quot;confId&quot;);&#xD;
+      &#xD;
+        var url = &quot;/security/patrol-record?patrolId=&quot;+patrolId+&quot;&amp;userId=&quot;+userId+&quot;&amp;confId=&quot;+confId;&#xD;
         &#xD;
         view.get(&quot;#iFrameTrack&quot;).set(&quot;path&quot;,url);&#xD;
         view.get(&quot;#dialogTrack&quot;).show();&#xD;
@@ -93,10 +95,16 @@
       <ClientEvent name="onReady">self.insert({});</ClientEvent>
       <Property name="dataType">dtBaseParam</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>
-        <Property name="cols">*,*,*,*,90,90</Property>
+        <Property name="cols">*,*,280,280,90,90,120</Property>
         <Property name="dataSet">dsParam</Property>
         <Property name="labelAlign">right</Property>
         <Property name="labelWidth">100</Property>
@@ -108,6 +116,7 @@
         <AutoFormElement>
           <Property name="name">deptId</Property>
           <Property name="property">deptId</Property>
+          <Property name="trigger">dsDeptDropDown</Property>
           <Editor/>
         </AutoFormElement>
         <AutoFormElement>
@@ -132,10 +141,19 @@
           <Property name="exClassName">btn-q1</Property>
         </Button>
         <Button>
-          <ClientEvent name="onClick">view.get(&quot;#dsParam&quot;).flushAsync();</ClientEvent>
+          <ClientEvent name="onClick">view.get(&quot;#dsParam&quot;).setData({});</ClientEvent>
           <Property name="caption">閲嶇疆</Property>
           <Property name="exClassName">btn-q2</Property>
           <Property name="iconClass">fa fa-refresh</Property>
+        </Button>
+        <Button>
+          <ClientEvent name="onClick">
+            var url = &quot;/com.fzzy.igds.ConfByDept.d&quot;;&#xD;
+            window.$openTab(&quot;搴撳尯閰嶇疆&quot;, url);
+          </ClientEvent>
+          <Property name="caption">搴撳尯閰嶇疆</Property>
+          <Property name="exClassName">btn-q1</Property>
+          <Property name="iconClass">fa fa-plus-square</Property>
         </Button>
       </AutoForm>
     </Container>
@@ -208,5 +226,30 @@
       </Children>
       <Tools/>
     </Dialog>
+    <DataSetDropDown id="dsDeptDropDown">
+      <ClientEvent name="onOpen">&#xD;
+var entity = view.get(&quot;#dsParam.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