From 089eecf29a79a8ef3e48196a1e47b387c587ee43 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Thu, 28 Mar 2024 17:11:17 +0800 Subject: [PATCH] add --- src/api/financial_travel_reimbursement.ts | 11 + src/views/contract_ledger/index.vue | 22 -- .../financial_expense_reimbursement/edit.vue | 12 +- .../financial_travel_reimbursement/detail.js | 99 +++++---- .../financial_travel_reimbursement/edit.vue | 207 ++++++++++++++---- .../financial_travel_reimbursement/index.vue | 49 +++-- src/views/project_profit_set/index.vue | 2 +- src/views/refundbidDeposit/index.vue | 2 +- 8 files changed, 278 insertions(+), 126 deletions(-) diff --git a/src/api/financial_travel_reimbursement.ts b/src/api/financial_travel_reimbursement.ts index a799f5b..2239f43 100644 --- a/src/api/financial_travel_reimbursement.ts +++ b/src/api/financial_travel_reimbursement.ts @@ -23,4 +23,15 @@ export function apiFinancialTravelReimbursementDelete(params: any) { // 财务管理--差旅费报销单详情 export function apiFinancialTravelReimbursementDetail(params: any) { return request.get({ url: '/financial.financial_travel_reimbursement/detail', params }) +} + +// 财务管理--差旅费报销单列表 +export function apiFinancialTravelReimbursementDetailLists(params: any) { + return request.get({ url: '/financial.financial_travel_reimbursement_detail/lists', params }) +} + + +// 删除财务管理--差旅费报销单 +export function apiFinancialTravelReimbursementDetailDelete(params: any) { + return request.post({ url: '/financial.financial_travel_reimbursement_detail/delete', params }) } \ No newline at end of file diff --git a/src/views/contract_ledger/index.vue b/src/views/contract_ledger/index.vue index dd60e21..a76d9e4 100644 --- a/src/views/contract_ledger/index.vue +++ b/src/views/contract_ledger/index.vue @@ -21,16 +21,6 @@ - - - 删除 -
@@ -57,18 +47,6 @@ - - -
diff --git a/src/views/financial_expense_reimbursement/edit.vue b/src/views/financial_expense_reimbursement/edit.vue index ad4847e..7094c3c 100644 --- a/src/views/financial_expense_reimbursement/edit.vue +++ b/src/views/financial_expense_reimbursement/edit.vue @@ -179,12 +179,6 @@ const tableConfig = reactive( } ) -const customEvent = (e) => { - formData.contract_id = e.id - formData.contract_name = e.contract_name - formData.contract_type_text = e.contract_type_text - showDialog.value = false -} const customEvent1 = (e) => { formData.fee_application_id = e.id formData.fee_application_theme = e.theme @@ -192,6 +186,12 @@ const customEvent1 = (e) => { } +const customEvent = (e) => { + formData.contract_id = e.id + formData.contract_name = e.contract_name + formData.contract_type_text = e.contract_type_text + showDialog.value = false +} // 表单验证 const formRules = reactive({ contract_id: [{ diff --git a/src/views/financial_travel_reimbursement/detail.js b/src/views/financial_travel_reimbursement/detail.js index 7329c41..24b5df9 100644 --- a/src/views/financial_travel_reimbursement/detail.js +++ b/src/views/financial_travel_reimbursement/detail.js @@ -1,36 +1,36 @@ -import { apiFinancialExpenseReimbursementDetailLists } from '@/api/financial_expense_reimbursement' +import { apiFinancialTravelReimbursementDetailLists } from '@/api/financial_travel_reimbursement' const detailConfig = { - title: "财务管理--费用报销单", + title: "财务管理--差旅费报销单", config: [ - { - label: "合同名称", - value: "contract_name" - }, - { - label: "合同类型", - value: "contract_type_text" - }, - { - label: "费用申请单", - value: "fee_application_theme" - }, - { - label: "单据主题", - value: "theme" - }, { label: "单据编号", value: "code" }, { - label: "单据张数", + label: "审批部门", + value: "approve_dept_name" + }, + { + label: "费用类别", + value: "cost_type_text" + }, + { + label: "支付方式", + value: "pay_type_text" + }, + { + label: "可抵扣税额", + value: "tax_deductible_amount" + }, + { + label: "附单据张数", value: "bill_num" }, { - label: "单据编号", - value: "code" + label: "关联费用申请", + value: "fee_application_theme" }, { label: "支付方式", @@ -41,21 +41,6 @@ const detailConfig = { value: "content", column: 1 }, - { - label: "单据编号", - value: "code" - }, - - { - label: "报销总金额", - value: "total_amount" - }, - - { - label: "附件", - value: "annex", - column: 1 - }, { label: "申请人", value: "create_user" @@ -77,16 +62,44 @@ const detailConfig = { }, { - label: "发生日期", + label: "起止日期", value: 'date' }, { - label: "科目名称", - value: 'subject_name_text', + label: "起止地点", + value: 'address', }, { - label: "金额", - value: 'amount', + label: "交通费", + value: 'traffic_amount', + }, + { + label: "住宿费", + value: 'stay_amount', + }, + { + label: "住宿天数", + value: 'stay_days', + }, + { + label: "住宿单价", + value: 'stay_price', + }, + { + label: "补助天数", + value: 'subsidy_days', + }, + { + label: "补助金额", + value: 'subsidy_amount', + }, + { + label: "补贴减扣", + value: 'subsidy_deduction', + }, + { + label: "补助标准", + value: 'subsidy_price', }, { label: "摘要", @@ -95,8 +108,8 @@ const detailConfig = { ], - query: 'expense_reimbursement_id', - fetchFun: apiFinancialExpenseReimbursementDetailLists, + query: 'travel_reimbursement_id', + fetchFun: apiFinancialTravelReimbursementDetailLists, } } diff --git a/src/views/financial_travel_reimbursement/edit.vue b/src/views/financial_travel_reimbursement/edit.vue index 102dd3b..a592440 100644 --- a/src/views/financial_travel_reimbursement/edit.vue +++ b/src/views/financial_travel_reimbursement/edit.vue @@ -1,50 +1,86 @@ @@ -52,9 +88,13 @@ diff --git a/src/views/project_profit_set/index.vue b/src/views/project_profit_set/index.vue index c287fa4..76df671 100644 --- a/src/views/project_profit_set/index.vue +++ b/src/views/project_profit_set/index.vue @@ -27,7 +27,7 @@
- + diff --git a/src/views/refundbidDeposit/index.vue b/src/views/refundbidDeposit/index.vue index a535ad2..c83e63a 100644 --- a/src/views/refundbidDeposit/index.vue +++ b/src/views/refundbidDeposit/index.vue @@ -31,7 +31,7 @@
- +