Merge branch 'znh' into 'develop'

Znh See merge request !19

Merge branch 'znh' into 'develop'
Znh See merge request !19
zhongnanhuang
2 parents 7cc5f5a5 945ed31e
Showing 6 changed files with 478 additions and 21 deletions
src/pages/Order/components/ApplyForInvoicingModal.tsx
src/pages/Order/components/ProcureCheckModal.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 { postServiceOrderApplyInvoicing } from '@/services';
+import {
+  ModalForm,
+  ProFormTextArea,
+  ProFormUploadDragger,
+} from '@ant-design/pro-components';
+import { Form, message } from 'antd';
+export default ({ setCheckVisible, subOrders, onClose }) => {
+  const [form] = Form.useForm<{
+    applyInvoicingNotes: string;
+    filePaths: any;
+    subIds: any[];
+  }>();
+  let subOrderIds = subOrders?.map((subOrder) => subOrder.id);
+
+  return (
+    <ModalForm<{
+      applyInvoicingNotes: string;
+      filePaths: any;
+      subIds: any[];
+    }>
+      width={500}
+      open
+      title="申请开票"
+      form={form}
+      autoFocusFirstInput
+      modalProps={{
+        okText: '确认',
+        cancelText: '取消',
+        destroyOnClose: true,
+        onCancel: () => {
+          setCheckVisible(false);
+        },
+      }}
+      submitter={{
+        render: (props, defaultDoms) => {
+          return defaultDoms;
+        },
+      }}
+      submitTimeout={2000}
+      onFinish={async (values) => {
+        values.subIds = subOrderIds;
+        //附件处理
+        values.filePaths = values.filePaths?.map((item) => {
+          return { url: item.response.data[0] };
+        });
+
+        const res = await postServiceOrderApplyInvoicing({ data: values });
+        if ((res.result = RESPONSE_CODE.SUCCESS)) {
+          message.success(res.message);
+          onClose();
+        }
+      }}
+      onOpenChange={setCheckVisible}
+    >
+      <div>如果需要合并订单，请将需要合并的订单id写在备注中。</div>
+      <ProFormTextArea
+        width="lg"
+        name="applyInvoicingNotes"
+        placeholder="请输入备注"
+      />
+      <ProFormUploadDragger
+        key="2"
+        label="附件"
+        name="filePaths"
+        action="/api/service/order/fileProcess"
+        fieldProps={{
+          headers: { Authorization: localStorage.getItem('token') },
+        }}
+      />
+    </ModalForm>
+  );
+};
 import { RESPONSE_CODE } from '@/constants/enum';
 import {
   postServiceOrderProcureCheckOrder,
+  postServiceOrderProcureConvertWarehouseKeeper,
   postServiceOrderQuerySupplier,
 } from '@/services';
 import { ModalForm, ProFormSelect } from '@ant-design/pro-components';
