祁鹏飞 3 месяцев назад
Родитель
Сommit
a359e295ae
2 измененных файлов с 7 добавлено и 5 удалено
  1. 3 1
      src/api/modules/finance.ts
  2. 4 4
      src/views/receivable/handingFee/ticket.vue

+ 3 - 1
src/api/modules/finance.ts

@@ -27,7 +27,7 @@ const financeApi = (axiosInstance: ApiInstance) => ({
     //金额总计
     queryTotalWithdrawalAmount: (data: any) => axiosInstance.post('/amountAuditing/queryTotalWithdrawalAmount', data),
     // 结算
-    settlement: (data: any) => axiosInstance.post('/receivable/settlement', data),
+    settlement: (data: any) => axiosInstance.post('/receivable/invoiceAndSettlement', data),
     // 非车险应收
     exportSuperviseJyExcel: (data: any) => axiosInstance.post('/receivable/exportSuperviseJyExcel', data, {responseType: 'blob'}),
     // 非车险应收导出
@@ -38,6 +38,8 @@ const financeApi = (axiosInstance: ApiInstance) => ({
     getSelectedReceivableList: (data: any) => axiosInstance.post('/receivable/getSelectedReceivableList', data),
     // 开票检测
     invoicingCheck: (data: any) => axiosInstance.post('/receivable/invoicingCheck', data),
+    // 开票前计算
+    calBeforeInvoice: (data: any) => axiosInstance.post('/receivable/calBeforeInvoice', data),
     // 手续费导入
     importSuperviseExcel: (data: any) => axiosInstance.post('/receivable/importSuperviseExcel', data),
 

+ 4 - 4
src/views/receivable/handingFee/ticket.vue

@@ -414,12 +414,12 @@ const handelComfirm = () => {
     invoiceVO: {
       ...countForm.value,
       attachmentIds,
+      incomeIds: selectedList.value.map(v => v.id),
+      orderNos: selectedList.value.map(v => v.orderNo),
+      companyId: route.query.id,
+      invoiceType: route.query.invoiceType
     },
     ...countForm.value,
-    incomeIds: selectedList.value.map(v => v.id),
-    orderNos: selectedList.value.map(v => v.orderNo),
-    companyId: route.query.id,
-    invoiceType: route.query.invoiceType
   }
   apiFn(params).then((sub: any) => {
     if (sub.code == 200) {