From aac8325e040609fce28a8897a22f0857ca6e5de1 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期二, 21 六月 2022 18:01:21 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
---
src/main/webapp/static/js/common.js | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 31ad23d..4645b46 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/jkwms";
+var baseUrl = "/lywms";
// 璇︽儏绐楀彛-楂樺害
var detailHeight = '80%';
@@ -14,7 +14,7 @@
// layer.close(loadIndex);
// 鏃堕棿 ==>> 瀛楃涓�
-function dateToStr(date) {
+function dateToStr(date, millisecond) {
var time = new Date(date);
var y = time.getFullYear();
var M = time.getMonth() + 1;
@@ -27,7 +27,18 @@
m = m < 10 ? ("0" + m) : m;
var s = time.getSeconds();
s = s < 10 ? ("0" + s) : s;
- return y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
+ if (!millisecond) {
+ return y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
+ } else {
+ var p = time.getMilliseconds();
+ if (p < 10) {
+ p = "00" + p;
+ }
+ if (p < 100) {
+ p = "0" + p;
+ }
+ return y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s + "," + p;
+ }
}
// 瀛楃涓� ===>> 鏃堕棿
@@ -214,7 +225,7 @@
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
--
Gitblit v1.9.1