bug476
This commit is contained in:
parent
c3328494f5
commit
64a145c11a
|
@ -417,9 +417,9 @@
|
||||||
voucher: {
|
voucher: {
|
||||||
denomination: item.voucher.denomination,
|
denomination: item.voucher.denomination,
|
||||||
reduce_amount: item.voucher.reduce_amount,
|
reduce_amount: item.voucher.reduce_amount,
|
||||||
status: self.statusSort(el.order_voucher)[0],
|
status: el.order_voucher.length ? self.statusSort(el.order_voucher)[0] : item.voucher.status,
|
||||||
num: self.statusSort(el.order_voucher)[1],
|
num: el.order_voucher.length ? self.statusSort(el.order_voucher)[1] : item.voucher.num,
|
||||||
send_num: el.order_voucher.length
|
send_num: el.order_voucher.length ? el.order_voucher.length : item.voucher.send_num,
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
product_all.push(obj);
|
product_all.push(obj);
|
||||||
|
|
|
@ -419,9 +419,9 @@
|
||||||
voucher: {
|
voucher: {
|
||||||
denomination: item.voucher.denomination,
|
denomination: item.voucher.denomination,
|
||||||
reduce_amount: item.voucher.reduce_amount,
|
reduce_amount: item.voucher.reduce_amount,
|
||||||
status: self.statusSort(el.order_voucher)[0],
|
status: el.order_voucher.length ? self.statusSort(el.order_voucher)[0] : item.voucher.status,
|
||||||
num: self.statusSort(el.order_voucher)[1],
|
num: el.order_voucher.length ? self.statusSort(el.order_voucher)[1] : item.voucher.num,
|
||||||
send_num: el.order_voucher.length
|
send_num: el.order_voucher.length ? el.order_voucher.length : item.voucher.send_num,
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
product_all.push(obj);
|
product_all.push(obj);
|
||||||
|
|
Loading…
Reference in New Issue