From e235d483194ab95bf62d1cfd343a172ff12781e8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 13 四月 2024 14:58:24 +0800
Subject: [PATCH] 聚乳酸库存明细 1.批号与包号排序需同步,增加水分,挥发段,分解段搜索,按照最大最小范围,包装类型跟托盘类型增加删选功能。 2.已经出库的物料,在明细表里面隐藏掉,但是数据保留。 3.增加二个跟聚乳酸一样的明细表,分改性树脂,纯树脂库存明细表,所有功能跟总的聚乳酸库存明细表一样 4.明细表整体框架调整一下,相对压缩一下,搜索功能框看看能否弄成二行 5.表里面的包装类型与托盘类型这些不主要的信息放到指标后面 6.关于分包再处理,举例原有系统里面销售选定的10包物料,再二次重新弄后,车间打印新标签,使用新的包号,在明细表里面体现原有所有指标信息及批号,包号,牌号跟新的关联 7.出库时候时间可选历史,不要就只能出现4天 8.提取库存里面需要有最大包号跟最小包号选择

---
 src/main/webapp/static/js/userLogin/userLogin.js |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/static/js/userLogin/userLogin.js b/src/main/webapp/static/js/userLogin/userLogin.js
index 69f8a69..f0907ef 100644
--- a/src/main/webapp/static/js/userLogin/userLogin.js
+++ b/src/main/webapp/static/js/userLogin/userLogin.js
@@ -10,9 +10,10 @@
     tableIns = table.render({
         elem: '#userLogin',
         headers: {token: localStorage.getItem('token')},
-        url: '/userLogin/list/auth',
+        url: baseUrl+'/userLogin/list/auth',
         page: true,
         limit: 16,
+        limits: [16, 30, 50, 100, 200, 500],
         toolbar: '#toolbar',
         cellMinWidth: 50,
         cols: [[
@@ -41,7 +42,7 @@
         },
         done: function(res, curr, count) {
             if (res.code === 403) {
-                top.location.href = "/";
+                top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
             limit();
@@ -63,7 +64,7 @@
             },
             done: function (res, curr, count) {
                 if (res.code === 403) {
-                    top.location.href = "/";
+                    top.location.href = baseUrl+"/";
                 }
                 pageCurr=curr;
                 limit();
@@ -108,7 +109,7 @@
                 } else {
                     layer.confirm('纭畾鍒犻櫎'+(ids.length===1?'姝�':ids.length)+'鏉℃暟鎹悧', function(){
                         $.ajax({
-                            url: "/userLogin/delete/auth",
+                            url: baseUrl+"/userLogin/delete/auth",
                             headers: {'token': localStorage.getItem('token')},
                             data: {ids: ids},
                             method: 'POST',
@@ -118,7 +119,7 @@
                                     layer.closeAll();
                                     tableReload(false);
                                 } else if (res.code === 403){
-                                    top.location.href = "/";
+                                    top.location.href = baseUrl+"/";
                                 } else {
                                     layer.msg(res.msg)
                                 }
@@ -128,7 +129,7 @@
                 }
                 break;
             case 'exportData':
-                layer.confirm('纭畾瀵煎嚭Excel鍚�', function() {
+                layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function() {
                     var titles = [];
                     var fields = [];
                     obj.config.cols[0].map(function (col) {
@@ -146,7 +147,7 @@
                         'fields': fields
                     };
                     $.ajax({
-                        url: "/userLogin/export/auth",
+                        url: baseUrl+"/userLogin/export/auth",
                         headers: {'token': localStorage.getItem('token')},
                         data: JSON.stringify(param),
                         dataType: 'json',
@@ -157,7 +158,7 @@
                             if (res.code === 200) {
                                 table.exportFile(titles, res.data, 'xls');
                             } else if (res.code === 403) {
-                                top.location.href = "/";
+                                top.location.href = baseUrl+"/";
                             } else {
                                 layer.msg(res.msg)
                             }
@@ -221,7 +222,7 @@
                         content: '../user/user_detail.html',
                         success: function(layero, index){
                             $.ajax({
-                                url: "/user/"+ param +"/auth",
+                                url: baseUrl+"/user/"+ param +"/auth",
                                 headers: {'token': localStorage.getItem('token')},
                                 method: 'GET',
                                 success: function (res) {
@@ -259,7 +260,7 @@
 
         };
         $.ajax({
-            url: "/userLogin/edit/auth",
+            url: baseUrl+"/userLogin/edit/auth",
             headers: {'token': localStorage.getItem('token')},
             data: top.reObject(data),
             method: 'POST',
@@ -271,7 +272,7 @@
                         $(this).val("");
                     });
                 } else if (res.code === 403){
-                    top.location.href = "/";
+                    top.location.href = baseUrl+"/";
                 }else {
                     layer.msg(res.msg)
                 }
@@ -318,7 +319,7 @@
         },
         done: function (res, curr, count) {
             if (res.code === 403) {
-                top.location.href = "/";
+                top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
             if (res.data.length === 0 && count !== 0) {

--
Gitblit v1.9.1