From 8e943b7104561c3b14cf223016698709c5ade4b5 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 15:37:26 +0800
Subject: [PATCH] #pda料箱组托和换码
---
src/main/webapp/static/js/pakStore/locCheckOut.js | 103 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 69 insertions(+), 34 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/locCheckOut.js b/src/main/webapp/static/js/pakStore/locCheckOut.js
index aeef93f..3c3026f 100644
--- a/src/main/webapp/static/js/pakStore/locCheckOut.js
+++ b/src/main/webapp/static/js/pakStore/locCheckOut.js
@@ -1,10 +1,17 @@
var locDetlLayerIdx;
var tableIns;
+var locDetlData = [];
function getCol() {
var cols = [
- {field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
+ {field: 'locNo', align: 'center',title: typeof I18n !== 'undefined' ? I18n.t('location_no') : '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
];
- cols.push.apply(cols, detlCols);
+ var dCols = [];
+ if (typeof getDetlCols === 'function') {
+ dCols = getDetlCols();
+ } else {
+ dCols = detlCols.slice();
+ }
+ cols.push.apply(cols, dCols);
return cols;
}
@@ -19,42 +26,52 @@
var admin = layui.admin;
var tableMerge = layui.tableMerge;
- tableIns = table.render({
- elem: '#chooseData',
- headers: {token: localStorage.getItem('token')},
- data: [],
- even: true,
- toolbar: '#toolbar',
- cellMinWidth: 50,
- cols: [getCol()],
- done: function(res, curr, count) {
- tableMerge.render(this);
- limit();
- getOutBound();
- }
- });
+ function initTable() {
+ tableIns = table.render({
+ elem: '#chooseData',
+ headers: {token: localStorage.getItem('token')},
+ data: [],
+ even: true,
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [getCol()],
+ text: {
+ none: typeof I18n !== 'undefined' ? I18n.t('no_data') : '鏆傛棤鐩稿叧鏁版嵁'
+ },
+ done: function(res, curr, count) {
+ tableMerge.render(this);
+ limit();
+ getOutBound();
+ if (typeof I18n !== 'undefined') {
+ I18n.updatePage();
+ }
+ }
+ });
+ }
+
+ if (typeof I18n !== 'undefined' && I18n.isReady()) {
+ initTable();
+ } else {
+ $(document).on('i18n:ready', function() {
+ initTable();
+ });
+ }
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(chooseData)', function (obj) {
- var data = locDetlData;
switch (obj.event) {
case 'outbound':
- if (data.length === 0){
- layer.msg('璇峰厛娣诲姞搴撲綅鐗╂枡');
+ if (locDetlData.length === 0){
+ layer.msg(typeof I18n !== 'undefined' ? I18n.t('please_add_check_inventory_first') : '璇峰厛娣诲姞鐩樼偣搴撳瓨', {icon: 2});
} else {
var staNo = $("#staNoSelect").val();
if (staNo === "" || staNo === null){
- layer.msg("璇烽�夋嫨鍑哄簱鍙�");
+ layer.msg(typeof I18n !== 'undefined' ? I18n.t('please_select_station') : "璇烽�夋嫨鐩樼偣绔�", {icon: 2});
return;
}
- var locDetls = [];
- data.forEach(function(elem) {
- // locDetls.push({locNo: elem.locNo, matnr: elem.matnr, count: elem.count}); // todo
- locDetls.push({locNo: elem.locNo, matnr: elem.matnr});
- });
let param = {
outSite: staNo,
- locDetls: locDetls
+ locDetls: locDetlData
}
$.ajax({
url: baseUrl+"/locCheck/out/start",
@@ -65,18 +82,33 @@
success: function (res) {
if (res.code === 200){
locDetlData = [];
- tableIns.reload({data: locDetlData,done:function (res) {limit();getOutBound();}});
- layer.msg(res.msg);
+ tableIns.reload({data: locDetlData});
+ layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 1});
} else if (res.code === 403){
top.location.href = baseUrl+"/";
} else {
- layer.msg(res.msg)
+ layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
}
}
});
}
break;
}
+ });
+
+ $(document).on('i18n:languageChanged', function() {
+ if (tableIns) {
+ tableIns.reload({
+ cols: [getCol()],
+ text: {
+ none: typeof I18n !== 'undefined' ? I18n.t('no_data') : '鏆傛棤鐩稿叧鏁版嵁'
+ }
+ });
+ } else {
+ initTable();
+ }
+ form.render('select');
+ I18n.updatePage();
});
// 鑾峰彇鍑哄簱鍙�
@@ -92,18 +124,21 @@
var template = Handlebars.compile(tpl);
var html = template(res);
$('#staNoSelect').append(html);
+ if (typeof I18n !== 'undefined') {
+ I18n.updatePage();
+ }
form.render('select');
} else if (res.code === 403){
top.location.href = baseUrl+"/";
}else {
- layer.msg(res.msg)
+ layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg)
}
}
})
}
$(document).on('click','#mat-query', function () {
- let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
+ let loadIndex = layer.msg(typeof I18n !== 'undefined' ? I18n.t('requesting') : '璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
locDetlLayerIdx = layer.open({
type: 2,
title: false,
@@ -122,10 +157,10 @@
// 娣诲姞琛ㄦ牸鏁版嵁
function addTableData(data) {
- for (var i=0;i<data.length;i++){
+ for (let i=0;i<data.length;i++){
let pass = false;
- for (var j=0;j<locDetlData.length;j++){
- if (data[i].matnr === locDetlData[j].matnr && data[i].locNo$ === locDetlData[j].locNo$) {
+ for (let j=0;j<locDetlData.length;j++){
+ if (data[i].matnr === locDetlData[j].matnr && data[i].batch === locDetlData[j].batch && data[i].locNo$ === locDetlData[j].locNo$) {
pass = true;
break;
}
--
Gitblit v1.9.1