From 37030abc0f7ab8eab6ec99d7d418dfcaf81678ee Mon Sep 17 00:00:00 2001
From: linxd <544554903@qq.com>
Date: Tue, 15 Jul 2025 13:58:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E4=B8=8B=E8=AF=84?=
 =?UTF-8?q?=E4=BB=B7=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86dva=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=95=B0=E6=8D=AE=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/models/supplierTaskManage.ts                              | 3 ++-
 .../supplierTaskManage/components/DivisionStep.tsx            | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/models/supplierTaskManage.ts b/src/models/supplierTaskManage.ts
index 7bd5522..3d70c47 100644
--- a/src/models/supplierTaskManage.ts
+++ b/src/models/supplierTaskManage.ts
@@ -246,8 +246,9 @@ const SupplierTaskModel: SupplierTaskModelType = {
           const userId = newUser.id || newUser.userId;
           const existing = existingUserMap.get(userId);
 
+          // 这里优化一下 如果newUser.indicatorIds为空 则取existing?.indicatorIds 否则取newUser.indicatorIds
           const indicatorIds =
-            newUser.indicatorIds && newUser.indicatorIds.length > 0
+            newUser.indicatorIds
               ? newUser.indicatorIds
               : existing?.indicatorIds || [];
 
diff --git a/src/pages/supplierEvaluateManage/supplierTaskManage/components/DivisionStep.tsx b/src/pages/supplierEvaluateManage/supplierTaskManage/components/DivisionStep.tsx
index c6055e0..fdc2d9b 100644
--- a/src/pages/supplierEvaluateManage/supplierTaskManage/components/DivisionStep.tsx
+++ b/src/pages/supplierEvaluateManage/supplierTaskManage/components/DivisionStep.tsx
@@ -204,7 +204,6 @@ const DivisionStepComponent = (props: DivisionStepProps) => {
     // 读取dva中的数据，只克隆一次
     const indicatorList = JSON.parse(JSON.stringify(taskFormData?.indicatorList || []));
     const userList = JSON.parse(JSON.stringify(taskFormData?.userList || []));
-
     // 批量更新indicatorList和userList
     userIds.forEach((userId) => {
       // 更新indicatorList
@@ -382,7 +381,8 @@ const DivisionStepComponent = (props: DivisionStepProps) => {
       key: 'action',
       render: (_: any, record: SupplierTaskManage.PersonnelItem) => (
         <Space size="middle">
-          {mode !== 'division' && (
+          {/* 如果是分工模式 或者 历史存在数据则显示按钮 */}
+          {(mode !== 'division' || !record.isSelected) && (
             <>
               <Button type="link" onClick={() => handleAssignIndicators(record.id)}>
                 {intl.formatMessage({ id: 'supplierTaskManage.button.evaluatorDivision' })}