|
|
@@ -377,23 +377,65 @@ function buildSteps(data: any) {
|
|
|
description: `创建时间:${data.create_datetime}`,
|
|
|
status: 'finish'
|
|
|
},
|
|
|
- {
|
|
|
+ {
|
|
|
title: '待审批',
|
|
|
- description: `待审批人:${data.approver_info.name}`,
|
|
|
+ description: `待审批人:${data.approval_records ?
|
|
|
+ (() => {
|
|
|
+ const names = data.approval_records
|
|
|
+ .map((item:any) => {
|
|
|
+ console.log('item:', item, 'approver_name:', item.approver_name); // 调试信息
|
|
|
+ // 支持多种字段名
|
|
|
+ return item.approver_name || item.app_user_approver_name || item.name;
|
|
|
+ })
|
|
|
+ .filter(name => name && name.trim()); // 过滤空值和空字符串
|
|
|
+ console.log('filtered names:', names); // 调试信息
|
|
|
+ return names.join('、') || '暂无待审批人员';
|
|
|
+ })()
|
|
|
+ : '未知'} 审批`,
|
|
|
status: data.status >= 2 ? 'finish' : 'process'
|
|
|
}
|
|
|
];
|
|
|
|
|
|
- if (data.status >= 2 &&data.status!=3) {
|
|
|
- steps.value.push({
|
|
|
- title: '审批通过',
|
|
|
- description: `审批人:${data.approver_info.name},时间:${data.approve_time},仓库:${getWarehouseName(data.warehouse)||'暂无仓库'}`,
|
|
|
- status: 'finish'
|
|
|
+ const approverinfo = data.approver_info ?? data.admin_approver_info
|
|
|
+
|
|
|
+
|
|
|
+ if (data.status >= 2&&data.status!=3 && data.borrow_type!=1) {
|
|
|
+ // 将审批记录倒序排列
|
|
|
+ const reversedApprovalRecords = [...data.approval_records].reverse();
|
|
|
+ reversedApprovalRecords.forEach((item:any,index:number) => {
|
|
|
+ if(item.status === 1){
|
|
|
+ if(index === 0){
|
|
|
+ steps.value.push({
|
|
|
+ title: '审批通过',
|
|
|
+ description: `审批人:${item.app_user_approver_name},时 间:${item.approve_time},领取仓库:${getWarehouseName(data.warehouse)||'暂无仓库'}`,
|
|
|
+ status: 'finish'
|
|
|
+ });
|
|
|
+ }else{
|
|
|
+ steps.value.push({
|
|
|
+ title: '审批通过',
|
|
|
+ description: `审批人:${item.approver_name},时 间:${item.create_datetime}`,/* ,领取仓库:${getWarehouseName(data.warehouse)||'暂无仓库'} */
|
|
|
+ status: 'finish'
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
});
|
|
|
} else if (data.status === 3) {
|
|
|
+ // console.log("data.approver_name:::",data.approver_info.name)
|
|
|
+ const rejectNames = data.approval_records
|
|
|
+ .filter((item:any) => item.status === 2)
|
|
|
+ .map((item:any) => item.approver_name || item.app_user_approver_name || item.name)
|
|
|
+ .filter((name:any) => name && name.trim());
|
|
|
+ const rejectReason = data.approval_records
|
|
|
+ .filter((item:any) => item.status === 2)
|
|
|
+ .map((item:any) => item.approve_remark)
|
|
|
+ .filter((reason:any) => reason && reason.trim());
|
|
|
+ const rejectTime = data.approval_records
|
|
|
+ .filter((item:any) => item.status === 2)
|
|
|
+ .map((item:any) => item.approve_time)
|
|
|
+ .filter((time:any) => time && time.trim());
|
|
|
steps.value.push({
|
|
|
title: '审批拒绝',
|
|
|
- description: `审批人:${data.approver_info.name},拒绝原因: ${data.approve_remark},时间:${data.approve_time}`,
|
|
|
+ description: `审批人:${rejectNames.join('、')},拒绝原因: ${rejectReason.join('、')},时间:${rejectTime.join('、')}`,
|
|
|
status: 'error'
|
|
|
});
|
|
|
}
|