From e69345c81150863c4a716819984693fd0487b419 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 07 二月 2026 11:52:25 +0800
Subject: [PATCH] 客户问题优化调整6-出入库详单取消入库重量，监管下出入库报表查询数据一样问题
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml | 214 ++++++++++++++++++++++++++++++----------------------
1 files changed, 123 insertions(+), 91 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
index 6afd1cd..77bd8f7 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
@@ -159,7 +159,7 @@
</PropertyDef>
<PropertyDef name="deptId">
<Property></Property>
- <Property name="label">鎵�灞炲垎搴�</Property>
+ <Property name="label">鎵�鍦ㄥ簱鍖�</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("deptPR#getAllData").getResult()}</Property>
<Property name="keyProperty">id</Property>
@@ -316,7 +316,7 @@
</Property>
</PropertyDef>
<PropertyDef name="plateNum">
- <Property name="label">杞︾墝鍙峰彿</Property>
+ <Property name="label">杞︾墝鍙�</Property>
</PropertyDef>
<PropertyDef name="foodVariety">
<Property></Property>
@@ -366,11 +366,6 @@
view.get("#btnDel").set("visible",false);
}

-if("OUT" == TYPE){
- view.get("#recordWeight").set("caption","鍑哄簱閲嶉噺");
-}else{
- view.get("#recordWeight").set("caption","鍏ュ簱閲嶉噺");
-}

