diff --git a/combining.html b/combining.html index b844ef0..c527751 100644 --- a/combining.html +++ b/combining.html @@ -410,19 +410,20 @@ all_err.push(row.receive_error); } }); - - let obj = { - id: item.id, - type: item.type, - voucher: { - denomination: item.voucher.denomination, - reduce_amount: item.voucher.reduce_amount, - 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, - } - }; - product_all.push(obj); + if(el.order_voucher.length) { + let obj = { + id: item.id, + type: item.type, + voucher: { + denomination: item.voucher.denomination, + reduce_amount: item.voucher.reduce_amount, + status: self.statusSort(el.order_voucher)[0], + num: self.statusSort(el.order_voucher)[1], + send_num: el.order_voucher.length, + } + }; + product_all.push(obj); + } } }); diff --git a/packkey/combining.html b/packkey/combining.html index 896889e..4ca9693 100644 --- a/packkey/combining.html +++ b/packkey/combining.html @@ -412,19 +412,20 @@ all_err.push(row.receive_error); } }); - - let obj = { - id: item.id, - type: item.type, - voucher: { - denomination: item.voucher.denomination, - reduce_amount: item.voucher.reduce_amount, - 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, - } - }; - product_all.push(obj); + if(el.order_voucher.length){ + let obj = { + id: item.id, + type: item.type, + voucher: { + denomination: item.voucher.denomination, + reduce_amount: item.voucher.reduce_amount, + status: self.statusSort(el.order_voucher)[0], + num: self.statusSort(el.order_voucher)[1], + send_num: el.order_voucher.length, + } + }; + product_all.push(obj); + } } });