From e66095ce55dcc9450b953f77dd753c698c53fd55 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 27 十月 2025 08:12:27 +0800
Subject: [PATCH] 更新erp对接 1.销售订单按子单自动上报 2.其他订单按主单上报 3.客户可以选择物料进行出库
---
src/main/webapp/static/js/order/outAll.js | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/static/js/order/outAll.js b/src/main/webapp/static/js/order/outAll.js
index a8f5953..2f2f8b0 100644
--- a/src/main/webapp/static/js/order/outAll.js
+++ b/src/main/webapp/static/js/order/outAll.js
@@ -3,6 +3,7 @@
var matnR;
var id;
var anfme;
+var da
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).extend({
@@ -93,13 +94,13 @@
table.on('toolbar(orderDetlTable)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id).data;
- if (obj.event === 'pakoutPreview') { // 娣诲姞
+ if (obj.event === 'orderDetlPakoutPreview') { // 娣诲姞
if (checkStatus.length === 0) {
layer.msg('璇烽�夋嫨鑷冲皯涓�鏉″嚭搴撴槑缁�', {icon: 2});
return;
}
- pakoutPreview(checkStatus.map(function (d) {
- return d.id;
+ orderDetlPakoutPreview(checkStatus.map(function (d) {
+ return d;
}));
} else if (obj.event === 'del') { // 鍒犻櫎
var checkRows = table.checkStatus('sensorTable');
@@ -116,8 +117,8 @@
/* 琛ㄦ牸2宸ュ叿鏉＄偣鍑讳簨浠� */
table.on('tool(orderDetlTable)', function (obj) {
- console.log(obj);
var data = obj.data;
+
switch (obj.event) {
// 鍑哄簱
case 'pakoutPreview':
@@ -149,8 +150,27 @@
});
}
+ function orderDetlPakoutPreview(ids) {
+ let loadIndex = layer.load(2);
+ // 鏋勫缓浼犻�掔殑鏁版嵁
+ da = ids
+ locDetlLayerIdx = layer.open({
+ type: 2,
+ title: false,
+ closeBtn: false,
+ maxmin: false,
+ area: ['90%', '85%'],
+ shadeClose: true,
+ content: 'OrderDetlStockOut.html',
+ success: function(layero, index){
+ layer.close(loadIndex);
+ }
+ });
+ }
+
function pakoutPreview(ids) {
let loadIndex = layer.load(2);
+ console.log("JSON.stringify(ids)"+JSON.stringify(ids))
$.ajax({
url: baseUrl + "/out/pakout2/preview/auth",
headers: {'token': localStorage.getItem('token')},
--
Gitblit v1.9.1