From 9ac73e6dc59a642d4beb13571983c34d9850433f Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 26 十二月 2025 11:04:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolSuper.view.xml | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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..cc5362a 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("companyPR#getData").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">dwmc</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="weekNum">
<Property name="dataType">Integer</Property>
@@ -100,6 +105,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 +131,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