|
|
@@ -737,7 +737,6 @@
|
|
|
workOrder.orderno = workOrder.order ? workOrder.order.code : '';
|
|
|
},
|
|
|
groupPendingDetail(workOrder) {
|
|
|
-
|
|
|
let details = workOrder.details.filter(item => {
|
|
|
return !['完成', '标记'].includes(item.tag);
|
|
|
}).sort((prev, curr) => {
|
|
|
@@ -747,21 +746,21 @@
|
|
|
let detail = details.find(e => true);
|
|
|
return {
|
|
|
id: workOrder.id,
|
|
|
- detail_id: detail.id,
|
|
|
- commodities: detail.commodities,
|
|
|
- issue_type_name: detail.issue_type ? detail.issue_type.name : '',
|
|
|
- status: detail.status,
|
|
|
- reissue_logistic_number: detail.reissue_logistic_number,
|
|
|
- logistic_number: detail.logistic_number,
|
|
|
- price: detail.price,
|
|
|
- return_logistic_number: detail.return_logistic_number,
|
|
|
- remark: detail.remark,
|
|
|
- tag: detail.tag,
|
|
|
- return_address: detail.return_address,
|
|
|
- return_phone: detail.return_phone,
|
|
|
- return_name: detail.return_name,
|
|
|
- images: detail.images,
|
|
|
- logistic_handle_tag: detail.logistic_handle_tag,
|
|
|
+ detail_id: detail ? detail.id : '',
|
|
|
+ commodities: detail ? detail.commodities : '',
|
|
|
+ issue_type_name: detail ? detail.issue_type.name : '',
|
|
|
+ status: detail ? detail.status : '',
|
|
|
+ reissue_logistic_number:detail ? detail.reissue_logistic_number : '',
|
|
|
+ logistic_number: detail ? detail.logistic_number : '',
|
|
|
+ price: detail ? detail.price : '',
|
|
|
+ return_logistic_number: detail ? detail.return_logistic_number : '',
|
|
|
+ remark: detail ? detail.remark : '',
|
|
|
+ tag: detail ? detail.tag : '',
|
|
|
+ return_address: detail ? detail.return_address : '',
|
|
|
+ return_phone: detail ? detail.return_phone : '',
|
|
|
+ return_name: detail ? detail.return_name : '',
|
|
|
+ images: detail ? detail.images : '',
|
|
|
+ logistic_handle_tag: detail ? detail.logistic_handle_tag : '',
|
|
|
};
|
|
|
},
|
|
|
groupCommodities(workOrder, isCurrent = true) {
|
loustwo