diff --git a/combining.html b/combining.html
index 141e9bd..b89eccf 100644
--- a/combining.html
+++ b/combining.html
@@ -417,7 +417,7 @@
voucher: {
denomination: item.voucher.denomination,
reduce_amount: item.voucher.reduce_amount,
- status: el.order_voucher.length ? self.statusSort(el.order_voucher)[0] : 1,
+ status: el.order_voucher.length ? self.statusSort(el.order_voucher)[0] : item.voucher.status,
num: el.order_voucher.length ? self.statusSort(el.order_voucher)[1] : item.voucher.num,
send_num: el.order_voucher.length ? el.order_voucher.length : item.voucher.send_num,
}
@@ -470,9 +470,11 @@
// 领取失败数,小于全部数量 -> send_status 4 部分失败
// 错误去重
self.goods.err_msg = [...new Set(all_err)];
- self.isOKLength = product_all.length - errLength.length;
- self.isErrLength = errLength.length;
- self.goods.send_status = 4;
+ if(self.goods.period_type != 2 && self.goods.period_type != 3) {
+ self.isOKLength = product_all.length - errLength.length;
+ self.isErrLength = errLength.length;
+ self.goods.send_status = 4;
+ }
self.popMsg = true;
return;
diff --git a/packkey/combining.html b/packkey/combining.html
index 9c9ba20..3be42a0 100644
--- a/packkey/combining.html
+++ b/packkey/combining.html
@@ -419,7 +419,7 @@
voucher: {
denomination: item.voucher.denomination,
reduce_amount: item.voucher.reduce_amount,
- status: el.order_voucher.length ? self.statusSort(el.order_voucher)[0] : 1,
+ status: el.order_voucher.length ? self.statusSort(el.order_voucher)[0] : item.voucher.status,
num: el.order_voucher.length ? self.statusSort(el.order_voucher)[1] : item.voucher.num,
send_num: el.order_voucher.length ? el.order_voucher.length : item.voucher.send_num,
}
@@ -472,9 +472,11 @@
// 领取失败数,小于全部数量 -> send_status 4 部分失败
// 错误去重
self.goods.err_msg = [...new Set(all_err)];
- self.isOKLength = product_all.length - errLength.length;
- self.isErrLength = errLength.length;
- self.goods.send_status = 4;
+ if(self.goods.period_type != 2 && self.goods.period_type != 3) {
+ self.isOKLength = product_all.length - errLength.length;
+ self.isErrLength = errLength.length;
+ self.goods.send_status = 4;
+ }
self.popMsg = true;
return;