From c7e9e47f7b75dd0a88c929d7fb0713e5f638fdf1 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期日, 08 二月 2026 19:08:11 +0800
Subject: [PATCH] 调整工单审核功能，调整出入库工单排序
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml | 218 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 158 insertions(+), 60 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 e4c9085..61553d5 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,28 +363,35 @@
<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>
</PropertyDef>
<PropertyDef name="timeDesc">
<Property></Property>
- <Property name="label">鏃堕棿</Property>
+ <Property name="label">鏌ヨ鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="createTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鍒惰〃鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="createUser">
+ <Property name="label">鍒惰〃浜�</Property>
</PropertyDef>
<PropertyDef name="title">
<Property></Property>
</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>
@@ -406,30 +418,55 @@

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

query = function(){
var data = view.get("#dsQuery.data");
view.get("#dsQuery").set("parameter",data).flushAsync();
};
-query();</ClientEvent>
+query();
+
+
+
+
+//杩借釜
+showImg = function(){
+ 
+ var select = view.get("#dataGridMain2").get("selection");
+ if(select){
+ 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("#dialogImg").show();
+ }else{
+ $notify("璇烽�夋嫨鏁版嵁鈥︹��");
+ }
+};</ClientEvent>
<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>
+ <DataSet id="dsDeptList">
+ <Property name="dataProvider">deptPR#getDeptByUserType</Property>
+ <Property name="userData">搴撳尯鍒楄〃涓嬫媺妗�</Property>
+ <Property name="loadMode">manual</Property>
+ <Property name="dataType">[dtDept]</Property>
</DataSet>
<Container>
<Property name="className">c-param</Property>
<AutoForm id="form1">
- <Property name="cols">*,*,*,*,90,90,140</Property>
+ <Property name="cols">*,*,280,280,90,90,140</Property>
<Property name="dataSet">dsQuery</Property>
<Property name="labelSeparator">锛�</Property>
<Property name="labelAlign">right</Property>
@@ -471,6 +508,15 @@
<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/inout-excel", "鍏ュ簱鏁版嵁", param);</ClientEvent>
<Property name="caption">瀵煎嚭EXCEL</Property>
<Property name="exClassName">btn-q2</Property>
<Property name="width">140</Property>
@@ -478,7 +524,7 @@
</Button>
</AutoForm>
<AutoForm id="form2">
- <Property name="cols">*,*,*,*,90,90,140</Property>
+ <Property name="cols">*,*,280,280,90,90,140</Property>
<Property name="dataSet">dsQuery</Property>
<Property name="labelSeparator">锛�</Property>
<Property name="labelAlign">right</Property>
@@ -487,8 +533,8 @@
<Property name="visible">false</Property>
<Property name="hideMode">display</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>
@@ -497,6 +543,7 @@
<Property name="property">deptId</Property>
<Property name="label">鎵�灞炲簱鍖�</Property>
<Property name="hideMode">visibility</Property>
+ <Property name="trigger">dsDeptDropDown</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -511,7 +558,15 @@
</AutoFormElement>
<Button>
<ClientEvent name="onClick"> var data = view.get("#dsQuery.data");
- view.get("#dsMain").set("parameter",data).flushAsync();</ClientEvent>
+ var deptId=data.get("deptId");
+ var companyId=data.get("companyId");
+ if(!companyId || !deptId){
+ $alert("璇峰厛閫夋嫨鏀跺偍鍏徃鍜屽拰鎵�灞炲簱鍖�");
+
+ }else{
+ 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>
@@ -523,6 +578,15 @@
<Property name="caption">閲嶇疆</Property>
</Button>
<Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dsQuery.data");
+var param = {
+ "type":"IN_DETAIL",
+ "deptId":data.get("deptId"),
+ "companyId":data.get("companyId"),
+ "start":data.get("start"),
+ "end":data.get("end")
+}
+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>
@@ -533,12 +597,12 @@
<Container>
<Property name="className">c-data</Property>
<AutoForm id="autoForm1" layoutConstraint="top">
- <Property name="cols">*,*,*,*,*,*,*</Property>
+ <Property name="cols">*,*,300</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">
+ <AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">title</Property>
<Property name="property">title</Property>
<Property name="showLabel">false</Property>
@@ -549,43 +613,21 @@
</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
<Property name="name">timeDesc</Property>
<Property name="property">timeDesc</Property>
<Property name="editorType">Label</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">none</Property>
- <Property name="property">none</Property>
+ <Property name="name">createUser</Property>
+ <Property name="property">createUser</Property>
<Property name="editorType">Label</Property>
- <Property name="showLabel">false</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">none</Property>
- <Property name="property">none</Property>
- <Property name="editorType">Label</Property>
- <Property name="showLabel">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">none</Property>
- <Property name="property">none</Property>
- <Property name="editorType">Label</Property>
- <Property name="showLabel">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">none</Property>
- <Property name="property">none</Property>
- <Property name="editorType">Label</Property>
- <Property name="showLabel">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">unit</Property>
- <Property name="property">unit</Property>
+ <Property name="name">createTime</Property>
+ <Property name="property">createTime</Property>
<Property name="editorType">Label</Property>
<Editor/>
</AutoFormElement>
@@ -606,59 +648,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">
@@ -667,6 +717,7 @@
arg.dom.style.fontWeight = "bold";
//arg.processDefault = false;
}</ClientEvent>
+ <ClientEvent name="onDataRowClick">view.get("#dataGridMain2").set("selection",arg.data);</ClientEvent>
<Property name="dataSet">dsMain</Property>
<Property name="readOnly">true</Property>
<Property name="highlightCurrentRow">false</Property>
@@ -674,62 +725,71 @@
<Property name="hideMode">display</Property>
<Property name="headerRowHeight">30</Property>
<Property name="rowHeight">50</Property>
+ <Property name="selectionMode">singleRow</Property>
+ <RowSelectorColumn/>
<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>
+ <ClientEvent name="onRenderCell"> var txt = arg.data.getText("id");
+ if(!txt || txt == '鍚堣') return true;
+ 
+arg.dom.innerHTML = "<a href='javascript:;' onClick='showImg()' class='a-btn1'>杩囩▼杩芥函</a>";</ClientEvent>
<Property name="width">160</Property>
<Property name="caption">鎿嶄綔</Property>
<Property name="align">center</Property>
@@ -747,5 +807,43 @@
</DataPilot>
</ToolBar>
</Container>
+ <Dialog id="dialogImg">
+ <Property name="width">55%</Property>
+ <Property name="height">95%</Property>
+ <Property name="iconClass">fa fa-tasks</Property>
+ <Property name="caption">娴佺▼杩芥函灞曠ず</Property>
+ <Buttons/>
+ <Children>
+ <IFrame id="iFrameImg">
+ <Property name="width">100%</Property>
+ </IFrame>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <DataSetDropDown id="dsDeptDropDown">
+ <ClientEvent name="onOpen">
+var entity = view.get("#dsQuery.data");
+if(!entity){
+ $alert("璇峰厛閫夋嫨鎵�灞炲叕鍙�");
+}else{
+ var deptId = entity.get("companyId");
+ if(!deptId){
+ $alert("璇峰厛閫夋嫨鎵�灞炲叕鍙�");
+ }else{
+ view.get("#dsDeptList").set("parameter",entity.get("companyId")).flushAsync();
+ }
+}</ClientEvent>
+ <Property name="dataSet">dsDeptList</Property>
+ <Property name="height">450</Property>
+ <Property name="autoOpen">true</Property>
+ <Property name="assignmentMap">deptId=id</Property>
+ <Property name="width">400</Property>
+ <DataColumn>
+ <Property name="align">center</Property>
+ <Property name="name">kqmc</Property>
+ <Property name="property">kqmc</Property>
+ <Editor/>
+ </DataColumn>
+ </DataSetDropDown>
</View>
</ViewConfig>
--
Gitblit v1.9.3