From b5130c2e6d60c7f23e37f7c620375bc4e253caa3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 18 十月 2022 14:52:20 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/locMast/locMast.js |   50 +++++++++-----------------------------------------
 1 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index a3dfb23..98692a4 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -21,18 +21,18 @@
             {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: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
+            ,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��',width:200}
+            // ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
             // ,{field: 'pltType', align: 'center',title: ''}
             // ,{field: 'ctnType', align: 'center',title: ''}
             // ,{field: 'locSts', align: 'center',title: ''}
             // ,{field: 'sheetNo', align: 'center',title: ''}
             ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
-            ,{field: 'row1', align: 'center',title: '鎺�'}
-            ,{field: 'bay1', align: 'center',title: '鍒�'}
+            ,{field: 'row1', align: 'center',title: '鎺�', sort:true}
+            ,{field: 'bay1', align: 'center',title: '鍒�', sort:true}
             ,{field: 'lev1', align: 'center',title: '灞�', sort:true}
             ,{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+"'";
+                    var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' disabled table-index='"+row.LAY_TABLE_INDEX+"'";
                     if(row.fullPlt === 'Y'){html += " checked ";}
                     html += ">";
                     return html;
@@ -53,6 +53,9 @@
             // ,{field: 'barcode', align: 'center',title: ''}
             // ,{field: 'PdcType', align: 'center',title: ''}
             // ,{field: 'ctnNo', align: 'center',title: ''}
+            ,{field: 'locType1$', align: 'center',title: '楂樹綆绫诲瀷'}
+            // ,{field: 'locType2$', align: 'center',title: '瀹界獎绫诲瀷'}
+            // ,{field: 'locType3$', align: 'center',title: '杞婚噸绫诲瀷'}
 
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
         ]],
@@ -126,6 +129,7 @@
                     success: function(layero, index){
                         layer.getChildFrame('#data-detail-submit-edit', index).hide();
                     	clearFormVal(layer.getChildFrame('#detail', index));
+                        top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
                         layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
                     }
                 });
@@ -286,42 +290,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