From 86d5b3bb16490028b3f6617e05eec35f5eb473a1 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 13 九月 2022 14:51:03 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/common.js | 184 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 178 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index e06cccb..f65aef1 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,5 +1,5 @@
-// var baseUrl = "http://127.0.0.1:8080/asrs";
-var baseUrl = "/asrs";
+var baseUrl = "/lywms";
+
// 璇︽儏绐楀彛-楂樺害
var detailHeight = '80%';
// 璇︽儏绐楀彛-瀹藉害
@@ -10,8 +10,11 @@
return typeof obj == "undefined" || obj == null || obj === "";
}
+// let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
+// layer.close(loadIndex);
+
// 鏃堕棿 ==>> 瀛楃涓�
-function dateToStr(date) {
+function dateToStr(date, millisecond) {
var time = new Date(date);
var y = time.getFullYear();
var M = time.getMonth() + 1;
@@ -24,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;
+ }
}
// 瀛楃涓� ===>> 鏃堕棿
@@ -76,12 +90,170 @@
(child?parent:window).$('.'+res.data[i].code).css("display", "inline-block");
}
} else if (res.code === 403){
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
} else {
layer.msg(res.msg)
}
}
});
}
-
}
+
+
+// http璇锋眰
+!function (n) {
+ "use strict";
+
+ var http = {
+ toAjax: function (params) {
+ $.ajax(params);
+ },
+ get: function (url, data, callback) {
+ http.toAjax({
+ method: 'GET',
+ url: url,
+ data: data,
+ dataType: 'json',
+ header: {'token': localStorage.getItem('token')},
+ timeout: 10000,
+ cache: false,
+ success: function (res) {
+ if (res.code === 200){
+ callback(res);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg);
+ }
+ },
+ error: function (res, type) {
+
+ }
+ })
+ },
+ // 榛樿琛ㄥ崟
+ post: function (url, param, callback, type) {
+ var headerType;
+ if (type === 'json') {
+ headerType = {'Content-Type': 'application/json'}
+ } else {
+ headerType = {'Content-Type': 'application/x-www-form-urlencoded'}
+ }
+ headerType['token'] = localStorage.getItem('token');
+ http.toAjax({
+ method: 'POST',
+ url: url,
+ data: param,
+ dataType: 'json',
+ headers: headerType,
+ timeout: 10000,
+ cache: false,
+ success: function (res) {
+ if (res.code === 200){
+ callback(res);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg);
+ }
+ },
+ error: function (res, type) {
+
+ }
+ })
+ },
+ };
+ "function" == typeof define && define.amd ? define(function () {
+ return http
+ }) : "object" == typeof module && module.exports ? module.exports = http : n.http = http
+}(this);
+
+/*************************************************************************************************************/
+/********************************************** 鐗╂枡涓氬姟鎶借薄 ***************************************************/
+/*************************************************************************************************************/
+
+function arrRemove(arr, key, val) {
+ for(var i=arr.length-1; i>=0; i--){
+ if(arr[i][key] === val){
+ arr.splice(i,1);
+ }
+ }
+}
+
+var matCols = [
+ {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', width: 180}
+ // {field: 'id', align: 'center',title: 'ID'}
+ // ,{field: 'uuid', align: 'center',title: '缂栧彿'}
+ // ,{field: 'tagId$', align: 'center',title: '鎵�灞炲綊绫�'}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
+ // ,{field: 'name', align: 'center',title: '鍒悕'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: false}
+ ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
+ ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+ ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
+ ,{field: 'sku', align: 'center',title: 'sku', hide: true}
+ ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
+ ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
+ ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+ ,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
+ ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
+ ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
+ ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
+ ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: false}
+ ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: false}
+ ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: false}
+ ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: false}
+ ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
+ ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
+ ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
+ ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
+ ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
+ ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
+ ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
+ ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+ // ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ // ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
+ // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
+]
+
+var detlCols = [
+ {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: false}
+ ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
+ ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+ ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
+ ,{field: 'sku', align: 'center',title: 'sku', hide: true}
+ ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
+ ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
+ ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+ ,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
+ ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
+ ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
+ ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
+ ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: false}
+ ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: false}
+ ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: false}
+ ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: false}
+ ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
+ ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
+ ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
+ ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
+ ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
+ ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
+ ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
+ ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+]
+
--
Gitblit v1.9.1