From ece092e4c5d4e968b424421c6f78b065bbb0bd73 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 24 八月 2024 15:13:10 +0800
Subject: [PATCH] #修复目标站显示错误问题
---
src/main/webapp/static/js/pakStore/locMove.js | 147 +++++++++++++++++--------------------------------
1 files changed, 51 insertions(+), 96 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/locMove.js b/src/main/webapp/static/js/pakStore/locMove.js
index 2516b44..542f6b9 100644
--- a/src/main/webapp/static/js/pakStore/locMove.js
+++ b/src/main/webapp/static/js/pakStore/locMove.js
@@ -1,11 +1,20 @@
var pageCurr = 0;
var tableIns;
-layui.use(['table','laydate', 'form'], function() {
+function getCol() {
+ var cols = [
+ {field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
+ ];
+ cols.push.apply(cols, detlCols);
+ return cols;
+}
+
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'tableMerge'], function() {
var table = layui.table;
var $ = layui.jquery;
- var layer = layui.layer;
- var layDate = layui.laydate;
var form = layui.form;
+ var tableMerge = layui.tableMerge;
// 鏁版嵁娓叉煋
tableIns = table.render({
@@ -14,24 +23,11 @@
// url: baseUrl+'/locDetl/list/auth',
data:[],
page: true,
- limit: 10,
- skin: 'line',
+ limit: 16,
+ limits: [16, 50, 100, 200, 500],
even: true,
cellMinWidth: 50,
- cols: [[
- {type: 'checkbox'}
- ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
- ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
- ,{field: 'tbnum', 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: '鍗曚綅'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
- ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
- ]],
+ cols: [getCol()],
request: {
pageName: 'curr',
pageSize: 'limit'
@@ -48,44 +44,41 @@
statusCode: 200
},
done: function(res, curr, count) {
+ tableMerge.render(this);
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
- form.on('checkbox(tableCheckbox)', function (data) {
- var _index = $(data.elem).attr('table-index')||0;
- if(data.elem.checked){
- res.data[_index][data.value] = 'Y';
- }else{
- res.data[_index][data.value] = 'N';
- }
- });
+ clearSelect();
}
});
});
// 鎼滅储搴撲綅鐗╂枡
-function getLoc() {
- let locNo = $("#locNo\\$").val();
- if (locNo === undefined || locNo === null || locNo === "") {
- layer.msg("璇烽�夋嫨搴撲綅鍙�");
- $('.search-input').css("border-color", "red");
- setTimeout(function () {
- $('.search-input').css("border-color", "#b8b8b8");
- }, 2000);
- return;
- }
+function getLoc(el) {
tableIns.reload({
url: baseUrl+'/locDetl/list/auth'
- , where: {loc_no: locNo}
+ , where: {loc_no: el.value}
, done:function (res) {
limit();
+ clearSelect();
+ // 鑾峰彇鍚屼竴鍫嗗灈鏈虹殑绌哄簱浣�
+ http.post(baseUrl + "/group/empty/stock", {sourceLocNo: el.value}, function (res) {
+ if (res.data != null) {
+ var tpl = $("#emptyLocStock").html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ $('#targetLocNo').append(html);
+ layui.form.render('select');
+ }
+ });
}
});
}
+// 绉诲簱鍚姩
function locMove() {
var sourceLocNo = $("#sourceLocNo").val();
var targetLocNo = $("#targetLocNo").val();
@@ -93,16 +86,16 @@
$("#sourceLocNo").css("border-color", "red");
setTimeout(function () {
$("#sourceLocNo").css("border-color", "#b8b8b8");
- }, 2000);
- layer.msg("璇疯緭鍏ュ簱浣�");
+ }, 1000);
+ layer.msg("璇疯緭鍏ユ簮搴撲綅");
return;
}
if (targetLocNo === null || targetLocNo === "") {
- $("#targetLocNo").css("border-color", "red");
+ $(".layui-select-title .layui-input").css("border-color", "red");
setTimeout(function () {
- $("#targetLocNo").css("border-color", "#b8b8b8");
- }, 2000);
- layer.msg("璇疯緭鍏ュ簱浣�");
+ $(".layui-select-title .layui-input").css("border-color", "#b8b8b8");
+ }, 1000);
+ layer.msg("璇疯緭鍏ョ洰鏍囧簱浣�");
return;
}
$.ajax({
@@ -116,7 +109,17 @@
method: 'POST',
success: function (res) {
if (res.code === 200) {
-
+ $("#sourceLocNo").val("");
+ $("#targetLocNo").empty();
+ layui.form.render('select');
+ tableIns.reload({
+ data: [],
+ url: '',
+ done:function (res) {
+ limit();clearSelect();
+ }
+ });
+ layer.msg(res.msg);
} else if (res.code === 403) {
top.location.href = baseUrl + "/";
} else {
@@ -124,57 +127,9 @@
}
}
})
- // layer.open({
- // title: "搴撲綅绉昏浆",
- // closeBtn: 0,
- // skin: 'layui-layer-lan',
- // offset: '180px',
- // type: 1,
- // shadeClose: true,
- // content: $('#locMoveWindow'),
- // area: ['40rem', '18rem'],
- // btn: ['纭畾', '鍏抽棴'],
- // success: function (layero, index) {
- //
- // }
- //
- // })
}
-var tips;
-function locStatus(el) {
- let val = el.value;
- if (val === null|| val === ""){
- return;
- }
- $.ajax({
- url: baseUrl+"/locMast/"+val+"/auth",
- headers: {'token': localStorage.getItem('token')},
- dataType:'json',
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var status;
- if (res.data != null) {
- status = res.data.locType$;
- } else {
- status = "鏈壘鍒板簱浣�";
- }
- tips = layer.tips(
- "<span style='color:#333;'>"+status+"</span>",
- el,
- {
- tipsMore: true,
- area: ['150px'],
- tips: [3,'#fff'],
- time:0
- ,maxWidth:500
- });
- } else if (res.code === 403) {
- top.location.href = baseUrl+"/";
- } else {
- layer.msg(res.msg);
- }
- }
- });
+function clearSelect() {
+ $("#targetLocNo").empty();
+ layui.form.render('select');
}
--
Gitblit v1.9.1