From 72149078ff14f391cdd3c312b74455e441630343 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 10 十一月 2025 13:51:52 +0800
Subject: [PATCH] *
---
src/main/webapp/static/js/orderPakout/order.js | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 113 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index 3d64b44..b72fec4 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -48,14 +48,16 @@
page: true,
cellMinWidth: 100,
cols: [[
- {type: 'numbers'},
- {field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
+ // {type: 'numbers'},
+ {field: 'itemName', align: 'center', title: '缁勮揣鍗曞彿'},
+ {field: 'cstmrName', align: 'center', title: '瀹㈡埛鍚嶇О'},
+ {field: 'orderNo', title: '娴佹按鍙�', templet: '#orderNoTpl'},
{field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
{field: 'tkType', align: 'center', title: 'TK', minWidth: 160, width: 160,hide: true},
{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},
+ {field: 'memo', align: 'center',title: '澶囨敞', hide: false},
{align: 'center', title: '鎿嶄綔', toolbar: '#operate'}
]],
request: {
@@ -174,8 +176,82 @@
priReduce(data.id);
} else if (layEvent === 'del') {
doDel(data.id);
- } else if (layEvent === 'complete') {//杞疄闄呯粍璐у崟
+ } else if (layEvent === 'inspection') {
+ doModify(data.id, data.orderNo, 12);
+ } else if (layEvent === 'abandoned') {
+ doAbandoned(data.id);
+ } else if (layEvent === 'complete') {
doModify(data.id, data.orderNo, 11);
+ } 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({
+ type: 1,
+ title: false,
+ area: '1020px',
+ 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) {
+ table.render({
+ elem: '#lookSSXMTable',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/order/pakout/orderDetl/list/auth',
+ where: {
+ order_id: data.id
+ },
+ page: true,
+ cellMinWidth: 100,
+ cols: [[
+ {type: 'numbers'},
+ {field: 'matnr', title: '瑙勬牸', width: 160},
+ // {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
+ {field: 'batch', align: 'center', title: '绠卞彿', width: 160},
+ {field: 'model', align: 'center',title: '鍗峰彿', width: 160},
+ // {field: 'anfme', align: 'center', title: '鏁伴噺'},
+ // {field: 'workQty', title: '浣滀笟鏁伴噺'},
+
+ // {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: 'specs', align: 'center', title: '鎺ュご'},
+ {field: 'danger$', align: 'center', title: '寰呭垽', width: 80},
+ {field: 'manu', title: '璐т綅', align: 'center', width: 100},
+ {field: 'memo', align: 'center', title: '澶囨敞'},
+ {field: 'status$', align: 'center', title: '鐘舵��', style: 'font-weight: bold'},
+ // {field: 'source$', align: 'center', title: '鏄惁纭', style: 'font-weight: bold'}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function () {
+ $(layero).find('.layui-table-view').css('margin', '0');
+ },
+ size: ''
+ });
+ }
+ });
}
});
@@ -452,10 +528,42 @@
})
});
}
+ function doAbandoned(orderId) {
+ layer.confirm('纭畾瑕佸簾寮冭鍒掔粍璐у崟鍚楋紵', {
+ shade: .1,
+ skin: 'layui-layer-admin'
+ }, function (i) {
+ layer.close(i);
+ layer.load(2);
+ $.ajax({
+ url: baseUrl+"/order/pakout/order/abandoned/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ orderId: orderId
+ },
+ 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});
+ }
+ }
+ })
+ });
+ }
// 淇敼璁㈠崟鐘舵��
function doModify(orderId, orderNo, settle) {
- layer.confirm('纭畾瑕佺敓鎴愬疄闄呯粍璐у崟锛屽悓涓�涓粍璐у崟鍙凤紝鍙兘瀛樺湪涓�涓疄闄呯粍璐у崟锛岃皑鎱庢搷浣滐紒锛侊紒', {
+ layer.confirm('绗﹀悎鍑哄簱鏉′欢璐х墿灏嗙洿鎺ュ嚭搴擄紒锛侊紒璋ㄦ厧鎿嶄綔锛侊紒锛�', {
shade: .1,
skin: 'layui-layer-admin'
}, function (i) {
--
Gitblit v1.9.1