From 33c3901ee9b86f7f66f467897190578a7d20a91d Mon Sep 17 00:00:00 2001 From: ywyonui Date: Fri, 5 Sep 2025 22:25:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8A=84=E9=80=81=E4=BA=BA?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/base/xs/qj/components/progressList.vue | 8 ++++---- src/pages/view/hr/jsQj/components/progressList.vue | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pages/base/xs/qj/components/progressList.vue b/src/pages/base/xs/qj/components/progressList.vue index 2bf7197..ebd52d9 100644 --- a/src/pages/base/xs/qj/components/progressList.vue +++ b/src/pages/base/xs/qj/components/progressList.vue @@ -20,7 +20,7 @@ {{ formatTime(approver.approveTime) }} - {{ getStatusText(approver.approveStatus) }} + {{ getStatusText(approver.spType, approver.approveStatus) }} @@ -116,11 +116,11 @@ const getSpTypeText = (spType: string) => { }; // 获取状态文本 -const getStatusText = (status: string) => { +const getStatusText = (spType: string, status: string) => { switch (status) { case 'apply': return '已申请'; - case 'pending': return '待处理'; - case 'approved': return '已同意'; + case 'pending': return spType === 'CC' ? '待抄送' : '待处理'; + case 'approved': return spType === 'CC' ? '已抄送' : '已同意'; case 'rejected': return '已拒绝'; case 'cc_sent': return '已抄送'; default: return '未知'; diff --git a/src/pages/view/hr/jsQj/components/progressList.vue b/src/pages/view/hr/jsQj/components/progressList.vue index fc9841a..6aeb1d9 100644 --- a/src/pages/view/hr/jsQj/components/progressList.vue +++ b/src/pages/view/hr/jsQj/components/progressList.vue @@ -20,7 +20,7 @@ {{ formatTime(approver.approveTime) }} - {{ getStatusText(approver.approveStatus) }} + {{ getStatusText(approver.spType, approver.approveStatus) }} @@ -120,11 +120,11 @@ const getSpTypeText = (spType: string) => { }; // 获取状态文本 -const getStatusText = (status: string) => { +const getStatusText = (spType: string, status: string) => { switch (status) { case 'apply': return '已申请'; - case 'pending': return '待处理'; - case 'approved': return '已同意'; + case 'pending': return spType === 'CC' ? '待抄送' : '待处理'; + case 'approved': return spType === 'CC' ? '已抄送' : '已同意'; case 'rejected': return '已拒绝'; case 'cc_sent': return '已抄送'; default: return '未知';