Ver código fonte

feat: 增加对于巡检工单的处理

ZhaoJun 1 ano atrás
pai
commit
60bbe708db

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

@@ -6,6 +6,7 @@ import { OrderStatus, OrderType } from '@/pages/TaskManage/constent';
 import {
   getCraftRecordList,
   getMaintainRecordList,
+  getPatrolMandateRecord,
   getRepairRecordList,
   getWorkOrderFlow,
   queryReagentDetail,
@@ -218,6 +219,34 @@ const TaskOrder: React.FC<IPropsType> = (props) => {
     },
   });
 
+  const { run: getPatrolOrderList } = useRequest(getPatrolMandateRecord, {
+    manual: true,
+    formatResult: (result) => {
+      if (result?.data?.list) {
+        const temp = result.data.list[0];
+        const tempDetail = {
+          ...temp,
+          CreateTime: temp?.CreatedTime
+            ? dayjs(temp.CreatedTime).format('YYYY-MM-DD HH:mm')
+            : '-',
+          PlanTime: temp.plan_end_time
+            ? dayjs(temp.plan_end_time).format('YYYY-MM-DD HH:mm')
+            : '-',
+          RepairTime: temp?.actual_end_time
+            ? dayjs(temp.actual_end_time).format('YYYY-MM-DD HH:mm')
+            : '-',
+          Reason: temp.detail,
+          Repairman: '-',
+          DispatchMan:
+            userList.find((user) => user.ID === temp.operator_id) || '-',
+          OrderStatus:
+            OrderStatus.find((status) => status.value === temp.status) || '-',
+        };
+        setOrderInfo(tempDetail);
+      }
+    },
+  });
+
   // 获取工单流程信息
   useRequest(getWorkOrderFlow, {
     // manual: true,
@@ -250,6 +279,11 @@ const TaskOrder: React.FC<IPropsType> = (props) => {
       case 3:
         getMaintainDetail({ project_id, id: order_id });
         break;
+      // 巡检
+      case 4:
+        getPatrolOrderList({ project_id, id: order_id });
+        break;
+      // 加药
       case 5:
         getDosingOrder({ id: order_id });
         break;
@@ -309,7 +343,7 @@ const TaskOrder: React.FC<IPropsType> = (props) => {
               </Col>
               <Col className={styles.fontS28} span={9}>
                 {/* @ts-ignore */}
-                派单人员:{orderInfo?.DispatchMan?.CName}
+                派单人员:{orderInfo?.DispatchMan?.CName || '-'}
               </Col>
             </Row>
             <Row className={styles.rowMargin}>
@@ -403,10 +437,10 @@ const TaskOrder: React.FC<IPropsType> = (props) => {
                 items={stepInfo?.map((item) => {
                   return {
                     title: (
-                      <span className={styles.fontS24}>{item.content}</span>
+                      <span className={styles.fontS28}>{item.content}</span>
                     ),
                     description: (
-                      <span className={styles.fontS20}>{item.time}</span>
+                      <span className={styles.fontS24}>{item.time}</span>
                     ),
                   };
                 })}

+ 9 - 2
src/pages/TaskManage/Detail/WorkOrderList/WorkOrderList.js

@@ -3,6 +3,7 @@ import PageTitle from '@/components/PageTitle';
 import {
   getCraftRecordList,
   getMaintainRecordList,
+  getPatrolMandateRecord,
   getReagentOrderList,
   getRepairRecordList,
 } from '@/services/TaskManage';
@@ -94,6 +95,10 @@ const WorkOrderList = (props) => {
       if (order?.CreateTime) {
         return dayjs(order.CreateTime).format('YYYY-MM-DD HH:mm');
       }
+    } else if (order_type === 4) {
+      if (order?.CreatedTime) {
+        return dayjs(order.CreatedTime).format('YYYY-MM-DD HH:mm');
+      }
     } else if (order_type === 5) {
       if (order?.start_time?.Valid) {
         return dayjs(order.start_time.Time).format('YYYY-MM-DD HH:mm');
@@ -111,7 +116,7 @@ const WorkOrderList = (props) => {
           return getCraftRecordList({
             project_id,
             status: status || 0,
-            work_type: order_type,
+            types: order_type === 1 ? 0 : order_type === 6 ? 1 : 2,
           });
         case 2:
           return getRepairRecordList({
@@ -121,7 +126,7 @@ const WorkOrderList = (props) => {
         case 3:
           return getMaintainRecordList({ project_id, status: status || 0 });
         case 4:
-          return;
+          return getPatrolMandateRecord({ project_id, status: status || 0 });
         case 5:
           return getReagentOrderList({ project_id, status: status || 0 });
       }
@@ -140,6 +145,8 @@ const WorkOrderList = (props) => {
                   temp = item.Repairman;
                 } else if (order_type === 3) {
                   temp = item.MaintenancePerson;
+                } else if (order_type === 4) {
+                  temp = '-';
                 } else if (order_type === 5) {
                   temp = '-';
                 } else {