修改人中心任务工单负责人字段

src/pages/Center/MyTask/Detail/TaskDetail.js

@@ -81,9 +81,10 @@ function TaskDetail(props) {
         MandateType: MandateType.find(
           (item) => item.value === result.data.MandateType,
         ),
-        ResponsiblePeople: userList.find(
-          (item) => item.ID === result.data.ResponsiblePeople,
-        ),
+        ResponsiblePeople: result.data.ResponsiblePeople.split(',')
+          .map((cur) => userList.find((item) => item.ID == Number(cur))?.CName)
+          .filter((item) => item)
+          .join(','),
         CreateTime: dayjs(result.data.CreateTime).format('YYYY-MM-DD HH:mm'),
       };
       const workOrder = result.data.Records.map((item) => {
@@ -92,7 +93,12 @@ function TaskDetail(props) {
           CreateTime: dayjs(item.CreateTime).format('YYYY-MM-DD HH:mm'),
           Status: OrderStatus.find((status) => status.value === item.Status),
           RecordType: OrderType.find((type) => type.value === item.RecordType),
-          Responsible: userList.find((user) => user.ID === item.Responsible),
+          Responsible: item.Responsible.split(',')
+            .map(
+              (cur) => userList.find((item) => item.ID == Number(cur))?.CName,
+            )
+            .filter((item) => item)
+            .join(','),
         };
       });
       const children = result.data.MandateChild;
