Browse Source

```

refactor(inspection): 优化费用报销单页面布局和数据加载逻辑

- 为费用明细表格添加动态高度计算功能,提升用户体验
- 调整费用报销单编辑器弹窗宽度,优化界面展示效果
- 重构合并导出费用报销单对话框样式,统一日期选择器宽度
- 修改差旅行程详情表格列宽配置,优化表格显示
- 更新费用单查询逻辑,移除按负责人过滤的限制条件
- 添加窗口大小变化监听,实现表格高度自适应调整
- 精简费用明细页面样式,提升页面加载性能
```
master
qiankanghui 4 weeks ago
parent
commit
f718707e68
  1. 56
      src/views/modules/inspection/expenseReport.vue
  2. 21
      src/views/modules/inspection/expenseReportEditor.vue
  3. 6
      src/views/modules/inspection/inspectionRequestList.vue

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

@ -50,10 +50,10 @@
<el-pagination style="margin-top: 0" :current-page="query.page" :page-size="query.limit" :total="total"
:page-sizes="[20, 50, 100, 200, 500]" layout="total, sizes, prev, pager, next, jumper"
@current-change="changePage" @size-change="changeSize"/>
<div v-loading="detailLoading">
<el-tabs v-model="activeTab" type="border-card" class="customer-tab" style="margin-top: 0; width: 99%">
<div ref="detail" v-loading="detailLoading">
<el-tabs v-model="activeTab" type="border-card" class="customer-tab detail-tabs" style="margin-top: 0; width: 99%">
<el-tab-pane label="费用明细" name="fees">
<el-table :data="document.details" border :height="tableHeight" show-summary :summary-method="feeSummary">
<el-table :data="document.details" border :height="detailHeight" show-summary :summary-method="feeSummary">
<el-table-column type="index" label="序号" width="55" header-align="center" align="center"/>
<el-table-column prop="feeTypeName" label="费用类型" min-width="160" header-align="center"/>
<el-table-column prop="amount" label="金额" width="160" header-align="center" align="right">
@ -63,8 +63,7 @@
</el-table>
</el-tab-pane>
<el-tab-pane label="差旅行程详情" name="trips">
<div style="margin-bottom: 5px">行程单独填报,仅作为附件,合计不计入费用总额。</div>
<el-table :data="document.trips" border :height="tableHeight" show-summary :summary-method="feeSummary">
<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="startPlace" label="出发地" min-width="120" header-align="center"/>
<el-table-column prop="endPlace" label="到达地" min-width="120" header-align="center"/>
@ -79,22 +78,26 @@
</el-tab-pane>
<el-tab-pane label="申请单清单" name="requests">
<request-fee-tab v-if="current.feeNo && isAuth('inspection:expenseReport:save')"
:key="rowKey(current)" :fee-data="current" :table-height="tableHeight"/>
<el-table v-else :data="requestRows" border :height="tableHeight">
:key="rowKey(current)" :fee-data="current" :table-height="detailHeight"/>
<el-table v-else :data="requestRows" border :height="detailHeight">
<el-table-column prop="requestNo" label="申请单号" header-align="center"/>
</el-table>
</el-tab-pane>
</el-tabs>
</div>
<expense-report-editor ref="editor" :types="types" :users="users" @saved="saved"/>
<el-dialog v-drag title="合并导出费用报销单" :visible.sync="exportVisible" width="600px" :close-on-click-modal="false">
<el-form ref="exportForm" :model="exportForm" :rules="exportRules" label-position="top">
<el-form-item label="已选费用单"><span>{{ exportForm.feeNos.length }} 张,同一申请人、同一年度</span></el-form-item>
<el-form-item label="填报日期" prop="reportDate"><el-date-picker v-model="exportForm.reportDate" value-format="yyyy-MM-dd" type="date" style="width: 130px"/></el-form-item>
<el-form-item label="出差起止日期" prop="tripDates"><el-date-picker v-model="exportForm.tripDates" type="daterange"
value-format="yyyy-MM-dd" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/></el-form-item>
<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>
<el-form-item label="填报日期" prop="reportDate">
<el-date-picker v-model="exportForm.reportDate" value-format="yyyy-MM-dd" type="date" style="width: 220px"/>
</el-form-item>
<el-form-item label="出差起止日期" prop="tripDates">
<el-date-picker v-model="exportForm.tripDates" type="daterange" value-format="yyyy-MM-dd"
range-separator="-" start-placeholder="开始" end-placeholder="结束" style="width: 220px"/>
</el-form-item>
</el-form>
<div style="margin-top: 5px">第一页仅汇总交通费、住宿费、住宿节约补助和补助;出差事由请在导出的表格中手工填写。</div>
<div class="export-tip">第一页仅汇总交通费、住宿费、住宿节约补助和补助;出差事由请在导出的表格中手工填写。</div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" :loading="exporting" @click="download">导出</el-button>
<el-button :disabled="exporting" @click="exportVisible = false">取消</el-button>
@ -124,6 +127,7 @@ export default {
query: { feeNo: '', applyUser: '', page: 1, limit: 50 },
dates: ['', ''],
tableHeight: 300,
detailHeight: 300,
rows: [],
total: 0,
selection: [],
@ -166,8 +170,22 @@ export default {
mounted () {
// rqrq:沿用原费用管理上下主从表的高度分配。
this.tableHeight = Math.max(180, Math.floor((window.innerHeight - 220) / 2))
this.$nextTick(() => this.updateDetailHeight())
window.addEventListener('resize', this.updateDetailHeight)
},
beforeDestroy () {
window.removeEventListener('resize', this.updateDetailHeight)
},
methods: {
updateDetailHeight () {
// rqrq:详情页签按容器实际位置铺满视口剩余高度,提示行占位三个页签统一扣除,保证表格大小一致。
const el = this.$refs.detail
if (!el) return
const tabsHeader = el.querySelector('.el-tabs__header')
const headerH = tabsHeader ? tabsHeader.getBoundingClientRect().height : 40
const borderH = 12 // 页签上下边框加内容区留白(与样式中 padding 5px 保持一致)
this.detailHeight = Math.max(180, Math.floor(window.innerHeight - el.getBoundingClientRect().top - headerH - borderH - 8))
},
rowKey (row) { return `${row.site}:${row.feeNo}` },
money (value) { return new Decimal(value || 0).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toFixed(2) },
feeSummary ({ columns, data }) {
@ -315,5 +333,13 @@ export default {
.po-date-pair { display: inline-flex; align-items: center; }
.po-date-pair /deep/ .el-date-editor { margin: 0; }
.po-date-sep { flex: 0 0 12px; width: 12px; text-align: center; line-height: 1; }
/deep/ .customer-tab .el-tabs__content { padding: 5px !important; }
/* rqrq:详情页签内容区小幅留白,表格紧跟页签头不再有大块空白。 */
.detail-tabs /deep/ .el-tabs__content { padding: 5px !important; }
/* rqrq:合并导出弹窗收紧宽度,两个日期框统一 220px 左对齐,区间框内部输入框不留额外边距。 */
.export-form /deep/ .el-form-item { margin-bottom: 12px; }
.export-form /deep/ .el-form-item__label { padding-bottom: 0; line-height: 24px; }
.export-form /deep/ .el-date-editor.el-input, .export-form /deep/ .el-date-editor.el-input__inner { width: 220px; }
.export-form /deep/ .el-date-editor .el-range-input { margin: 0; }
.export-selected { line-height: 36px; }
.export-tip { color: #909399; font-size: 12px; line-height: 1.6; }
</style>

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

@ -1,6 +1,6 @@
<template>
<el-dialog v-drag class="customer-css" :title="form.header.feeNo ? '编辑费用记录' : '新增费用记录'" :visible.sync="visible"
width="94%" top="3vh" :close-on-click-modal="false" :close-on-press-escape="!saving"
width="60%" top="3vh" :close-on-click-modal="false" :close-on-press-escape="!saving"
:show-close="!saving" append-to-body>
<!-- rqrq:标签位置、控件尺寸及弹窗页签沿用项目已有样式。 -->
<el-form ref="headerForm" :model="form.header" :rules="rules" label-position="top">
@ -16,16 +16,16 @@
<el-col :span="8"><el-form-item label="天数" prop="tripDays">
<el-input-number v-model="form.header.tripDays" :min="0.01" :max="9999.99" :precision="2" :step="0.5"/>
</el-form-item></el-col>
<el-col :span="12"><el-form-item label="起始地点" prop="startPlace">
<el-col :span="8"><el-form-item label="起始地点" prop="startPlace">
<el-input v-model.trim="form.header.startPlace" maxlength="200"/>
</el-form-item></el-col>
<el-col :span="12"><el-form-item label="终点地点" prop="endPlace">
<el-col :span="8"><el-form-item label="终点地点" prop="endPlace">
<el-input v-model.trim="form.header.endPlace" maxlength="200"/>
</el-form-item></el-col>
<el-col :span="12"><el-form-item label="出差事由" prop="tripReason">
<el-col :span="8"><el-form-item label="出差事由" prop="tripReason">
<el-input v-model.trim="form.header.tripReason" maxlength="500"/>
</el-form-item></el-col>
<el-col :span="12"><el-form-item label="备注">
<el-col :span="24"><el-form-item label="备注">
<el-input v-model="form.header.remark" maxlength="250"/>
</el-form-item></el-col>
</el-row>
@ -53,7 +53,6 @@
<template slot-scope="s"><el-link type="danger" @click="form.details.splice(s.$index, 1)">删除</el-link></template>
</el-table-column>
</el-table>
<div style="margin-top: 5px">模板仅汇总交通费、住宿费、住宿节约补助和补助;其他费用计入系统费用总额。</div>
</el-tab-pane>
<el-tab-pane label="差旅行程详情" name="trips">
<div style="margin-bottom: 5px">
@ -61,7 +60,7 @@
<span style="margin-left: 12px">行程合计:{{ tripTotal }}(仅作为附件,不计入费用总额)</span>
</div>
<el-table :data="form.trips" border height="340">
<el-table-column type="index" label="序号" width="50" header-align="center" align="center"/>
<el-table-column type="index" label="序号" width="40" header-align="center" align="center"/>
<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>
@ -71,19 +70,19 @@
<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="220" header-align="center">
<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>
</el-table-column>
<el-table-column label="票据数" width="100" header-align="center" align="right">
<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="120" header-align="center" align="right">
<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="140" header-align="center" align="right">
<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>
<el-table-column label="操作" width="70" header-align="center" align="center" fixed="right">

6
src/views/modules/inspection/inspectionRequestList.vue

@ -2356,7 +2356,7 @@ export default {
// 加载新增PO选择列表
loadAddPoSelectList () {
const params = {
currentPlannerOnly: !this.isSupplierPageMode, // rqrq - 补选 PO 同样限定本人
currentPlannerOnly: false, // rqrq - 补选 PO 不再按本人 Planner 过滤
site: this.$store.state.user.site,
supplierNo: this.addFormData.supplierNo,
orderRef1: this.addPoSearch.orderRef1 || '',
@ -2939,7 +2939,7 @@ export default {
// 查询新增弹窗专用供应商列表
loadPoSupplierList () {
const params = {
currentPlannerOnly: !this.isSupplierPageMode, // rqrq - 本人负责的供应商
currentPlannerOnly: false, // rqrq - 本页不再按本人 Planner 过滤,返回当前工厂全部供应商
site: this.$store.state.user.site,
supplierNo: this.poSupplierSearch.supplierNo || '',
supplierName: this.poSupplierSearch.supplierName || '',
@ -3264,7 +3264,7 @@ export default {
const params = {
supplierNo: this.addFormData.supplierNo,
site: this.$store.state.user.site,
currentPlannerOnly: !this.isSupplierPageMode, // rqrq - 供应商模式保持原有 PO 范围
currentPlannerOnly: false, // rqrq - PO 列表不再按本人 Planner 过滤
page: 1,
limit: 1000
}

Loading…
Cancel
Save