|
|
@@ -85,7 +85,7 @@ class Export extends BaseController
|
|
|
->alias('a')
|
|
|
->leftJoin('pay b', 'a.payNo=b.payNo')
|
|
|
->leftJoin('invoice_info c', 'c.hpNo=a.hpNo')
|
|
|
- ->field('"" 序号,a.hpNo,a.addtime,a.invoiceNumber,a.open_time,b.total_fee,b.supplierName,a.invoiceType,a.status,a.updatetime,a.remark,c.item_list')
|
|
|
+ ->field('"" 序号,a.hpNo,a.addtime,a.invoiceNumber,a.open_time,b.supplierName,a.invoiceType,a.status,a.updatetime,a.remark,c.item_list,c.total')
|
|
|
->where($where)
|
|
|
->order('a.addtime desc')
|
|
|
->cursor();
|
|
|
@@ -106,7 +106,7 @@ class Export extends BaseController
|
|
|
'金额' => $val['amount'],
|
|
|
'税额' => $val['tax'],
|
|
|
'税率' => $val['tax_rate'],
|
|
|
- '总额' => $item['total_fee'],
|
|
|
+ '总额' => $item['total'],
|
|
|
'供应商' => $item['supplierName'],
|
|
|
'业务类型' => '采购回票',
|
|
|
'发票类型' => $invoiceType[$item['invoiceType']] ?? '',
|
|
|
@@ -126,7 +126,7 @@ class Export extends BaseController
|
|
|
'金额' => '',
|
|
|
'税额' => '',
|
|
|
'税率' => '',
|
|
|
- '总额' => $item['total_fee'],
|
|
|
+ '总额' => $item['total'],
|
|
|
'供应商' => $item['supplierName'],
|
|
|
'业务类型' => '采购回票',
|
|
|
'发票类型' => $invoiceType[$item['invoiceType']] ?? '',
|
