diff --git a/src/components/CostEntry/actionBar.vue b/src/components/CostEntry/actionBar.vue index cef1b1e1..1d246398 100644 --- a/src/components/CostEntry/actionBar.vue +++ b/src/components/CostEntry/actionBar.vue @@ -246,6 +246,12 @@ deepCopyRow.id = '' deepCopyRow.feeStatus = 1 deepCopyRow.feeStatusText = '录入状态' + deepCopyRow.settlementAmount = null + deepCopyRow.orderInvoiceAmount = null + deepCopyRow.invoiceAmountRest = null + deepCopyRow.invoiceAmount = null + deepCopyRow.auditOperator = null + deepCopyRow.auditDate = null props.data.push(deepCopyRow) }) } @@ -434,8 +440,9 @@ } // 撤销整票审核 const withdrawAll = () => { - WithdrawBusiness({ id: props.id, businessType: 1 }).then(res => { - + WithdrawBusiness({ businessId: props.id, businessType: 1, taskTypeName: 'BILL_RECV_AUDIT' }).then(res => { + createMessage.success(res.message) + emits('refresh') }) } // 引入费用模版 diff --git a/src/components/CostEntry/api.ts b/src/components/CostEntry/api.ts index 7e14e4ca..016be39b 100644 --- a/src/components/CostEntry/api.ts +++ b/src/components/CostEntry/api.ts @@ -19,7 +19,7 @@ enum Api { GetPrintInfo = '/feeApi/FeeRecord/GetPrintInfo', GetFees = '/feeApi/PaymentApplication/GetFees', ApplyBusinessAudit = '/feeApi/FeeRecord/ApplyBusinessAudit', - WithdrawBusiness = '/feeApi/FeeRecordWithdrawBusiness', + WithdrawBusiness = '/feeApi/FeeRecord/WithdrawBusiness', SubmitWithAudit = '/feeApi/FeeRecord/SubmitWithAudit' } // 列表 (Auth) diff --git a/src/components/CostEntry/components/feeTable.vue b/src/components/CostEntry/components/feeTable.vue index 0ba6e2e8..78033d8b 100644 --- a/src/components/CostEntry/components/feeTable.vue +++ b/src/components/CostEntry/components/feeTable.vue @@ -97,11 +97,13 @@ } // 根据业务编号及类型获取关联费用记录 (Auth) const getFees = async (id, businessType, customerId) => { - const postData = [{ - id, - businessType, - customerId - }] + const postData = { + items: [{ + id, + businessType, + customerId + }] + } loading.value = true await GetFees(postData).then(res => { const { data } = res diff --git a/src/components/CostEntry/feeTable.vue b/src/components/CostEntry/feeTable.vue index 745f195e..e33686dd 100644 --- a/src/components/CostEntry/feeTable.vue +++ b/src/components/CostEntry/feeTable.vue @@ -1212,7 +1212,8 @@ allSave, getUnitList, initData, - validate + validate, + init }) diff --git a/src/components/CostEntry/index.vue b/src/components/CostEntry/index.vue index c9a9b747..037ea7bf 100644 --- a/src/components/CostEntry/index.vue +++ b/src/components/CostEntry/index.vue @@ -48,6 +48,8 @@ import FeeTable from './feeTable.vue' // 表格统计组件 import FeeStatistic from './feeStatistic.vue' + import { useMessage } from '/@/hooks/web/useMessage' + const { createMessage } = useMessage() import { ApplyBusinessAudit } from './api' const props = defineProps({ details: { type: [Object, Array] }, @@ -85,8 +87,10 @@ rtb.value.allSave(true) ptb.value.allSave(true) setTimeout(() => { - ApplyBusinessAudit({ id: props.details.id, businessType: 1 }).then(res => { - console.log(res) + ApplyBusinessAudit({ businessId: props.details.id, businessType: 1, taskTypeName: 'BILL_RECV_AUDIT' }).then(res => { + createMessage.success(res.message) + rtb.value.init() + ptb.value.init() }, 1000) }) } diff --git a/src/views/approve/fee/components/feeTable.vue b/src/views/approve/fee/components/feeTable.vue index a4e6a27a..1d72a799 100644 --- a/src/views/approve/fee/components/feeTable.vue +++ b/src/views/approve/fee/components/feeTable.vue @@ -7,53 +7,55 @@
-

应收应付费用

- - - - - {{ check ? '仅待审核费用' : '显示所有费用' }} - +

{{ status == 'BILL_RECV_AUDIT' ? '应收费用确认' : '应收应付费用' }}

+ + + + + + {{ check ? '仅待审核费用' : '显示所有费用' }} + + + + + + + 审核通过 + + + + 驳回提交 + + + + 禁开发票 + + + + 解禁发票 + + + + 批准申请 + + + + 驳回申请 + + + + 本票审核 -
- - - - 审核通过 - - - - 驳回提交 - - - - 禁开发票 - - - - 解禁发票 - - - - 批准申请 - - - - 驳回申请 - - - - 本票审核 - +
@@ -134,7 +136,7 @@