From 8b5b019716e49f54fcc016814a3c432a4a32db75 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 22 十二月 2023 15:42:17 +0800
Subject: [PATCH] 合并订单
---
src/main/webapp/static/js/order/order.js | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 232a262..b3f59d9 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -193,7 +193,7 @@
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
- // {field: 'batch', title: '鎵瑰彿'},
+ {field: 'batch', title: '鎵瑰彿'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
@@ -206,7 +206,6 @@
// {field: 'inQty', title: '宸插叆搴撻噺'},
// {field: 'color', title: '棰滆壊'},
// {field: 'specs', title: '瑙勬牸'},
- {field: 'weight', title: '閲嶉噺'}
]],
request: {
pageName: 'curr',
@@ -262,7 +261,11 @@
console.log(nList);
for (let xi = 0; xi < nList.length; xi++) {
if (nList[xi].anfme <= 0){
- layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2});
+ layer.msg('鏄庣粏鏁伴噺涓嶅悎娉�', {icon: 2});
+ return false;
+ }
+ if (nList[xi].batch == null || nList[xi].batch == ""){
+ layer.msg('鎵规涓嶅悎娉�', {icon: 2});
return false;
}
if (nList[xi].anfme < nList[xi].workQty){
@@ -312,7 +315,7 @@
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
{field: 'specs', title: '瑙勬牸'},
- {field: 'weight', title: '閲嶉噺', edit: true},
+ {field: 'batch', title: '鎵规', edit: true},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
// {field: 'payment', title: '璐х墿鐘舵��',align: 'center', templet: '#payment'},
@@ -588,8 +591,7 @@
layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
layer.closeAll();
layer.load(1, {shade: [0.1,'#fff']});
- // location.href = "http://192.168.4.121:8082/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo;
- location.href = "http://10.114.97.100:8080/stwms/order/printExport/auth?orderNo="+data.orderNo;
+ location.href = baseUrl+"/order/printExport/auth?orderNo="+data.orderNo;
layer.closeAll('loading');
});
}
--
Gitblit v1.9.1