-import { Form, message } from 'antd';
+import { Button, Form, Input, Popconfirm, message } from 'antd';
+import { useState } from 'react';
 export default ({ setCheckVisible, data, subOrders, onClose }) => {
   const [form] = Form.useForm<{ name: string; company: string }>();
+
+  const [checkNotes, setCheckNotes] = useState<string>('');
+
   let subOrderIds: any[] = [];
   //是单条子订单审核
   if (subOrders === undefined) {
@@ -31,7 +36,7 @@ export default ({ setCheckVisible, data, subOrders, onClose }) =&gt; {
     }>
       width={500}
       open
-      title="供应商选择"
+      title="采购审核"
       form={form}
       autoFocusFirstInput
       modalProps={{
@@ -44,7 +49,48 @@ export default ({ setCheckVisible, data, subOrders, onClose }) =&gt; {
       }}
       submitter={{
         render: (props, defaultDoms) => {
-          return defaultDoms;
+          return [
+            defaultDoms[0],
+            <>
+              <Popconfirm
+                title="是否转回仓库"
+                description={
+                  <div>
+                    <div className="py-2">
+                      <span>转回仓库后将由仓库管理员进行打印、发货</span>
+                    </div>
+                    <Input.TextArea
+                      placeholder="请填写备注"
+                      onChange={(e: any) => {
+                        setCheckNotes(e.target.value);
+                      }}
+                      rows={4}
+                    ></Input.TextArea>
+                  </div>
+                }
+                onConfirm={async () => {
+                  const res =
+                    await postServiceOrderProcureConvertWarehouseKeeper({
+                      data: {
+                        subIds: subOrderIds,
+                        checkNotes: checkNotes,
+                      },
+                    });
+
+                  if (res?.result === RESPONSE_CODE.SUCCESS) {
+                    message.success(res.message);
+                    onClose();
+                    return true;
+                  }
+                }}
+                okText="确定"
+                cancelText="取消"
+              >
+                <Button type="primary">转回仓库</Button>
+              </Popconfirm>
+            </>,
+            defaultDoms[1],
+          ];
         },
       }}
       submitTimeout={2000}
@@ -112,6 +112,7 @@ export const ORDER_STATUS_OPTIONS = {
   IN_AFTER_SALES: '售后中',
   AFTER_SALES_COMPLETION: '售后完成',
   NO_NEED_SEND: '无需发货',
+  PROCURE_CONVERT_WAREHOUSE_KEEPER: '采购转仓库',
 };
 export const AFTE_SALES_PLAN_OPTIONS = {
@@ -148,6 +149,7 @@ export const TAGS_COLOR = new Map&lt;string, string&gt;([
   ['PROCURE_PROCESS_FOR_MINE', 'processing'],
   ['PROCURE_WAIT_SHIP', 'processing'],
   ['NO_NEED_SEND', 'success'],
+  ['PROCURE_CONVERT_WAREHOUSE_KEEPER', 'processing'],
 ]);
 export const SALES_CODE_OPTIONS = [
@@ -217,6 +219,7 @@ export const HISTORY_OPT_TYPE = new Map&lt;string, string&gt;([
   ['PROCURE_PRINT', '采购打印子订单'],
   ['PROCURE_SEND', '采购发货子订单'],
   ['NO_NEED_SEND', '不需要发货'],
+  ['PROCURE_CONVERT_WAREHOUSE_KEEPER', '采购转仓库'],
 ]);
 export const MAIN_ORDER_COLUMNS = [
@@ -41,6 +41,7 @@ import { cloneDeep } from &#39;lodash&#39;;
 import { Key, useRef, useState } from 'react';
 import OrderPrintModal from '../OrderPrint/OrderPrintModal';
 import AfterSalesDrawer from './components/AfterSalesDrawer';
+import ApplyForInvoicingModal from './components/ApplyForInvoicingModal';
 import AttachmentModal from './components/AttachmentModal';
 import CheckModal from './components/CheckModal';
 import ConfirmReceiptModal from './components/ConfirmReceiptModal';
@@ -89,6 +90,8 @@ const OrderPage = () =&gt; {
   const [isSendProduct, setIsSendProduct] = useState<boolean>(false);
   const [isMainOrder, setIsMainOrder] = useState<boolean>(false);
   const [importModalVisible, setImportModalVisible] = useState<boolean>(false);
+  const [applyForInvoicingVisible, setApplyForInvoicingVisible] =
+    useState<boolean>(false);
   const [procureCheckModalVisible, setProcureCheckModalVisible] =
     useState<boolean>(false);
   const [confirmReceiptVisible, setConfirmReceiptVisible] =
@@ -190,6 +193,24 @@ const OrderPage = () =&gt; {
     );
   };
+  /**
+   * 检查是否可以打印
+   * @param paths 按钮集合
+   * @returns
+   */
+  function checkePrintable(paths: any) {
+    if (
+      !paths?.includes('printOrder') &&
+      !paths?.includes('supplierPrint') &&
+      !paths?.includes('procurePrint') &&
+      !paths?.includes('rePrintOrder')
+    ) {
+      return false;
+    }
+
+    return true;
+  }
+
   const onCheckboxChange = (record: never) => {
     let newSelectedItems = [];
     if (selectedItems.includes(record.id)) {
@@ -308,6 +329,28 @@ const OrderPage = () =&gt; {
         );
       }
+      if (orderStatus === 'PROCURE_CONVERT_WAREHOUSE_KEEPER') {
+        return (
+          <MyToolTip
+            title={optRecord.checkNotes}
+            content={
+              <>
+                <Tag
+                  color={TAGS_COLOR.get(optRecord.orderStatus)}
+                  style={{ marginRight: '4px' }}
+                >
+                  {enumValueToLabel(
+                    optRecord.orderStatus,
+                    ORDER_STATUS_OPTIONS,
+                  )}
+                </Tag>
+                <QuestionCircleOutlined style={{ color: '#C1C1C1' }} />
+              </>
+            }
+          />
+        );
+      }
+
       return (
         <Tag color={TAGS_COLOR.get(optRecord.orderStatus)}>
           {enumValueToLabel(optRecord.orderStatus, ORDER_STATUS_OPTIONS)}
@@ -349,22 +392,6 @@ const OrderPage = () =&gt; {
               }}
             />
           </Flex>
-
-          <Flex title={optRecord.notes}>
-            <div className="max-w-[90%] whitespace-no-wrap overflow-hidden overflow-ellipsis">
-              <span className="text-[#8C8C8C]">
-                开票备注：请将2312210003,2312210002,2312210001订单合并开票
-              </span>
-            </div>
-            {/* 编辑备注按钮 */}
-            <EditTwoTone
-              onClick={() => {
-                setNotesEditVisible(true);
-                setOrderRow(optRecord);
-                setIsMainOrder(false);
-              }}
-            />
-          </Flex>
         </Flex>
         <Flex className="w-[16%]" vertical gap="small">
           <div
@@ -663,6 +690,22 @@ const OrderPage = () =&gt; {
           ) : (
             ''
           )}
+
+          {optRecord.subPath?.includes('applyInvoicing') ? (
+            <Button
+              className="p-0"
+              type="link"
+              onClick={() => {
+                setApplyForInvoicingVisible(true);
+                setSelectedRows([optRecord]);
+              }}
+            >
+              申请开票
+            </Button>
+          ) : (
+            ''
+          )}
+
           {optRecord.subPath?.includes('checkOrder') ? (
             <Button
               className="p-0"
@@ -1079,10 +1122,18 @@ const OrderPage = () =&gt; {
                       className="p-0"
                       type="link"
                       onClick={() => {
-                        if (!selectedRowObj[record.id]?.length) {
+                        const selectedSubOrders = selectedRowObj[record.id];
+                        if (!selectedSubOrders?.length) {
                           return message.error('请选择选择子订单');
                         }
-                        setSelectedRows(selectedRowObj[record.id]);
+
+                        for (let subOrderRecord of selectedSubOrders) {
+                          let subPath = subOrderRecord.subPath;
+                          if (!checkePrintable(subPath)) {
+                            return message.error('请选择可以打印的子订单');
+                          }
+                        }
+                        setSelectedRows(selectedSubOrders);
                         setOrderRow(record);
                         setOrderPrintVisible(true);
                         setOrderCheckType(CHECK_TYPE.NORMAL);
@@ -1186,6 +1237,40 @@ const OrderPage = () =&gt; {
                   ) : (
                     ''
                   )}
+
+                  {record.mainPath?.includes('applyInvoicing') ? (
+                    <Button
+                      type="link"
+                      className="p-0"
+                      onClick={() => {
+                        let selectedSubOrders = selectedRowObj[record.id];
+                        if (selectedSubOrders === undefined) {
+                          selectedSubOrders = record.subOrderInformationLists;
+                        }
+
+                        setSelectedRows(selectedSubOrders);
+                        for (let i = 0; i < selectedSubOrders.length; i++) {
+                          if (
+                            selectedSubOrders[i].invoicingStatus ===
+                              'UN_INVOICE' ||
+                            selectedSubOrders[i].afterInvoicingStatus ===
+                              'APPLY_FOR_INVOICING'
+                          ) {
+                            message.error(
+                              '请选择需要开票且未申请开票的子订单进行申请',
+                            );
+                            return;
+                          }
+                        }
+                        setApplyForInvoicingVisible(true);
+                      }}
+                    >
+                      申请开票
+                    </Button>
+                  ) : (
+                    ''
+                  )}
+
                   {record.mainPath?.includes('updateOrder') ? (
                     <Button
                       className="p-0"
@@ -1779,6 +1864,18 @@ const OrderPage = () =&gt; {
         />
       )}
+      {applyForInvoicingVisible && (
+        <ApplyForInvoicingModal
+          setCheckVisible={setApplyForInvoicingVisible}
+          subOrders={selectedRows}
+          onClose={() => {
+            setApplyForInvoicingVisible(false);
+            setSelectedRows({});
+            refreshTable();
+          }}
+        />
+      )}
+
       {notesEditVisible && (
         <OrderNotesEditModal
           setNotesEditVisible={setNotesEditVisible}
@@ -709,6 +709,19 @@ export interface ProcureCheckOrderDto {
   supplier?: string;
 }
+export interface ProcureConvertWarehouseKeeperDto {
+  /**
+   * @description
+   *   审核备注
+   */
+  checkNotes?: string;
+  /**
+   * @description
+   *   子订单id集合
+   */
+  subIds?: Array<number>;
+}
+
 export interface ProcurePrintDto {
   /**
    * @description
@@ -745,7 +758,16 @@ export interface QueryAnnexDto {
 }
 export interface QueryHistoryRecordDto {
+  /**
+   * @description
+   *   子订单id集合
+   */
   ids?: Array<number>;
+  /**
+   * @description
+   *   查看已经删除的订单，false表示查看未删除的订单，true表示查看删除的订单
+   */
+  isDeleteQueryOrder?: boolean;
 }
 export interface QueryMainOrderDto {
@@ -35,6 +35,7 @@ import type {
   OrderUnlockFieldApplyVO,
   OrderUpdateVO,
   ProcureCheckOrderDto,
+  ProcureConvertWarehouseKeeperDto,
   ProcurePrintDto,
   ProductInformationDto,
   QueryAnnexDto,
@@ -575,6 +576,77 @@ export const patchError = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postOfficialWebsiteUploadAliOss */
+export interface PostOfficialWebsiteUploadAliOssOption {
+  /**
+   * @description
+   *   files
+   */
+  formData: {
+    /**
+        @description
+          files */
+    files: Array<File>;
+  };
+}
+
+/** @description response type for postOfficialWebsiteUploadAliOss */
+export interface PostOfficialWebsiteUploadAliOssResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostOfficialWebsiteUploadAliOssResponseSuccess =
+  PostOfficialWebsiteUploadAliOssResponse[200];
+/**
+ * @description
+ *   为官网提供上传文件的接口
+ * @tags 官网
+ * @produces *
+ * @consumes application/json
+ */
+export const postOfficialWebsiteUploadAliOss = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/official/website/uploadAliOss';
+  function request(
+    option: PostOfficialWebsiteUploadAliOssOption,
+  ): Promise<PostOfficialWebsiteUploadAliOssResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostOfficialWebsiteUploadAliOssResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postOrderErpApplyList */
 export interface PostOrderErpApplyListOption {
   /**
@@ -4927,6 +4999,77 @@ export const postServiceOrderApplyAfterSales = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceOrderApplyInvoicing */
+export interface PostServiceOrderApplyInvoicingOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: Dto;
+  };
+}
+
+/** @description response type for postServiceOrderApplyInvoicing */
+export interface PostServiceOrderApplyInvoicingResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderApplyInvoicingResponseSuccess =
+  PostServiceOrderApplyInvoicingResponse[200];
+/**
+ * @description
+ *   销售发起开票
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderApplyInvoicing = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/applyInvoicing';
+  function request(
+    option: PostServiceOrderApplyInvoicingOption,
+  ): Promise<PostServiceOrderApplyInvoicingResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderApplyInvoicingResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderCheckOrder */
 export interface PostServiceOrderCheckOrderOption {
   /**
@@ -5991,6 +6134,78 @@ export const postServiceOrderProcureCheckOrder = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceOrderProcureConvertWarehouseKeeper */
+export interface PostServiceOrderProcureConvertWarehouseKeeperOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: ProcureConvertWarehouseKeeperDto;
+  };
+}
+
+/** @description response type for postServiceOrderProcureConvertWarehouseKeeper */
+export interface PostServiceOrderProcureConvertWarehouseKeeperResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderProcureConvertWarehouseKeeperResponseSuccess =
+  PostServiceOrderProcureConvertWarehouseKeeperResponse[200];
+/**
+ * @description
+ *   采购转回仓库
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderProcureConvertWarehouseKeeper =
+  /* #__PURE__ */ (() => {
+    const method = 'post';
+    const url = '/service/order/procureConvertWarehouseKeeper';
+    function request(
+      option: PostServiceOrderProcureConvertWarehouseKeeperOption,
+    ): Promise<PostServiceOrderProcureConvertWarehouseKeeperResponseSuccess> {
+      return requester(request.url, {
+        method: request.method,
+        ...option,
+      }) as unknown as Promise<PostServiceOrderProcureConvertWarehouseKeeperResponseSuccess>;
+    }
+
+    /** http method */
+    request.method = method;
+    /** request url */
+    request.url = url;
+    return request;
+  })();
+
 /** @description request parameter type for postServiceOrderProcurePrint */
 export interface PostServiceOrderProcurePrintOption {
   /**