From 8d5c70aef9cbacbcc412d73c4b730e21f94e6514 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 30 六月 2025 09:04:10 +0800
Subject: [PATCH] 1
---
src/main/webapp/static/wms/js/locMast/locMast.js | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/static/wms/js/locMast/locMast.js b/src/main/webapp/static/wms/js/locMast/locMast.js
index c67cc91..4b77865 100644
--- a/src/main/webapp/static/wms/js/locMast/locMast.js
+++ b/src/main/webapp/static/wms/js/locMast/locMast.js
@@ -1,11 +1,11 @@
var pageCurr;
-layui.use(['table','laydate', 'form'], function(){
+layui.use(['table','laydate', 'form','upload','layer'], function(){
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
var layDate = layui.laydate;
var form = layui.form;
-
+ var upload = layui.upload;
// 鏁版嵁娓叉煋
tableIns = table.render({
elem: '#locMast',
@@ -28,10 +28,11 @@
// ,{field: 'ctnType', align: 'center',title: ''}
// ,{field: 'locSts', align: 'center',title: ''}
// ,{field: 'sheetNo', align: 'center',title: ''}
- ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
+ // ,{field: 'crnNo', 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: 'barcode', 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' disabled table-index='"+row.LAY_TABLE_INDEX+"'";
// if(row.fullPlt === 'Y'){html += " checked ";}
@@ -54,7 +55,7 @@
// ,{field: 'barcode', align: 'center',title: ''}
// ,{field: 'PdcType', align: 'center',title: ''}
// ,{field: 'ctnNo', align: 'center',title: ''}
- ,{field: 'locType1$', align: 'center',title: '搴撲綅绫诲瀷'}
+ // ,{field: 'locType1$', align: 'center',title: '搴撲綅绫诲瀷'}
// ,{field: 'locType2$', align: 'center',title: '瀹界獎绫诲瀷'}
// ,{field: 'locType3$', align: 'center',title: '杞婚噸绫诲瀷'}
@@ -91,6 +92,28 @@
});
}
});
+
+ upload.render({
+ elem: '#uploadExcel', // 缁戝畾鍏冪礌
+ url: baseUrl+'/importCrnErr', // 涓婁紶鎺ュ彛锛屾浛鎹负浣犵殑鍚庣鎺ュ彛
+ headers:{'token': localStorage.getItem('token')},
+ accept: 'file', // 鍏佽涓婁紶鐨勬枃浠剁被鍨�
+ exts: 'xls|xlsx', // 鍏佽涓婁紶鐨勬枃浠跺悗缂�
+ done: function(res){
+ // 涓婁紶瀹屾瘯鍥炶皟
+ if(res.code === 200){
+ layer.msg(res.msg);
+ console.log('鏂囦欢鏁版嵁:', res.data);
+ } else {
+ layer.msg(res.msg || '涓婁紶澶辫触');
+ }
+ },
+ error: function(){
+ // 璇锋眰寮傚父鍥炶皟
+ layer.msg('涓婁紶澶辫触锛岃閲嶈瘯');
+ }
+ });
+
// 鐩戝惉鎺掑簭浜嬩欢
table.on('sort(locMast)', function (obj) {
@@ -459,6 +482,9 @@
barcode: $('#barcode').val(),
PdcType: $('#PdcType').val(),
ctnNo: $('#ctnNo').val(),
+ containerCode:$('#containerCode').val(),
+ containerTypeCode:$('#containerTypeCode').val(),
+ emptyContainer:$('#emptyContainer').val(),
};
$.ajax({
--
Gitblit v1.9.1