feat: update 售后审核

zhongnanhuang
1 parent 7bd04f86
Showing 5 changed files with 223 additions and 87 deletions
src/pages/Order/components/CheckModal.tsx
src/pages/Order/constant.ts
src/pages/Order/index.tsx
src/services/definition.ts
src/services/request.ts
 import { RESPONSE_CODE } from '@/constants/enum';
 import {
+  postServiceOrderAfterSalesCheck,
   postServiceOrderCheckOrder,
   postServiceOrderFileProcess,
   postServiceOrderFinanceCheckOrder,
+  postServiceOrderQueryAfterSalesInfoSnapshot,
 } from '@/services';
 import { ModalForm, ProFormTextArea } from '@ant-design/pro-components';
-import { Button, Form, Modal, UploadFile, message } from 'antd';
+import { Button, Descriptions, Form, Modal, UploadFile, message } from 'antd';
 import Upload, { RcFile, UploadProps } from 'antd/es/upload';
 import { useEffect, useRef, useState } from 'react';
 import { CHECK_TYPE, COMFIR_RECEIPT_IMAGES_NUMBER } from '../constant';
@@ -34,6 +36,28 @@ export default ({
   const [fileList, setFileList] = useState<UploadFile[]>([]);
   const handleCancel = () => setPreviewOpen(false);
   const [messageApi, contextHolder] = message.useMessage();
+  const [afterSalesItems, setAfterSalesItems] = useState<any[]>([]);
+  const [form] = Form.useForm<{ name: string; company: string }>();
+  let subOrderIds: any[] = subOrders.map((subOrder) => subOrder.id);
+
+  /**
+   * 审核类型
+   */
+  function checkType(check: string) {
+    if (orderCheckType === check) {
+      return true;
+    }
+    return false;
+  }
+
+  const getOrderAfterSalesInfo = async () => {
+    let res = await postServiceOrderQueryAfterSalesInfoSnapshot({
+      data: { subOrderIds: subOrderIds },
+    });
+    setAfterSalesItems([]);
+    console.log(res);
+  };
+
   const handleChange: UploadProps['onChange'] = ({ fileList: newFileList }) => {
     //fileListObj得在change里变化，change的参数是已经处理过的file数组
     //beforeUpload中的参数file是未处理过，还需要Base64拿到文件数据处理
@@ -96,6 +120,11 @@ export default ({
     message.info('您的剪贴板中没有照片');
   };
   useEffect(() => {
+    //回显售后信息
+    if (checkType(CHECK_TYPE.AFTER_SALES)) {
+      getOrderAfterSalesInfo();
+    }
+
     document.addEventListener('paste', onPaste);
     return () => {
       document.removeEventListener('paste', onPaste);
@@ -143,15 +172,6 @@ export default ({
     headers: { Authorization: localStorage.getItem('token') },
   };
  
-  const [form] = Form.useForm<{ name: string; company: string }>();
-  let subOrderIds: any[] = [];
-  //是单条子订单审核
-  if (subOrders === undefined) {
-    subOrderIds = [data.id];
-  } else {
-    subOrderIds = subOrders.map((subOrder) => subOrder.id);
-  }
-
   async function doCheck(body: object) {
     const data = await postServiceOrderCheckOrder({
       data: body,
@@ -224,7 +244,7 @@ export default ({
    * @param body 售后审核
    */
   async function doAfterSalesCheck(body: object) {
-    const data = await postServiceOrderFinanceCheckOrder({
+    const data = await postServiceOrderAfterSalesCheck({
       data: body,
     });
     if (data.result === RESPONSE_CODE.SUCCESS) {
@@ -233,16 +253,6 @@ export default ({
     }
   }
  
-  /**
-   * 审核类型
-   */
-  function checkType(check: string) {
-    if (orderCheckType === check) {
-      return true;
-    }
-    return false;
-  }
-
   return (
     <>
       <ModalForm<{
@@ -281,10 +291,10 @@ export default ({
  
                   if (checkType(CHECK_TYPE.AFTER_SALES)) {
                     doAfterSalesCheck({
-                      flag: false,
-                      ids: subOrderIds,
-                      externalProcurement: 0,
-                      checkNotes: form.getFieldValue('name'),
+                      isAfterSalesSuccess: false,
+                      subOrderIds: subOrderIds,
+                      mainId: data.id,
+                      afterSalesRejectionNotes: form.getFieldValue('name'),
                     });
                     return;
                   }
@@ -338,10 +348,10 @@ export default ({
           if (checkType(CHECK_TYPE.AFTER_SALES)) {
             //审核通过
             return doAfterSalesCheck({
-              flag: true,
-              ids: subOrderIds,
-              externalProcurement: 0,
-              checkNotes: values.name,
+              isAfterSalesSuccess: true,
+              subOrderIds: subOrderIds,
+              mainId: data.id,
+              afterSalesRejectionNotes: values.name,
             });
           }
  
@@ -351,6 +361,20 @@ export default ({
         }}
         onOpenChange={setCheckVisible}
       >
+        {checkType(CHECK_TYPE.AFTER_SALES) ? (
+          <Descriptions
+            className="mb-5"
+            labelStyle={{ textAlign: 'center' }}
+            column={1}
+            bordered
+            title={<span className="text-sm font-medium">售后信息</span>}
+            size="small"
+            items={afterSalesItems}
+          />
+        ) : (
+          ''
+        )}
+
         <div>请特别注意订单总金额与订单金额。</div>
         <ProFormTextArea
           width="lg"
@@ -359,7 +383,9 @@ export default ({
         />
         {checkType(CHECK_TYPE.FINALCIAL) ? (
           <>
-            {/* <div className="pb-4 text-xs decoration-gray-50">可复制照片粘贴</div> */}
+            <div className="pb-4 text-xs decoration-gray-50">
+              可复制照片粘贴
+            </div>
             <Upload {...props}>
               {fileList.length < COMFIR_RECEIPT_IMAGES_NUMBER
                 ? uploadButton
@@ -119,6 +119,7 @@ export const ORDER_STATUS_OPTIONS = {
   AUDIT_FAILED: '审核失败',
   IN_AFTER_SALES: '售后中',
   AFTER_SALES_COMPLETION: '售后完成',
+  AFTER_SALES_FAILURE: '售后失败',
   NO_NEED_SEND: '无需发货',
   PROCURE_CONVERT_WAREHOUSE_KEEPER: '采购转仓库',
 };
@@ -165,6 +166,7 @@ export const TAGS_COLOR = new Map&lt;string, string&gt;([
   ['PROCURE_WAIT_SHIP', 'processing'],
   ['NO_NEED_SEND', 'success'],
   ['PROCURE_CONVERT_WAREHOUSE_KEEPER', 'processing'],
+  ['AFTER_SALES_FAILURE', 'red'],
 ]);
 export const SALES_CODE_OPTIONS = [
   { label: 'D-Linda', value: 'D-Linda' },
@@ -66,7 +66,6 @@ import ProcureConvertModal from &#39;./components/ProcureConvertModal&#39;;
 import SubOrderComfirmReceiptImagesModal from './components/SubOrderComfirmReceiptImagesModal';
 import {
   AFTER_INVOICING_STATUS,
-  AFTE_SALES_PLAN_OPTIONS,
   CHECK_TYPE,
   LOGISTICS_STATUS_OPTIONS,
   MAIN_ORDER_COLUMNS,
@@ -357,31 +356,37 @@ const OrderPage = () =&gt; {
         orderStatus === 'IN_AFTER_SALES'
       ) {
         return (
-          <MyToolTip
-            key="key"
-            title={
-              enumValueToLabel(
-                optRecord.afterSalesPlan,
-                AFTE_SALES_PLAN_OPTIONS,
-              ) +
-              ' ' +
-              optRecord.afterSalesNotes
-            }
-            content={
-              <>
-                <Tag
-                  color={TAGS_COLOR.get(optRecord.orderStatus)}
-                  style={{ marginRight: '4px' }}
-                >
-                  {enumValueToLabel(
-                    optRecord.orderStatus,
-                    ORDER_STATUS_OPTIONS,
-                  )}
-                </Tag>
-                <QuestionCircleOutlined style={{ color: '#C1C1C1' }} />
-              </>
-            }
-          />
+          // <MyToolTip
+          //   key="key"
+          //   title={
+          //     enumValueToLabel(
+          //       optRecord.afterSalesPlan,
+          //       AFTE_SALES_PLAN_OPTIONS,
+          //     ) +
+          //     ' ' +
+          //     optRecord.afterSalesNotes
+          //   }
+          //   content={
+          //     <>
+          //       <Tag
+          //         color={TAGS_COLOR.get(optRecord.orderStatus)}
+          //         style={{ marginRight: '4px' }}
+          //       >
+          //         {enumValueToLabel(
+          //           optRecord.orderStatus,
+          //           ORDER_STATUS_OPTIONS,
+          //         )}
+          //       </Tag>
+          //       <QuestionCircleOutlined style={{ color: '#C1C1C1' }} />
+          //     </>
+          //   }
+          // />
+          <Tag
+            color={TAGS_COLOR.get(optRecord.orderStatus)}
+            style={{ marginRight: '4px' }}
+          >
+            {enumValueToLabel(optRecord.orderStatus, ORDER_STATUS_OPTIONS)}
+          </Tag>
         );
       }
  
@@ -436,7 +441,6 @@ const OrderPage = () =&gt; {
     //财务审核附件处理
     const getInvoicingCheckAnnexList = () => {
       let invoicingCheckAnnexList = optRecord.invoicingCheckAnnexList;
-
       return (
         <div>
           <Image.PreviewGroup
@@ -883,7 +887,7 @@ const OrderPage = () =&gt; {
                 className="p-0"
                 type="link"
                 onClick={() => {
-                  setOrderRow(optRecord);
+                  setOrderRow(record);
                   setCheckVisible(true);
                   setSelectedRows([optRecord]);
                   setOrderCheckType(CHECK_TYPE.NORMAL);
@@ -900,7 +904,7 @@ const OrderPage = () =&gt; {
                 className="p-0"
                 type="link"
                 onClick={() => {
-                  setOrderRow(optRecord);
+                  setOrderRow(record);
                   setCheckVisible(true);
                   setSelectedRows([optRecord]);
                   setOrderCheckType(CHECK_TYPE.AFTER_SALES);
@@ -917,7 +921,7 @@ const OrderPage = () =&gt; {
                 className="p-0"
                 type="link"
                 onClick={() => {
-                  setOrderRow(optRecord);
+                  setOrderRow(record);
                   setCheckVisible(true);
                   setSelectedRows([optRecord]);
                   setOrderCheckType(CHECK_TYPE.FINALCIAL);
@@ -934,7 +938,7 @@ const OrderPage = () =&gt; {
                 className="p-0"
                 type="link"
                 onClick={() => {
-                  setOrderRow(optRecord);
+                  setOrderRow(record);
                   setSelectedRows([optRecord]);
                   setOrderCheckType(CHECK_TYPE.PROCURE);
                   setProcureCheckModalVisible(true);
@@ -1645,12 +1649,13 @@ const OrderPage = () =&gt; {
                         let selectedSubOrders = selectedRowObj[record.id];
                         setSelectedRows(selectedSubOrders);
                         if (selectedSubOrders === undefined) {
-                          setSelectedRows(record.subOrderInformationLists);
+                          selectedSubOrders = record.subOrderInformationLists;
                         }
-                        for (let i = 0; i < selectedRows.length; i++) {
+                        for (let i = 0; i < selectedSubOrders.length; i++) {
                           if (
-                            selectedRows[i].orderStatus !== 'UNAUDITED' &&
-                            selectedRows[i].orderStatus !== 'FINANCE_PROCESS'
+                            selectedSubOrders[i].orderStatus !== 'UNAUDITED' &&
+                            selectedSubOrders[i].orderStatus !==
+                              'FINANCE_PROCESS'
                           ) {
                             message.error('请选择未审核的子订单进行审核');
                             return;
@@ -1658,6 +1663,7 @@ const OrderPage = () =&gt; {
                         }
                         setOrderRow(record);
                         setCheckVisible(true);
+                        setSelectedRows(selectedSubOrders);
                         setOrderCheckType(CHECK_TYPE.NORMAL);
                       }}
                     >
@@ -1675,11 +1681,12 @@ const OrderPage = () =&gt; {
                         let selectedSubOrders = selectedRowObj[record.id];
                         setSelectedRows(selectedSubOrders);
                         if (selectedSubOrders === undefined) {
-                          setSelectedRows(record.subOrderInformationLists);
+                          selectedSubOrders = record.subOrderInformationLists;
                         }
-                        for (let i = 0; i < selectedRows.length; i++) {
+                        for (let i = 0; i < selectedSubOrders.length; i++) {
                           if (
-                            selectedRows[i].orderStatus !== 'IN_AFTER_SALES'
+                            selectedSubOrders[i].orderStatus !==
+                            'IN_AFTER_SALES'
                           ) {
                             message.error('请选择售后中的子订单进行审核');
                             return;
@@ -1687,6 +1694,7 @@ const OrderPage = () =&gt; {
                         }
                         setOrderRow(record);
                         setCheckVisible(true);
+                        setSelectedRows(selectedSubOrders);
                         setOrderCheckType(CHECK_TYPE.AFTER_SALES);
                       }}
                     >
@@ -1753,12 +1761,13 @@ const OrderPage = () =&gt; {
                         let selectedSubOrders = selectedRowObj[record.id];
                         setSelectedRows(selectedSubOrders);
                         if (selectedSubOrders === undefined) {
-                          setSelectedRows(record.subOrderInformationLists);
+                          selectedSubOrders = record.subOrderInformationLists;
                         }
-                        for (let i = 0; i < selectedRows.length; i++) {
+                        for (let i = 0; i < selectedSubOrders.length; i++) {
                           if (
-                            selectedRows[i].orderStatus !== 'UNAUDITED' &&
-                            selectedRows[i].orderStatus !== 'FINANCE_PROCESS'
+                            selectedSubOrders[i].orderStatus !== 'UNAUDITED' &&
+                            selectedSubOrders[i].orderStatus !==
+                              'FINANCE_PROCESS'
                           ) {
                             message.error('请选择未审核的子订单进行审核');
                             return;
@@ -1766,6 +1775,7 @@ const OrderPage = () =&gt; {
                         }
                         setOrderRow(record);
                         setCheckVisible(true);
+                        setSelectedRows(selectedSubOrders);
                         setOrderCheckType(CHECK_TYPE.FINALCIAL);
                       }}
                     >
@@ -1784,11 +1794,12 @@ const OrderPage = () =&gt; {
                         let selectedSubOrders = selectedRowObj[record.id];
                         setSelectedRows(selectedSubOrders);
                         if (selectedSubOrders === undefined) {
-                          setSelectedRows(record.subOrderInformationLists);
+                          selectedSubOrders = record.subOrderInformationLists;
                         }
-                        for (let i = 0; i < selectedRows.length; i++) {
+                        for (let i = 0; i < selectedSubOrders.length; i++) {
                           if (
-                            selectedRows[i].orderStatus !== 'PROCURE_UN_PROCESS'
+                            selectedSubOrders[i].orderStatus !==
+                            'PROCURE_UN_PROCESS'
                           ) {
                             message.error('请选择未审核的子订单进行审核');
                             return;
@@ -1796,6 +1807,7 @@ const OrderPage = () =&gt; {
                         }
                         setOrderRow(record);
                         setProcureCheckModalVisible(true);
+                        setSelectedRows(selectedSubOrders);
                         setOrderCheckType(CHECK_TYPE.PROCURE);
                       }}
                     >
@@ -712,6 +712,11 @@ export interface ProcureCheckOrderDto {
 export interface ProcureConvertProcureDto {
   /**
    * @description
+   *   采购转发备注
+   */
+  procureConvertNotes?: string;
+  /**
+   * @description
    *   采购人名称
    */
   procureName?: string;
@@ -764,6 +769,14 @@ export interface ProductInformationDto {
   productName?: string;
 }
  
+export interface QueryAfterSalesInfoSnapshotDto {
+  /**
+   * @description
+   *   子订单id集合
+   */
+  subOrderIds?: Array<number>;
+}
+
 export interface QueryAnnexDto {
   /**
    * @description
@@ -881,6 +894,16 @@ export interface View {
   contentType?: string;
 }
  
+export interface YearMonth {
+  leapYear?: boolean;
+  /** @format int32 */
+  month?: number;
+  /** @format int32 */
+  monthValue?: number;
+  /** @format int32 */
+  year?: number;
+}
+
 export interface Dto {
   /**
    * @description
@@ -41,6 +41,7 @@ import type {
   ProcureOrderDto,
   ProcurePrintDto,
   ProductInformationDto,
+  QueryAfterSalesInfoSnapshotDto,
   QueryAnnexDto,
   QueryCustomerInformationDto,
   QueryHistoryRecordDto,
@@ -4847,8 +4848,8 @@ export const postServiceOrderAddOrder = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
-/** @description request parameter type for postServiceOrderAfterSalesCompletion */
-export interface PostServiceOrderAfterSalesCompletionOption {
+/** @description request parameter type for postServiceOrderAfterSalesCheck */
+export interface PostServiceOrderAfterSalesCheckOption {
   /**
    * @description
    *   dto
@@ -4861,8 +4862,8 @@ export interface PostServiceOrderAfterSalesCompletionOption {
   };
 }
  
-/** @description response type for postServiceOrderAfterSalesCompletion */
-export interface PostServiceOrderAfterSalesCompletionResponse {
+/** @description response type for postServiceOrderAfterSalesCheck */
+export interface PostServiceOrderAfterSalesCheckResponse {
   /**
    * @description
    *   OK
@@ -4890,25 +4891,25 @@ export interface PostServiceOrderAfterSalesCompletionResponse {
   404: any;
 }
  
-export type PostServiceOrderAfterSalesCompletionResponseSuccess =
-  PostServiceOrderAfterSalesCompletionResponse[200];
+export type PostServiceOrderAfterSalesCheckResponseSuccess =
+  PostServiceOrderAfterSalesCheckResponse[200];
 /**
  * @description
- *   售后完成
+ *   售后审核
  * @tags 内部订单
  * @produces *
  * @consumes application/json
  */
-export const postServiceOrderAfterSalesCompletion = /* #__PURE__ */ (() => {
+export const postServiceOrderAfterSalesCheck = /* #__PURE__ */ (() => {
   const method = 'post';
-  const url = '/service/order/afterSalesCompletion';
+  const url = '/service/order/afterSalesCheck';
   function request(
-    option: PostServiceOrderAfterSalesCompletionOption,
-  ): Promise<PostServiceOrderAfterSalesCompletionResponseSuccess> {
+    option: PostServiceOrderAfterSalesCheckOption,
+  ): Promise<PostServiceOrderAfterSalesCheckResponseSuccess> {
     return requester(request.url, {
       method: request.method,
       ...option,
-    }) as unknown as Promise<PostServiceOrderAfterSalesCompletionResponseSuccess>;
+    }) as unknown as Promise<PostServiceOrderAfterSalesCheckResponseSuccess>;
   }
  
   /** http method */
@@ -6990,6 +6991,78 @@ export const getServiceOrderProvideToken = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
+/** @description request parameter type for postServiceOrderQueryAfterSalesInfoSnapshot */
+export interface PostServiceOrderQueryAfterSalesInfoSnapshotOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: QueryAfterSalesInfoSnapshotDto;
+  };
+}
+
+/** @description response type for postServiceOrderQueryAfterSalesInfoSnapshot */
+export interface PostServiceOrderQueryAfterSalesInfoSnapshotResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderQueryAfterSalesInfoSnapshotResponseSuccess =
+  PostServiceOrderQueryAfterSalesInfoSnapshotResponse[200];
+/**
+ * @description
+ *   查询售后信息快照
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderQueryAfterSalesInfoSnapshot =
+  /* #__PURE__ */ (() => {
+    const method = 'post';
+    const url = '/service/order/queryAfterSalesInfoSnapshot';
+    function request(
+      option: PostServiceOrderQueryAfterSalesInfoSnapshotOption,
+    ): Promise<PostServiceOrderQueryAfterSalesInfoSnapshotResponseSuccess> {
+      return requester(request.url, {
+        method: request.method,
+        ...option,
+      }) as unknown as Promise<PostServiceOrderQueryAfterSalesInfoSnapshotResponseSuccess>;
+    }
+
+    /** http method */
+    request.method = method;
+    /** request url */
+    request.url = url;
+    return request;
+  })();
+
 /** @description request parameter type for postServiceOrderQueryCustomerInformation */
 export interface PostServiceOrderQueryCustomerInformationOption {
   /**