Browse Source

feat(expense): 更新费用报销单表格字段和选择器组件

- 将实际验货日期字段从 needInspectDate 更改为 inspectDate
- 新增交通工具数据接口 getExpenseVehicles
- 更新差旅行程详情表格列配置,调整费用类型和交通工具列宽
- 隐藏里程字段并注释相关代码
- 在费用编辑器中将费用类型和交通工具改为下拉选择框
- 新增交通工具下拉选项功能
- 添加费用类型变更时的自动填充逻辑
- 更新组件props以接收vehicles数据
- 调整新增行程项目的默认值设置
master
qiankanghui 3 weeks ago
parent
commit
32a5056e99
  1. 1
      src/api/inspection/expenseReport.js
  2. 8
      src/views/modules/inspection/com_requestFeeTab.vue
  3. 17
      src/views/modules/inspection/expenseReport.vue
  4. 48
      src/views/modules/inspection/expenseReportEditor.vue

1
src/api/inspection/expenseReport.js

@ -7,5 +7,6 @@ export const getExpense = data => createAPI(`${base}/detail`, 'post', data)
export const saveExpense = data => createAPI(`${base}/save`, 'post', data)
export const deleteExpense = data => createAPI(`${base}/delete`, 'post', data)
export const getExpenseTypes = data => createAPI(`${base}/types`, 'post', data)
export const getExpenseVehicles = data => createAPI(`${base}/vehicles`, 'post', data)
export const getExpenseUsers = data => createAPI(`${base}/users`, 'post', data)
export const exportExpenses = data => createAPI(`${base}/export`, 'post', data, 'download')

8
src/views/modules/inspection/com_requestFeeTab.vue

@ -14,9 +14,9 @@
<el-table-column prop="requestNo" label="申请单号" header-align="center" align="left" min-width="150"/>
<el-table-column prop="supplierNo" label="供应商编码" header-align="center" align="left" width="120"/>
<el-table-column prop="supplierName" label="供应商名称" header-align="center" align="left" min-width="180"/>
<el-table-column prop="needInspectDate" label="实际验货日期" header-align="center" align="center" width="120">
<el-table-column prop="inspectDate" label="实际验货日期" header-align="center" align="center" width="120">
<template slot-scope="scope">
{{ formatDate(scope.row.needInspectDate) }}
{{ formatDate(scope.row.inspectDate) }}
</template>
</el-table-column>
<el-table-column prop="createBy" label="关联人" header-align="center" align="left" width="120"/>
@ -102,9 +102,9 @@
<el-table-column prop="requestNo" label="申请单号" header-align="center" align="left" min-width="150"/>
<el-table-column prop="supplierNo" label="供应商编码" header-align="center" align="left" width="120"/>
<el-table-column prop="supplierName" label="供应商名称" header-align="center" align="left" min-width="180"/>
<el-table-column prop="needInspectDate" label="实际验货日期" header-align="center" align="center" width="120">
<el-table-column prop="inspectDate" label="实际验货日期" header-align="center" align="center" width="120">
<template slot-scope="scope">
{{ formatDate(scope.row.needInspectDate) }}
{{ formatDate(scope.row.inspectDate) }}
</template>
</el-table-column>
<el-table-column prop="status" label="状态" header-align="center" align="center" width="100"/>

17
src/views/modules/inspection/expenseReport.vue

