Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

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

@@ -101,7 +101,7 @@ function TaskDetail(props) {
         {
           key: '1',
           label: (
-            <span style={{ color: '#ffffff', marginRight: '0.1rem' }}>
+            <span style={{ color: '#ffffff', marginRight: '0.05rem' }}>
               关联工单({workOrder.length})
             </span>
           ),
@@ -110,18 +110,18 @@ function TaskDetail(props) {
               <div key={record.Id} className={styles.workOrderCard}>
                 <div className={styles.leftInfo}>
                   <Row style={{ marginBottom: '0.15rem' }}>
-                    <Col className={styles.fontS32} span={12}>
+                    <Col className={styles.fontS32} span={10}>
                       <>
                         工单类型：
                         {record.RecordType?.label?.replace('工单', '')}
                       </>
                     </Col>
-                    <Col className={styles.fontS32} span={12}>
+                    <Col className={styles.fontS32} span={14}>
                       时间：{record.CreateTime || '-'}
                     </Col>
                   </Row>
                   <Row>
-                    <Col className={styles.fontS32} span={12}>
+                    <Col className={styles.fontS32} span={10}>
                       工单状态：
                       <span style={{ color: '#5697e4' }}>
                         {typeof record.Status === 'number'
@@ -129,7 +129,7 @@ function TaskDetail(props) {
                           : record.Status?.label}
                       </span>
                     </Col>
-                    <Col className={styles.fontS32} span={12}>
+                    <Col className={styles.fontS32} span={14}>
                       工单负责人：
                       {typeof record.Responsible === 'number'
                         ? '-'
@@ -297,6 +297,7 @@ function TaskDetail(props) {
               任务总结
             </Col>
             <Col
+              span={20}
               className={styles.fontS32}
               style={{ color: 'rgba(97, 93, 93, 1)' }}
             >

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

@@ -334,10 +334,12 @@ const WorkOrderDetail = (props) => {
                   派单时间：{orderInfo?.CreateTime || '-'}
                 </Col>
               </Row>
-              <Row>
+              <Row className={styles.rowMargin}>
                 <Col className={styles.fontS28} span={13}>
                   计划完成时间：{orderInfo?.PlanTime || '-'}
                 </Col>
+              </Row>
+              <Row>
                 <Col className={styles.fontS28}>
                   实际完成时间：{orderInfo?.RepairTime || '-'}
                 </Col>

src/pages/Center/MyTask/Detail/taskDetail.less

@@ -39,11 +39,15 @@
           border-radius: 0;
         }
 
+        .ant-collapse-header .ant-collapse-expand-icon {
+          padding-inline-end: 0;
+        }
+
         .ant-collapse-header {
           height: 0.5rem;
           background: url('@/assets/TaskManage/viewOrder@2x.png') no-repeat
             center;
-          background-size: 25% 100%;
+          background-size: 30% 100%;
           justify-content: center;
           flex-direction: row-reverse;
           align-items: center;

src/pages/Center/MyTask/Detail/workOrderDetail.less

@@ -22,15 +22,21 @@
 }
 
 .taskStep {
-  margin-left: 20%;
+  margin-left: 15%;
   width: 70%;
   :global {
     .ant-steps.ant-steps-vertical > .ant-steps-item .ant-steps-item-content {
-      width: 80%;
       display: flex;
       justify-content: space-between;
+      align-items: flex-start;
       margin-bottom: 0.3rem;
     }
+    .ant-steps.ant-steps-vertical
+      > .ant-steps-item
+      .ant-steps-item-description {
+      padding-bottom: 0;
+      padding-top: 0.18rem;
+    }
   }
 }
 

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

@@ -169,7 +169,7 @@ const MyTaskList = (props) => {
       {
         key: '1',
         label: (
-          <span style={{ color: '#ffffff', marginRight: '0.1rem' }}>
+          <span style={{ color: '#ffffff', marginRight: '0.05rem' }}>
             关联工单({workOrder.length})
           </span>
         ),
@@ -178,21 +178,21 @@ const MyTaskList = (props) => {
             <div key={order.Id} className={styles.workOrderCard}>
               <div className={styles.leftInfo}>
                 <Row style={{ marginBottom: '0.15rem' }}>
-                  <Col className={styles.fontS32} span={12}>
+                  <Col className={styles.fontS32} span={11}>
                     工单类型：{order.RecordType?.label || '-'}
                   </Col>
-                  <Col className={styles.fontS32} span={12}>
+                  <Col className={styles.fontS32} span={13}>
                     时间：{order.CreateTime}
                   </Col>
                 </Row>
                 <Row>
-                  <Col className={styles.fontS32} span={12}>
+                  <Col className={styles.fontS32} span={11}>
                     工单状态：
                     <span style={{ color: '#5697e4' }}>
                       {order.Status?.label}
                     </span>
                   </Col>
-                  <Col className={styles.fontS32} span={12}>
+                  <Col className={styles.fontS32} span={13}>
                     工单负责人：{order.Responsible?.CName}
                   </Col>
                 </Row>
@@ -251,7 +251,7 @@ const MyTaskList = (props) => {
                 maxHeight: '0.7rem',
               }}
             >
-              <Col span={12} className={styles.fontS32}>
+              <Col span={11} className={styles.fontS32}>
                 时间: {formatItem.CreateTime}
               </Col>
               <Col className={styles.fontS32}>
@@ -265,7 +265,7 @@ const MyTaskList = (props) => {
                 maxHeight: '0.75rem',
               }}
             >
-              <Col span={12} className={styles.fontS32}>
+              <Col span={11} className={styles.fontS32}>
                 任务负责人: {formatItem.ResponsiblePeople?.CName || '-'}
               </Col>
               <Col span={8} className={styles.fontS32}>
@@ -277,7 +277,7 @@ const MyTaskList = (props) => {
                   style={{
                     backgroundColor: '#f5a623',
                     color: 'white',
-                    width: '2rem',
+                    width: '1.8rem',
                     letterSpacing: '0.05rem',
                     height: '0.55rem',
                     display: 'flex',

src/pages/Center/MyTask/List/taskList.less

@@ -30,10 +30,14 @@
         border-radius: 0;
       }
 
+      .ant-collapse-header .ant-collapse-expand-icon {
+        padding-inline-end: 0;
+      }
+
       .ant-collapse-header {
         height: 0.5rem;
         background: url('@/assets/TaskManage/viewOrder@2x.png') no-repeat center;
-        background-size: 25% 100%;
+        background-size: 30% 100%;
         justify-content: center;
         flex-direction: row-reverse;
         align-items: center;

src/pages/Center/MyTask/index.js

@@ -97,10 +97,10 @@ const MyTask = (props) => {
           title={<span className={styles.itemLabel}>{item.label}</span>}
         />
 
-        <div className={styles.itemCount}>
+        {/* <div className={styles.itemCount}>
           <div className={styles.countNumber}>{mandateCount[index]}</div>
           <div className={styles.counterText}>任务数量</div>
-        </div>
+        </div> */}
 
         <CaretRightFilled style={{ fontSize: '0.3rem', color: '#BCBABA' }} />
       </List.Item>

src/pages/TaskManage/Detail/TaskDetail/TaskDetail.tsx

@@ -136,7 +136,7 @@ function TaskDetail(props: IPropsType) {
         {
           key: '1',
           label: (
-            <span style={{ color: '#ffffff', marginRight: '0.1rem' }}>
+            <span style={{ color: '#ffffff', marginRight: '0.05rem' }}>
               关联工单({workOrder.length})
             </span>
           ),
@@ -145,18 +145,18 @@ function TaskDetail(props: IPropsType) {
               <div key={record.Id} className={styles.workOrderCard}>
                 <div className={styles.leftInfo}>
                   <Row style={{ marginBottom: '0.15rem' }}>
-                    <Col className={styles.fontS32} span={12}>
+                    <Col className={styles.fontS32} span={10}>
                       <>
                         工单类型：
                         {record.RecordType?.label?.replace('工单', '')}
                       </>
                     </Col>
-                    <Col className={styles.fontS32} span={12}>
+                    <Col className={styles.fontS32} span={14}>
                       时间：{record.CreateTime || '-'}
                     </Col>
                   </Row>
                   <Row>
-                    <Col className={styles.fontS32} span={12}>
+                    <Col className={styles.fontS32} span={10}>
                       工单状态：
                       <span style={{ color: '#5697e4' }}>
                         {typeof record.Status === 'number'
@@ -164,7 +164,7 @@ function TaskDetail(props: IPropsType) {
                           : record.Status?.label}
                       </span>
                     </Col>
-                    <Col className={styles.fontS32} span={12}>
+                    <Col className={styles.fontS32} span={14}>
                       工单负责人：
                       {typeof record.Responsible === 'number'
                         ? '-'
@@ -355,6 +355,7 @@ function TaskDetail(props: IPropsType) {
                 任务总结
               </Col>
               <Col
+                span={20}
                 className={styles.fontS32}
                 style={{ color: 'rgba(97, 93, 93, 1)' }}
               >

src/pages/TaskManage/Detail/TaskDetail/taskDetail.less

@@ -39,11 +39,15 @@
           border-radius: 0;
         }
 
+        .ant-collapse-header .ant-collapse-expand-icon {
+          padding-inline-end: 0;
+        }
+
         .ant-collapse-header {
           height: 0.5rem;
           background: url('@/assets/TaskManage/viewOrder@2x.png') no-repeat
             center;
-          background-size: 25% 100%;
+          background-size: 30% 100%;
           justify-content: center;
           flex-direction: row-reverse;
           align-items: center;

src/pages/TaskManage/Detail/TaskList/TaskList.tsx

@@ -216,7 +216,7 @@ const TaskList: React.FC<IPropsType> = (props) => {
       {
         key: '1',
         label: (
-          <span style={{ color: '#ffffff', marginRight: '0.1rem' }}>
+          <span style={{ color: '#ffffff', marginRight: '0.05rem' }}>
             关联工单({workOrder.length})
           </span>
         ),
@@ -225,21 +225,21 @@ const TaskList: React.FC<IPropsType> = (props) => {
             <div key={order.Id} className={styles.workOrderCard}>
               <div className={styles.leftInfo}>
                 <Row style={{ marginBottom: '0.15rem' }}>
-                  <Col className={styles.fontS32} span={12}>
+                  <Col className={styles.fontS32} span={11}>
                     工单类型：{order.RecordType?.label || '-'}
                   </Col>
-                  <Col className={styles.fontS32} span={12}>
+                  <Col className={styles.fontS32} span={13}>
                     时间：{order.CreateTime}
                   </Col>
                 </Row>
                 <Row>
-                  <Col className={styles.fontS32} span={12}>
+                  <Col className={styles.fontS32} span={11}>
                     工单状态：
                     <span style={{ color: '#5697e4' }}>
                       {order.Status?.label}
                     </span>
                   </Col>
-                  <Col className={styles.fontS32} span={12}>
+                  <Col className={styles.fontS32} span={13}>
                     工单负责人：{order.Responsible?.CName}
                   </Col>
                 </Row>
@@ -298,7 +298,7 @@ const TaskList: React.FC<IPropsType> = (props) => {
                 maxHeight: '0.7rem',
               }}
             >
-              <Col span={12} className={styles.fontS32}>
+              <Col span={11} className={styles.fontS32}>
                 时间: {formatItem.CreateTime}
               </Col>
               <Col className={styles.fontS32}>
@@ -312,7 +312,7 @@ const TaskList: React.FC<IPropsType> = (props) => {
                 maxHeight: '0.75rem',
               }}
             >
-              <Col span={12} className={styles.fontS32}>
+              <Col span={11} className={styles.fontS32}>
                 任务负责人: {formatItem.ResponsiblePeople?.CName || '-'}
               </Col>
               <Col span={8} className={styles.fontS32}>
@@ -324,7 +324,7 @@ const TaskList: React.FC<IPropsType> = (props) => {
                   style={{
                     backgroundColor: '#f5a623',
                     color: 'white',
-                    width: '2rem',
+                    width: '1.8rem',
                     letterSpacing: '0.05rem',
                     height: '0.55rem',
                     display: 'flex',

src/pages/TaskManage/Detail/TaskList/taskList.less

@@ -29,10 +29,14 @@
         border-radius: 0;
       }
 
+      .ant-collapse-header .ant-collapse-expand-icon {
+        padding-inline-end: 0;
+      }
+
       .ant-collapse-header {
         height: 0.5rem;
         background: url('@/assets/TaskManage/viewOrder@2x.png') no-repeat center;
-        background-size: 25% 100%;
+        background-size: 30% 100%;
         justify-content: center;
         flex-direction: row-reverse;
         align-items: center;

src/pages/TaskManage/Detail/TaskOrder/TaskOrder.tsx

@@ -364,10 +364,12 @@ const TaskOrder: React.FC<IPropsType> = (props) => {
                   派单时间：{orderInfo?.CreateTime || '-'}
                 </Col>
               </Row>
-              <Row>
-                <Col className={styles.fontS28} span={13}>
+              <Row className={styles.rowMargin}>
+                <Col className={styles.fontS28}>
                   计划完成时间：{orderInfo?.PlanTime || '-'}
                 </Col>
+              </Row>
+              <Row>
                 <Col className={styles.fontS28}>
                   实际完成时间：{orderInfo?.RepairTime || '-'}
                 </Col>

src/pages/TaskManage/Detail/TaskOrder/taskOrder.less

@@ -14,15 +14,22 @@
 }
 
 .taskStep {
-  margin-left: 20%;
+  margin-left: 15%;
   width: 70%;
   :global {
     .ant-steps.ant-steps-vertical > .ant-steps-item .ant-steps-item-content {
-      width: 80%;
       display: flex;
       justify-content: space-between;
+      align-items: flex-start;
       margin-bottom: 0.3rem;
     }
+
+    .ant-steps.ant-steps-vertical
+      > .ant-steps-item
+      .ant-steps-item-description {
+      padding-bottom: 0;
+      padding-top: 0.18rem;
+    }
   }
 }
 

src/pages/TaskManage/Popup/WorkOrderModal.js

@@ -287,6 +287,8 @@ const WorkOrderModal = (props) => {
               <Col span={13} className={styles.fontS32}>
                 计划完成时间：{orderInfo?.PlanTime || '-'}
               </Col>
+            </Row>
+            <Row>
               <Col className={styles.fontS32}>
                 实际完成时间：{orderInfo?.RepairTime || '-'}
               </Col>

src/pages/TaskManage/Popup/WorkOrderModal.less

@@ -1,5 +1,6 @@
 .modalContainer {
   padding: 0.2rem 0.3rem 0rem 0.3rem;
+  background-color: white;
 }
 
 .closeModalBtn {
@@ -33,15 +34,22 @@
 }
 
 .taskStep {
-  margin-left: 20%;
+  margin-left: 15%;
   width: 70%;
   :global {
     .ant-steps.ant-steps-vertical > .ant-steps-item .ant-steps-item-content {
-      width: 80%;
       display: flex;
       justify-content: space-between;
+      align-items: flex-end;
       margin-bottom: 0.3rem;
     }
+
+    .ant-steps.ant-steps-vertical
+      > .ant-steps-item
+      .ant-steps-item-description {
+      padding-bottom: 0;
+      padding-top: 0.18rem;
+    }
   }
 }
 

src/pages/TaskManage/Popup/index.less

@@ -2,6 +2,7 @@
   * {
     font-family: Source Han Sans, Source Han Sans;
   }
+  background-color: white;
   padding: 0.3rem;
   :global {
     .ant-tabs > .ant-tabs-nav,

src/pages/TaskManage/components/MandateDetail.js

@@ -64,6 +64,7 @@ const MandateDetail = (props) => {
     {
       title: '序号',
       key: 'index',
+      width: '1rem',
       render: (_text, _record, index) => {
         return index + 1 + '、';
       },
@@ -210,7 +211,7 @@ const MandateDetail = (props) => {
           <Col className={styles.fontS32} style={{ fontWeight: '600' }}>
             任务内容：
           </Col>
-          <Col className={styles.fontS32} span={21}>
+          <Col className={styles.fontS32} span={19}>
             <Table
               className={styles.taskTable}
               columns={columns}
@@ -247,13 +248,13 @@ const MandateDetail = (props) => {
           <div key={item.Id} className={styles.relatedOrder}>
             <div className={styles.leftInfo}>
               <Row>
-                <Col span={12} className={styles.fontS32}>
+                <Col span={11} className={styles.fontS32}>
                   工单类型：{item?.RecordType?.label}
                 </Col>
                 <Col className={styles.fontS32}>时间：{item?.CreateTime}</Col>
               </Row>
               <Row>
-                <Col span={12} className={styles.fontS32}>
+                <Col span={11} className={styles.fontS32}>
                   工单状态：
                   <span style={{ color: ' #5697e4' }}>
                     {item?.Status?.label}
@@ -270,7 +271,7 @@ const MandateDetail = (props) => {
                 className={styles.rightButton}
                 onClick={() => openWorkOrderModal(item)}
               >
-                查看工单
+                查看
               </div>
               {/* <div
                 className={styles.rightButton}

src/pages/TaskManage/components/MandateDetail.less

@@ -64,7 +64,7 @@
 
   .rightButton {
     flex: auto;
-    width: 2rem;
+    width: 1.5rem;
     border-radius: 0.5rem;
     color: #5697e4;
     background-color: #ffffff;

src/pages/TaskManage/index.tsx

@@ -84,10 +84,10 @@ const TaskManage = (props: any) => {
           title={<span className={styles.itemLabel}>{item.label}</span>}
         />
 
-        <div className={styles.itemCount}>
+        {/* <div className={styles.itemCount}>
           <div className={styles.countNumber}>{mandateCount[index]}</div>
           <div className={styles.counterText}>任务数量</div>
-        </div>
+        </div> */}
 
         <CaretRightFilled style={{ fontSize: '0.3rem', color: '#BCBABA' }} />
       </List.Item>