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

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

@@ -28,7 +28,6 @@
     .ant-steps.ant-steps-vertical > .ant-steps-item .ant-steps-item-content {
       display: flex;
       justify-content: space-between;
-      align-items: flex-start;
       margin-bottom: 0.3rem;
     }
     .ant-steps.ant-steps-vertical

src/pages/Center/MyTask/index.js

@@ -102,7 +102,7 @@ const MyTask = (props) => {
           <div className={styles.counterText}>任务数量</div>
         </div> */}
 
-        <CaretRightFilled style={{ fontSize: '0.3rem', color: '#BCBABA' }} />
+        <CaretRightFilled style={{ fontSize: '0.34rem', color: '#BCBABA' }} />
       </List.Item>
     );
   };

src/pages/Center/MyTask/index.less

@@ -19,7 +19,7 @@
     background-color: #ffffff;
 
     .itemLabel {
-      font-size: 0.28rem;
+      font-size: 0.34rem;
       color: #615d5d;
       font-weight: 500;
       letter-spacing: 0.05rem;

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

@@ -20,7 +20,6 @@
     .ant-steps.ant-steps-vertical > .ant-steps-item .ant-steps-item-content {
       display: flex;
       justify-content: space-between;
-      align-items: flex-start;
       margin-bottom: 0.3rem;
     }
 

src/pages/TaskManage/Popup/WorkOrderModal.js

@@ -149,6 +149,7 @@ const WorkOrderModal = (props) => {
       }
     },
   });
