ZhaoJun 1 vuosi sitten
vanhempi
commit
def76482ee

+ 3 - 2
src/pages/TaskManage/Detail/TaskOrder/TaskOrder.tsx

@@ -167,9 +167,9 @@ const TaskOrder: React.FC<IPropsType> = (props) => {
             dayjs(temp.actual_end_time).format('YYYY-MM-DD HH:mm')) ||
           '-',
         Reason: temp.detail,
-        Repairman: userList.find((item) => item.ID === temp.checker_id) || '-',
+        Repairman: userList.find((item) => item.ID === temp.operator_id) || '-',
         DispatchMan:
-          userList.find((item) => item.ID === temp.operator_id) || '-',
+          userList.find((item) => item.ID === temp.checker_id) || '-',
         OrderStatus:
           OrderStatus.find((item) => item.value === temp.status) || '-',
         MandateImages:
@@ -267,6 +267,7 @@ const TaskOrder: React.FC<IPropsType> = (props) => {
     switch (order_type) {
       // 工艺
       case 1:
+      case 7:
       case 6:
         getCraftDetail({ project_id, work_id: order_id });
         break;

+ 1 - 3
src/pages/TaskManage/Popup/WorkOrderModal.js

@@ -89,9 +89,7 @@ const WorkOrderModal = (props) => {
           Reason: temp.Reason,
           Repairman: userList.find((item) => item.ID === temp.Repairman) || '-',
           DispatchMan:
-            userList.find((item) => {
-              item.ID === temp.operator_id;
-            }) || '-',
+            userList.find((item) => item.ID === temp.operator_id) || '-',
           OrderStatus:
             OrderStatus.find((item) => item.value === temp.AcceptanceStatus) ||
             '-',