|
|
@@ -560,10 +560,11 @@ const handleTicket = (bool) => {
|
|
|
})
|
|
|
}
|
|
|
isSettlement.value = bool
|
|
|
+ const companyId= route.query.id || searchList.value.find(v => v.name === 'companyId')?.search || ''
|
|
|
const params = {
|
|
|
incomeIds: tableData.value.map(v => v.id),
|
|
|
orderNos: tableData.value.map(v => v.orderNo),
|
|
|
- companyId: route.query.id || '',
|
|
|
+ companyId,
|
|
|
invoiceType: route.query.invoiceType
|
|
|
}
|
|
|
api.financeApi.invoicingCheck(params).then(async (res: any) => {
|
|
|
@@ -665,20 +666,21 @@ const handelComfirm = () => {
|
|
|
let apiFn = api.financeApi.commissionInvoicing
|
|
|
if (isSettlement.value) apiFn = api.financeApi.invoiceAndSettlement
|
|
|
const attachmentIds = countForm.value.attachmentIds
|
|
|
+ const companyId= route.query.id || searchList.value.find(v => v.name === 'companyId')?.search || ''
|
|
|
const params = {
|
|
|
invoiceVO: {
|
|
|
...countForm.value,
|
|
|
attachmentIds,
|
|
|
incomeIds: tableData.value.map(v => v.id),
|
|
|
orderNos: tableData.value.map(v => v.orderNo),
|
|
|
- companyId: route.query.id,
|
|
|
+ companyId,
|
|
|
invoiceType: route.query.invoiceType
|
|
|
},
|
|
|
...countForm.value,
|
|
|
attachmentIds,
|
|
|
incomeIds: tableData.value.map(v => v.id),
|
|
|
orderNos: tableData.value.map(v => v.orderNo),
|
|
|
- companyId: route.query.id,
|
|
|
+ companyId,
|
|
|
invoiceType: route.query.invoiceType
|
|
|
}
|
|
|
apiFn(params).then((sub: any) => {
|