From 7ebe16b9abbee8e884db27d2ec360f17455b14f2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 24 八月 2021 09:03:07 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/stoMan/stoQue.js |   63 +++++++++++++++++--------------
 1 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index bf2902c..8c946b5 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -7,33 +7,40 @@
     var layDate = layui.laydate;
     var form = layui.form;
 
+    layDate.render({
+        elem: '.layui-laydate-range'
+        ,type: 'datetime'
+        ,range: true
+    });
+
     // 鏁版嵁娓叉煋
     tableIns = table.render({
         elem: '#stoQue',
         headers: {token: localStorage.getItem('token')},
         url: baseUrl+'/locMast/list/auth',
         page: true,
-        limit: 10,
+        limit: 16,
+        limits: [16, 30, 50, 100, 200, 500],
         even: true,
         toolbar: '#toolbar',
         cellMinWidth: 50,
         cols: [[
             {type: 'checkbox'}
-            ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�',event: 'locDetl'}
-            ,{field: 'locType$', align: 'center',title: '搴撲綅鐘舵��', width: 180,event: 'locDetl'}
-            ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷',event: 'locDetl'}
-            ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿',event: 'locDetl'}
-            ,{field: 'row1', align: 'center',title: '鎺�',event: 'locDetl'}
-            ,{field: 'bay1', align: 'center',title: '鍒�',event: 'locDetl'}
-            ,{field: 'lev1', align: 'center',title: '灞�',event: 'locDetl'}
-            ,{field: 'fullPlt', align: 'center',title: '婊℃澘',event: 'locDetl', templet:function(row){
+            ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
+            ,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��', width: 180, style: 'color: #8E2323'}
+            // ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
+            ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
+            ,{field: 'row1', align: 'center',title: '鎺�'}
+            ,{field: 'bay1', align: 'center',title: '鍒�'}
+            ,{field: 'lev1', align: 'center',title: '灞�'}
+            ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
                     var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
                     if(row.fullPlt === 'Y'){html += " checked ";}
                     html += "disabled='disabled' >";
                     return html;
                 },width:80}
-            ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'locDetl'}
-            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180,event: 'locDetl'}
+            ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
+            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180}
             ,{ fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}
         ]],
         request: {
@@ -53,7 +60,7 @@
         },
         done: function(res, curr, count) {
             if (res.code === 403) {
-                top.location.href = "/";
+                top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
             limit();
@@ -86,7 +93,7 @@
             },
             done: function (res, curr, count) {
                 if (res.code === 403) {
-                    top.location.href = "/";
+                    top.location.href = baseUrl+"/";
                 }
                 pageCurr=curr;
                 limit();
@@ -103,7 +110,7 @@
                 alert("杩樻病鍋�");
                 break;
             case 'exportData':
-                layer.confirm('纭畾瀵煎嚭Excel鍚�', function(){
+                layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
                     var titles=[];
                     var fields=[];
                     obj.config.cols[0].map(function (col) {
@@ -132,7 +139,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)
                             }
@@ -150,11 +157,11 @@
             // 鏌ョ湅鏄庣粏
             case 'locDetl':
                 // locDetl(data.locNo);
-                if (data.locType.trim() === ''
-                    || data.locType.trim() === 'S'
-                    || data.locType.trim() === 'D'
-                    || data.locType.trim() === 'O')  {
-                    layer.msg("姝ゅ簱浣嶇殑鐘舵�佷笉瀛樺湪鐗╂枡");
+                if (data.locSts.trim() === ''
+                    || data.locSts.trim() === 'S'
+                    || data.locSts.trim() === 'D'
+                    || data.locSts.trim() === 'O')  {
+                    layer.msg("姝ゅ簱浣嶇殑鐘舵�佷笉瀛樺湪浜у搧");
                     return;
                 }
                 locDetlToLayer(data.locNo);
@@ -162,12 +169,12 @@
         }
     });
 
-    // iframe鐗╂枡璇︽儏
+    // iframe浜у搧璇︽儏
     function locDetlToLayer(val) {
         locNo = val;
         layer.open({
             type: 2,
-            title: '宸ヤ綔妗f槑缁�',
+            title: '搴撳瓨鏄庣粏',
             maxmin: true,
             area: [top.detailWidth, top.detailHeight],
             shadeClose: true,
@@ -176,7 +183,7 @@
             }
         });
     }
-    // div鐗╂枡璇︽儏
+    // div浜у搧璇︽儏
     var pageCur;
     function locDetl(locNo){
         $('#detlTable').css("display", 'block');
@@ -194,12 +201,12 @@
             cols: [[
                 // {type: 'checkbox'}
                 {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
-                ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
+                ,{field: 'matnr', align: 'center',title: '浜у搧'}
                 ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
                 ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
                 // ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
-                ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
-                ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
+                ,{field: 'zmatid', align: 'center',title: '浜у搧鏍囩ID'}
+                ,{field: 'maktx', align: 'center',title: '浜у搧鎻忚堪'}
                 ,{field: 'werks', align: 'center',title: '宸ュ巶'}
                 ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
                 ,{field: 'altme', align: 'center',title: '鍗曚綅'}
@@ -223,7 +230,7 @@
             },
             done: function(res, curr, count) {
                 if (res.code === 403) {
-                    top.location.href = "/";
+                    top.location.href = baseUrl+"/";
                 }
                 pageCur=curr;
                 form.on('checkbox(tableCheckbox)', function (data) {
@@ -265,7 +272,7 @@
             },
             done: function (res, curr, count) {
                 if (res.code === 403) {
-                    top.location.href = "/";
+                    top.location.href = baseUrl+"/";
                 }
                 pageCurr=curr;
                 if (count === 1){

--
Gitblit v1.9.1