From eb89350c3d558cf64d320ac3363fe7a9ee2dc0d0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 24 七月 2020 09:19:38 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/locMast/locMast.js |   44 ++++----------------------------------------
 1 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 3e4455b..a7a5278 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -21,7 +21,7 @@
             {type: 'checkbox', fixed: 'left'}
 //            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
             ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�',sort:true}
-            ,{field: 'locType$', align: 'center',title: '搴撲綅鐘舵��',width:200}
+            ,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��',width:200}
             ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
             // ,{field: 'pltType', align: 'center',title: ''}
             // ,{field: 'ctnType', align: 'center',title: ''}
@@ -40,8 +40,8 @@
             // ,{field: 'outEnable', align: 'center',title: ''}
             // ,{field: 'ioTime$', align: 'center',title: ''}
             // ,{field: 'firstTime$', align: 'center',title: ''}
-            // ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser', style: 'text-decoration: underline;cursor:pointer'}
-            // ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+            ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
             // ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'text-decoration: underline;cursor:pointer'}
             // ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
             // ,{field: 'errorTime$', align: 'center',title: ''}
@@ -120,7 +120,7 @@
                     type: 2,
                     title: '鏂板',
                     maxmin: true,
-                    area: [top.detailWidth, top.detailHeight],
+                    area: ['500px', top.detailHeight],
                     shadeClose: false,
                     content: 'locMast_detail.html',
                     success: function(layero, index){
@@ -286,42 +286,6 @@
                        success: function(layero, index){
                            $.ajax({
                                url: baseUrl+"/basWhs/"+ param +"/auth",
-                               headers: {'token': localStorage.getItem('token')},
-                               method: 'GET',
-                               success: function (res) {
-                                   if (res.code === 200){
-                                       setFormVal(layer.getChildFrame('#detail', index), res.data, true);
-                                       top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
-                                       layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
-                                       layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
-                                       layero.find('iframe')[0].contentWindow.layui.form.render('select');
-                                       layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
-                                   } else if (res.code === 403){
-                                       parent.location.href = "/";
-                                   }else {
-                                       layer.msg(res.msg)
-                                   }
-                               }
-                           })
-                       }
-                   });
-                }
-                break;
-            case 'locType':
-                var param = top.reObject(data).locType;
-                if (param === undefined) {
-                    layer.msg("鏃犳暟鎹�");
-                } else {
-                   layer.open({
-                       type: 2,
-                       title: '搴撲綅璇︽儏',
-                       maxmin: true,
-                       area: [top.detailWidth, top.detailHeight],
-                       shadeClose: false,
-                       content: '../basLocType/basLocType_detail.html',
-                       success: function(layero, index){
-                           $.ajax({
-                               url: baseUrl+"/basLocType/"+ param +"/auth",
                                headers: {'token': localStorage.getItem('token')},
                                method: 'GET',
                                success: function (res) {

--
Gitblit v1.9.1