@@ -131,9 +137,7 @@ function TaskDetail(props) {
                     </Col>
                     <Col className={styles.fontS30} span={14}>
                       工单负责人：
-                      {typeof record.Responsible === 'number'
-                        ? '-'
-                        : record.Responsible?.CName}
+                      {record.Responsible}
                     </Col>
                   </Row>
                 </div>
@@ -283,7 +287,7 @@ function TaskDetail(props) {
             </Col>
             <Col className={styles.fontS30}>
               {/*// @ts-ignore*/}
-              任务负责人：{mandateDetail?.ResponsiblePeople?.CName}
+              任务负责人：{mandateDetail?.ResponsiblePeople}
             </Col>
           </Row>
         </div>

src/pages/Center/MyTask/Detail/WorkOrderDetail.js

@@ -56,11 +56,15 @@ const WorkOrderDetail = (props) => {
         Clean: temp.Clean,
         Check: temp.Check,
         Repairman:
-          userList.find((item) => item.ID === temp.MaintenancePerson) || '-',
+          temp.ResponsiblePeople.split(',')
+            .map(
+              (cur) => userList.find((item) => item.ID == Number(cur))?.CName,
+            )
+            .filter((item) => item)
+            .join(',') || '-',
         DispatchMan:
-          userList.find(
-            (item) => (item.ID = temp.Operators[0]?.Operator?.ID),
-          ) || '-',
+          userList.find((item) => (item.ID = temp.Operators[0]?.Operator?.ID))
+            ?.CName || '-',
         OrderStatus:
           OrderStatus.find((item) => item.value === temp.Status) || '-',
         MandateImages:
@@ -100,9 +104,14 @@ const WorkOrderDetail = (props) => {
           ? dayjs(temp.RepairTime).format('YYYY-MM-DD HH:mm')
           : '-',
         Reason: temp.Reason,
-        Repairman: userList.find((item) => item.ID === temp.Repairman) || '-',
-        DispatchMan:
-          userList.find((item) => item.ID === temp.operator_id) || '-',
+        Repairman:
+          temp.Repairman.split(',')
+            .map(
+              (cur) => userList.find((item) => item.ID == Number(cur))?.CName,
+            )
+            .filter((item) => item)
+            .join(',') || '-',
+        DispatchMan: temp.operator_name || '-',
         OrderStatus:
           OrderStatus.find((item) => item.value === temp.AcceptanceStatus) ||
           '-',
@@ -138,9 +147,9 @@ const WorkOrderDetail = (props) => {
             dayjs(temp.actual_end_time).format('YYYY-MM-DD HH:mm')) ||
           '-',
         Reason: temp.detail,
-        Repairman: userList.find((item) => item.ID === temp.operator_id) || '-',
+        Repairman: temp.operator_name || '-',
         DispatchMan:
-          userList.find((item) => item.ID === temp.checker_id) || '-',
+          userList.find((item) => item.ID === temp.checker_id)?.CName || '-',
         OrderStatus:
           OrderStatus.find((item) => item.value === temp.status) || '-',
         MandateImages:
@@ -178,8 +187,7 @@ const WorkOrderDetail = (props) => {
           ? dayjs(result.actual_end_time.Time).format('YYYY-MM-DD HH:mm')
           : '-',
         Reason: result.note,
-        Repairman:
-          userList.find((user) => user.ID === result.operator_id) || '-',
+        Repairman: operator_name || '-',
         DispatchMan: '-',
         OrderStatus:
           OrderStatus.find((status) => status.value === result.status) || '-',
@@ -206,8 +214,7 @@ const WorkOrderDetail = (props) => {
             ? dayjs(temp.actual_end_time).format('YYYY-MM-DD HH:mm')
             : '-',
           Reason: temp.detail,
-          Repairman:
-            userList.find((user) => user.ID === temp.operator_id) || '-',
+          Repairman: temp.operator_name || '-',
           DispatchMan: '-',
           OrderStatus:
             OrderStatus.find((status) => status.value === temp.status) || '-',
@@ -316,7 +323,7 @@ const WorkOrderDetail = (props) => {
                 </Col>
                 <Col className={styles.fontS28} span={9}>
                   {/* @ts-ignore */}
-                  工单负责人：{orderInfo?.Repairman?.CName || '-'}
+                  工单负责人：{orderInfo?.Repairman}
                 </Col>
               </Row>
               <Row className={styles.rowMargin}>
@@ -326,7 +333,7 @@ const WorkOrderDetail = (props) => {
                 </Col>
                 <Col className={styles.fontS28} span={9}>
                   {/* @ts-ignore */}
-                  派单人员：{orderInfo?.DispatchMan?.CName || '-'}
+                  派单人员：{orderInfo?.DispatchMan || '-'}
                 </Col>
               </Row>
               <Row className={styles.rowMargin}>

src/pages/Center/MyTask/List/TaskList.js

@@ -148,19 +148,25 @@ const MyTaskList = (props) => {
       MandateClass: MandateClass.find(
         (itemClass) => itemClass.value === item.MandateClass,
       ),
-      ResponsiblePeople: userList.find(
-        (user) => user.ID === item.ResponsiblePeople,
-      ),
+      ResponsiblePeople: item.ResponsiblePeople.split(',')
+        .map((cur) => userList.find((item) => item.ID == Number(cur))?.CName)
+        .filter((item) => item)
+        .join(','),
       CreateTime: dayjs(item.CreateTime).format('YYYY-MM-DD HH:mm'),
     };
 
+    console.log('------------------', formatItem);
+
     const workOrder = item.Records.map((record) => {
       return {
         ...record,
         key: record.Id,
         Status: OrderStatus.find((status) => status.value === record.Status),
         RecordType: OrderType.find((type) => type.value === record.RecordType),
-        Responsible: userList.find((user) => user.ID === record.Responsible),
+        Responsible: record.Responsible.split(',')
+          .map((cur) => userList.find((item) => item.ID == Number(cur))?.CName)
+          .filter((item) => item)
+          .join(','),
         CreateTime: dayjs(record.CreateTime).format('YYYY-MM-DD HH:mm'),
       };
     });
@@ -193,7 +199,7 @@ const MyTaskList = (props) => {
                     </span>
                   </Col>
                   <Col className={styles.fontS30} span={13}>
-                    工单负责人：{order.Responsible?.CName}
+                    工单负责人：{order.Responsible}
                   </Col>
                 </Row>
               </div>
@@ -266,7 +272,7 @@ const MyTaskList = (props) => {
               }}
             >
               <Col span={11} className={styles.fontS30}>
-                任务负责人: {formatItem.ResponsiblePeople?.CName || '-'}
+                任务负责人: {formatItem.ResponsiblePeople || '-'}
               </Col>
               <Col span={8} className={styles.fontS30}>
                 任务状态: {formatItem.Status?.label || '-'}