From 5ffc5c22b0833d8f569e99eb775d08ca28676c7d Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 19 一月 2026 14:37:16 +0800
Subject: [PATCH] 细节调整2
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReport.view.xml | 22 +---
fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityData.view.xml | 26 +++---
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutParam.java | 6 +
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml | 49 ++++--------
fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReportPR.java | 8 +-
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml | 49 ++++--------
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetailPR.java | 6 +
fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityDataPR.java | 17 ++--
fzzy-igdss-web/src/main/resources/templates/security/snapRecord.html | 6
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java | 6 +
fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html | 6
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/QuantityParam.java | 3
fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReport.view.xml | 17 +--
fzzy-igdss-view/src/main/java/com/fzzy/igds/ConfByDept.view.xml | 2
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/SuperInventoryReportParam.java | 6 +
fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java | 4
16 files changed, 105 insertions(+), 128 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutParam.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutParam.java
index 0ada48e..67fc704 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutParam.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutParam.java
@@ -1,5 +1,6 @@
package com.fzzy.igds.data;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
@@ -78,4 +79,9 @@
private Double settleMoney;
private Date updateTime = new Date();
+
+ private String createUser;
+
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime; // 鍒涘缓鏃堕棿
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/QuantityParam.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/QuantityParam.java
index afc3b3d..9d6b57b 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/QuantityParam.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/QuantityParam.java
@@ -33,6 +33,9 @@
private String createUser; // 鍒涘缓浜�
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime; // 鍒涘缓鏃堕棿
+
private String timeDesc; // 鏃堕棿鎻忚堪
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/SuperInventoryReportParam.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/SuperInventoryReportParam.java
index c5d9ada..b6ecaa6 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/SuperInventoryReportParam.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/SuperInventoryReportParam.java
@@ -1,7 +1,10 @@
package com.fzzy.igds.data;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+
+import java.util.Date;
/**
*鐩戠搴撳瓨鎶ヨ〃鏌ヨ瀹炰綋绫�
@@ -22,6 +25,7 @@
private String createUser;
- private String createTime;
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime; // 鍒涘缓鏃堕棿
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ConfByDept.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ConfByDept.view.xml
index 4bc359d..46ebdc4 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ConfByDept.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ConfByDept.view.xml
@@ -137,7 +137,7 @@
var cur = view.get("#dgMain").get("selection");
if(cur){
var deptId = cur.get("id");
- var url = "/com.fzzy.igds.inoutConfManage.d?deptId="+ deptId;
+ var url = "/com.fzzy.igds.InoutConfManage.d?deptId="+ deptId;
window.$openTab("鍑哄叆搴撻厤缃�", url);
}else{
$notify("璇峰厛閫夋嫨搴撳尯鈥︹��");
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReport.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReport.view.xml
index 3e6b570..fad86b9 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReport.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReport.view.xml
@@ -554,7 +554,7 @@
</PropertyDef>
<PropertyDef name="depotId">
<Property></Property>
- <Property name="label">浠撳簱鍚嶇О</Property>
+ <Property name="label">閫夋嫨浠撳簱</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("depotPR#getData").getResult()}</Property>
<Property name="keyProperty">id</Property>
@@ -563,11 +563,11 @@
</PropertyDef>
<PropertyDef name="start">
<Property name="dataType">Date</Property>
- <Property name="label">妫�娴嬫棩鏈�</Property>
+ <Property name="label">寮�濮嬫椂闂�</Property>
</PropertyDef>
<PropertyDef name="end">
<Property name="dataType">Date</Property>
- <Property name="label">妫�娴嬫椂闂�</Property>
+ <Property name="label">鎴鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="createUser">
<Property name="label">鍒惰〃浜�</Property>
@@ -579,6 +579,7 @@
<Property name="label">璇存槑锛�</Property>
</PropertyDef>
<PropertyDef name="createTime">
+ <Property name="dataType">DateTime</Property>
<Property name="label">鍒惰〃鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="timeDescLabel"/>
@@ -644,7 +645,7 @@
<Container>
<Property name="className">c-param</Property>
<AutoForm>
- <Property name="cols">*,*,300,300,90,90</Property>
+ <Property name="cols">*,*,280,280,90,90</Property>
<Property name="dataSet">dataSetC</Property>
<Property name="labelSeparator">锛�</Property>
<Property name="labelAlign">right</Property>
@@ -689,12 +690,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">dataSetC</Property>
<Property name="labelAlign">right</Property>
<Property name="showHint">false</Property>
<Property name="labelWidth">120</Property>
- <AutoFormElement layoutConstraint="colSpan:4">
+ <AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">title</Property>
<Property name="property">title</Property>
<Property name="showLabel">false</Property>
@@ -709,15 +710,6 @@
<Property name="name">timeDesc</Property>
<Property name="property">timeDesc</Property>
<Property name="editorType">Label</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">depotName</Property>
- <Property name="property">depotName</Property>
- <Property name="editorType">Label</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelWidth">80</Property>
- <Property name="showLabel">false</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java
index edff85b..a97a70a 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java
@@ -66,11 +66,11 @@
result.put("start", start);
result.put("timeDesc",
- DateFormatUtils.format(start, "yyyy-MM-dd") + " 鎴嚦锛�"
+ DateFormatUtils.format(start, "yyyy-MM-dd") + " 鑷� "
+ DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
result.put("createUser", ContextUtil.getLoginUserName());
- result.put("createTime", DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+ result.put("createTime", new Date());
return result;
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityData.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityData.view.xml
index a69121e..dafe1f6 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityData.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityData.view.xml
@@ -88,17 +88,21 @@
</PropertyDef>
<PropertyDef name="start">
<Property name="dataType">Date</Property>
- <Property name="label">妫�娴嬫椂闂村紑濮�</Property>
+ <Property name="label">寮�濮嬫椂闂�</Property>
</PropertyDef>
<PropertyDef name="end">
<Property name="dataType">Date</Property>
- <Property name="label">妫�娴嬫椂闂存埅鑷�</Property>
+ <Property name="label">鎴鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="createUser">
<Property name="label">鍒惰〃浜�</Property>
</PropertyDef>
<PropertyDef name="timeDesc">
- <Property name="label">鏃堕棿</Property>
+ <Property name="label">妫�娴嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="createTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鍒惰〃鏃堕棿</Property>
</PropertyDef>
</DataType>
</Model>
@@ -126,7 +130,7 @@
<Container>
<Property name="className">c-param</Property>
<AutoForm>
- <Property name="cols">*,*,*,*,90,90</Property>
+ <Property name="cols">*,*,280,280,90,90</Property>
<Property name="dataSet">dataSetC</Property>
<Property name="labelSeparator">锛�</Property>
<Property name="labelAlign">right</Property>
@@ -188,12 +192,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">dataSetC</Property>
<Property name="labelAlign">right</Property>
<Property name="showHint">false</Property>
<Property name="labelWidth">120</Property>
- <AutoFormElement layoutConstraint="colSpan:4">
+ <AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">title</Property>
<Property name="property">title</Property>
<Property name="showLabel">false</Property>
@@ -211,16 +215,14 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
+ <Property name="name">createUser</Property>
+ <Property name="property">createUser</Property>
<Property name="editorType">Label</Property>
- <Property name="labelWidth">110</Property>
- <Property name="labelAlign">right</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">createUser</Property>
- <Property name="property">createUser</Property>
+ <Property name="name">createTime</Property>
+ <Property name="property">createTime</Property>
<Property name="editorType">Label</Property>
<Editor/>
</AutoFormElement>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityDataPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityDataPR.java
index 7d2a164..8db259a 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityDataPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityDataPR.java
@@ -17,11 +17,10 @@
import java.util.Date;
/**
- *鏁伴噺妫�娴嬫暟鎹姤琛�
+ * 鏁伴噺妫�娴嬫暟鎹姤琛�
*
* @author sgj
* @date 2025/12/18
-
*/
@Component
public class QuantityDataPR {
@@ -41,19 +40,21 @@
public QuantityParam getQuery(String type) {
QuantityParam result = new QuantityParam();
SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
- result.setTitle("鏁伴噺妫�娴嬫暟鎹�");
+ result.setTitle("鏁伴噺妫�娴嬫眹鎬昏〃");
if (null != subDept) {
- result.setTitle(subDept.getDeptName() + "鏁伴噺妫�娴嬫暟鎹�");
- if(Constant.DEPT_TYPE_20.equals(subDept.getType())){
+ result.setTitle(subDept.getDeptName() + "鏁伴噺妫�娴嬫眹鎬昏〃");
+ if (Constant.DEPT_TYPE_20.equals(subDept.getType())) {
result.setDeptId(String.valueOf(subDept.getDeptId()));
}
}
result.setEnd(new Date());
- Date start = DateUtil.getNewByDay(new Date(), -90);
+ Date start = DateUtil.getNewByDay(new Date(), -30);
result.setStart(start);
- result.setTimeDesc(DateFormatUtils.format(start, "yyyy-MM-dd") + " 鎴嚦锛�"
- + DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
+ result.setTimeDesc(
+ DateFormatUtils.format(start, "yyyy-MM-dd") + " 鑷� "
+ + DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
result.setCreateUser(ContextUtil.getLoginUserName());
+ result.setCreateTime(new Date());
return result;
}
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 53ecd65..62dd80c 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
@@ -369,7 +369,14 @@
</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>
@@ -458,7 +465,7 @@
<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>
@@ -516,7 +523,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>
@@ -589,12 +596,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>
@@ -605,43 +612,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>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java
index a4996d9..4b88f92 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java
@@ -48,14 +48,16 @@
result.setTitle(deptName + "鍏ュ簱鏄庣粏姹囨��");
result.setDeptId(deptId);
}
- result.setUnit("鍗冨厠锛圞G锛�");
result.setEnd(new Date());
Date start = DateUtil.getNewByDay(new Date(), -30);
result.setStart(start);
result.setTimeDesc(
- DateFormatUtils.format(start, "yyyy-MM-dd") + " 鎴嚦锛�"
+ DateFormatUtils.format(start, "yyyy-MM-dd") + " 鑷� "
+ DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
+
+ result.setCreateUser(ContextUtil.getLoginUserName());
+ result.setCreateTime(new Date());
return result;
}
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 77ff8a0..0b53918 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
@@ -363,13 +363,20 @@
<Property name="label">鎴鏃堕棿</Property>
<Property name="dataType">Date</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="unit">
<Property></Property>
<Property name="label">鍗曚綅</Property>
</PropertyDef>
<PropertyDef name="timeDesc">
<Property></Property>
- <Property name="label">鏃堕棿</Property>
+ <Property name="label">鏌ヨ鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="title">
<Property></Property>
@@ -453,7 +460,7 @@
<Container>
<Property name="className">c-param</Property>
<AutoForm id="form1" layoutConstraint="top">
- <Property name="cols">*,*,*,*,90,90,140</Property>
+ <Property name="cols">*,*,280,280,90,90,140</Property>
<Property name="dataSet">dsQuery</Property>
<Property name="exClassName">bg-color</Property>
<Property name="labelWidth">110</Property>
@@ -510,7 +517,7 @@
</Button>
</AutoForm>
<AutoForm id="form2" layoutConstraint="top">
- <Property name="cols">*,*,*,*,90,90,140</Property>
+ <Property name="cols">*,*,280,280,90,90,140</Property>
<Property name="dataSet">dsQuery</Property>
<Property name="exClassName">bg-color</Property>
<Property name="labelWidth">110</Property>
@@ -581,12 +588,12 @@
<Container layoutConstraint="center">
<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>
@@ -597,43 +604,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>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetailPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetailPR.java
index 046f512..cbee952 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetailPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetailPR.java
@@ -48,14 +48,16 @@
result.setTitle(deptName + "鍑哄簱鏄庣粏姹囨��");
result.setDeptId(deptId);
}
- result.setUnit("鍗冨厠锛圞G锛�");
result.setEnd(new Date());
Date start = DateUtil.getNewByDay(new Date(), -30);
result.setStart(start);
result.setTimeDesc(
- DateFormatUtils.format(start, "yyyy-MM-dd") + " 鎴嚦锛�"
+ DateFormatUtils.format(start, "yyyy-MM-dd") + " 鑷� "
+ DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
+
+ result.setCreateUser(ContextUtil.getLoginUserName());
+ result.setCreateTime(new Date());
return result;
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReport.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReport.view.xml
index 22c2f43..91a8f2b 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReport.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReport.view.xml
@@ -104,7 +104,7 @@
</PropertyDef>
<PropertyDef name="timeDesc">
<Property></Property>
- <Property name="label">鏃堕棿</Property>
+ <Property name="label">鏌ヨ鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="title">
<Property></Property>
@@ -113,7 +113,8 @@
<Property name="label">鍒涘缓浜�</Property>
</PropertyDef>
<PropertyDef name="createTime">
- <Property name="label">鍒涘缓鏃堕棿</Property>
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鍒惰〃鏃堕棿</Property>
</PropertyDef>
</DataType>
</Model>
@@ -152,7 +153,7 @@
<Container>
<Property name="className">c-param</Property>
<AutoForm>
- <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>
@@ -210,12 +211,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:4">
+ <AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">title</Property>
<Property name="property">title</Property>
<Property name="showLabel">false</Property>
@@ -230,12 +231,6 @@
<Property name="name">timeDesc</Property>
<Property name="property">timeDesc</Property>
<Property name="editorType">Label</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="visible">false</Property>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReportPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReportPR.java
index a496bad..5bbd020 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReportPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReportPR.java
@@ -38,9 +38,9 @@
public SuperInventoryReportParam getQuery() {
SuperInventoryReportParam result = new SuperInventoryReportParam();
SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
- result.setTitle("搴撳瓨鎶ヨ〃");
+ result.setTitle("搴撳瓨姹囨�昏〃");
if (null != subDept) {
- result.setTitle(subDept.getDeptName() + "搴撳瓨鎶ヨ〃");
+ result.setTitle(subDept.getDeptName() + "搴撳瓨姹囨�昏〃");
result.setDeptId(String.valueOf(subDept.getDeptId()));
}
result.setTimeDesc("妫�娴嬫椂闂�");
@@ -48,10 +48,10 @@
Date start = DateUtil.getNewByDay(new Date(), -30);
result.setStart(start);
result.setTimeDesc(
- DateFormatUtils.format(start, "yyyy-MM-dd") + " 鎴嚦锛�"
+ DateFormatUtils.format(start, "yyyy-MM-dd") + " 鑷� "
+ DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
result.setCreateUser(ContextUtil.getLoginUserName());
- result.setCreateTime(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+ result.setCreateTime(new Date());
return result;
}
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html b/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html
index b6cc7d9..fcc1aec 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html
@@ -11,7 +11,7 @@
<th:block th:include="include :: select2-css" />
<style>
.select-list .select2-container--bootstrap {
- width: 300px!important;
+ width: 280px!important;
display: inline-block;
}
</style>
@@ -45,9 +45,9 @@
</li>
<li class="select-time">
<label style="width: 100px">浜嬩欢鏃堕棿锛� </label>
- <input type="text" class="time-input" style="width: 120px;" id="start" placeholder="寮�濮嬫椂闂�" name="start"/>
+ <input type="text" class="time-input" style="width: 140px;" id="start" placeholder="寮�濮嬫椂闂�" name="start"/>
<span>-</span>
- <input type="text" class="time-input" style="width: 120px;" id="end" placeholder="缁撴潫鏃堕棿" name="end"/>
+ <input type="text" class="time-input" style="width: 140px;" id="end" placeholder="缁撴潫鏃堕棿" name="end"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="searchRecord()"><i
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/snapRecord.html b/fzzy-igdss-web/src/main/resources/templates/security/snapRecord.html
index 4ded0ed..75aad2a 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/snapRecord.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/snapRecord.html
@@ -11,7 +11,7 @@
<th:block th:include="include :: select2-css"/>
<style>
.select-list .select2-container--bootstrap {
- width: 300px!important;
+ width: 280px!important;
display: inline-block;
}
</style>
@@ -44,10 +44,10 @@
</li>
<li class="select-time">
<label style="width: 100px">鎶撴媿鏃堕棿锛�</label>
- <input type="text" class="time-input" style="width: 120px;" id="start"
+ <input type="text" class="time-input" style="width: 140px;" id="start"
placeholder="寮�濮嬫椂闂�" name="start"/>
<span>-</span>
- <input type="text" class="time-input" style="width: 120px;" id="end" placeholder="缁撴潫鏃堕棿"
+ <input type="text" class="time-input" style="width: 140px;" id="end" placeholder="缁撴潫鏃堕棿"
name="end"/>
</li>
<li>
--
Gitblit v1.9.3