|
|
@@ -1001,7 +1001,7 @@
|
|
|
workOrder.pending_detail = this.groupPendingDetail(workOrder);
|
|
|
workOrder.logistic_numbers = this.groupLogisticNumber(workOrder);
|
|
|
workOrder.orderno = workOrder.order ? workOrder.order.code : '';
|
|
|
- workOrder.process_logs = this.groupProcess_logs(workOrder);
|
|
|
+ workOrder.process_logs = this.groupProcessLogs(workOrder);
|
|
|
workOrder.log_is_show = false;
|
|
|
workOrder.shop_name = workOrder.order ? (workOrder.order.shop ? workOrder.order.shop.name : '') : '';
|
|
|
workOrder.owner_name = workOrder.owner ? workOrder.owner.name : '';
|
|
|
@@ -1179,8 +1179,8 @@
|
|
|
}
|
|
|
return new Array(...logistic_numbers);
|
|
|
},
|
|
|
- groupProcess_logs(workOrder) {
|
|
|
- return workOrder.details.map(e=>e.process_logs ? e.process_logs : [] ).reduce((a,b)=> a=[...a,...b],[]);
|
|
|
+ groupProcessLogs(workOrder) {
|
|
|
+ return workOrder.details.map(e=>e.process_logs ? e.process_logs : [] ).reduce((a,b)=> a=[...a,...b],[]).sort((pre,cur)=>cur.id-pre.id);
|
|
|
},
|
|
|
createOrderIssue(item, tag) { // 生成问题件
|
|
|
let url = '{{route('workOrder.buildOrderIssueApi')}}';
|