From 9d831229b5a8c238ce55f4ee8de7433c56cbe3a8 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 14 十一月 2025 08:30:35 +0800
Subject: [PATCH] *
---
src/main/webapp/static/js/locDetl/locDetl.js | 112 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 91 insertions(+), 21 deletions(-)
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index fcda34d..26c9c1f 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -2,45 +2,48 @@
function getCol() {
var cols = [
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'},
- {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
+ {field: 'matnr', align: 'center',title: '瑙勬牸', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
- ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, 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: true}
+ ,{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: true}
+ ,{field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
- ,{field: 'price', 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: 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: 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: 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:160}
+
)
return cols;
}
@@ -58,8 +61,8 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/locDetl/list/auth',
page: true,
- limit: 20,
- limits: [20, 30, 50, 100, 200, 500],
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
@@ -258,6 +261,40 @@
}
});
break;
+ case 'inspection':
+ var model = top.reObject(data).model;
+ if (model === undefined) {
+ layer.msg("鏃犳暟鎹�");
+ }
+ layer.confirm('纭鍚慚ES鏍″噯鏄惁鍚堟牸', {
+ shade: .1,
+ skin: 'layui-layer-admin'
+ }, function (i) {
+ $.ajax({
+ url: baseUrl + "/actual/shipment/locDetl/report/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ model: model // 浼犻�掔粍璐у崟鍙�
+ },
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll('loading');
+ if (res.code === 200){
+ if (insTbCount === 0) {
+ insTb.reload({page: {curr: 1}});
+ } else {
+ $(".layui-laypage-btn")[0].click();
+ }
+ layer.msg(res.msg, {icon: 1});
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ break;
case 'locNo':
var param = top.reObject(data).locNo;
if (param === undefined) {
@@ -391,6 +428,8 @@
var data = {
// id: $('#id').val(),
locNo: $('#locNo').val(),
+ batch: $('#batch').val(),
+ danger: $('#danger').val(),
matnr: $('#matnr').val(),
lgnum: $('#lgnum').val(),
tbnum: $('#tbnum').val(),
@@ -431,6 +470,35 @@
})
}
+ // 鍚屾搴撳瓨鑷矼ES
+ form.on('submit(synchronize)', function (data) {
+ layer.confirm('纭鍚慚ES鍚屾搴撳瓨锛�', {
+ shade: .1,
+ skin: 'layui-layer-admin'
+ }, function (i) {
+ $.ajax({
+ url: baseUrl + "/synchronize/mes/locDetl/report/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll('loading');
+ if (res.code === 200){
+ if (insTbCount === 0) {
+ insTb.reload({page: {curr: 1}});
+ } else {
+ $(".layui-laypage-btn")[0].click();
+ }
+ layer.msg(res.msg, {icon: 1});
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ });
+
// 澶嶉�夋浜嬩欢
form.on('checkbox(detailCheckbox)', function (data) {
var el = data.elem;
@@ -446,6 +514,7 @@
pageCurr = 1;
tableReload(false);
});
+
// 鎼滅储鏍忛噸缃簨浠�
form.on('submit(reset)', function (data) {
@@ -473,7 +542,8 @@
});
function tableReload(child) {
- var searchData = {};
+ var searchData = {
+ };
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
});
--
Gitblit v1.9.1