From e1b47924a7f000f043d40fc9359491b6fa5d7873 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 10 十一月 2025 19:08:51 +0800
Subject: [PATCH] *
---
src/main/webapp/static/js/orderPakout/order.js | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index 6fa4030..b72fec4 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -57,7 +57,7 @@
{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: {
@@ -176,7 +176,11 @@
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"]');
@@ -524,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