feat(order): 添加订单交期提醒功能

- 新增订单交期提醒弹窗，展示待交期提醒和交期提醒数量 - 实现订单交期统计接口调用和数据展示 - 优化模态框样式，调整卡片布局和样式

feat(order): 添加订单交期提醒功能
- 新增订单交期提醒弹窗，展示待交期提醒和交期提醒数量 - 实现订单交期统计接口调用和数据展示 - 优化模态框样式，调整卡片布局和样式
曾国涛
1 parent eee7cccd
Showing 5 changed files with 233 additions and 30 deletions
src/models/count.ts
src/pages/Order/Order/index.tsx
src/pages/ResearchGroup/index.tsx
src/services/definition.ts
src/services/request.ts
@@ -3,9 +3,12 @@ import { useState } from &#39;react&#39;;
  
 const useOpenModal = () => {
   const [openCount, setOpenCount] = useState(0);
+  const [deliveryOpenCount, setDeliveryOpenCount] = useState(0);
   return {
     openCount,
     setOpenCount,
+    deliveryOpenCount,
+    setDeliveryOpenCount,
   };
 };
  
-import { postServiceOrderWarningOrderStatistics } from '@/services';
+import {
+  postServiceOrderDeliverStatistics,
+  postServiceOrderWarningOrderStatistics,
+} from '@/services';
 import { getUserInfo } from '@/utils/user';
 import { useModel } from '@umijs/max';
 import { Button, Card, Col, Modal, Row } from 'antd';
