From f8f88d218a90f7264465cc575a350792354402a2 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 11 七月 2024 12:42:22 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/webapp/static/js/common.js | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wms/src/main/webapp/static/js/common.js b/zy-asrs-wms/src/main/webapp/static/js/common.js
index 8cbf20d..f16f134 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/common.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/jkwms";
+var baseUrl = "/wms";
// 璇︽儏绐楀彛-楂樺害
var detailHeight = '80%';
@@ -77,7 +77,10 @@
}
var param = (child?parent.window:window).location.href.split("?")[1];
if (null != param) {
- var resourceId = param.split("=")[1];
+ var resourceId = getQueryVariable('resourceId')
+ if (resourceId == false) {
+ resourceId = param.split("=")[1];
+ }
$.ajax({
url: baseUrl+"/power/menu/"+resourceId+"/auth",
headers: {'token': localStorage.getItem('token')},
@@ -187,7 +190,7 @@
// ,{field: 'tagId$', align: 'center',title: '鎵�灞炲綊绫�'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
// ,{field: 'name', align: 'center',title: '鍒悕'}
- ,{field: 'specs', 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}
@@ -228,8 +231,8 @@
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
-
- ,{field: 'specs', align: 'center',title: '閰嶇疆'}
+ ,{field: 'fullPlt$', 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}
@@ -257,3 +260,13 @@
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
]
+function getQueryVariable(variable)
+{
+ var query = window.location.search.substring(1);
+ var vars = query.split("&");
+ for (var i=0;i<vars.length;i++) {
+ var pair = vars[i].split("=");
+ if(pair[0] == variable){return pair[1];}
+ }
+ return(false);
+}
--
Gitblit v1.9.1