From c55a86895cabc3e91c2e7aa4eab099a7287e0ae6 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 21 四月 2026 14:54:16 +0800
Subject: [PATCH] 站点优化
---
rsf-admin/src/page/task/TaskList.jsx | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index 1667f99..6a71189 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -372,6 +372,22 @@
)
}
+/** 鎷ｆ枡/鐩樼偣鍑哄簱锛氫粎 RCS 鎵ц涓�(<198)鍙彇娑堬紱199銆�198 涓嶅彲鍙栨秷 */
+const canCancelPickOrCheckOut = (record) => {
+ if (record?.taskType != 103 && record?.taskType != 107) return false;
+ const s = record.taskStatus;
+ return s < 198;
+};
+
+/** 鏅�氬叆鍑哄簱銆佺┖鏉垮叆鍑哄簱銆佺Щ搴撶瓑锛氬垱寤烘�佸彲鍙栨秷锛�199 涓嶅彲鍙栨秷锛堜笌鍏ㄧ増鍑哄簱 101 鍚岃鍒欙級 */
+const canCancelLegacy = (record) => {
+ const t = record?.taskType;
+ const s = record?.taskStatus;
+ // if (t != 1 && t != 101 && t != 10 && t != 11) return false;
+ if (t != 1 && t != 101 && t != 10 && t != 11 && t != 110) return false;
+ return s == 1 || s == 101;
+};
+
/**
* 鍙栨秷鎸夐挳
* @returns
@@ -393,8 +409,9 @@
notify(msg);
}
}
+ const showCancel = canCancelPickOrCheckOut(record) || canCancelLegacy(record);
return (
- (record.taskStatus == 1 || record.taskStatus == 101 || record.taskStatus == 199) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 107 || record.taskType == 103 || record.taskType == 11) ?
+ showCancel ?
<ConfirmButton
onConfirm={clickCancel}
startIcon={<CancelIcon />}
@@ -427,7 +444,8 @@
}
}
return (
- (record.taskStatus == 1 || record.taskStatus == 101) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 103 || record.taskType == 11) ?
+ // 绌烘澘鍑哄簱 110 涓庡叏鐗堝嚭搴� 101 鍚岋細寰呮墽琛屾椂鍙疆椤�
+ (record.taskStatus == 1 || record.taskStatus == 101) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 103 || record.taskType == 11 || record.taskType == 110) ?
<Button
onClick={clickTop}
label="toolbar.top">
--
Gitblit v1.9.1