From 8482d4e5969a324fd30406fb488eea265e78a49a Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期一, 09 三月 2026 19:33:33 +0800
Subject: [PATCH] no message
---
src/main/webapp/static/js/orderPakout/order.js | 208 +++++++++++++++++++++++++++-------------------------
1 files changed, 108 insertions(+), 100 deletions(-)
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index b28b5ff..7df8460 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -14,19 +14,19 @@
// 娓叉煋鎼滅储妯℃澘
$.ajax({
- url: baseUrl+"/docType/list/auth",
+ url: baseUrl + "/docType/list/auth",
headers: {'token': localStorage.getItem('token')},
data: {
limit: 9999
},
method: 'POST',
success: function (res) {
- if (res.code === 200){
+ if (res.code === 200) {
let template = Handlebars.compile($('#docTypeTpl').html());
$('#docType-query').html(template(res.data));
layui.form.render('select');
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
} else {
layer.msg(res.msg, {icon: 2})
}
@@ -36,20 +36,23 @@
// 娓叉煋琛ㄦ牸
var insTb = table.render({
elem: '#order',
- url: baseUrl+'/order/pakout/order/head/page/auth',
+ url: baseUrl + '/order/pakout/order/head/page/auth',
headers: {token: localStorage.getItem('token')},
page: true,
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
- {field: 'itemName$', align: 'center', title: '鍑哄簱鍖哄煙', minWidth: 160, width: 160},
- {field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
+ {field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', minWidth: 180},
+ {field: 'defNumber', align: 'center', title: '娴佹按鍙�', minWidth: 160, width: 160},
+ {field: 'number', align: 'center', title: '娲惧伐鍗曞彿', minWidth: 160, width: 160},
+ {field: 'cstmrName', align: 'center', title: '鍏徃ID', minWidth: 160, width: 160},
+ {field: 'itemName', align: 'center', title: '绠卞彿', minWidth: 160, width: 160},
+ {field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 130},
+ {field: 'orderTime', align: 'center', title: '娲惧伐鏃堕棿', minWidth: 160, width: 160},
+ {field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 160, width: 160},
+ {field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 100, width: 100},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
- {field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
- {field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
- {field: 'memo', align: 'center',title: '澶囨敞', hide: true},
- {align: 'center', title: '鎿嶄綔', toolbar: '#operate'}
+ {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
]],
request: {
pageName: 'curr',
@@ -69,7 +72,7 @@
done: function (res, curr, count) {
limit();
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
insTbCount = count;
}
@@ -99,45 +102,33 @@
doModify(data.id, data.orderNo, 4);
} else if (layEvent === 'look') {
var $a = $(obj.tr).find('a[lay-event="look"]');
- var offset = $a.offset();
- var top = offset.top;
- var left = offset.left;
- layer.open({
+ admin.open({
type: 1,
- title: false,
- area: '820px',
- offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
- shade: .01,
- shadeClose: true,
- fixed: false,
- content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
- success: function (layero) {
+ title: '鍗曟嵁鏄庣粏',
+ height: '450px',
+ content: $('#orderItem').html(),
+ area: '78%',
+ success: function (layero, dIndex) {
table.render({
- elem: '#lookSSXMTable',
+ elem: '#itemTable',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/order/pakout/orderDetl/list/auth',
+ url: baseUrl + '/order/pakout/orderDetl/list/auth',
where: {
order_id: data.id
},
page: true,
+ height: '450px;',
cellMinWidth: 100,
cols: [[
- {type: 'numbers'},
- {field: 'matnr', title: '闆朵欢浠ｇ爜', width: 160},
- {field: 'maktx', title: '闆朵欢鍚嶇О', width: 160},
- // {field: 'batch', title: '鎵瑰彿'},
- {field: 'standby1', title: '渚涘簲鍟嗕唬鐮�'},
+ {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
+ {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
+ {field: 'tag$', align: 'center', title: '闆朵欢绫诲瀷'},
+ {field: 'standby1', title: '渚涘簲鍟嗙紪鐮�', width: 120},
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
- // {field: 'unit', title: '鍗曚綅'},
- // {
- // field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
- // return util.toDateString(d.createTime);
- // }, width: 180
- // },
- // {field: 'inQty', title: '宸插叆搴撻噺'},
- // {field: 'color', title: '棰滆壊'},
+ {field: 'weight', align: 'center',title: '閲嶉噺', hide: false },
+ {field: 'volume', align: 'center',title: '灏哄', hide: false},
{field: 'specs', title: '瑙勬牸'}
]],
request: {
@@ -165,6 +156,12 @@
}
});
+ function getCol() {
+ var cols = [{field: 'locNo$', align: 'center', title: '搴撲綅鍙�'},];
+ cols.push.apply(cols, cacheCols);
+ return cols;
+ }
+
// 鏄剧ず琛ㄥ崟寮圭獥
function showEditModel(expTpe) {
admin.open({
@@ -179,7 +176,7 @@
$.ajax({
url: baseUrl + "/basAreas/list/auth",
headers: {'token': localStorage.getItem('token')},
- data: { limit: 9999 },
+ data: {limit: 9999},
method: 'POST',
success: function (res) {
if (res.code === 200) {
@@ -213,18 +210,18 @@
}
let nList = admin.util.deepClone(xxDataList);
for (let xi = 0; xi < nList.length; xi++) {
- if (nList[xi].anfme <= 0){
+ if (nList[xi].anfme <= 0) {
layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2});
return false;
}
- if (nList[xi].anfme < nList[xi].workQty){
+ if (nList[xi].anfme < nList[xi].workQty) {
layer.msg('鏁伴噺涓嶈兘灏忎簬宸蹭綔涓氭暟閲�', {icon: 2});
return false;
}
}
layer.load(2);
$.ajax({
- url: baseUrl+"/order/pakout/order/form/" + (isExpAdd?"add":"modify") + "/auth",
+ url: baseUrl + "/order/pakout/order/form/" + (isExpAdd ? "add" : "modify") + "/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
orderId: Number(data.field.id),
@@ -233,17 +230,17 @@
itemName: data.field.itemName ? Number(data.field.itemName) : null,
orderDetlPakoutList: nList
}),
- contentType:'application/json;charset=UTF-8',
+ contentType: 'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
layer.closeAll('loading');
- if (res.code === 200){
+ if (res.code === 200) {
layer.close(dIndex);
$(".layui-laypage-btn")[0].click();
layer.msg(res.msg, {icon: 1});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
layer.msg(res.msg, {icon: 2});
}
}
@@ -259,19 +256,22 @@
page: true,
height: '350px;',
cellMinWidth: 100,
- cols: [[
- {type: 'numbers', title: '#'},
- {field: 'matnr', title: '闆朵欢浠ｇ爜', width: 160},
- {field: 'maktx', title: '闆朵欢鍚嶇О', width: 200},
- // {field: 'batch', title: '鎵瑰彿', edit: true},
- {field: 'standby1', title: '渚涘簲鍟嗕唬鐮�', edit: true},
- {field: 'specs', title: '瑙勬牸'},
- {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
- {field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
- // {field: 'unit', title: '鍗曚綅', width: 80},
- {field: 'memo', title: '澶囨敞' , edit: true},
- {align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
- ]],
+ cols: [
+ getCol()
+ // [
+ // {type: 'numbers', title: '#'},
+ // {field: 'matnr', title: '闆朵欢浠ｇ爜', width: 160},
+ // {field: 'maktx', title: '闆朵欢鍚嶇О', width: 200},
+ // // {field: 'batch', title: '鎵瑰彿', edit: true},
+ // {field: 'standby1', title: '渚涘簲鍟嗕唬鐮�', edit: true},
+ // {field: 'specs', title: '瑙勬牸'},
+ // {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
+ // {field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
+ // // {field: 'unit', title: '鍗曚綅', width: 80},
+ // {field: 'memo', title: '澶囨敞' , edit: true},
+ // {align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
+ // ]
+ ],
done: function (res) {
$(layero).find('.layui-table-view').css('margin', '0');
},
@@ -279,17 +279,17 @@
};
if (!isExpAdd) {
$.ajax({
- url: baseUrl+"/order/pakout/order/detl/all/auth?orderId=" + expTpe.id,
+ url: baseUrl + "/order/pakout/order/detl/all/auth?orderId=" + expTpe.id,
headers: {'token': localStorage.getItem('token')},
method: 'GET',
async: false,
success: function (res) {
- if (res.code === 200){
+ if (res.code === 200) {
xxDataList = res.data;
tbOptions.data = xxDataList;
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
layer.msg(res.msg, {icon: 2})
}
}
@@ -303,7 +303,7 @@
if (layEvent === 'edit') {
showEditModel2(data);
} else if (layEvent === 'del') {
- if(data.workQty > 0){
+ if (data.workQty > 0) {
layer.msg("宸插瓨鍦ㄤ綔涓氭暟閲忥紝涓嶈兘鍒犻櫎", {icon: 2});
return;
}
@@ -326,7 +326,7 @@
table.on('edit(formSSXMTable)', function (obj) {
let index = obj.tr.attr("data-index");
let data = xxDataList[index];
- if (obj.field === 'anfme'){
+ if (obj.field === 'anfme') {
let vle = Number(obj.value);
if (isNaN(vle)) {
layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
@@ -338,7 +338,7 @@
// insTbSSXM.reload({data: xxDataList});
return false;
}
- if(obj.value < data.workQty){
+ if (obj.value < data.workQty) {
layer.msg("杈撳叆鏁伴噺涓嶈兘灏忎簬浣滀笟涓暟閲�", {icon: 2});
// data[obj.field] = 0;
// insTbSSXM.reload({data: xxDataList});
@@ -368,21 +368,21 @@
// 琛ㄥ崟鎻愪氦浜嬩欢
form.on('submit(matEditSubmit)', function (data) {
let selectList = matXmSelect.getValue();
- for (let i = 0; i<selectList.length; i++) {
+ for (let i = 0; i < selectList.length; i++) {
let item = selectList[i];
// 鏌ヨ鐗╂枡璇︽儏
$.ajax({
- url: baseUrl+"/mat/covert/"+item.value+"/auth",
+ url: baseUrl + "/mat/covert/" + item.value + "/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
async: false,
success: function (res) {
- if (res.code === 200){
+ if (res.code === 200) {
xxDataList.push(res.data);
insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
layer.msg(res.msg, {icon: 2})
}
}
@@ -398,19 +398,19 @@
width: '340px',
},
autoRow: true,
- toolbar: { show: true },
+ toolbar: {show: true},
filterable: true,
remoteSearch: true,
- remoteMethod: function(val, cb, show){
+ remoteMethod: function (val, cb, show) {
$.ajax({
- url: baseUrl+"/mat/all/get/kv",
+ url: baseUrl + "/mat/all/get/kv",
headers: {'token': localStorage.getItem('token')},
data: {
condition: val
},
method: 'POST',
success: function (res) {
- if (res.code === 200){
+ if (res.code === 200) {
cb(res.data)
} else {
cb([]);
@@ -440,7 +440,7 @@
layer.close(i);
layer.load(2);
$.ajax({
- url: baseUrl+"/order/pakout/order/delete/auth",
+ url: baseUrl + "/order/pakout/order/delete/auth",
headers: {'token': localStorage.getItem('token')},
data: {
orderId: orderId
@@ -448,16 +448,16 @@
method: 'POST',
success: function (res) {
layer.closeAll('loading');
- if (res.code === 200){
+ 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 {
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
layer.msg(res.msg, {icon: 2});
}
}
@@ -476,7 +476,7 @@
console.log(orderId);
console.log(settle);
$.ajax({
- url: baseUrl+"/order/pakout/order/update/auth",
+ url: baseUrl + "/order/pakout/order/update/auth",
headers: {'token': localStorage.getItem('token')},
data: {
id: orderId,
@@ -486,16 +486,16 @@
method: 'POST',
success: function (res) {
layer.closeAll('loading');
- if (res.code === 200){
+ 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 {
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
layer.msg(res.msg, {icon: 2});
}
}
@@ -507,7 +507,7 @@
function showWrkTrace(orderId) {
let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
$.ajax({
- url: baseUrl+"/order/pakout/order/wrk/trace/auth",
+ url: baseUrl + "/order/pakout/order/wrk/trace/auth",
headers: {'token': localStorage.getItem('token')},
data: {
orderId: orderId
@@ -515,7 +515,7 @@
method: 'POST',
success: function (res) {
layer.close(loadIndex);
- if (res.code === 200){
+ if (res.code === 200) {
laytpl(wrkTraceDialog.innerHTML).render(res.data, function (html) {
admin.open({
type: 1,
@@ -536,19 +536,27 @@
},
color: ['#10B4E8', '#E0E0E0', '#FF0000'],
tooltip: {trigger: 'item'},
- series: [{name: '鏁伴噺', type: 'pie', radius: ['75%', '80%'], label: {normal: {show: false}}}]
+ series: [{
+ name: '鏁伴噺',
+ type: 'pie',
+ radius: ['75%', '80%'],
+ label: {normal: {show: false}}
+ }]
};
traceCharts.setOption(traceOptions);
// 璧嬪��
traceCharts.setOption({
title: {
- subtext: res.data.totalQty+"/"+res.data.wrkQty+"/"+res.data.endQty
+ subtext: res.data.totalQty + "/" + res.data.wrkQty + "/" + res.data.endQty
},
series: [
{
data: [
{name: '宸蹭綔涓�', value: res.data.wrkQty},
- {name: '鏈綔涓�', value: res.data.totalQty-res.data.wrkQty-res.data.lackQty},
+ {
+ name: '鏈綔涓�',
+ value: res.data.totalQty - res.data.wrkQty - res.data.lackQty
+ },
{name: '搴撳瓨涓嶈冻', value: res.data.lackQty},
]
}
@@ -557,9 +565,9 @@
}
});
});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
layer.msg(res.msg, {icon: 2});
}
}
@@ -568,7 +576,7 @@
layDate.render({
elem: '.layui-laydate-range'
- ,type: 'datetime'
- ,range: true
+ , type: 'datetime'
+ , range: true
});
});
--
Gitblit v1.9.1