feat(hrm): 新增拨款申请功能并修复仓储显示问题
- 添加拨款申请相关组件、API及页面逻辑 - 修复仓储模块列表显示边框和内容插槽问题 - 更新版本记录至5.2.3版本
This commit is contained in:
@@ -114,6 +114,10 @@
|
||||
{
|
||||
label: '报销',
|
||||
value: 'reimburse'
|
||||
},
|
||||
{
|
||||
label: '拨款',
|
||||
value: 'appropriation'
|
||||
}
|
||||
],
|
||||
bizTypeIndex: 0,
|
||||
@@ -168,6 +172,9 @@
|
||||
} else if (task.bizType === 'reimburse') {
|
||||
const amt = biz.totalAmount != null ? biz.totalAmount : 0;
|
||||
return `${biz.reimburseType || '报销'} · 金额: ${amt}元`;
|
||||
} else if (task.bizType === 'appropriation') {
|
||||
const amt = biz.amount != null ? biz.amount : 0;
|
||||
return `${biz.appropriationType || '拨款'} · 金额: ${amt}元`;
|
||||
}
|
||||
return '-';
|
||||
},
|
||||
@@ -181,7 +188,8 @@
|
||||
leave: '请假',
|
||||
travel: '出差',
|
||||
seal: '用印',
|
||||
reimburse: '报销'
|
||||
reimburse: '报销',
|
||||
appropriation: '拨款'
|
||||
};
|
||||
return map[type] || type || '-';
|
||||
},
|
||||
@@ -191,7 +199,8 @@
|
||||
leave: 'primary',
|
||||
travel: 'success',
|
||||
seal: 'warning',
|
||||
reimburse: 'danger'
|
||||
reimburse: 'danger',
|
||||
appropriation: 'danger'
|
||||
};
|
||||
return map[type] || 'info';
|
||||
},
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
import HRMReimburseDetail from '@/components/hrm/detailPanels/reimburse.vue'
|
||||
import HRMSealDetail from '@/components/hrm/detailPanels/seal.vue'
|
||||
import HRMTravelDetail from '@/components/hrm/detailPanels/travel.vue'
|
||||
import HRMAppropriationDetail from '@/components/hrm/detailPanels/appropriation.vue'
|
||||
|
||||
import {
|
||||
approveFlowTask,
|
||||
@@ -34,7 +35,8 @@
|
||||
HRMLeaveDetail,
|
||||
HRMReimburseDetail,
|
||||
HRMSealDetail,
|
||||
HRMTravelDetail
|
||||
HRMTravelDetail,
|
||||
HRMAppropriationDetail
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
@@ -46,7 +48,8 @@
|
||||
leave: 'HRMLeaveDetail', // 请假
|
||||
reimburse: 'HRMReimburseDetail', // 报销
|
||||
seal: 'HRMSealDetail', // 用章
|
||||
travel: 'HRMTravelDetail' // 差旅
|
||||
travel: 'HRMTravelDetail' ,// 差旅
|
||||
appropriation: 'HRMAppropriationDetail'
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user