feat:销售订单-一级审核,二级审核,确认订单

src/pages/transaction/components/approvedOrderModal/index.tsx

@@ -5,20 +5,21 @@ import { createFormActions } from '@formily/antd'
 export interface ApprovedOrderModalProps {
   currentRef: any,
   onConfirm(),
-  loading?: boolean
+  loading?: boolean,
+  title?: string
 }
 
 const approvedActions = createFormActions()
 // 需要弹窗确认的审核订单
 const ApprovedOrderModal:React.FC<ApprovedOrderModalProps> = (props) => {
-  const { currentRef, onConfirm, children, loading } = props
+  const { currentRef, onConfirm, title, children, loading } = props
   useEffect(() => {
     if (currentRef) {
       currentRef.current = Object.assign({}, currentRef.current, {actions: approvedActions})
     }
   }, [currentRef])
   return <ModalForm
-    modalTitle='提示'
+    modalTitle={title || '提示'}
     currentRef={currentRef}
     confirm={onConfirm}
     actions={approvedActions}

src/pages/transaction/saleOrder/firstApprovedOrder/detail/index.tsx

-import React from 'react';
+import React, { useState, useCallback, useRef } from 'react';
+import { OrderDetailContext } from '../../../_public/order/context';
+import { PublicApi } from '@/services/api';
+import { Button } from 'antd';
+import OrderDetailHeader from '@/pages/transaction/components/OrderDetailHeader';
+import OrderDetailWrapper from '@/pages/transaction/components/OrderDetailWrapper';
+import PreLoading from '@/components/PreLoading';
+import { useOrderDetail } from '../../../_public/order/effects/useOrderDetail';
+import ApprovedOrderModal from '../../../components/approvedOrderModal';
+import { history } from 'umi'
+import { useHttpRequest } from '@/hooks/useHttpRequest';
+import OrderDetailSection from '../../../components/orderDetailSection';
 
 const FirstApprovedOrderDetail: React.FC = () => {
+  const { formContext, id, detailList } = useOrderDetail({type: 'saleOrder'})
+  const { run, loading } = useHttpRequest(PublicApi.postOrderSubmittedReviewOrderOne)
+  const approvedRef = useRef<any>({})
+
+  const handleClick = useCallback(() => {
+    approvedRef.current.setVisible(true)
+  }, [])
+
+  // 提交表单
+  const handleSubmit = useCallback(() => {
+    approvedRef.current.actions.submit().then(async () => {
+      const params = {
+        id: Number(id),
+        state: 1
+      }
+      const result = await run(params)
+
+      if (result.code === 1000) {
+        approvedRef.current.setVisible(false)
+        history.goBack()
+      }
+    })
+  }, [])
+
   return (
     <div>
-      待审核订单（一级）详情
+      <OrderDetailContext.Provider value={formContext}>
+        <OrderDetailHeader detailList={detailList} detailData={formContext.data} extraRight={
+          <Button type='primary' onClick={handleClick}>
+            提交审核
+          </Button>
+        } />
+
+        <OrderDetailWrapper>
+          <PreLoading loading={!formContext.data} active paragraph={{rows: 6}}>
+            <OrderDetailSection formContext={formContext} type='saleOrder'/>
+          </PreLoading>
+        </OrderDetailWrapper>
+
+        {/* 提交时触发的弹窗集合 */}
+        <ApprovedOrderModal
+          currentRef={approvedRef}
+          onConfirm={handleSubmit}
+          loading={loading}
+        />
+      </OrderDetailContext.Provider>
     </div>
   );
 };

src/pages/transaction/saleOrder/readyConfirmOrder/detail/index.tsx

-import React from 'react';
+import React, { useState, useCallback, useRef } from 'react';
+import { OrderDetailContext } from '../../../_public/order/context';
+import { PublicApi } from '@/services/api';
+import { Button } from 'antd';
+import OrderDetailHeader from '@/pages/transaction/components/OrderDetailHeader';
+import OrderDetailWrapper from '@/pages/transaction/components/OrderDetailWrapper';
+import PreLoading from '@/components/PreLoading';
+import { useOrderDetail } from '../../../_public/order/effects/useOrderDetail';
+import ApprovedOrderModal from '../../../components/approvedOrderModal';
+import { history } from 'umi'
+import { useHttpRequest } from '@/hooks/useHttpRequest';
+import OrderDetailSection from '../../../components/orderDetailSection';
 
 const ReadyConfirmOrderDetail: React.FC = () => {
+  const { formContext, id, detailList } = useOrderDetail({type: 'saleOrder'})
+  const { run, loading } = useHttpRequest(PublicApi.postOrderConfirmedOrder)
+  const approvedRef = useRef<any>({})
+
+  const handleClick = useCallback(() => {
+    approvedRef.current.setVisible(true)
+  }, [])
+
+  // 提交表单
+  const handleSubmit = useCallback(() => {
+    approvedRef.current.actions.submit().then(async () => {
+      const params = {
+        id: Number(id),
+        state: 1
+      }
+      const result = await run(params)
+
+      if (result.code === 1000) {
+        approvedRef.current.setVisible(false)
+        history.goBack()
+      }
+    })
+  }, [])
+
   return (
     <div>
-      待确认订单
+      <OrderDetailContext.Provider value={formContext}>
+        <OrderDetailHeader detailList={detailList} detailData={formContext.data} extraRight={
+          <Button type='primary' onClick={handleClick}>
+            确认订单
+          </Button>
+        } />
+
+        <OrderDetailWrapper>
+          <PreLoading loading={!formContext.data} active paragraph={{rows: 6}}>
+            <OrderDetailSection formContext={formContext} type='saleOrder'/>
+          </PreLoading>
+        </OrderDetailWrapper>
+
+        {/* 提交时触发的弹窗集合 */}
+        <ApprovedOrderModal
+          currentRef={approvedRef}
+          onConfirm={handleSubmit}
+          loading={loading}
+        />
+      </OrderDetailContext.Provider>
     </div>
   );
 };

src/pages/transaction/saleOrder/secondApprovedOrder/detail/index.tsx

-import React from 'react';
+import React, { useState, useCallback, useRef } from 'react';
+import { OrderDetailContext } from '../../../_public/order/context';
+import { PublicApi } from '@/services/api';
+import { Button } from 'antd';
+import OrderDetailHeader from '@/pages/transaction/components/OrderDetailHeader';
+import OrderDetailWrapper from '@/pages/transaction/components/OrderDetailWrapper';
+import PreLoading from '@/components/PreLoading';
+import { useOrderDetail } from '../../../_public/order/effects/useOrderDetail';
+import ApprovedOrderModal from '../../../components/approvedOrderModal';
+import { history } from 'umi'
+import { useHttpRequest } from '@/hooks/useHttpRequest';
+import OrderDetailSection from '../../../components/orderDetailSection';
 
 const SecondApprovedOrderDetail: React.FC = () => {
+  const { formContext, id, detailList } = useOrderDetail({type: 'saleOrder'})
+  const { run, loading } = useHttpRequest(PublicApi.postOrderSubmittedReviewOrderTwo)
+  const approvedRef = useRef<any>({})
+
+  const handleClick = useCallback(() => {
+    approvedRef.current.setVisible(true)
+  }, [])
+
+  // 提交表单
+  const handleSubmit = useCallback(() => {
+    approvedRef.current.actions.submit().then(async () => {
+      const params = {
+        id: Number(id),
+        state: 1
+      }
+      const result = await run(params)
+
+      if (result.code === 1000) {
+        approvedRef.current.setVisible(false)
+        history.goBack()
+      }
+    })
+  }, [])
+
   return (
     <div>
-      待审核订单（二级）详情
+      <OrderDetailContext.Provider value={formContext}>
+        <OrderDetailHeader detailList={detailList} detailData={formContext.data} extraRight={
+          <Button type='primary' onClick={handleClick}>
+            提交审核
+          </Button>
+        } />
+
+        <OrderDetailWrapper>
+          <PreLoading loading={!formContext.data} active paragraph={{rows: 6}}>
+            <OrderDetailSection formContext={formContext} type='saleOrder'/>
+          </PreLoading>
+        </OrderDetailWrapper>
+
+        {/* 提交时触发的弹窗集合 */}
+        <ApprovedOrderModal
+          currentRef={approvedRef}
+          onConfirm={handleSubmit}
+          loading={loading}
+        />
+      </OrderDetailContext.Provider>
     </div>
   );
 };