From b28c9a27dfefb67600192dcd587efdf0cf64cc98 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 24 九月 2024 10:00:38 +0800
Subject: [PATCH] 不同订单类型不能合并下推送货单；设置默认打印模板；一键打印
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
index afb1e2b..eb1ae4e 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
@@ -805,22 +805,31 @@
break;
case 'btn-generate':
var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
+ , data = checkStatus.data;
if (data.length == 0) {
layer.alert("璇烽�夋嫨鏁版嵁", { icon: 5 });
return;
}
if (data[0].瀹屾垚鐘舵�� == "宸插畬鎴�") {
return layer.msg('璁㈠崟宸插畬鎴愶紒')
- }
+ }
ajaxLabelData = data;
//鏍规嵁閫変腑鐨勯噰璐鍗曪紝閲嶆柊浠庨噾铦朵簯鍚屾閲囪喘璁㈠崟鍏宠仈鏁伴噺杩囨潵銆傝�冭檻閲囪喘璁㈠崟鍒犻櫎鍜屽叧闂姸鎬侊紝鍚屾鐘舵��
var ids = "";
var entryids = "";
+ var HBillType = data[0].璁㈠崟绫诲瀷
+ var HErr = "";
$.each(data, function (obj) {
ids += data[obj].hmainid + ",";
entryids += data[obj].hsubid + ",";
+ if (HBillType != data[obj].璁㈠崟绫诲瀷) {
+ HErr += data[obj].璁㈠崟绫诲瀷;
+ }
})
+ if (HErr != "") {
+ return layer.msg('閲囪喘璁㈠崟璁㈠崟绫诲瀷涓嶅悓锛屼笉鍏佽鍚堝苟涓嬫帹鐢熸垚閫佽揣鍗曪紒')
+ }
+
ids = ids.substring(0, ids.length - 1);
entryids = entryids.substring(0, entryids.length - 1);
var hasPrivileage = true;
--
Gitblit v1.9.1