+
   const { run: getDosingOrder } = useRequest(getReagentOrderDetail, {
     manual: true,
     formatResult: (result) => {

src/pages/TaskManage/Popup/WorkOrderModal.less

@@ -1,6 +1,7 @@
 .modalContainer {
   padding: 0.2rem 0.3rem 0rem 0.3rem;
   background-color: white;
+  border-radius: 0.5rem;
 }
 
 .closeModalBtn {
@@ -40,7 +41,6 @@
     .ant-steps.ant-steps-vertical > .ant-steps-item .ant-steps-item-content {
       display: flex;
       justify-content: space-between;
-      align-items: flex-end;
       margin-bottom: 0.3rem;
     }
 

src/pages/TaskManage/Popup/index.less

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

src/pages/TaskManage/components/MandateDetail.js

@@ -13,6 +13,7 @@ import {
   Modal,
   Row,
   Select,
+  Spin,
   Table,
   message,
 } from 'antd';
@@ -79,7 +80,7 @@ const MandateDetail = (props) => {
     },
   ];
 
-  const { run: getMandateInfo } = useRequest(queryMandate, {
+  const { run: getMandateInfo, loading } = useRequest(queryMandate, {
     manual: true,
     formatResult: (result) => {
       if (result?.data) {
@@ -205,161 +206,163 @@ const MandateDetail = (props) => {
   }, []);
 
   return (
-    <div>
-      <div className={styles.mandate}>
-        <Row style={{ padding: '0 0.2rem' }}>
-          <Col className={styles.fontS32} style={{ fontWeight: '600' }}>
-            任务内容：
-          </Col>
-          <Col className={styles.fontS32} span={19}>
-            <Table
-              className={styles.taskTable}
-              columns={columns}
-              dataSource={mandateChild}
-              pagination={false}
-            />
-          </Col>
-        </Row>
-        <div className={styles.taskOtherInfo}>
-          <Row>
-            <Col className={styles.fontS32} span={14}>
-              任务时间：{mandateDetail?.CreateTime || '-'}
-            </Col>
-            <Col className={styles.fontS32}>
-              任务类别：{mandateDetail?.MandateClass?.label || '-'}
+    <Spin spinning={loading}>
+      <div>
+        <div className={styles.mandate}>
+          <Row style={{ padding: '0 0.2rem' }}>
+            <Col className={styles.fontS32} style={{ fontWeight: '600' }}>
+              任务内容：
             </Col>
-          </Row>
-          <Row style={{ marginTop: '0.2rem' }}>
-            <Col className={styles.fontS32} span={14}>
-              任务状态：{' '}
-              <span style={{ color: ' #5697e4' }}>
-                {mandateDetail?.Status.label}
-              </span>
-            </Col>
-            <Col className={styles.fontS32}>
-              任务负责人：{mandateDetail?.ResponsiblePeople?.CName || '-'}
+            <Col className={styles.fontS32} span={19}>
+              <Table
+                className={styles.taskTable}
+                columns={columns}
+                dataSource={mandateChild}
+                pagination={false}
+              />
             </Col>
           </Row>
+          <div className={styles.taskOtherInfo}>
+            <Row>
+              <Col className={styles.fontS32} span={14}>
+                任务时间：{mandateDetail?.CreateTime || '-'}
+              </Col>
+              <Col className={styles.fontS32}>
+                任务类别：{mandateDetail?.MandateClass?.label || '-'}
+              </Col>
+            </Row>
+            <Row style={{ marginTop: '0.2rem' }}>
+              <Col className={styles.fontS32} span={14}>
+                任务状态：{' '}
+                <span style={{ color: ' #5697e4' }}>
+                  {mandateDetail?.Status.label}
+                </span>
+              </Col>
+              <Col className={styles.fontS32}>
+                任务负责人：{mandateDetail?.ResponsiblePeople?.CName || '-'}
+              </Col>
+            </Row>
+          </div>
         </div>
-      </div>
-      {handledWorkOrder?.length > 0 && <Divider />}
-      {handledWorkOrder?.map((item) => {
-        return (
-          <div key={item.Id} className={styles.relatedOrder}>
-            <div className={styles.leftInfo}>
-              <Row>
-                <Col span={11} className={styles.fontS32}>
-                  工单类型：{item?.RecordType?.label}
-                </Col>
-                <Col className={styles.fontS32}>时间：{item?.CreateTime}</Col>
-              </Row>
-              <Row>
-                <Col span={11} className={styles.fontS32}>
-                  工单状态：
-                  <span style={{ color: ' #5697e4' }}>
-                    {item?.Status?.label}
-                  </span>
-                </Col>
-                <Col className={styles.fontS32}>
-                  工单负责人：{item?.Responsible?.CName}
-                </Col>
-              </Row>
-            </div>
-            <Divider type="vertical" style={{ height: '0.4rem' }} />
-            <div className={styles.rightButtonContainer}>
-              <div
-                className={styles.rightButton}
-                onClick={() => openWorkOrderModal(item)}
-              >
-                查看
+        {handledWorkOrder?.length > 0 && <Divider />}
+        {handledWorkOrder?.map((item) => {
+          return (
+            <div key={item.Id} className={styles.relatedOrder}>
+              <div className={styles.leftInfo}>
+                <Row>
+                  <Col span={11} className={styles.fontS32}>
+                    工单类型：{item?.RecordType?.label}
+                  </Col>
+                  <Col className={styles.fontS32}>时间：{item?.CreateTime}</Col>
+                </Row>
+                <Row>
+                  <Col span={11} className={styles.fontS32}>
+                    工单状态：
+                    <span style={{ color: ' #5697e4' }}>
+                      {item?.Status?.label}
+                    </span>
+                  </Col>
+                  <Col className={styles.fontS32}>
+                    工单负责人：{item?.Responsible?.CName}
+                  </Col>
+                </Row>
               </div>
-              {/* <div
+              <Divider type="vertical" style={{ height: '0.4rem' }} />
+              <div className={styles.rightButtonContainer}>
+                <div
+                  className={styles.rightButton}
+                  onClick={() => openWorkOrderModal(item)}
+                >
+                  查看
+                </div>
+                {/* <div
                 className={styles.rightButton}
                 onClick={() => openWorkOrderModal(item)}
               >
                 关闭工单
               </div> */}
+              </div>
             </div>
+          );
+        })}
+        {mandateDetail?.Status?.value === 0 && <Divider />}
+        {mandateDetail?.Status?.value === 0 && (
+          <div className={styles.footerConstainer}>
+            <Button
+              className={styles.footerBtn}
+              shape="round"
+              onClick={() => {
+                openSpecifiedModal('ignore');
+              }}
+            >
+              忽略
+            </Button>
+            {(mandateDetail?.MandateClass?.value === 1 ||
+              mandateDetail?.MandateClass?.value === 2) &&
+              mandateDetail?.Status?.value === 0 && (
+                <>
+                  <Button
+                    className={styles.footerBtn}
+                    shape="round"
+                    onClick={() => {
+                      openSpecifiedModal('manual');
+                    }}
+                  >
+                    手动处理
+                  </Button>
+                  <Button
+                    className={styles.footerBtn}
+                    shape="round"
+                    onClick={() => {
+                      openSpecifiedModal('auto');
+                    }}
+                  >
+                    自动处理
+                  </Button>
+                </>
+              )}
+            <Button
+              className={styles.footerBtn}
+              shape="round"
+              onClick={() => {
+                openSpecifiedModal('dispatch');
+              }}
+            >
+              派单
+            </Button>
           </div>
-        );
-      })}
-      {mandateDetail?.Status?.value === 0 && <Divider />}
-      {mandateDetail?.Status?.value === 0 && (
-        <div className={styles.footerConstainer}>
-          <Button
-            className={styles.footerBtn}
-            shape="round"
-            onClick={() => {
-              openSpecifiedModal('ignore');
-            }}
-          >
-            忽略
-          </Button>
-          {(mandateDetail?.MandateClass?.value === 1 ||
-            mandateDetail?.MandateClass?.value === 2) &&
-            mandateDetail?.Status?.value === 0 && (
-              <>
-                <Button
-                  className={styles.footerBtn}
-                  shape="round"
-                  onClick={() => {
-                    openSpecifiedModal('manual');
-                  }}
-                >
-                  手动处理
-                </Button>
-                <Button
-                  className={styles.footerBtn}
-                  shape="round"
-                  onClick={() => {
-                    openSpecifiedModal('auto');
-                  }}
-                >
-                  自动处理
-                </Button>
-              </>
-            )}
-          <Button
-            className={styles.footerBtn}
-            shape="round"
-            onClick={() => {
-              openSpecifiedModal('dispatch');
+        )}
+        {/* 弹窗 */}
+        <ConfigProvider locale={zhCN}>
+          <IgnoreTaskModal
+            open={ignoreModalOpen}
+            onCancel={() => setIgnoreModalOpen(false)}
+            onOk={onIgnoreConfirm}
+          />
+          <AutoHandleModal
+            open={autoHandleModalOpen}
+            onCancel={() => setAutoHandleModalOpen(false)}
+            onOk={onAutoHandleConfirm}
+          />
+          <MandateSelectModal
+            open={mandateSelectModalOpen}
+            onCancel={() => setMandateSelectModalOpen(false)}
+            selectedTask={selectedTask}
+            setSelectedTask={setSelectedTask}
+            onOk={onMandateSelected}
+            list={mandateChild}
+          />
+          <DispatchTaskModal
+            open={dispatchModalOpen}
+            userList={userList}
+            onCancel={() => {
+              setDispatchModalOpen(false);
             }}
-          >
-            派单
-          </Button>
-        </div>
-      )}
-      {/* 弹窗 */}
-      <ConfigProvider locale={zhCN}>
-        <IgnoreTaskModal
-          open={ignoreModalOpen}
-          onCancel={() => setIgnoreModalOpen(false)}
-          onOk={onIgnoreConfirm}
-        />
-        <AutoHandleModal
-          open={autoHandleModalOpen}
-          onCancel={() => setAutoHandleModalOpen(false)}
-          onOk={onAutoHandleConfirm}
-        />
-        <MandateSelectModal
-          open={mandateSelectModalOpen}
-          onCancel={() => setMandateSelectModalOpen(false)}
-          selectedTask={selectedTask}
-          setSelectedTask={setSelectedTask}
-          onOk={onMandateSelected}
-          list={mandateChild}
-        />
-        <DispatchTaskModal
-          open={dispatchModalOpen}
-          userList={userList}
-          onCancel={() => {
-            setDispatchModalOpen(false);
-          }}
-          onOK={onDispatchConfirm}
-        />
-      </ConfigProvider>
-    </div>
+            onOK={onDispatchConfirm}
+          />
+        </ConfigProvider>
+      </div>
+    </Spin>
   );
 };
 

src/pages/TaskManage/index.less

@@ -19,7 +19,7 @@
     background-color: #ffffff;
 
     .itemLabel {
-      font-size: 0.28rem;
+      font-size: 0.34rem;
       color: #615d5d;
       font-weight: 500;
       letter-spacing: 0.05rem;

src/pages/TaskManage/index.tsx

@@ -89,7 +89,7 @@ const TaskManage = (props: any) => {
           <div className={styles.counterText}>任务数量</div>
         </div> */}
 
-        <CaretRightFilled style={{ fontSize: '0.3rem', color: '#BCBABA' }} />
+        <CaretRightFilled style={{ fontSize: '0.34rem', color: '#BCBABA' }} />
       </List.Item>
     );
   };