From c1cd979992d45347dcbca48e24e6502db7a3831b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 31 三月 2022 10:19:53 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/common.js | 63 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 3e2e453..17e7e8f 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,8 +1,4 @@
-// 鐢熶骇
-// var baseUrl = "/asrs";
-// 娴嬭瘯
-var baseUrl = "";
-
+var baseUrl = "/jkwms";
// 璇︽儏绐楀彛-楂樺害
var detailHeight = '80%';
@@ -13,6 +9,9 @@
function isEmpty(obj){
return typeof obj == "undefined" || obj == null || obj === "";
}
+
+// let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
+// layer.close(loadIndex);
// 鏃堕棿 ==>> 瀛楃涓�
function dateToStr(date) {
@@ -104,11 +103,17 @@
url: url,
data: data,
dataType: 'json',
- header: {'Content-Type': 'application/json'},
+ header: {'token': localStorage.getItem('token')},
timeout: 10000,
cache: false,
- success: function (result) {
- callback(result);
+ 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) {
@@ -151,3 +156,45 @@
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: 'matNo', align: 'center',title: '鍟嗗搧缂栧彿'}
+ ,{field: 'matName', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'str2', align: 'center',title: '瑙勬牸'}
+ ,{field: 'str5', align: 'center',title: '鍨嬪彿'}
+ ,{field: 'str6', align: 'center',title: '鎵瑰彿', hide: true}
+ ,{field: 'str1', align: 'center',title: '鍗曚綅'}
+ ,{field: 'barcode', align: 'center',title: '鏉＄爜'}
+ ,{field: 'str7', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
+ ,{field: 'str3', align: 'center',title: '鍝侀」鏁�', hide: true}
+ ,{field: 'str4', align: 'center',title: '瀹㈡埛鍚嶇О', hide: true}
+]
+
+var detlCols = [
+ {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'lgnum', align: 'center',title: '瑙勬牸'}
+ ,{field: 'type', align: 'center',title: '鍨嬪彿', hide: true}
+ ,{field: 'supplier', align: 'center',title: '鎵瑰彿', hide: true}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'altme', align: 'center',title: '鍗曚綅'}
+ ,{field: 'color', align: 'center',title: '鏉＄爜'}
+ ,{field: 'warehouse', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
+ ,{field: 'brand', align: 'center',title: '鍝侀」鏁�', hide: true}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ ,{field: 'bname', align: 'center',title: '瀹㈡埛鍚嶇О', hide: true}
+]
+
--
Gitblit v1.9.1