From 9c136c58963fb453c41865f658d4eef48d536d02 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 26 十二月 2025 17:56:46 +0800
Subject: [PATCH] 抓拍、ai事件查询修改；弹框调整；收储公司、库区、仓库页面交互优化
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml | 83 ++++++++++++++++++++++++++++++-----------
1 files changed, 60 insertions(+), 23 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 2048427..584341d 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
@@ -13,6 +13,11 @@
<PropertyDef name="companyId">
<Property></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="progress">
<Property></Property>
@@ -358,15 +363,6 @@
<Property name="label">鎴鏃堕棿</Property>
<Property name="dataType">Date</Property>
</PropertyDef>
- <PropertyDef name="customerName">
- <Property></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="unit">
<Property></Property>
<Property name="label">鍗曚綅</Property>
@@ -380,6 +376,15 @@
</PropertyDef>
<PropertyDef name="none">
<Property></Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property></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>
</DataType>
</Model>
@@ -428,7 +433,7 @@
<Container>
<Property name="className">c-param</Property>
<AutoForm id="form1" layoutConstraint="top">
- <Property name="cols">*,*,*,*,90,90,110</Property>
+ <Property name="cols">*,*,*,*,90,90,140</Property>
<Property name="dataSet">dsQuery</Property>
<Property name="exClassName">bg-color</Property>
<Property name="labelWidth">110</Property>
@@ -469,13 +474,23 @@
<Property name="caption">閲嶇疆</Property>
</Button>
<Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dsQuery.data");
+var param = {
+ "type":"OUT",
+ "depotId":data.get("depotId"),
+ "foodVariety":data.get("foodVariety"),
+ "start":data.get("start"),
+ "end":data.get("end")
+}
+window.parent.$.table.exportExcelDorado("./export/inOutReport-excel", "鍑哄簱鏁版嵁", param);</ClientEvent>
<Property name="caption">瀵煎嚭EXCEL</Property>
- <Property name="exClassName">btn4</Property>
+ <Property name="exClassName">btn-q2</Property>
+ <Property name="width">140</Property>
<Property name="iconClass">fa fa-file-excel-o</Property>
</Button>
</AutoForm>
<AutoForm id="form2" layoutConstraint="top">
- <Property name="cols">*,*,*,*,90,90,110</Property>
+ <Property name="cols">*,*,*,*,90,90,140</Property>
<Property name="dataSet">dsQuery</Property>
<Property name="exClassName">bg-color</Property>
<Property name="labelWidth">110</Property>
@@ -483,8 +498,8 @@
<Property name="hideMode">display</Property>
<Property name="visible">false</Property>
<AutoFormElement>
- <Property name="name">customerName</Property>
- <Property name="property">customerName</Property>
+ <Property name="name">companyId</Property>
+ <Property name="property">companyId</Property>
<Property name="label">鏀跺偍鍏徃</Property>
<Editor/>
</AutoFormElement>
@@ -519,8 +534,18 @@
<Property name="caption">閲嶇疆</Property>
</Button>
<Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dsQuery.data");
+var param = {
+ "type":"OUT",
+ "deptId":data.get("deptId"),
+ "companyId":data.get("companyId"),
+ "start":data.get("start"),
+ "end":data.get("end")
+}
+window.parent.$.table.exportExcelDorado("./export/inOutReport-excel", "鍑哄簱鏁版嵁", param);</ClientEvent>
<Property name="caption">瀵煎嚭EXCEL</Property>
- <Property name="exClassName">btn4</Property>
+ <Property name="exClassName">btn-q2</Property>
+ <Property name="width">140</Property>
<Property name="iconClass">fa fa-file-excel-o</Property>
</Button>
</AutoForm>
@@ -601,59 +626,67 @@
<RowNumColumn/>
<DataColumn name="id">
<Property name="property">id</Property>
- <Property name="width">130</Property>
+ <Property name="width">150</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="plateNum">
<Property name="property">plateNum</Property>
<Property name="align">center</Property>
+ <Property name="width">120</Property>
</DataColumn>
<DataColumn name="depotId">
<Property name="property">depotId</Property>
<Property name="caption">浠撳簱</Property>
- <Property name="width">80</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn>
<Property name="name">foodVariety</Property>
<Property name="property">foodVariety</Property>
<Property name="align">center</Property>
+ <Property name="width">100</Property>
</DataColumn>
<DataColumn name="fullWeight">
<Property name="property">fullWeight</Property>
<Property name="caption">姣涢噸</Property>
<Property name="align">center</Property>
+ <Property name="width">100</Property>
</DataColumn>
<DataColumn name="emptyWeight">
<Property name="property">emptyWeight</Property>
<Property name="caption">鐨噸</Property>
<Property name="align">center</Property>
+ <Property name="width">100</Property>
</DataColumn>
<DataColumn name="netWeight">
<Property name="property">netWeight</Property>
<Property name="align">center</Property>
+ <Property name="width">100</Property>
</DataColumn>
<DataColumn>
<Property name="name">deOther</Property>
<Property name="property">deOther</Property>
<Property name="align">center</Property>
+ <Property name="width">100</Property>
</DataColumn>
<DataColumn name="settleWeight">
<Property name="property">settleWeight</Property>
<Property name="caption">缁撶畻閲嶉噺</Property>
<Property name="align">center</Property>
+ <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>
<Property name="caption">绂诲簱鏃堕棿</Property>
+ <Property name="width">150</Property>
</DataColumn>
</DataGrid>
<DataGrid id="dataGridMain2" layoutConstraint="padding:8">
@@ -673,55 +706,59 @@
<Property name="caption">搴忓彿</Property>
</RowNumColumn>
<DataColumn>
- <Property name="property">customerName</Property>
+ <Property name="property">companyId</Property>
<Property name="caption">鏀跺偍鍏徃</Property>
- <Property name="width">80</Property>
<Property name="align">center</Property>
- <Property name="name">customerName</Property>
+ <Property name="name">companyId</Property>
</DataColumn>
<DataColumn>
<Property name="property">deptId</Property>
<Property name="caption">搴撳尯鍚嶇О</Property>
- <Property name="width">80</Property>
+ <Property name="width">250</Property>
<Property name="align">center</Property>
<Property name="name">deptId</Property>
</DataColumn>
<DataColumn name="id">
<Property name="property">id</Property>
- <Property name="width">130</Property>
+ <Property name="width">150</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="plateNum">
<Property name="property">plateNum</Property>
<Property name="align">center</Property>
+ <Property name="width">120</Property>
</DataColumn>
<DataColumn name="depotId">
<Property name="property">depotId</Property>
<Property name="caption">浠撳簱</Property>
- <Property name="width">80</Property>
+ <Property name="width">120</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn>
<Property name="name">foodVariety</Property>
<Property name="property">foodVariety</Property>
<Property name="align">center</Property>
+ <Property name="width">100</Property>
</DataColumn>
<DataColumn name="settleWeight">
<Property name="property">settleWeight</Property>
<Property name="caption">缁撶畻閲嶉噺</Property>
<Property name="align">center</Property>
+ <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>
<Property name="caption">绂诲簱鏃堕棿</Property>
+ <Property name="width">150</Property>
</DataColumn>
<DataColumn>
<ClientEvent name="onRenderCell">//arg.dom.innerHTML = "<a href='javascript:;' onClick='detail()' class='a-btn1'>鏌ョ湅璇︽儏</a>";</ClientEvent>
--
Gitblit v1.9.3