@@ -35,8 +38,12 @@ const OrderPage = () =&gt; {
   const [waitFeedback, setWaitFeedback] = useState(0);
   const [invoiceCreateWarningNum, setInvoiceCreateWarningNum] = useState(0);
   const [open, setOpen] = useState(false);
-  const { openCount, setOpenCount } = useModel('count');
+  const { openCount, setOpenCount, deliveryOpenCount, setDeliveryOpenCount } =
+    useModel('count');
  
+  const [pendingDelivery, setPendingDelivery] = useState(0);
+  const [pendingCompletion, setPendingCompletion] = useState(0);
+  const [deliveryOpen, setDeliveryOpen] = useState(false);
   async function getInvoiceWarningNum() {
     const res = await postServiceOrderWarningOrderStatistics({
       data: {
@@ -66,13 +73,28 @@ const OrderPage = () =&gt; {
     setInvoiceCreateWarningNum(res.data.waitInvoicing);
   }
  
+  async function getOrderDeliverStatistics() {
+    const res = await postServiceOrderDeliverStatistics();
+    if (
+      (res.data.pendingDelivery !== 0 || res.data.pendingCompletion !== 0) &&
+      deliveryOpenCount !== 'true'
+    ) {
+      setDeliveryOpenCount('true');
+      setDeliveryOpen(true);
+    }
+    setPendingCompletion(res.data.pendingCompletion);
+    setPendingDelivery(res.data.pendingDelivery);
+  }
+
   useEffect(() => {
     //预警订单数
     getInvoiceWarningNum();
+    getOrderDeliverStatistics();
   }, []);
   // 隐藏弹窗
   const navigateToWarning = () => {
     setOpen(false);
+    setDeliveryOpen(false);
     // history.push('/order/OrderWarning');
     // window.location.replace = '/order/OrderWarning';
     // navigate('/order/OrderWarning');
@@ -421,6 +443,126 @@ const OrderPage = () =&gt; {
           </div>
         </Modal>
       )}
+      {roleCode === 'WAREHOUSE_KEEPER' && (
+        <Modal
+          title="订单交期提醒"
+          open={deliveryOpen}
+          width={600}
+          closable={false}
+          footer={[
+            <Button
+              key="confirm"
+              size="large"
+              type="primary"
+              onClick={navigateToWarning}
+            >
+              去处理
+            </Button>,
+          ]}
+        >
+          <Row
+            gutter={4} // 调整间距，例如改为 8
+            justify="space-between" // Aligns Cols to the start and end
+            align="middle" // Vertically center contents
+          >
+            {/* 新增卡片1: 待确认收货订单 */}
+            <Col span={8}>
+              {' '}
+              {/* 修改位置：将 span 改为 6，以保证一行四个卡片 */}
+              <div
+                style={{
+                  display: 'flex',
+                  justifyContent: 'center',
+                  marginTop: '20px',
+                }}
+              >
+                <Card
+                  bordered={true}
+                  style={{
+                    backgroundColor: '#f0f0f0', // 背景颜色
+                    width: '250px', // 卡片宽度
+                    height: '200px', // 卡片高度
+                    display: 'flex',
+                    alignItems: 'center',
+                    justifyContent: 'center',
+                  }}
+                >
+                  <div
+                    style={{
+                      fontWeight: 'bold', // 字体加粗
+                      color: 'black', // 字体颜色
+                      fontSize: '18px', // 字体大小
+                    }}
+                  >
+                    <div
+                      style={{
+                        fontWeight: 'bold', // 字体加粗
+                        color: 'black', // 字体颜色
+                        fontSize: '40px', // 字体大小
+                        justifyContent: 'center',
+                        display: 'flex',
+                        alignItems: 'center',
+                        marginBottom: '20px',
+                      }}
+                    >
+                      {pendingDelivery}
+                    </div>
+                    待交期提醒
+                  </div>
+                </Card>
+              </div>
+            </Col>
+
+            {/* 新增卡片1: 待确认收货订单 */}
+            <Col span={8}>
+              {' '}
+              {/* 修改位置：将 span 改为 6，以保证一行四个卡片 */}
+              <div
+                style={{
+                  display: 'flex',
+                  justifyContent: 'center',
+                  marginTop: '20px',
+                }}
+              >
+                <Card
+                  bordered={true}
+                  style={{
+                    backgroundColor: '#f0f0f0', // 背景颜色
+                    width: '250px', // 卡片宽度
+                    height: '200px', // 卡片高度
+                    display: 'flex',
+                    alignItems: 'center',
+                    justifyContent: 'center',
+                  }}
+                >
+                  <div
+                    style={{
+                      fontWeight: 'bold', // 字体加粗
+                      color: 'black', // 字体颜色
+                      fontSize: '18px', // 字体大小
+                    }}
+                  >
+                    <div
+                      style={{
+                        fontWeight: 'bold', // 字体加粗
+                        color: 'black', // 字体颜色
+                        fontSize: '40px', // 字体大小
+                        justifyContent: 'center',
+                        display: 'flex',
+                        alignItems: 'center',
+                        marginBottom: '20px',
+                      }}
+                    >
+                      {pendingCompletion}
+                    </div>
+                    交期提醒
+                  </div>
+                </Card>
+              </div>
+            </Col>
+          </Row>
+        </Modal>
+      )}
  
       <OrderList paramsNew={{}} searchShow={true} toolbarShow={true} />
     </div>
@@ -677,7 +677,7 @@ const PrepaidPage = () =&gt; {
                 key="button"
                 icon={<PlusOutlined />}
                 onClick={() => {
-                  setRequestType(null);
+                  setRequestType('ADD_MEMBER');
                   setResearchGroupMemberRequestAddModalVisible(true);
                 }}
                 type="primary"
@@ -1516,6 +1516,32 @@ export interface Entry {
   unEmpInsuranceC?: string;
 }
  
+export interface File {
+  absolute?: boolean;
+  absoluteFile?: File;
+  absolutePath?: string;
+  canonicalFile?: File;
+  canonicalPath?: string;
+  directory?: boolean;
+  executable?: boolean;
+  file?: boolean;
+  /** @format int64 */
+  freeSpace?: number;
+  hidden?: boolean;
+  /** @format int64 */
+  lastModified?: number;
+  name?: string;
+  parent?: string;
+  parentFile?: File;
+  path?: string;
+  readable?: boolean;
+  /** @format int64 */
+  totalSpace?: number;
+  /** @format int64 */
+  usableSpace?: number;
+  writable?: boolean;
+}
+
 export interface FilePathDto {
   url?: string;
 }
@@ -4030,7 +4056,7 @@ export interface ResetPwdVO {
  
 export interface Resource {
   description?: string;
-  file?: TsgFile;
+  file?: File;
   filename?: string;
   inputStream?: InputStream;
   open?: boolean;
@@ -4076,6 +4102,8 @@ export interface SubOrder {
   applyTime?: string;
   /** @format int32 */
   attrId?: number;
+  /** @format date-time */
+  auditedDatetime?: string;
   checkNotes?: string;
   /** @format date-time */
   collectMoneyTime?: string;
@@ -4088,6 +4116,8 @@ export interface SubOrder {
   createTime?: string;
   /** @format date-time */
   deadline?: string;
+  /** @format int64 */
+  deductedPayment?: number;
   /** @format date-time */
   deliveryDatetime?: string;
   deliveryStatus?: SubOrderDeliveryStatus;
@@ -4730,32 +4760,6 @@ export interface CompanyInfo {
   taxIdIsNotNull?: boolean;
 }
  
-export interface TsgFile {
-  absolute?: boolean;
-  absoluteFile?: TsgFile;
-  absolutePath?: string;
-  canonicalFile?: TsgFile;
-  canonicalPath?: string;
-  directory?: boolean;
-  executable?: boolean;
-  file?: boolean;
-  /** @format int64 */
-  freeSpace?: number;
-  hidden?: boolean;
-  /** @format int64 */
-  lastModified?: number;
-  name?: string;
-  parent?: string;
-  parentFile?: TsgFile;
-  path?: string;
-  readable?: boolean;
-  /** @format int64 */
-  totalSpace?: number;
-  /** @format int64 */
-  usableSpace?: number;
-  writable?: boolean;
-}
-
 export interface InvoiceDetail {
   createByName?: string;
   /** @format date-time */
@@ -20874,6 +20874,60 @@ export const postServiceOrderDeliverOrders = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
+/** @description response type for postServiceOrderDeliverStatistics */
+export interface PostServiceOrderDeliverStatisticsResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderDeliverStatisticsResponseSuccess =
+  PostServiceOrderDeliverStatisticsResponse[200];
+/**
+ * @description
+ *   orderDeliverStatistics
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderDeliverStatistics = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/deliverStatistics';
+  function request(): Promise<PostServiceOrderDeliverStatisticsResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+    }) as unknown as Promise<PostServiceOrderDeliverStatisticsResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderEditOrder */
 export interface PostServiceOrderEditOrderOption {
   /**