Merge branch 'master' of yb/kmall-pt-general into master

kmall-admin/src/main/webapp/js/common.js

@@ -481,4 +481,24 @@ function hasPermission(perm) {
         }
     }
     return false;
-}
+}
+
+function dateFormat(fmt, date) {
+    let ret;
+    const opt = {
+        "Y+": date.getFullYear().toString(),        // 年
+        "m+": (date.getMonth() + 1).toString(),     // 月
+        "d+": date.getDate().toString(),            // 日
+        "H+": date.getHours().toString(),           // 时
+        "M+": date.getMinutes().toString(),         // 分
+        "S+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+    };
+    for (let k in opt) {
+        ret = new RegExp("(" + k + ")").exec(fmt);
+        if (ret) {
+            fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+        };
+    };
+    return fmt;
+}

kmall-admin/src/main/webapp/js/shop/storetransferinventoryorder.js

@@ -1,4 +1,5 @@
 $(function () {
+	new Date();
     $("#jqGrid").jqGrid({
         url: '../storetransferinventoryorder/list',
         datatype: "json",
@@ -24,9 +25,13 @@ $(function () {
 				return ret;
 			}},
 			{label: '备注', name: 'remark', index: 'remark', width: 80},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
+			{label: '创建时间', name: 'createTime', index: 'create_time',formatter: function (val) {
+				return dateFormat("YYYY-mm-dd HH:MM:SS", new Date(val));
+			}, width: 80},
 			{label: '创建人', name: 'createSn', index: 'create_sn', width: 80},
-			{label: '修改时间', name: 'modifyTime', index: 'modify_time', width: 80},
+			{label: '修改时间', name: 'modifyTime', index: 'modify_time',formatter: function (val) {
+					return dateFormat("YYYY-mm-dd HH:MM:SS", new Date(val));
+			}, width: 80},
 			{label: '修改人', name: 'modifySn', index: 'modify_sn', width: 80}],
 		viewrecords: true,
         height: 550,

kmall-admin/src/main/webapp/js/shop/storetransferinventoryorderdetail.js

@@ -10,7 +10,9 @@ $(function () {
 			{label: '备注', name: 'remark', index: 'remark', width: 80},
 			{label: '创建人', name: 'createSn', index: 'create_sn', width: 80},
 			{label: '修改时间', name: 'modifyTime', index: 'modify_time', width: 80},
-			{label: '修改人', name: 'modifySn', index: 'modify_sn', width: 80}],
+			{label: '修改人', name: 'modifySn', index: 'modify_sn',formatter: function (val) {
+				return dateFormat("YYYY-mm-dd HH:MM:SS", new Date(val));
+			}, width: 80}],
 		viewrecords: true,
         height: 550,
         rowNum: 10,