From c7fcb7f2763ea83db7611575af90824bd24c7338 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期一, 29 十二月 2025 11:16:19 +0800
Subject: [PATCH] 收储公司、库区、仓库页面交互调整

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolSuper.view.xml |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolSuper.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolSuper.view.xml
index 2147c7d..cae85d2 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolSuper.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolSuper.view.xml
@@ -16,7 +16,12 @@
       </PropertyDef>
       <PropertyDef name="companyId">
         <Property></Property>
-        <Property name="label">绯荤粺缁勭粐缂栫爜</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>
       </PropertyDef>
       <PropertyDef name="weekNum">
         <Property name="dataType">Integer</Property>
@@ -69,8 +74,7 @@
     var cur = view.get(&quot;#dgMain&quot;).get(&quot;selection&quot;);&#xD;
     var deptId = cur.get(&quot;deptId&quot;);&#xD;
     var url = &quot;/com.fzzy.igds.Patrol.d&quot;;&#xD;
-    var panelId = window.parent.frameElement.getAttribute('data-id');
-    window.parent.parent.$.modal.openTab(&quot;宸℃洿璇︽儏&quot;, url,false, panelId);
+    window.$openParentTab(&quot;宸℃洿璇︽儏&quot;, url,false, panelId);
 };&#xD;
 &#xD;
 renderStatus = function(arg){&#xD;
@@ -100,6 +104,9 @@
         <Property name="selectionMode">singleRow</Property>
         <RowSelectorColumn/>
         <RowNumColumn/>
+        <DataColumn name="companyId">
+          <Property name="property">companyId</Property>
+        </DataColumn>
         <DataColumn name="deptId">
           <Property name="property">deptId</Property>
         </DataColumn>
@@ -123,10 +130,6 @@
           <Property name="property">isPatrol</Property>
           <Property name="align">center</Property>
           <Property name="width">120</Property>
-        </DataColumn>
-        <DataColumn name="remark">
-          <Property name="property">remark</Property>
-          <Property name="align">center</Property>
         </DataColumn>
         <DataColumn name="updateTime">
           <Property name="property">updateTime</Property>

--
Gitblit v1.9.3