|
@@ -800,7 +800,8 @@ class SalesOrderService extends Service
|
|
|
$data['data'][$key]['state_name'] = SalesOrder::$state2[$value['state']] ?? '';
|
|
|
}
|
|
|
$data['data'][$key]['invoice_state_name'] = SalesOrder::$invoice_state[$value['invoice_state']] ?? '';
|
|
|
- $data['data'][$key]['invoice_arr'] = $invoiceData[$value['id']] ?? [];
|
|
|
+ $tmp = $invoiceData[$value['id']] ?? [];
|
|
|
+ $data['data'][$key]['invoice_arr'] = implode(',', $tmp);
|
|
|
$data['data'][$key]['dispatch_company'] = $dispatch[$value['id']] ?? '';
|
|
|
|
|
|
//合同对应的金额数据
|