@ -65,12 +65,12 @@
<el-tab-pane label="差旅行程详情" name="trips">
<el-table :data="document.trips" border :height="detailHeight" show-summary :summary-method="feeSummary">
<el-table-column prop="tripDate" label="日期" width="105" header-align="center" align="center"/>
<el-table-column prop="expenseDesc" label="费用类型" min-width="120" header-align="center"/>
<el-table-column prop="startPlace" label="出发地" min-width="120" header-align="center"/>
<el-table-column prop="endPlace" label="到达地" min-width="120" header-align="center"/>
<el-table-column prop="expenseDesc" label="出差费用明细说明" min-width="220" header-align="center"/>
<el-table-column prop="vehicle" label="交通工具" width="100" header-align="center"/>
<el-table-column prop="vehicle" label="交通工具" width="120" header-align="center"/>
<el-table-column prop="billCount" label="票据数" width="75" header-align="center" align="right"/>
<el-table-column prop="mileage" label="里程" width="100" header-align="center" align="right"/>
<!-- <el-table-column prop="mileage" label="里程" width="100" header-align="center" align="right"/>-->
<el-table-column prop="amount" label="金额" width="130" header-align="center" align="right">
<template slot-scope="s">{{ money(s.row.amount) }}</template>
</el-table-column>
@ -85,7 +85,7 @@
</el-tab-pane>
</el-tabs>
</div>
<expense-report-editor ref="editor" :types="types" :users="users" @saved="saved"/>
<expense-report-editor ref="editor" :types="types" :vehicles="vehicles" :users="users" @saved="saved"/>
<el-dialog v-drag title="合并导出费用报销单" :visible.sync="exportVisible" width="480px" :close-on-click-modal="false">
<el-form ref="exportForm" :model="exportForm" :rules="exportRules" label-position="top" class="export-form">
<el-form-item label="已选费用单"><span class="export-selected">{{ exportForm.feeNos.length }} 张,同一申请人、同一年度</span></el-form-item>
@ -109,7 +109,7 @@
<script>
import Decimal from 'decimal.js'
import { saveAs } from 'file-saver'
import { listExpenses, getExpense, deleteExpense, getExpenseTypes, getExpenseUsers, exportExpenses } from '@/api/inspection/expenseReport'
import { listExpenses, getExpense, deleteExpense, getExpenseTypes, getExpenseVehicles, getExpenseUsers, exportExpenses } from '@/api/inspection/expenseReport'
import ExpenseReportEditor from './expenseReportEditor'
import RequestFeeTab from './com_requestFeeTab'
@ -134,6 +134,7 @@ export default {
current: {},
document: emptyDocument(),
types: [],
vehicles: [],
users: [],
loading: false,
detailLoading: false,
@ -195,14 +196,16 @@ export default {
async initialize () {
const site = this.site
this.types = []
this.vehicles = []
this.users = []
this.search()
try {
const responses = await Promise.all([getExpenseTypes({ site }), getExpenseUsers({ site })])
const responses = await Promise.all([getExpenseTypes({ site }), getExpenseVehicles({ site }), getExpenseUsers({ site })])
if (this.site !== site) return
responses.forEach(r => { if (r.data.code !== 0) throw new Error(r.data.msg || '下拉数据加载失败') })
this.types = responses[0].data.rows || []
this.users = responses[1].data.rows || []
this.vehicles = responses[1].data.rows || []
this.users = responses[2].data.rows || []
} catch (e) { this.$message.error(e.message || '下拉数据加载失败') }
},
search () { this.query.page = 1; this.load() },

48
src/views/modules/inspection/expenseReportEditor.vue

@ -64,24 +64,28 @@
<el-table-column label="日期" width="150" header-align="center" align="center">
<template slot-scope="s"><el-date-picker v-model="s.row.tripDate" type="date" value-format="yyyy-MM-dd"/></template>
</el-table-column>
<el-table-column label="费用类型" min-width="200" header-align="center">
<template slot-scope="s"><el-select v-model="s.row.expenseDesc" filterable placeholder="请选择" @change="onExpenseDescChange(s.row)">
<el-option v-for="t in rowExpenseDescOptions(s.row)" :key="t.value" :value="t.value" :label="t.label"/>
</el-select></template>
</el-table-column>
<el-table-column label="出发地" min-width="130" header-align="center">
<template slot-scope="s"><el-input v-model.trim="s.row.startPlace" maxlength="200"/></template>
</el-table-column>
<el-table-column label="到达地" min-width="130" header-align="center">
<template slot-scope="s"><el-input v-model.trim="s.row.endPlace" maxlength="200"/></template>
</el-table-column>
<el-table-column label="出差费用明细说明" min-width="200" header-align="center">
<template slot-scope="s"><el-input v-model.trim="s.row.expenseDesc" maxlength="500"/></template>
</el-table-column>
<el-table-column label="交通工具" width="130" header-align="center">
<template slot-scope="s"><el-input v-model.trim="s.row.vehicle" maxlength="50"/></template>
<template slot-scope="s"><el-select v-model="s.row.vehicle" filterable placeholder="请选择">
<el-option v-for="v in rowVehicleOptions(s.row)" :key="v.value" :value="v.value" :label="v.label"/>
</el-select></template>
</el-table-column>
<el-table-column label="票据数" width="80" header-align="center" align="right">
<template slot-scope="s"><el-input-number v-model="s.row.billCount" :min="0" :max="1000000" :precision="0" :controls="false"/></template>
</el-table-column>
<el-table-column label="里程" width="100" header-align="center" align="right">
<template slot-scope="s"><el-input-number v-model="s.row.mileage" :min="0" :precision="2" :controls="false"/></template>
</el-table-column>
<!-- <el-table-column label="里程" width="100" header-align="center" align="right">-->
<!-- <template slot-scope="s"><el-input-number v-model="s.row.mileage" :min="0" :precision="2" :controls="false"/></template>-->
<!-- </el-table-column>-->
<el-table-column label="金额" width="120" header-align="center" align="right">
<template slot-scope="s"><el-input-number v-model="s.row.amount" :min="0" :precision="2" :controls="false"/></template>
</el-table-column>
@ -111,6 +115,7 @@ export default {
name: 'ExpenseReportEditor',
props: {
types: { type: Array, default: () => [] },
vehicles: { type: Array, default: () => [] },
users: { type: Array, default: () => [] }
},
data () {
@ -152,20 +157,39 @@ export default {
return row.feeType && !this.types.some(t => t.value === row.feeType)
? this.types.concat([{ value: row.feeType, label: `${row.feeTypeName || row.feeType}(历史类型)` }]) : this.types
},
rowExpenseDescOptions (row) {
return row.expenseDesc && !this.types.some(t => t.value === row.expenseDesc)
? this.types.concat([{ value: row.expenseDesc, label: `${row.expenseDesc}(历史类型)` }]) : this.types
},
rowVehicleOptions (row) {
return row.vehicle && !this.vehicles.some(v => v.value === row.vehicle)
? this.vehicles.concat([{ value: row.vehicle, label: `${row.vehicle}(历史类型)` }]) : this.vehicles
},
addFee () {
this.form.details.push({ itemNo: null, feeType: '', amount: 0, remark: '' })
},
addTrip () {
const h = this.form.header
this.form.trips.push({ tripDate: h.feeDate || '',
startPlace: h.startPlace || '',
endPlace: h.endPlace || '',
expenseDesc: h.tripReason || '',
this.form.trips.push({ tripDate: this.form.header.feeDate || '',
startPlace: '',
endPlace: '',
expenseDesc: '',
vehicle: '',
billCount: 0,
mileage: 0,
amount: 0 })
},
// 交通费、通勤费用需体现起终点,自动带出主表地点;其他类型出发地、到达地、交通工具置为 N/A - rqrq。
onExpenseDescChange (row) {
if (['交通费', '通勤费用'].includes((row.expenseDesc || '').trim())) {
const h = this.form.header
row.startPlace = h.startPlace || ''
row.endPlace = h.endPlace || ''
} else {
row.startPlace = 'N/A'
row.endPlace = 'N/A'
row.vehicle = 'N/A'
}
},
validateRows () {
const invalidAmount = value => value === null || value === undefined || !Number.isFinite(Number(value)) || Number(value) < 0
for (let i = 0; i < this.form.details.length; i++) {

Loading…
Cancel
Save