From ce6b5be6c0e1544bcc66f9fce9efec3ced724d95 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 11 七月 2020 15:46:29 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/locMast/locMast.js |   43 +++++++++++++++++++++++--------------------
 1 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 3c0a7d3..a3dfb23 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -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){
@@ -204,22 +204,24 @@
                 break;
             case "init":
                 layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞堕噸缃簱浣�', formType: 1,   shadeClose: true}, function(pass, idx){
-                    if (pass === "123456") {
-                        layer.open({
-                            type: 1,
-                            title: '鍒濆鍖栧簱浣�',
-                            area: ["400px"],
-                            maxmin: true,
-                            shadeClose: true,
-                            content: $("#resetLocDiv"),
-                            success: function (layero, index) {
+                    http.get(baseUrl+"/locMast/init/pwd", {pwd: pass}, function (res) {
+                        if (res.data) {
+                            layer.open({
+                                type: 1,
+                                title: '鍒濆鍖栧簱浣�',
+                                area: ["400px"],
+                                maxmin: true,
+                                shadeClose: true,
+                                content: $("#resetLocDiv"),
+                                success: function (layero, index) {
 
-                            }
-                        })
-                    } else {
-                        layer.msg("鍙d护閿欒");
-                    }
-                    layer.close(idx);
+                                }
+                            })
+                        } else {
+                            layer.msg("鍙d护閿欒");
+                        }
+                        layer.close(idx);
+                    })
                 });
                 break;
         }
@@ -255,13 +257,13 @@
                     type: 2,
                     title: '淇敼',
                     maxmin: true,
-                    area: [top.detailWidth, top.detailHeight],
+                    area: ['500px', top.detailHeight],
                     shadeClose: false,
                     content: 'locMast_detail.html',
                     success: function(layero, index){
                         layer.getChildFrame('#data-detail-submit-save', index).hide();
                         setFormVal(layer.getChildFrame('#detail', index), data, false);
-                        top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
+                        // top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
                         top.convertDisabled(layer.getChildFrame('#locNo', index), true);
                         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');
@@ -430,6 +432,7 @@
                 if (res.code === 200){
                     layer.msg(res.msg);
                     layer.closeAll();
+                    tableReload(false);
                 } else if (res.code === 403){
                     parent.location.href = "/";
                 }else {

--
Gitblit v1.9.1