From af8af24790cb7240da60c6752d47254d62533ffb Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 26 三月 2026 17:11:55 +0800
Subject: [PATCH] 出入库明细，导入导出，根据登录用户类型，以及搜索条件，做回显调整
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml | 45 ++++++++++++++++-----------------------------
1 files changed, 16 insertions(+), 29 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 8f441da..43c8ff6 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
@@ -185,7 +185,7 @@
<Property></Property>
<Property name="label">瑁呭嵏浠撳簱</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("depotPR#getData").getResult()}</Property>
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getDepotByUserType").getResult()}</Property>
<Property name="keyProperty">id</Property>
<Property name="valueProperty">name</Property>
</Property>
@@ -303,6 +303,11 @@
</PropertyDef>
</DataType>
<DataType name="dtQuery">
+ <ClientEvent name="onDataChange">var prop = arg.property;
+if(prop =='start' || prop == 'end'){
+ var entity = arg.entity;
+ entity.set("timeDesc",entity.get('start').formatDate("Y-m-d") +" 鑷� "+entity.get('end').formatDate("Y-m-d"));
+}</ClientEvent>
<Property name="creationType">com.fzzy.igds.data.InoutParam</Property>
<PropertyDef name="type">
<Property name="label">鍑哄叆搴撶被鍨�</Property>
@@ -320,7 +325,7 @@
<Property></Property>
<Property name="label">瑁呭嵏浠撳簱</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("depotPR#getData").getResult()}</Property>
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getDepotByUserType").getResult()}</Property>
<Property name="keyProperty">id</Property>
<Property name="valueProperty">name</Property>
</Property>
@@ -403,13 +408,11 @@
if(ViewType==1){
view.get("#form1").set("visible",true);
view.get("#dataGridMain1").set("visible",true);
- view.get("#tool").set("visible",true);
}

if(ViewType==2){
view.get("#form2").set("visible",true);
view.get("#dataGridMain2").set("visible",true);
- view.get("#tool").set("visible",true);
}

var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�
@@ -508,7 +511,10 @@
"depotId":data.get("depotId"),
"foodVariety":data.get("foodVariety"),
"start":data.get("start"),
- "end":data.get("end")
+ "end":data.get("end"),
+ "timeDesc":data.get("timeDesc"),
+ "createUser":data.get("createUser"),
+ "createTime":data.get("createTime")
}
window.parent.$.table.exportExcelDorado("./export/inout-excel", "鍑哄簱鏁版嵁", param);</ClientEvent>
<Property name="caption">瀵煎嚭EXCEL</Property>
@@ -576,7 +582,10 @@
"deptId":data.get("deptId"),
"companyId":data.get("companyId"),
"start":data.get("start"),
- "end":data.get("end")
+ "end":data.get("end"),
+ "timeDesc":data.get("timeDesc"),
+ "createUser":data.get("createUser"),
+ "createTime":data.get("createTime")
}
window.parent.$.table.exportExcelDorado("./export/inout-excel", "鍑哄簱鏁版嵁", param);</ClientEvent>
<Property name="caption">瀵煎嚭EXCEL</Property>
@@ -689,13 +698,6 @@
<Property name="width">100</Property>
</DataColumn>
<DataColumn>
- <Property name="property">recordWeight</Property>
- <Property name="align">center</Property>
- <Property name="name">recordWeight</Property>
- <Property name="caption">鍑哄簱閲嶉噺</Property>
- <Property name="width">100</Property>
- </DataColumn>
- <DataColumn>
<Property name="property">completeTime</Property>
<Property name="align">center</Property>
<Property name="name">completeTime</Property>
@@ -721,6 +723,7 @@
<RowSelectorColumn/>
<RowNumColumn>
<Property name="caption">搴忓彿</Property>
+ <Property name="width">30</Property>
</RowNumColumn>
<DataColumn>
<Property name="property">companyId</Property>
@@ -764,13 +767,6 @@
<Property name="width">100</Property>
</DataColumn>
<DataColumn>
- <Property name="property">recordWeight</Property>
- <Property name="align">center</Property>
- <Property name="name">recordWeight</Property>
- <Property name="caption">鍑哄簱閲嶉噺</Property>
- <Property name="width">100</Property>
- </DataColumn>
- <DataColumn>
<Property name="property">completeTime</Property>
<Property name="align">center</Property>
<Property name="name">completeTime</Property>
@@ -788,15 +784,6 @@
<Editor/>
</DataColumn>
</DataGrid>
- <ToolBar id="tool" layoutConstraint="bottom">
- <Property name="hideMode">display</Property>
- <Property name="visible">false</Property>
- <Fill/>
- <DataPilot layoutConstraint="right">
- <Property name="itemCodes">pageSize,pages</Property>
- <Property name="dataSet">dsMain</Property>
- </DataPilot>
- </ToolBar>
</Container>
<Dialog id="dialogImg">
<Property name="width">55%</Property>
--
Gitblit v1.9.3