From eeadaf600bf7a2a753f3d3cfd945e3c51b1817d5 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 06 十二月 2024 14:27:31 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js b/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js
index 417749e..a4bfba5 100644
--- a/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js
+++ b/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js
@@ -30,8 +30,7 @@
where: {order_id: 9999999999},
cols: [[
{type: 'checkbox'}
- ,{type: 'numbers', title: '#'}
- ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'}
,{field: 'locNo', align: 'center',title: '搴撲綅'}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
@@ -49,6 +48,7 @@
// ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�'}
// ,{field: 'count', align: 'center',title: '鏁伴噺'}
// ,{field: 'weight', align: 'center',title: '閲嶉噺'}
+ ,{field: 'profit$', align: 'center',title: '鐩堜簭',templet: '#profitTpl'}
,{field: 'status$', align: 'center',title: '鐘舵��'}
// ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
// ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
@@ -135,8 +135,6 @@
return;
}
- console.log(111)
- console.log(billNumber)
// 鍙戦�� Ajax 璇锋眰鍒板悗绔�
$.ajax({
url: baseUrl+"/inventoryCheckOrder/add/auth", // 鏇挎崲涓轰綘鐨勫悗绔帴鍙ｅ湴鍧�
@@ -147,6 +145,13 @@
success: function (res) {
if (res.code === 200){
layer.msg(res.msg, {icon: 1});
+ // 娓呯┖杈撳叆妗�
+ $('#billNumber').val('');
+ $('#warehouseArea').val('鍫嗗灈鏈�'); // 閲嶇疆涓洪粯璁ら�夐」
+ form.render('select'); // 閲嶆柊娓叉煋 select
+
+ // 鍏抽棴寮规
+ layer.close(index);
} else if (res.code === 403){
top.location.href = baseUrl+"/";
}else {
@@ -164,7 +169,7 @@
/* 琛ㄦ牸2澶村伐鍏锋爮鐐瑰嚮浜嬩欢 */
table.on('toolbar(orderDetlTable)', function (obj) {
-
+ // console.log(obj.config.where.order_id);
var checkStatus = table.checkStatus(obj.config.id).data;
if (obj.event === 'pakoutPreview') { // 娣诲姞
if (checkStatus.length === 0) {
@@ -184,6 +189,29 @@
return d.id;
});
doDelSensor({ids: ids});
+ } else if (obj.event === 'submitERP') { // 鎻愪氦erp
+ $.ajax({
+ url: baseUrl + "/mobile/checkOut/submit/auth",
+ headers: {'token': localStorage.getItem('token')},
+ // contentType: 'application/json;charset=UTF-8',
+ data: {
+ orderId: obj.config.where.order_id
+ },
+ method: 'GET',
+ success: function (res) {
+ notice.destroy();
+ if (res.code === 200) {
+ layer.msg(res.msg, {icon: 1});
+ insTb.reload({where: null});
+ insTb2.reload({where: null, page: {curr: 1}});
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+
}
});
--
Gitblit v1.9.1