From 0b5dc6887e46ac956b5b783c70244d40589fbd25 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 13 十一月 2025 16:11:21 +0800
Subject: [PATCH] *
---
src/main/webapp/static/js/locDetl/locDetl.js | 136 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 116 insertions(+), 20 deletions(-)
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 27fb1c1..18b853c 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -1,4 +1,53 @@
var pageCurr;
+function getCol() {
+ var cols = [
+ {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'},
+ {field: 'matnr', align: 'center',title: '瑙勬牸', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
+ ,{field: 'batch', align: 'center',title: '绠卞彿', width: 300, sort:true}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ ,{field: 'specs', align: 'center',title: '鎺ュご'}
+ ,{field: 'model', align: 'center',title: '鍗峰彿', hide: false}
+ ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
+ ,{field: 'brand', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true}
+ ,{field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+ ,{field: 'price', align: 'center',title: '闀垮害', hide: false}
+ ,{field: 'sku', align: 'center',title: 'sku', hide: true}
+ ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
+ ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
+ ,{field: 'origin', align: 'center',title: '鏈ㄧ浣嶇疆', hide: false}
+ ,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
+ ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
+ ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
+ ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
+ ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
+ // ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
+ ,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: false}
+ ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
+ ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
+ // ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
+ // ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
+ // ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
+ // ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
+ // ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
+ // ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
+ ,{field: 'danger$', align: 'center',title: '寰呭垽', hide: false}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false}
+
+ ];
+
+ // cols.push.apply(cols, detlCols);
+ cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
+
+ )
+ return cols;
+}
+
layui.use(['table','laydate', 'form'], function(){
var table = layui.table;
var $ = layui.jquery;
@@ -17,25 +66,7 @@
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
- cols: [[
- {type: 'checkbox'}
-// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
- ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
- // ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�', width:80}
- // ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
- // ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
- // ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID', width:200}
- ,{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'}
- // ,{field: 'memo', align: 'center',title: '澶囨敞'}
-
- // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
- ]],
+ cols: [getCol()],
request: {
pageName: 'curr',
pageSize: 'limit'
@@ -162,6 +193,7 @@
'locDetl': exportData,
'fields': fields
};
+ var loadIndex = layer.msg('姝ｅ湪瀵煎嚭...', {icon: 16, shade: 0.01, time: false});
$.ajax({
url: baseUrl+"/locDetl/export/auth",
headers: {'token': localStorage.getItem('token')},
@@ -170,6 +202,7 @@
contentType:'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
+ layer.close(loadIndex);
layer.closeAll();
if (res.code === 200) {
table.exportFile(titles,res.data,'xls');
@@ -226,6 +259,65 @@
layero.find('iframe')[0].contentWindow.layui.form.render('select');
layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
}
+ });
+ break;
+ case 'edit':
+ var model = top.reObject(data).model;
+ if (model === undefined) {
+ layer.msg("鏃犳暟鎹�");
+ }
+ this.$confirm(
+ '纭鍚慚ES鏍″噯鏄惁鍚堟牸锛�',
+ '纭淇敼',
+ {
+ confirmButtonText: '纭',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ dangerouslyUseHTMLString: true
+ }
+ ).then(() => {
+ // 璋冪敤鍚庡彴API涓婃姤鏁版嵁
+ $.ajax({
+ url: baseUrl + "/actual/shipment/locDetl/report/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ model: model // 浼犻�掔粍璐у崟鍙�
+ },
+ method: 'POST',
+ success: (res) => {
+ this.reportLoading = false;
+ if (typeof done === 'function') {
+ done();
+ }
+ if (res.code === 200 || res.success) {
+ this.$message({
+ message: `缁勮揣鍗曞彿 ${groupOrderNo} 涓婃姤鎴愬姛`,
+ type: 'success',
+ duration: 3000
+ });
+ // 涓婃姤鎴愬姛鍚庡叧闂脊绐楀苟鍒锋柊鏁版嵁
+ setTimeout(() => {
+ this.closeDetailDialog();
+ this.getTableDataA(); // 鍒锋柊涓昏〃鏁版嵁
+ }, 1500);
+ } else {
+ this.$message.error(res.message || '涓婃姤澶辫触');
+ }
+ },
+ error: (error) => {
+ this.reportLoading = false;
+ if (typeof done === 'function') {
+ done();
+ }
+ console.error('涓婃姤澶辫触:', error);
+ this.$message.error('涓婃姤澶辫触锛岃妫�鏌ョ綉缁滆繛鎺�');
+ }
+ });
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堜慨鏀�'
+ });
});
break;
case 'locNo':
@@ -361,6 +453,8 @@
var data = {
// id: $('#id').val(),
locNo: $('#locNo').val(),
+ batch: $('#batch').val(),
+ danger: $('#danger').val(),
matnr: $('#matnr').val(),
lgnum: $('#lgnum').val(),
tbnum: $('#tbnum').val(),
@@ -417,6 +511,7 @@
tableReload(false);
});
+
// 鎼滅储鏍忛噸缃簨浠�
form.on('submit(reset)', function (data) {
pageCurr = 1;
@@ -443,7 +538,8 @@
});
function tableReload(child) {
- var searchData = {};
+ var searchData = {
+ };
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
});
--
Gitblit v1.9.1