From 51c27e505842ce3343dfabfb994d2fc28ae0d8a8 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 11 三月 2026 14:56:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-admin/src/page/task/TaskList.jsx | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index 445e8cd..51a6b7a 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} />) : (<></>)
)
}
--
Gitblit v1.9.1