fix:审批单合并成审批中心

dev_1.0.2
jiangpeng 2026-08-05 11:17:04 +08:00
parent 0b693760df
commit 2d5cffb78e
1 changed files with 12 additions and 5 deletions

View File

@ -70,12 +70,12 @@
</el-form> </el-form>
<div class="table-panel"> <div class="table-panel">
<el-table :data="approvalList" class="approval-table" v-loading="loading"> <el-table :data="approvalList" class="approval-table" v-loading="loading" @sort-change="handleSortChange" :default-sort="{prop: 'startTime', order: 'descending'}">
<el-table-column type="index" label="序号" width="65" align="center" /> <el-table-column type="index" label="序号" width="65" align="center" />
<el-table-column label="流程编号" prop="processNo" min-width="195" /> <el-table-column label="流程编号" prop="processNo" min-width="195" />
<el-table-column label="流程标题" prop="processTitle" min-width="250"> <el-table-column label="流程标题" prop="processTitle" min-width="250">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.approveStatus === '1'" class="urgent-dot"></span> <span v-if="isApproveButton(scope.row)" class="urgent-dot"></span>
<span>{{ scope.row.processTitle }}</span> <span>{{ scope.row.processTitle }}</span>
</template> </template>
</el-table-column> </el-table-column>
@ -85,7 +85,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发起人" prop="initiator" min-width="110" /> <el-table-column label="发起人" prop="initiator" min-width="110" />
<el-table-column label="发起时间" prop="startTime" min-width="135" /> <el-table-column label="发起时间" prop="startTime" min-width="135" sortable="custom" :sort-orders="['descending', 'ascending']" />
<el-table-column label="含税总计(元)" prop="totalAmount" min-width="145"> <el-table-column label="含税总计(元)" prop="totalAmount" min-width="145">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="amount">{{ formatAmount(scope.row.totalAmount) }}</span> <span class="amount">{{ formatAmount(scope.row.totalAmount) }}</span>
@ -685,11 +685,18 @@ export default {
approveStatus: statusMap[this.activeTab], approveStatus: statusMap[this.activeTab],
pageNum: 1, pageNum: 1,
pageSize: this.searchParams.pageSize, pageSize: this.searchParams.pageSize,
orderByColumn: 'startTime', orderByColumn: this.searchParams.orderByColumn,
isAsc: 'desc' isAsc: this.searchParams.isAsc
} }
this.getList() this.getList()
}, },
handleSortChange({ column, prop, order }) {
if (prop === 'startTime') {
this.searchParams.orderByColumn = 'startTime'
this.searchParams.isAsc = order === 'ascending' ? 'asc' : 'desc'
this.getList()
}
},
getApproveTypeLabel(value) { getApproveTypeLabel(value) {
if (!value) return '-' if (!value) return '-'
const item = (this.dict.type.approve_type || []).find(d => d.value == value) const item = (this.dict.type.approve_type || []).find(d => d.value == value)