ZhaoJun 1 rok pred
rodič
commit
4230791a3a

+ 1 - 1
src/pages/Center/MyTask/Detail/taskDetail.less

@@ -8,7 +8,7 @@
 
   .normalInfo {
     padding: 0.25rem 0.15rem;
-    background-color: #fdf2df;
+    background-color: #fdefd9;
   }
 
   .infoRow {

+ 6 - 1
src/pages/Home/index.js

@@ -265,7 +265,11 @@ const Scada = () => {
     >
       <div className={styles.scada} style={{ width: '540px', height: '270px' }}>
         {data?.map((url) => (
-          <iframe style={{ width: '540px', height: '270px' }} src={url} />
+          <iframe
+            key={url}
+            style={{ width: '540px', height: '270px' }}
+            src={url}
+          />
         ))}
         <div className={styles.mask}></div>
       </div>
@@ -306,6 +310,7 @@ const Backlog = (props) => {
         <div>
           {data?.map((item) => (
             <div
+              key={item.connect}
               className={styles.item}
               onClick={(e) => {
                 e.stopPropagation();

+ 9 - 3
src/pages/MessageCenter/index.js

@@ -35,8 +35,12 @@ const MessageCenter = () => {
     UnityAction.sendMsg('notiReadAll', '');
   };
 
-  const handlerSeeClick = () => {
-    UnityAction.sendMsg('noti', tab == '1' ? 'gongKuang' : 'ziJian');
+  const handlerSeeClick = (item) => {
+    if (item?.MandateId) {
+      UnityAction.sendMsg('OpenTaskModal', `mandate_id=${item.MandateId}`);
+    } else {
+      UnityAction.sendMsg('noti', tab == '1' ? 'gongKuang' : 'ziJian');
+    }
   };
 
   const renderItem = (item) => {
@@ -57,7 +61,9 @@ const MessageCenter = () => {
           <Button
             className={styles.btn}
             type="primary"
-            onClick={handlerSeeClick}
+            onClick={() => {
+              handlerSeeClick(item);
+            }}
           >
             查看
           </Button>

+ 1 - 1
src/pages/Smart/components/CircleScore.less

@@ -22,7 +22,7 @@
 
 .text {
   position: absolute;
-  top: 50%;
+  top: 52%;
   left: 50%;
   transform: translate(-50%, -50%);
   font-size: 0.44rem;

+ 1 - 1
src/pages/Smart/index.js

@@ -23,7 +23,7 @@ const Work = (props) => {
       {/* <div className="content-title"> */}
       <div className={styles.score}>
         <CircleScore big>
-          {data?.score}
+          {data?.score?.toFixed(2)}
           <div style={{ fontSize: '0.24rem' }}>{data?.grade}</div>
         </CircleScore>
         <div className={styles.scoreRight}>

+ 1 - 1
src/pages/SmartOps/index.js

@@ -274,7 +274,7 @@ function SmartOps(props) {
   };
 
   return (
-    <PageContent closeable>
+    <PageContent>
       <PageTitle returnable={time}>智慧运营</PageTitle>
       <div className={`card-box ${styles.topContent}`}>
         <div className={styles.titleContent}>

+ 1 - 1
src/pages/TaskManage/Detail/TaskDetail/taskDetail.less

@@ -8,7 +8,7 @@
 
   .normalInfo {
     padding: 0.25rem 0.15rem;
-    background-color: #fdf2df;
+    background-color: #fdefd9;
   }
 
   .infoRow {

+ 277 - 251
src/pages/TaskManage/Popup/WorkOrderModal.js

@@ -7,9 +7,9 @@ import {
 } from '@/services/TaskManage';
 import { CloseCircleFilled } from '@ant-design/icons';
 import { connect, useLocation, useParams, useRequest } from '@umijs/max';
-import { Button, Col, Divider, Row, Steps } from 'antd';
+import { Button, Col, Divider, Row, Spin, Steps } from 'antd';
 import dayjs from 'dayjs';
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import ReactZmage from 'react-zmage';
 import SubTitle from '../components/SubTitle';
 import { OrderStatus, OrderType } from '../constent';
@@ -31,150 +31,167 @@ const WorkOrderModal = (props) => {
   const [additionalInfo, setAdditionalInfo] = useState({});
   const [stepInfo, setStepInfo] = useState([]);
 
-  const { run: getCraftDetail } = useRequest(getCraftRecordList, {
-    manual: true,
-    formatResult: (result) => {
-      if (result?.data?.list) {
-        const temp = result.data.list[0];
-        const tempDetail = {
-          ...temp,
-          CreateTime: dayjs(temp.start_time).format('YYYY-MM-DD HH:mm'),
-          PlanTime: 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: mandate_class !== 2 ? temp.detail : renderReason(temp.detail),
-          Repairman:
-            userList.find((item) => item.ID === temp.checker_id) || '-',
-          DispatchMan:
-            userList.find((item) => item.ID === temp.operator_id) || '-',
-          OrderStatus:
-            OrderStatus.find((item) => item.value === temp.status) || '-',
-          MandateImages:
-            temp?.mandate_images?.length > 0
-              ? temp.mandate_images.map((item) => {
-                  console.log(item);
-                  if (item.type === 2) {
+  const { run: getCraftDetail, loading: craftLoading } = useRequest(
+    getCraftRecordList,
+    {
+      manual: true,
+      formatResult: (result) => {
+        if (result?.data?.list) {
+          const temp = result.data.list[0];
+          const tempDetail = {
+            ...temp,
+            CreateTime: dayjs(temp.start_time).format('YYYY-MM-DD HH:mm'),
+            PlanTime: 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:
+              mandate_class !== 2 ? temp.detail : renderReason(temp.detail),
+            Repairman:
+              userList.find((item) => item.ID === temp.checker_id) || '-',
+            DispatchMan:
+              userList.find((item) => item.ID === temp.operator_id) || '-',
+            OrderStatus:
+              OrderStatus.find((item) => item.value === temp.status) || '-',
+            MandateImages:
+              temp?.mandate_images?.length > 0
+                ? temp.mandate_images.map((item) => {
+                    console.log(item);
+                    if (item.type === 2) {
+                      return {
+                        src: item.val,
+                      };
+                    }
                     return {
-                      src: item.val,
+                      src: `data:image/png;base64,${item.val}`,
                     };
-                  }
-                  return {
-                    src: `data:image/png;base64,${item.val}`,
-                  };
-                })
-              : [],
-        };
-        setOrderInfo(tempDetail);
-        // 根据不同的工单类型查询工单操作详情
-      }
+                  })
+                : [],
+          };
+          setOrderInfo(tempDetail);
+          // 根据不同的工单类型查询工单操作详情
+        }
+      },
     },
-  });
+  );
 
-  const { run: getRepairDetail } = useRequest(getRepairRecordList, {
-    manual: true,
-    formatResult: (result) => {
-      if (result?.data?.list) {
-        const temp = result.data.list[0];
+  const { run: getRepairDetail, loading: repairLoading } = useRequest(
+    getRepairRecordList,
+    {
+      manual: true,
+      formatResult: (result) => {
+        if (result?.data?.list) {
+          const temp = result.data.list[0];
 
-        const tempDetail = {
-          ...temp,
-          CreateTime: dayjs(temp.CreateTime).format('YYYY-MM-DD HH:mm'),
-          PlanTime: dayjs(temp.PlanTime).format('YYYY-MM-DD HH:mm'),
-          RepairTime:
-            (temp.RepairTime &&
-              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) || '-',
-          OrderStatus:
-            OrderStatus.find((item) => item.value === temp.AcceptanceStatus) ||
-            '-',
-          MandateImages:
-            temp?.mandate_images?.length > 0
-              ? temp.mandate_images.map((item) => {
-                  if (item.type === 2) {
+          const tempDetail = {
+            ...temp,
+            CreateTime: dayjs(temp.CreateTime).format('YYYY-MM-DD HH:mm'),
+            PlanTime: dayjs(temp.PlanTime).format('YYYY-MM-DD HH:mm'),
+            RepairTime:
+              (temp.RepairTime &&
+                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) || '-',
+            OrderStatus:
+              OrderStatus.find(
+                (item) => item.value === temp.AcceptanceStatus,
+              ) || '-',
+            MandateImages:
+              temp?.mandate_images?.length > 0
+                ? temp.mandate_images.map((item) => {
+                    if (item.type === 2) {
+                      return {
+                        src: item.val,
+                      };
+                    }
                     return {
-                      src: item.val,
+                      src: `data:image/png;base64,${item.val}`,
                     };
-                  }
-                  return {
-                    src: `data:image/png;base64,${item.val}`,
-                  };
-                })
-              : [],
-        };
-        setOrderInfo(tempDetail);
-      }
+                  })
+                : [],
+          };
+          setOrderInfo(tempDetail);
+        }
+      },
     },
-  });
+  );
 
-  const { run: getMaintainDetail } = useRequest(getMaintainRecordList, {
-    manual: true,
-    formatResult: (result) => {
-      if (result?.data?.list) {
-        const temp = result.data.list[0];
-        const tempDetail = {
-          ...temp,
-          CreateTime: dayjs(temp.CreateTime).format('YYYY-MM-DD HH:mm'),
-          PlanTime: dayjs(temp.PlanTime).format('YYYY-MM-DD HH:mm'),
-          RepairTime: dayjs(temp.RepairTime).format('YYYY-MM-DD HH:mm') || '-',
-          Reason: temp.Note,
-          Repairman:
-            userList.find((item) => item.ID === temp.MaintenancePerson) || '-',
-          DispatchMan:
-            userList.find(
-              (item) => (item.ID = temp.Operators[0]?.Operator?.ID),
-            ) || '-',
-          OrderStatus:
-            OrderStatus.find((item) => item.value === temp.Status) || '-',
-          MandateImages:
-            temp?.mandate_images?.length > 0
-              ? temp.mandate_images.map((item) => {
-                  if (item.type === 2) {
+  const { run: getMaintainDetail, loading: maintainLoading } = useRequest(
+    getMaintainRecordList,
+    {
+      manual: true,
+      formatResult: (result) => {
+        if (result?.data?.list) {
+          const temp = result.data.list[0];
+          const tempDetail = {
+            ...temp,
+            CreateTime: dayjs(temp.CreateTime).format('YYYY-MM-DD HH:mm'),
+            PlanTime: dayjs(temp.PlanTime).format('YYYY-MM-DD HH:mm'),
+            RepairTime:
+              dayjs(temp.RepairTime).format('YYYY-MM-DD HH:mm') || '-',
+            Reason: temp.Note,
+            Repairman:
+              userList.find((item) => item.ID === temp.MaintenancePerson) ||
+              '-',
+            DispatchMan:
+              userList.find(
+                (item) => (item.ID = temp.Operators[0]?.Operator?.ID),
+              ) || '-',
+            OrderStatus:
+              OrderStatus.find((item) => item.value === temp.Status) || '-',
+            MandateImages:
+              temp?.mandate_images?.length > 0
+                ? temp.mandate_images.map((item) => {
+                    if (item.type === 2) {
+                      return {
+                        src: item.val,
+                      };
+                    }
                     return {
-                      src: item.val,
+                      src: `data:image/png;base64,${item.val}`,
                     };
-                  }
-                  return {
-                    src: `data:image/png;base64,${item.val}`,
-                  };
-                })
-              : [],
-        };
-        setOrderInfo(tempDetail);
-      }
+                  })
+                : [],
+          };
+          setOrderInfo(tempDetail);
+        }
+      },
     },
-  });
+  );
 
-  const { run: getDosingOrder } = useRequest(getReagentOrderDetail, {
-    manual: true,
-    formatResult: (result) => {
-      const temp = {
-        ...result,
-        CreateTime: result?.start_time?.Valid
-          ? dayjs(result?.start_time?.Time).format('YYYY-MM-DD HH:mm')
-          : '-',
-        PlanTime: result?.plan_end_time?.Valid
-          ? dayjs(result.plan_end_time.Time).format('YYYY-MM-DD HH:mm')
-          : '-',
-        RepairTime: result?.actual_end_time?.Valid
-          ? dayjs(result.actual_end_time.Time).format('YYYY-MM-DD HH:mm')
-          : '-',
-        Reason: result.note,
-        Repairman: '-',
-        DispatchMan:
-          userList.find((user) => user.ID === result.operator_id) || '-',
-        OrderStatus:
-          OrderStatus.find((status) => status.value === result.status) || '-',
-      };
-      setOrderInfo(temp);
-      setAdditionalInfo(temp);
+  const { run: getDosingOrder, loading: dosingLoding } = useRequest(
+    getReagentOrderDetail,
+    {
+      manual: true,
+      formatResult: (result) => {
+        const temp = {
+          ...result,
+          CreateTime: result?.start_time?.Valid
+            ? dayjs(result?.start_time?.Time).format('YYYY-MM-DD HH:mm')
+            : '-',
+          PlanTime: result?.plan_end_time?.Valid
+            ? dayjs(result.plan_end_time.Time).format('YYYY-MM-DD HH:mm')
+            : '-',
+          RepairTime: result?.actual_end_time?.Valid
+            ? dayjs(result.actual_end_time.Time).format('YYYY-MM-DD HH:mm')
+            : '-',
+          Reason: result.note,
+          Repairman: '-',
+          DispatchMan:
+            userList.find((user) => user.ID === result.operator_id) || '-',
+          OrderStatus:
+            OrderStatus.find((status) => status.value === result.status) || '-',
+        };
+        setOrderInfo(temp);
+        setAdditionalInfo(temp);
+      },
     },
-  });
+  );
 
   useRequest(getWorkOrderFlow, {
     defaultParams: [{ work_type: order_type, work_id: order_id }],
@@ -185,6 +202,13 @@ const WorkOrderModal = (props) => {
     },
   });
 
+  const loading = useMemo(() => {
+    if (craftLoading || repairLoading || maintainLoading || dosingLoding) {
+      return true;
+    }
+    return false;
+  }, [craftLoading, repairLoading, maintainLoading, dosingLoding]);
+
   const closePage = () => {
     // ToDo: send message to unity to close this page
     UnityAction.sendMsg('CloseWorkOrder');
@@ -256,141 +280,143 @@ const WorkOrderModal = (props) => {
         onClick={closePage}
       />
       <Divider style={{ margin: '0 0 0.1rem 0' }} />
-      <div>
+      <Spin spinning={loading}>
         <div>
-          <SubTitle title="工单信息" radius />
-          <div className={styles.basicalInfo}>
-            <Row style={{ marginTop: '0' }}>
-              <Col span={13} className={styles.fontS32}>
-                工单类型:
-                {OrderType.find((item) => item.value === order_type)?.label ||
-                  '-'}
-              </Col>
-              <Col span={8} className={styles.fontS32}>
-                {/*// @ts-ignore*/}
-                工单负责人:{orderInfo?.Repairman?.CName || '-'}
-              </Col>
-            </Row>
-            <Row>
-              <Col span={13} className={styles.fontS32}>
-                工单状态:{orderInfo?.OrderStatus?.label}
-              </Col>
-              <Col span={8} className={styles.fontS32}>
-                派单人员:{orderInfo?.DispatchMan?.CName}
-              </Col>
-            </Row>
-            <Row>
-              <Col className={styles.fontS32}>
-                派单时间:{orderInfo?.CreateTime || '-'}
-              </Col>
-            </Row>
-            <Row>
-              <Col span={13} className={styles.fontS32}>
-                计划完成时间:{orderInfo?.PlanTime || '-'}
-              </Col>
-            </Row>
-            <Row>
-              <Col className={styles.fontS32}>
-                实际完成时间:{orderInfo?.RepairTime || '-'}
-              </Col>
-            </Row>
-            {orderInfo?.MandateImages?.length > 0 && (
-              <Row>
-                <Col className={styles.fontS32} span={4}>
-                  任务图片:
-                </Col>
-                {renderImg()}
-              </Row>
-            )}
-          </div>
-        </div>
-        {order_type === 3 && (
           <div>
-            <SubTitle title="操作内容" />
-            <div className={styles.additionInfo}>
-              <Row justify={'space-around'} style={{ marginTop: '0' }}>
-                <Col className={styles.fontS32} span={8}>
-                  是否润滑/加油:{orderInfo?.Lubrication === 1 ? '是' : '否'}
-                </Col>
-                <Col className={styles.fontS32} span={8}>
-                  是否拆检:{orderInfo?.Check === 1 ? '是' : '否'}
+            <SubTitle title="工单信息" radius />
+            <div className={styles.basicalInfo}>
+              <Row style={{ marginTop: '0' }}>
+                <Col span={13} className={styles.fontS32}>
+                  工单类型:
+                  {OrderType.find((item) => item.value === order_type)?.label ||
+                    '-'}
                 </Col>
-                <Col className={styles.fontS32} span={8}>
-                  是否清洁:{orderInfo?.Clean === 1 ? '是' : '否'}
+                <Col span={8} className={styles.fontS32}>
+                  {/*// @ts-ignore*/}
+                  工单负责人:{orderInfo?.Repairman?.CName || '-'}
                 </Col>
               </Row>
-              <Row justify={'space-around'}>
-                <Col className={styles.fontS32} span={8}>
-                  是否紧固:{orderInfo?.Fasten === 1 ? '是' : '否'}
+              <Row>
+                <Col span={13} className={styles.fontS32}>
+                  工单状态:{orderInfo?.OrderStatus?.label}
                 </Col>
-                <Col className={styles.fontS32} span={8}>
-                  是否除锈:{orderInfo?.AntiCorrosive === 1 ? '是' : '否'}
+                <Col span={8} className={styles.fontS32}>
+                  派单人员:{orderInfo?.DispatchMan?.CName}
                 </Col>
-                <Col className={styles.fontS32} span={8}>
-                  是否防腐:{orderInfo?.RustRemoval === 1 ? '是' : '否'}
+              </Row>
+              <Row>
+                <Col className={styles.fontS32}>
+                  派单时间:{orderInfo?.CreateTime || '-'}
+                </Col>
+              </Row>
+              <Row>
+                <Col span={13} className={styles.fontS32}>
+                  计划完成时间:{orderInfo?.PlanTime || '-'}
                 </Col>
               </Row>
-            </div>
-          </div>
-        )}
-        {order_type === 5 && (
-          <div>
-            <SubTitle title="加药详情" />
-            <div
-              style={{
-                padding: '0.15rem',
-                background: 'rgba(23, 85, 255, 0.06)',
-              }}
-            >
               <Row>
-                <Col className={styles.fontS32}>加药详情:</Col>
-                <Col className={styles.fontS32} span={18}>
-                  {`药剂名称:${additionalInfo?.name || '-'} 加药量:${
-                    additionalInfo?.dosage || '-'
-                  }升 浓度:${additionalInfo?.concentration || '-'}`}
+                <Col className={styles.fontS32}>
+                  实际完成时间:{orderInfo?.RepairTime || '-'}
                 </Col>
               </Row>
+              {orderInfo?.MandateImages?.length > 0 && (
+                <Row>
+                  <Col className={styles.fontS32} span={4}>
+                    任务图片:
+                  </Col>
+                  {renderImg()}
+                </Row>
+              )}
             </div>
           </div>
-        )}
-        {stepInfo.length > 0 && (
-          <div>
-            <SubTitle title="工单流程" />
-            <Divider
-              type="horizontal"
-              style={{
-                height: '0.02rem',
-                margin: 0,
-                padding: 0,
-                color: 'rgba(23, 85, 255, 0.50)',
-                background: 'rgba(23, 85, 255, 0.50)',
-              }}
-            />
-            <div
-              style={{
-                padding: '0.15rem 0.2rem',
-              }}
-              className={styles.taskStep}
-            >
-              <Steps
-                direction="vertical"
-                progressDot
-                current={1}
-                items={stepInfo?.map((item) => {
-                  return {
-                    title: (
-                      <span className={styles.fontS32}>{item.content}</span>
-                    ),
-                    description: (
-                      <span className={styles.fontS28}>{item.time}</span>
-                    ),
-                  };
-                })}
+          {order_type === 3 && (
+            <div>
+              <SubTitle title="操作内容" />
+              <div className={styles.additionInfo}>
+                <Row justify={'space-around'} style={{ marginTop: '0' }}>
+                  <Col className={styles.fontS32} span={8}>
+                    是否润滑/加油:{orderInfo?.Lubrication === 1 ? '是' : '否'}
+                  </Col>
+                  <Col className={styles.fontS32} span={8}>
+                    是否拆检:{orderInfo?.Check === 1 ? '是' : '否'}
+                  </Col>
+                  <Col className={styles.fontS32} span={8}>
+                    是否清洁:{orderInfo?.Clean === 1 ? '是' : '否'}
+                  </Col>
+                </Row>
+                <Row justify={'space-around'}>
+                  <Col className={styles.fontS32} span={8}>
+                    是否紧固:{orderInfo?.Fasten === 1 ? '是' : '否'}
+                  </Col>
+                  <Col className={styles.fontS32} span={8}>
+                    是否除锈:{orderInfo?.AntiCorrosive === 1 ? '是' : '否'}
+                  </Col>
+                  <Col className={styles.fontS32} span={8}>
+                    是否防腐:{orderInfo?.RustRemoval === 1 ? '是' : '否'}
+                  </Col>
+                </Row>
+              </div>
+            </div>
+          )}
+          {order_type === 5 && (
+            <div>
+              <SubTitle title="加药详情" />
+              <div
+                style={{
+                  padding: '0.15rem',
+                  background: 'rgba(23, 85, 255, 0.06)',
+                }}
+              >
+                <Row>
+                  <Col className={styles.fontS32}>加药详情:</Col>
+                  <Col className={styles.fontS32} span={18}>
+                    {`药剂名称:${additionalInfo?.name || '-'} 加药量:${
+                      additionalInfo?.dosage || '-'
+                    }升 浓度:${additionalInfo?.concentration || '-'}`}
+                  </Col>
+                </Row>
+              </div>
+            </div>
+          )}
+          {stepInfo.length > 0 && (
+            <div>
+              <SubTitle title="工单流程" />
+              <Divider
+                type="horizontal"
+                style={{
+                  height: '0.02rem',
+                  margin: 0,
+                  padding: 0,
+                  color: 'rgba(23, 85, 255, 0.50)',
+                  background: 'rgba(23, 85, 255, 0.50)',
+                }}
               />
+              <div
+                style={{
+                  padding: '0.15rem 0.2rem',
+                }}
+                className={styles.taskStep}
+              >
+                <Steps
+                  direction="vertical"
+                  progressDot
+                  current={1}
+                  items={stepInfo?.map((item) => {
+                    return {
+                      title: (
+                        <span className={styles.fontS32}>{item.content}</span>
+                      ),
+                      description: (
+                        <span className={styles.fontS28}>{item.time}</span>
+                      ),
+                    };
+                  })}
+                />
+              </div>
             </div>
-          </div>
-        )}
-      </div>
+          )}
+        </div>
+      </Spin>
     </div>
   );
 };

+ 13 - 13
src/pages/TaskManage/components/MandateDetail.js

@@ -209,19 +209,6 @@ const MandateDetail = (props) => {
     <Spin spinning={loading}>
       <div>
         <div className={styles.mandate}>
-          <Row style={{ padding: '0 0.2rem' }}>
-            <Col className={styles.fontS32} style={{ fontWeight: '600' }}>
-              任务内容:
-            </Col>
-            <Col className={styles.fontS32} span={20}>
-              <Table
-                className={styles.taskTable}
-                columns={columns}
-                dataSource={mandateChild}
-                pagination={false}
-              />
-            </Col>
-          </Row>
           <div className={styles.taskOtherInfo}>
             <Row>
               <Col className={styles.fontS32} span={14}>
@@ -243,6 +230,19 @@ const MandateDetail = (props) => {
               </Col>
             </Row>
           </div>
+          <Row style={{ padding: '0 0.2rem' }} justify="space-between">
+            <Col className={styles.fontS32} style={{ fontWeight: '600' }}>
+              任务内容:
+            </Col>
+            <Col className={styles.fontS32} span={20}>
+              <Table
+                className={styles.taskTable}
+                columns={columns}
+                dataSource={mandateChild}
+                pagination={false}
+              />
+            </Col>
+          </Row>
         </div>
         {handledWorkOrder?.length > 0 && <Divider />}
         {handledWorkOrder?.map((item) => {

+ 1 - 1
src/pages/TaskManage/components/MandateDetail.less

@@ -15,7 +15,7 @@
 
 .taskOtherInfo {
   padding: 0.2rem;
-  background-color: #f2ede4;
+  background-color: #fdefd9;
 }
 
 .modalTitle {