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/ReportInDetail.view.xml | 68 ++++++++++++++++------------------
1 files changed, 32 insertions(+), 36 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
index 62dd80c..b50da89 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.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>
@@ -358,10 +363,12 @@
<PropertyDef name="start">
<Property name="label">寮�濮嬫椂闂�</Property>
<Property name="dataType">Date</Property>
+ <Property name="displayFormat">Y-m-d</Property>
</PropertyDef>
<PropertyDef name="end">
<Property name="label">鎴鏃堕棿</Property>
<Property name="dataType">Date</Property>
+ <Property name="displayFormat">Y-m-d</Property>
</PropertyDef>
<PropertyDef name="unit">
<Property></Property>
@@ -403,14 +410,12 @@
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;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�
@@ -418,7 +423,8 @@

//榛樿鏌ヨ鏌ヨ鎻愭潯浠�
view.get("#dsQuery").insert({
- deptId:deptId
+ deptId:deptId,
+ type:"IN"
});

query = function(){
@@ -438,7 +444,7 @@
var user = encodeURIComponent(select.get("userName"));
var plateNum = encodeURIComponent(select.get("plateNum"));

- view.get("#iFrameImg").set("path", "./basic/inout/inout-img?id=" + select.get("id")+"&plateNum="+plateNum+"&user="+user);
+ view.get("#iFrameImg").set("path", "/basic/inout/inout-img?id=" + select.get("id")+"&plateNum="+plateNum+"&user="+user);
view.get("#dialogImg").show();
}else{
$notify("璇烽�夋嫨鏁版嵁鈥︹��");
@@ -447,12 +453,12 @@
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataType">[dtMain]</Property>
- <Property name="dataProvider">reportInDetailPR#listRecord</Property>
+ <Property name="dataProvider">reportInoutPR#listRecord</Property>
<Property name="loadMode">manual</Property>
</DataSet>
<DataSet id="dsQuery">
<Property name="dataType">dtQuery</Property>
- <Property name="dataProvider">reportInDetailPR#getQuery</Property>
+ <Property name="dataProvider">reportInoutPR#getQueryInout</Property>
<Property></Property>
<Property name="loadMode">manual</Property>
</DataSet>
@@ -495,7 +501,13 @@
</AutoFormElement>
<Button>
<ClientEvent name="onClick"> var data = view.get("#dsQuery.data");
- view.get("#dsMain").set("parameter",data).flushAsync();</ClientEvent>
+ var start=data.getText("start");
+ var end=data.getText("end");
+ var timeDesc =start +" 鑷� "+end;
+ data.set("timeDesc",timeDesc);
+ view.get("#dsMain").set("parameter",data).flushAsync();
+ 
+</ClientEvent>
<Property name="caption">鎼滅储</Property>
<Property name="exClassName">btn-q1</Property>
<Property name="iconClass">fa fa-search</Property>
@@ -513,9 +525,12 @@
"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/inOutReport-excel", "鍏ュ簱鏁版嵁", param);</ClientEvent>
+window.parent.$.table.exportExcelDorado("./export/inout-excel", "鍏ュ簱鏁版嵁", param);</ClientEvent>
<Property name="caption">瀵煎嚭EXCEL</Property>
<Property name="exClassName">btn-q2</Property>
<Property name="width">140</Property>
@@ -583,9 +598,12 @@
"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/inOutReport-excel", "鍏ュ簱鏁版嵁", param);</ClientEvent>
+window.parent.$.table.exportExcelDorado("./export/inout-excel", "鍏ュ簱鏁版嵁", param);</ClientEvent>
<Property name="caption">瀵煎嚭EXCEL</Property>
<Property name="exClassName">btn-q2</Property>
<Property name="width">140</Property>
@@ -696,13 +714,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>
@@ -728,6 +739,7 @@
<RowSelectorColumn/>
<RowNumColumn>
<Property name="caption">搴忓彿</Property>
+ <Property name="width">30</Property>
</RowNumColumn>
<DataColumn>
<Property name="property">companyId</Property>
@@ -771,13 +783,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>
@@ -796,15 +801,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