From 5d2d9dbe286f6e079232e68d30bbd0530ccecaef Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期五, 28 八月 2020 17:59:57 +0800
Subject: [PATCH] #v2.0
---
src/main/webapp/static/js/common.js | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 3e2e453..8ef13c0 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 = "/gdasrs";
// 璇︽儏绐楀彛-楂樺害
var detailHeight = '80%';
@@ -104,11 +100,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 +153,37 @@
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: 'str3', align: 'center',title: '棰滆壊'}
+ ,{field: 'num1', align: 'center',title: '鏁伴噺'}
+ ,{field: 'str1', align: 'center',title: '鐗╂枡鍗曚綅'}
+ ,{field: 'str4', align: 'center',title: '瀹㈡埛'}
+]
+
+var detlCols = [
+ {field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О'}
+ ,{field: 'lgnum', align: 'center',title: '瑙勬牸'}
+ ,{field: 'color', align: 'center',title: '棰滆壊'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'altme', align: 'center',title: '鍗曚綅'}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ ,{field: 'bname', align: 'center',title: '瀹㈡埛'}
+]
+
--
Gitblit v1.9.1