From 86c6ebe11056fd50b8d51ba083401efdc555dcff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 1 Apr 2020 23:13:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=98=8E=E7=BB=86=E9=87=8C=E7=9A=84=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/common/common.js                   | 25 +++++++++++++++++++
 erp_web/pages/materials/material.html         |  4 ++-
 .../erp/controller/DepotItemController.java   |  2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/erp_web/js/common/common.js b/erp_web/js/common/common.js
index 339e3a19..7e6d2a02 100644
--- a/erp_web/js/common/common.js
+++ b/erp_web/js/common/common.js
@@ -456,4 +456,29 @@
 				}
 			}
 		});
+	}
+
+	// 格式化日期，如月、日、时、分、秒保证为2位数
+	function formatNumber (n) {
+		n = n.toString();
+		return n[1] ? n : '0' + n;
+	}
+	
+	// 参数number为毫秒时间戳，format为需要转换成的日期格式
+	function formatTime(number, format) {
+		if(number) {
+			var time = new Date(number);
+			var newArr = [];
+			var formatArr = ['Y', 'M', 'D', 'h', 'm', 's'];
+			newArr.push(time.getFullYear());
+			newArr.push(formatNumber(time.getMonth() + 1));
+			newArr.push(formatNumber(time.getDate()));
+			newArr.push(formatNumber(time.getHours()));
+			newArr.push(formatNumber(time.getMinutes()));
+			newArr.push(formatNumber(time.getSeconds()));
+			for (var i in newArr) {
+				format = format.replace(formatArr[i], newArr[i]);
+			}
+			return format;
+		}
 	}
\ No newline at end of file
diff --git a/erp_web/pages/materials/material.html b/erp_web/pages/materials/material.html
index 50519218..7edeef85 100644
--- a/erp_web/pages/materials/material.html
+++ b/erp_web/pages/materials/material.html
@@ -586,7 +586,9 @@
                     },
                     {title: '类型', field: 'Type', width: 100},
                     {title: '数量', field: 'BasicNumber', width: 80},
-                    {title: '日期', field: 'OperTime', width: 180}
+                    {title: '日期', field: 'OperTime', width: 180, formatter: function (value) {
+                            return formatTime(value, 'Y-M-D h:m:s');
+                    }}
                 ]],
                 onLoadError: function () {
                     $.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
diff --git a/src/main/java/com/jsh/erp/controller/DepotItemController.java b/src/main/java/com/jsh/erp/controller/DepotItemController.java
index a0e4193c..a4e9dcb2 100644
--- a/src/main/java/com/jsh/erp/controller/DepotItemController.java
+++ b/src/main/java/com/jsh/erp/controller/DepotItemController.java
@@ -74,7 +74,7 @@ public class DepotItemController {
                 item.put("Number", d.getNumber()); //商品编号
                 item.put("Type", d.getNewtype()); //进出类型
                 item.put("BasicNumber", d.getBnum()); //数量
-                item.put("OperTime", d.getOtime()); //时间
+                item.put("OperTime", d.getOtime().getTime()); //时间
                 dataArray.add(item);
             }
         }