From 00a44859a673b388e1dca5f54c4ecaffc5fee30e Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期四, 19 三月 2026 10:21:08 +0800
Subject: [PATCH] lsh#0：新增、更新、解禁（只要调用了更新，就代表非禁用了） 1：禁用
---
rsf-admin/src/page/task/TaskList.jsx | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index 445e8cd..b2a1f0f 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -343,8 +343,9 @@
notify(msg);
}
}
+ // 浠呭綋鎺ュ彛杩斿洖 canComplete 涓� true 鏃跺睍绀猴紙瀛樺湪姝ラ婊¤冻 taskStatus=wmsNowTaskStatus 涓� wmsNextTaskStatus!=null锛�
return (
- ((record?.taskStatus < 98) || (record?.taskType >= 101 && record?.taskStatus < 198)) || (record?.taskType == 11 && record?.taskStatus == 101) ? (<ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />) : (<></>)
+ record?.canComplete === true ? (<ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />) : (<></>)
)
}
@@ -370,14 +371,13 @@
}
}
return (
- (record.taskStatus == 1 || record.taskStatus == 101) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 107 || record.taskType == 103 || record.taskType == 11) ?
+ record?.canCancel === true ? (
<ConfirmButton
onConfirm={clickCancel}
startIcon={<CancelIcon />}
label={"toolbar.cancel"}>
</ConfirmButton>
- :
- <></>
+ ) : <></>
)
}
/**
--
Gitblit v1.9.1