//榛樿鏌ヨ鏌ヨ鎻愭潯浠�
view.get("#dsQuery").insert({
@@ -418,7 +413,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("璇烽�夋嫨鏁版嵁鈥︹��");
@@ -584,7 +579,7 @@
</ToolBarButton>
<ToolBarButton id="btnDel">
<ClientEvent name="onClick">showAbnormal();</ClientEvent>
- <Property name="caption">寮傚父鎿嶄綔</Property>
+ <Property name="caption">浣滃簾鎿嶄綔</Property>
<Property name="exClassName">btn4</Property>
<Property name="iconClass">fa fa-minus</Property>
<Property name="width">100</Property>
@@ -610,6 +605,22 @@
<Property name="iconClass">fa fa-print</Property>
<Property name="width">120</Property>
</ToolBarButton>
+ <ToolBarButton>
+ <Property name="caption">瀵煎叆EXCEL</Property>
+ <Property name="exClassName">btn2</Property>
+ <Property name="iconClass">fa fa-file-excel-o</Property>
+ <Property name="action">uploadExcel</Property>
+ <Property name="width">120</Property>
+ </ToolBarButton>
+ <ToolBarButton>
+ <ClientEvent name="onClick">
+var url = "/export/download-inout-excel";
+window.open(url);
</ClientEvent>
+ <Property name="caption">妯℃澘涓嬭浇</Property>
+ <Property name="exClassName">btn1</Property>
+ <Property name="iconClass">fa fa-cloud-download</Property>
+ <Property name="width">120</Property>
+ </ToolBarButton>
</ToolBar>
<DataGrid id="dataGridMain" layoutConstraint="padding:8">
<ClientEvent name="onDataRowClick">view.get("#dataGridMain").set("selection",arg.data);</ClientEvent>
@@ -628,12 +639,19 @@
<Property name="align">center</Property>
<Property name="width">150</Property>
</DataColumn>
+ <DataColumn name="deptId">
+ <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
+ arg.processDefault = true;</ClientEvent>
+ <Property name="property">deptId</Property>
+ <Property name="align">center</Property>
+ <Property name="width">250</Property>
+ </DataColumn>
<DataColumn name="plateNum">
<ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
arg.processDefault = true;</ClientEvent>
<Property name="property">plateNum</Property>
<Property name="align">center</Property>
- <Property name="width">130</Property>
+ <Property name="width">120</Property>
</DataColumn>
<DataColumn>
<Property name="property">customerName</Property>
@@ -678,15 +696,6 @@
<Property name="align">center</Property>
<Property name="width">100</Property>
</DataColumn>
- <DataColumn id="recordWeight">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
-arg.processDefault = true;</ClientEvent>
- <Property name="property">recordWeight</Property>
- <Property name="align">center</Property>
- <Property name="width">100</Property>
- <Property name="visible">true</Property>
- <Property name="name">recordWeight</Property>
- </DataColumn>
<DataColumn name="progress">
<ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
arg.processDefault = true;</ClientEvent>
@@ -711,8 +720,9 @@
<Dialog id="dialogMain" layout="regionPadding:8">
<Property name="iconClass">fa fa-tasks</Property>
<Property name="caption">鍗曟嵁淇℃伅</Property>
- <Property name="width">1200</Property>
- <Property name="showCaptionBar">false</Property>
+ <Property name="width">80%</Property>
+ <Property name="closeable">false</Property>
+ <Property name="height">90%</Property>
<Buttons>
<Button id="btnOK">
<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
@@ -748,7 +758,7 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*</Property>
+ <Property name="cols">*,*,*,*</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
<Property name="labelWidth">100</Property>
@@ -762,10 +772,21 @@
<Property name="property">plateNum</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
<AutoFormElement>
<Property name="name">depotId</Property>
<Property name="property">depotId</Property>
<Property name="label">瑁呭嵏浠撳簱</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">foodVariety</Property>
+ <Property name="property">foodVariety</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -779,29 +800,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">foodVariety</Property>
- <Property name="property">foodVariety</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">perWet</Property>
- <Property name="property">perWet</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">userContact</Property>
- <Property name="property">userContact</Property>
- <Property name="label">鑱旂郴鐢佃瘽</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">foodLevel</Property>
<Property name="property">foodLevel</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">perImpurity</Property>
- <Property name="property">perImpurity</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -817,15 +817,31 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">userContact</Property>
+ <Property name="property">userContact</Property>
+ <Property name="label">鑱旂郴鐢佃瘽</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="label">瀹㈡埛鍚嶇О</Property>
<Property name="property">customerName</Property>
<Property name="editable">false</Property>
<Property name="trigger">ddNotice</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
<Property name="name">noticeId</Property>
<Property name="property">noticeId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">perWet</Property>
+ <Property name="property">perWet</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">perImpurity</Property>
+ <Property name="property">perImpurity</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
@@ -837,76 +853,70 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,50,*,50,*,50</Property>
+ <Property name="cols">*,*,*,*</Property>
<Property name="labelAlign">right</Property>
<Property name="labelWidth">100</Property>
<Property name="labelSeparator">锛�</Property>
- <AutoFormElement layoutConstraint="colSpan:2">
- <ClientEvent name="onBlur">deAutoByWeight();</ClientEvent>
- <Property name="name">fullWeight</Property>
- <Property name="property">fullWeight</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
<Property name="name">fullWeightTime</Property>
<Property name="property">fullWeightTime</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
<Property name="name">fullWeightUser</Property>
<Property name="property">fullWeightUser</Property>
<Property name="label">婊¤溅绉伴噸浜�</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
<ClientEvent name="onBlur">deAutoByWeight();</ClientEvent>
- <Property name="name">emptyWeight</Property>
- <Property name="property">emptyWeight</Property>
+ <Property name="name">fullWeight</Property>
+ <Property name="property">fullWeight</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">emptyWeightTime</Property>
- <Property name="property">emptyWeightTime</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">emptyWeightUser</Property>
- <Property name="property">emptyWeightUser</Property>
- <Property name="label">绌鸿溅绉伴噸浜�</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">netWeight</Property>
- <Property name="property">netWeight</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
<ClientEvent name="onBlur">deAutoByWeight();</ClientEvent>
<Property name="name">deOther</Property>
<Property name="property">deOther</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
+ <Property name="name">emptyWeightTime</Property>
+ <Property name="property">emptyWeightTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">emptyWeightUser</Property>
+ <Property name="property">emptyWeightUser</Property>
+ <Property name="label">绌鸿溅绉伴噸浜�</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <ClientEvent name="onBlur">deAutoByWeight();</ClientEvent>
+ <Property name="name">emptyWeight</Property>
+ <Property name="property">emptyWeight</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">netWeight</Property>
+ <Property name="property">netWeight</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">registerTime</Property>
<Property name="property">registerTime</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
+ <Property name="name">completeTime</Property>
+ <Property name="property">completeTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">settleWeight</Property>
<Property name="property">settleWeight</Property>
<Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">recordWeight</Property>
- <Property name="property">recordWeight</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">completeTime</Property>
- <Property name="property">completeTime</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
@@ -949,7 +959,7 @@
<Tools/>
</Dialog>
<Dialog id="dialogImg">
- <Property name="width">1000</Property>
+ <Property name="width">55%</Property>
<Property name="height">95%</Property>
<Property name="iconClass">fa fa-tasks</Property>
<Property name="caption">娴佺▼杩芥函灞曠ず</Property>
@@ -962,21 +972,22 @@
<Tools/>
</Dialog>
<Dialog id="dialogAbnormal" layout="regionPadding:5">
- <Property name="width">450</Property>
+ <Property name="width">30%</Property>
<Property name="iconClass">fa fa-tasks</Property>
<Property name="caption">寮傚父鎿嶄綔鍘熷洜</Property>
<Property name="closeable">false</Property>
+ <Property name="height">45%</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">todoError();</ClientEvent>
- <Property name="caption">寮傚父缁堟</Property>
+ <Property name="caption">纭浣滃簾</Property>
<Property name="iconClass">fa fa-check</Property>
<Property name="exClassName">btn1</Property>
<Property name="width">120</Property>
</Button>
<Button>
<ClientEvent name="onClick">self.get("parent").close();</ClientEvent>
- <Property name="caption">鍙栨秷鎿嶄綔</Property>
+ <Property name="caption">鍙栨秷</Property>
<Property name="exClassName">btn3</Property>
<Property name="iconClass">fa fa-times-circle</Property>
<Property name="width">120</Property>
@@ -1161,5 +1172,26 @@
</Container>
</CustomDropDown>
<YearDropDown id="yearDropDown"/>
+ <UploadAction id="uploadExcel">
+ <ClientEvent name="onFileUploaded">var fileName = arg.returnValue;
+if(fileName){
+ $notify("闄勪欢涓婁紶鎴愬姛锛屽紑濮嬫墽琛岃В鏋愨�︹��");
+ view.get("#ajaxAnalysisExcel").set("parameter",fileName).execute(function(result){
+ if("200"!=result.code){
+ $alert(result.message);
+ }else{
+ $alert(result.message);
+ query();
+ }
+ });
+}</ClientEvent>
+ <Property name="fileResolver">fileUploadManage#uploadExcel</Property>
+ <Property name="maxFileSize">10MB</Property>
+ <Filters/>
+ </UploadAction>
+ <AjaxAction id="ajaxAnalysisExcel">
+ <Property name="service">inoutDataPR#analysisExcel</Property>
+ <Property name="executingMessage">姝ｅ湪鎵ц瑙ｆ瀽鈥︹��</Property>
+ </AjaxAction>
</View>
</ViewConfig>
--
Gitblit v1.9.3