From 28c49925c98713465db8cd64899d984d6cd0f7ad Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 26 十二月 2025 17:56:59 +0800
Subject: [PATCH] Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml | 256 ++++++++++++++++++++++++++++++--------------------
1 files changed, 153 insertions(+), 103 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 84cac83..60dd6bb 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
@@ -12,7 +12,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="progress">
<Property></Property>
@@ -180,7 +185,7 @@
<Property></Property>
<Property name="label">瑁呭嵏浠撳簱</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getData").getResult()}</Property>
<Property name="keyProperty">id</Property>
<Property name="valueProperty">name</Property>
</Property>
@@ -315,7 +320,7 @@
<Property></Property>
<Property name="label">瑁呭嵏浠撳簱</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getData").getResult()}</Property>
<Property name="keyProperty">id</Property>
<Property name="valueProperty">name</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>
@@ -381,9 +377,18 @@
<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>
- <View layout="padding:5;regionPadding:5">
+ <View layout="padding:10">
<ClientEvent name="onReady">//var TYPE = "INOUT_DETAIL";
//椤甸潰灞曠ず绫诲瀷锛�1 姝ｅ父鎶ヨ〃椤甸潰锛�2 鐩戠灞曠ず椤甸潰
var ViewType = "${request.getParameter('viewType')}";
@@ -391,12 +396,14 @@
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;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�
@@ -424,118 +431,136 @@
<Property></Property>
<Property name="loadMode">manual</Property>
</DataSet>
- <AutoForm id="form1" layoutConstraint="top">
- <Property name="cols">*,*,*,*</Property>
- <Property name="dataSet">dsQuery</Property>
- <Property name="exClassName">bg-color</Property>
- <Property name="labelWidth">100</Property>
- <Property name="labelAlign">right</Property>
- <Property name="hideMode">display</Property>
- <Property name="visible">false</Property>
- <AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodVariety</Property>
- <Property name="property">foodVariety</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">start</Property>
- <Property name="property">start</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">end</Property>
- <Property name="property">end</Property>
- <Editor/>
- </AutoFormElement>
- <Container layout="hbox regionPadding:15">
+ <Container>
+ <Property name="className">c-param</Property>
+ <AutoForm id="form1">
+ <Property name="cols">*,*,*,*,90,90,140</Property>
+ <Property name="dataSet">dsQuery</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelWidth">110</Property>
+ <Property name="exClassName">bg-color</Property>
+ <Property name="visible">false</Property>
+ <Property name="hideMode">display</Property>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">foodVariety</Property>
+ <Property name="property">foodVariety</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">start</Property>
+ <Property name="property">start</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">end</Property>
+ <Property name="property">end</Property>
+ <Editor/>
+ </AutoFormElement>
<Button>
<ClientEvent name="onClick"> var data = view.get("#dsQuery.data");
view.get("#dsMain").set("parameter",data).flushAsync();</ClientEvent>
- <Property name="caption">鏌ヨ</Property>
- <Property name="exClassName">btn1</Property>
+ <Property name="caption">鎼滅储</Property>
+ <Property name="exClassName">btn-q1</Property>
<Property name="iconClass">fa fa-search</Property>
</Button>
<Button>
<ClientEvent name="onClick">view.get("#dsQuery").flushAsync();</ClientEvent>
- <Property name="exClassName">btn2</Property>
+ <Property name="exClassName">btn-q2</Property>
<Property name="iconClass">fa fa-refresh</Property>
<Property name="caption">閲嶇疆</Property>
</Button>
<Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dsQuery.data");
+var param = {
+ "type":"IN",
+ "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>
- <Property name="menu">menuExport</Property>
- <Property name="action">exportExcel</Property>
</Button>
- </Container>
- </AutoForm>
- <AutoForm id="form2" layoutConstraint="top">
- <Property name="cols">*,*,*,*</Property>
- <Property name="dataSet">dsQuery</Property>
- <Property name="exClassName">bg-color</Property>
- <Property name="labelWidth">100</Property>
- <Property name="labelAlign">right</Property>
- <Property name="hideMode">display</Property>
- <Property name="visible">false</Property>
- <AutoFormElement>
- <Property name="name">customerName</Property>
- <Property name="property">customerName</Property>
- <Property name="label">鏀跺偍鍏徃</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">deptId</Property>
- <Property name="property">deptId</Property>
- <Property name="label">鎵�灞炲簱鍖�</Property>
- <Property name="hideMode">visibility</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">start</Property>
- <Property name="property">start</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">end</Property>
- <Property name="property">end</Property>
- <Editor/>
- </AutoFormElement>
- <Container layout="hbox regionPadding:15">
+ </AutoForm>
+ <AutoForm id="form2">
+ <Property name="cols">*,*,*,*,90,90,140</Property>
+ <Property name="dataSet">dsQuery</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelWidth">110</Property>
+ <Property name="exClassName">bg-color</Property>
+ <Property name="visible">false</Property>
+ <Property name="hideMode">display</Property>
+ <AutoFormElement>
+ <Property name="name">companyId</Property>
+ <Property name="property">companyId</Property>
+ <Property name="label">鏀跺偍鍏徃</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
+ <Property name="label">鎵�灞炲簱鍖�</Property>
+ <Property name="hideMode">visibility</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">start</Property>
+ <Property name="property">start</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">end</Property>
+ <Property name="property">end</Property>
+ <Editor/>
+ </AutoFormElement>
<Button>
<ClientEvent name="onClick"> var data = view.get("#dsQuery.data");
view.get("#dsMain").set("parameter",data).flushAsync();</ClientEvent>
- <Property name="caption">鏌ヨ</Property>
- <Property name="exClassName">btn1</Property>
+ <Property name="caption">鎼滅储</Property>
+ <Property name="exClassName">btn-q1</Property>
<Property name="iconClass">fa fa-search</Property>
</Button>
<Button>
<ClientEvent name="onClick">view.get("#dsQuery").flushAsync();</ClientEvent>
- <Property name="exClassName">btn2</Property>
+ <Property name="exClassName">btn-q2</Property>
<Property name="iconClass">fa fa-refresh</Property>
<Property name="caption">閲嶇疆</Property>
</Button>
<Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dsQuery.data");
+var param = {
+ "type":"IN",
+ "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>
- <Property name="menu">menuExport</Property>
- <Property name="action">exportExcel</Property>
</Button>
- </Container>
- </AutoForm>
- <Container layoutConstraint="center">
- <Property name="exClassName">bg-color</Property>
+ </AutoForm>
+ </Container>
+ <Container>
+ <Property name="className">c-data</Property>
<AutoForm id="autoForm1" layoutConstraint="top">
<Property name="cols">*,*,*,*,*,*,*</Property>
<Property name="dataSet">dsQuery</Property>
<Property name="labelAlign">right</Property>
<Property name="showHint">false</Property>
+ <Property name="labelWidth">120</Property>
<AutoFormElement layoutConstraint="colSpan:7">
<Property name="name">title</Property>
<Property name="property">title</Property>
@@ -588,7 +613,7 @@
<Editor/>
</AutoFormElement>
</AutoForm>
- <DataGrid id="dataGridMain1" layoutConstraint="center">
+ <DataGrid id="dataGridMain1" layoutConstraint="padding:8">
<ClientEvent name="onRenderRow">if(arg.data.get('id') == '鍚堣'){
//arg.dom.style.background = "#fcc5c5";
arg.dom.style.fontWeight = "bold";
@@ -599,65 +624,75 @@
<Property name="highlightCurrentRow">false</Property>
<Property name="hideMode">display</Property>
<Property name="visible">true</Property>
+ <Property name="headerRowHeight">30</Property>
+ <Property name="rowHeight">50</Property>
<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="center">
+ <DataGrid id="dataGridMain2" layoutConstraint="padding:8">
<ClientEvent name="onRenderRow">if(arg.data.get('id') == '鍚堣'){
//arg.dom.style.background = "#fcc5c5";
arg.dom.style.fontWeight = "bold";
@@ -668,59 +703,65 @@
<Property name="highlightCurrentRow">false</Property>
<Property name="visible">false</Property>
<Property name="hideMode">display</Property>
+ <Property name="headerRowHeight">30</Property>
+ <Property name="rowHeight">50</Property>
<RowNumColumn>
<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>
@@ -731,6 +772,15 @@
<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>
</View>
</ViewConfig>
--
Gitblit v1.9.3