Commit 51151952 by wangchunyang

样式按标准调整,去除多去的文件

parent 0bcd26da
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
show-total show-sizer @on-change="pageChange('pending', $event)" @on-page-size-change="sizeChange('pending', $event)" /> show-total show-sizer @on-change="pageChange('pending', $event)" @on-page-size-change="sizeChange('pending', $event)" />
</TabPane> </TabPane>
<TabPane label="审批历史查询" name="history" v-if="power.leave_view"> <TabPane label="审批历史查询" name="history" v-if="power.leave_view">
<div class="search-div"> <div class="search-div">
<Row type="flex" :gutter="16" align="middle"> <Row type="flex" :gutter="16" align="middle">
<Col span="18"> <Col span="18">
...@@ -345,27 +345,32 @@ export default { ...@@ -345,27 +345,32 @@ export default {
{ title: '请假类型', key: 'leave_type_name', align: 'center' }, { title: '请假类型', key: 'leave_type_name', align: 'center' },
{ title: '起止时间', key: 'start_time', align: 'center', render: (h, { row }) => h('span', `${row.start_time || '-'} ~ ${row.end_time || '-'}`) }, { title: '起止时间', key: 'start_time', align: 'center', render: (h, { row }) => h('span', `${row.start_time || '-'} ~ ${row.end_time || '-'}`) },
{ title: '审批完成时间', key: 'approval_complete_time', align: 'center' }, { title: '审批完成时间', key: 'approval_complete_time', align: 'center' },
{ title: '结果', key: 'op_result', align: 'center', render: (h, { row }) => { {
let statusText = ''; title: '结果',
let statusClass = ''; key: 'op_result',
switch (row.op_result) { align: 'center',
case 0: render: (h, { row }) => {
statusText = '未通过'; let statusText = ''
statusClass = 'text-orange'; let statusClass = ''
break; switch (row.op_result) {
case 1: case 0:
statusText = '通过'; statusText = '未通过'
statusClass = 'text-green'; statusClass = 'text-orange'
break; break
case -1: case 1:
statusText = '驳回'; statusText = '通过'
statusClass = 'text-red'; statusClass = 'text-green'
break; break
default: case -1:
statusText = '-'; statusText = '驳回'
statusClass = 'text-red'
break
default:
statusText = '-'
}
return h('span', { class: statusClass }, statusText)
} }
return h('span', { class: statusClass }, statusText); },
} },
{ title: '操作', slot: 'action', align: 'center', width: 100 } { title: '操作', slot: 'action', align: 'center', width: 100 }
], ],
queryColumns: [ queryColumns: [
...@@ -457,7 +462,6 @@ export default { ...@@ -457,7 +462,6 @@ export default {
// 加载待审批计数,用于页面顶部/选项卡徽章显示 // 加载待审批计数,用于页面顶部/选项卡徽章显示
this.loadPendingCount() this.loadPendingCount()
this.getUserDmPermission() this.getUserDmPermission()
}, },
watch: { watch: {
// 当弹窗关闭时清理选择的审批人,确保下次打开时下拉框能正确刷新显示 // 当弹窗关闭时清理选择的审批人,确保下次打开时下拉框能正确刷新显示
...@@ -487,7 +491,7 @@ export default { ...@@ -487,7 +491,7 @@ export default {
} }
}, },
methods: { methods: {
getUserDmPermission () { getUserDmPermission () {
getUserDmPermissionList({}).then(ret => { getUserDmPermissionList({}).then(ret => {
console.log('ret', ret) console.log('ret', ret)
if (ret.data && ret.data.errcode === 0) { if (ret.data && ret.data.errcode === 0) {
...@@ -1079,22 +1083,22 @@ export default { ...@@ -1079,22 +1083,22 @@ export default {
openHistoryDetail (row) { this.openDetail(row) }, openHistoryDetail (row) { this.openDetail(row) },
renderApproveResult (h, { row }) { return row.approver_result === 1 ? '通过' : (row.approver_result === -1 ? '驳回' : '未处理') }, renderApproveResult (h, { row }) { return row.approver_result === 1 ? '通过' : (row.approver_result === -1 ? '驳回' : '未处理') },
formatDatetime (val) { formatDatetime (val) {
if (!val) return '-'; if (!val) return '-'
try { try {
// 处理ISO格式时间字符串,如 "2023-12-31T10:30:00.000Z" // 处理ISO格式时间字符串,如 "2023-12-31T10:30:00.000Z"
if (typeof val === 'string' && val.includes('T')) { if (typeof val === 'string' && val.includes('T')) {
// 移除时区信息和毫秒,转换为本地时间格式 // 移除时区信息和毫秒,转换为本地时间格式
const date = new Date(val); const date = new Date(val)
if (!isNaN(date.getTime())) { if (!isNaN(date.getTime())) {
const pad = (n) => (n < 10 ? '0' + n : String(n)); const pad = (n) => (n < 10 ? '0' + n : String(n))
return date.getFullYear() + '-' + pad(date.getMonth() + 1) + '-' + pad(date.getDate()) + ' ' + return date.getFullYear() + '-' + pad(date.getMonth() + 1) + '-' + pad(date.getDate()) + ' ' +
pad(date.getHours()) + ':' + pad(date.getMinutes()) + ':' + pad(date.getSeconds()); pad(date.getHours()) + ':' + pad(date.getMinutes()) + ':' + pad(date.getSeconds())
} }
} }
// 如果不是ISO格式或解析失败,返回原值的T替换版本 // 如果不是ISO格式或解析失败,返回原值的T替换版本
return String(val).replace('T', ' '); return String(val).replace('T', ' ')
} catch (e) { } catch (e) {
return String(val).replace('T', ' '); return String(val).replace('T', ' ')
} }
}, },
loadStats () { loadStats () {
...@@ -1119,7 +1123,6 @@ export default { ...@@ -1119,7 +1123,6 @@ export default {
this.loadStats() this.loadStats()
}, },
deleteApply (row) { deleteApply (row) {
deleteLeaveById({ id: row.id, leave_id: row.leave_id }).then(ret => { deleteLeaveById({ id: row.id, leave_id: row.leave_id }).then(ret => {
if (ret.data && ret.data.errcode === 0) { if (ret.data && ret.data.errcode === 0) {
this.$Message.success('删除成功') this.$Message.success('删除成功')
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论