From c6bc9682699d3e10dc06a3d6641a70179e64f9a1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 14 九月 2021 08:32:11 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs
---
src/main/webapp/static/js/locMast/locMast.js | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 2c8959e..ea9e9d3 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -5,6 +5,7 @@
var layer = layui.layer;
var layDate = layui.laydate;
var form = layui.form;
+ var dropdown = layui.dropdown
// 鏁版嵁娓叉煋
tableIns = table.render({
@@ -20,7 +21,7 @@
cols: [[
{type: 'checkbox', fixed: 'left'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
- ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�',sort:true}
+ ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�', sort:true}
,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��',width:200}
// ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
// ,{field: 'pltType', align: 'center',title: ''}
@@ -50,12 +51,12 @@
// ,{field: 'scWeight', align: 'center',title: ''}
// ,{field: 'invWh', align: 'center',title: ''}
// ,{field: 'mk', align: 'center',title: ''}
- // ,{field: 'barcode', align: 'center',title: ''}
+ ,{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: '杞婚噸绫诲瀷'}
+ // ,{field: 'locType2$', align: 'center',title: '瀹界獎绫诲瀷'}
+ // ,{field: 'locType3$', align: 'center',title: '杞婚噸绫诲瀷'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
]],
@@ -90,6 +91,7 @@
});
}
});
+
// 鐩戝惉鎺掑簭浜嬩欢
table.on('sort(locMast)', function (obj) {
@@ -207,6 +209,7 @@
});
break;
case "init":
+ $('#initDo').removeClass("layui-btn-disabled")
layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞堕噸缃簱浣�', formType: 1, shadeClose: true}, function(pass, idx){
http.get(baseUrl+"/locMast/init/pwd", {pwd: pass}, function (res) {
if (res.data) {
@@ -390,13 +393,16 @@
// 鍒濆鍖栦繚瀛�
form.on('submit(initDo)', function (data) {
+ // layer.load(1, {shade: [0.5,'#000']});
+ $('#initDo').addClass("layui-btn-disabled").attr("disabled", "disabled");
$.ajax({
url: baseUrl+"/locMast/init/auth",
headers: {'token': localStorage.getItem('token')},
data: data.field,
method: 'POST',
- async: false,
+ // async: false,
success: function (res) {
+ // layer.closeAll('loading');
if (res.code === 200){
layer.msg(res.msg);
layer.closeAll();
--
Gitblit v1.9.1