feat: update 采购批量审核

zhongnanhuang
1 parent 78b2816b
Showing 7 changed files with 257 additions and 52 deletions
src/pages/Order/components/OrderDrawer copy.tsx
src/pages/Order/components/ProcureCheckModal.tsx
src/pages/Order/components/ProcureNotesEditModal.tsx
src/pages/Order/constant.ts
src/pages/Order/index.tsx
src/services/definition.ts
src/services/request.ts
@@ -556,6 +556,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           }}
           // disabled={mainInfoDisbled}
         />
+
         <ProFormText
           key="erpCustomerName"
           name="erpCustomerName"
@@ -4,20 +4,24 @@ import {
   postServiceOrderProcureConvertWarehouseKeeper,
   postServiceOrderQuerySupplier,
 } from '@/services';
-import { ModalForm, ProFormSelect } from '@ant-design/pro-components';
+import {
+  ModalForm,
+  ProFormSelect,
+  ProFormTextArea,
+} from '@ant-design/pro-components';
 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 }>();
+export default ({ setCheckVisible, isMainOrder, data, orders, onClose }) => {
+  const [form] = Form.useForm<{ supplier: string }>();
   const [checkNotes, setCheckNotes] = useState<string>('');
-  let subOrderIds: any[] = [];
+  let ids: any[] = [];
   //是单条子订单审核
-  if (subOrders === undefined) {
-    subOrderIds = [data.id];
+  if (orders === undefined) {
+    ids = [data.id];
   } else {
-    subOrderIds = subOrders.map((subOrder) => subOrder.id);
+    ids = orders.map((order: any) => order.id);
   }
   async function doCheck(body: object) {
     const data = await postServiceOrderProcureCheckOrder({
@@ -31,8 +35,7 @@ export default ({ setCheckVisible, data, subOrders, onClose }) =&gt; {
   return (
     <ModalForm<{
-      name: string;
-      company: string;
+      supplier: string;
     }>
       width={500}
       open
@@ -69,13 +72,22 @@ export default ({ setCheckVisible, data, subOrders, onClose }) =&gt; {
                   </div>
                 }
                 onConfirm={async () => {
-                  const res =
-                    await postServiceOrderProcureConvertWarehouseKeeper({
+                  let res;
+                  if (isMainOrder) {
+                    res = await postServiceOrderProcureConvertWarehouseKeeper({
+                      data: {
+                        mainIds: ids,
+                        checkNotes: checkNotes,
+                      },
+                    });
+                  } else {
+                    res = await postServiceOrderProcureConvertWarehouseKeeper({
                       data: {
-                        subIds: subOrderIds,
+                        subIds: ids,
                         checkNotes: checkNotes,
                       },
                     });
+                  }
                   if (res?.result === RESPONSE_CODE.SUCCESS) {
                     message.success(res.message);
@@ -95,7 +107,7 @@ export default ({ setCheckVisible, data, subOrders, onClose }) =&gt; {
       }}
       submitTimeout={2000}
       onFinish={async (values) => {
-        if (values.name === '0') {
+        if (values.supplier === '0') {
           message.error('选择转回仓库请点击转回仓库按钮！');
           return;
         }
@@ -103,11 +115,19 @@ export default ({ setCheckVisible, data, subOrders, onClose }) =&gt; {
         // if (values.name === '采购自行发货') {
         //   procureIsPrintAndSend = true;
         // }
-        return doCheck({
-          ids: subOrderIds,
-          supplier: values.name,
-          procureIsPrintAndSend: procureIsPrintAndSend,
-        });
+        if (isMainOrder) {
+          return doCheck({
+            ...values,
+            mainOrderIds: ids,
+            procureIsPrintAndSend: procureIsPrintAndSend,
+          });
+        } else {
+          return doCheck({
+            ...values,
+            subOrderIds: ids,
+            procureIsPrintAndSend: procureIsPrintAndSend,
+          });
+        }
       }}
       onOpenChange={setCheckVisible}
     >
@@ -115,7 +135,7 @@ export default ({ setCheckVisible, data, subOrders, onClose }) =&gt; {
         key="key"
         label="采购名称"
         width="lg"
-        name="name"
+        name="supplier"
         // options={options}
         placeholder="请选择采购"
         rules={[{ required: true, message: '采购名称必填' }]}
@@ -128,6 +148,8 @@ export default ({ setCheckVisible, data, subOrders, onClose }) =&gt; {
           return options;
         }}
       />
+
+      <ProFormTextArea label="备注" name="procureNotes" key="procureNotes" />
     </ModalForm>
   );
 };
+import { RESPONSE_CODE } from '@/constants/enum';
+import { postServiceOrderProcureNotesEdit } from '@/services';
+import { ModalForm, ProFormTextArea } from '@ant-design/pro-components';
+import { Form, message } from 'antd';
+export default ({ setNotesEditVisible, data, onClose }) => {
+  const [form] = Form.useForm<{ procureNotes: string }>();
+  return (
+    <ModalForm<{
+      procureNotes: string;
+    }>
+      width={500}
+      open
+      title="修改备注"
+      form={form}
+      autoFocusFirstInput
+      modalProps={{
+        okText: '保存',
+        cancelText: '取消',
+        destroyOnClose: true,
+        onCancel: () => {
+          setNotesEditVisible(false);
+        },
+      }}
+      submitTimeout={2000}
+      onFinish={async (values) => {
+        let body = {
+          subOrderId: data.id,
+          procureNotes: values.procureNotes,
+        };
+        const res = await postServiceOrderProcureNotesEdit({ data: body });
+        if (res.result === RESPONSE_CODE.SUCCESS) {
+          message.success(res.message);
+          onClose();
+        }
+      }}
+      onOpenChange={setNotesEditVisible}
+    >
+      <ProFormTextArea
+        width="lg"
+        key="procureNotes"
+        name="procureNotes"
+        initialValue={data.procureNotes}
+        placeholder="填写备注内容"
+      />
+    </ModalForm>
+  );
+};
@@ -56,6 +56,9 @@ export const PAYEE_OPTIONS = {
   INNOVATION_ALIPAY: '创新支付宝',
   ZHUGUANG_ALIPAY: '烛光支付宝',
   ZHUGUANG_WISE_COLLECTION: '烛光慧收款',
+  EXPERIMENT_QR_CODE: '实验二维码',
+  INNOVATION_QR_CODE: '创新二维码',
+  NEW_ENERGY_QR_CODE: '新能源二维码',
 };
 export const PROCURE_ORDER_STATUS = {
@@ -72,6 +72,7 @@ import OrderDrawer from &#39;./components/OrderDrawer&#39;;
 import OrderNotesEditModal from './components/OrderNotesEditModal';
 import ProcureCheckModal from './components/ProcureCheckModal';
 import ProcureConvertModal from './components/ProcureConvertModal';
+import ProcureNotesEditModal from './components/ProcureNotesEditModal';
 import SubOrderComfirmReceiptImagesModal from './components/SubOrderComfirmReceiptImagesModal';
 import {
   AFTER_INVOICING_STATUS,
@@ -103,6 +104,8 @@ const OrderPage = () =&gt; {
   ] = useState<boolean>(false);
   const [data, setData] = useState([]); //列表数据
   const [notesEditVisible, setNotesEditVisible] = useState<boolean>(false);
+  const [procureNotesEditModalVisible, setProcureNotesEditModalVisible] =
+    useState<boolean>(false);
   const [financialMergeDrawerVisible, setFinancialMergeDrawerVisible] =
     useState<boolean>(false);
   const [attachmentModalVisible, setAttachmentModalVisible] =
@@ -164,6 +167,7 @@ const OrderPage = () =&gt; {
   const mainTableFormRef = useRef<ProFormInstance>();
   let [searchParams, setSearchParam] = useState(Object); //表格的查询条件存储
   const [messageApi, contextHolder] = message.useMessage();
+  const roleCode = userInfo?.roleSmallVO?.code;
   // const openCheckNotes = (checkNotes: string) => {
   //   Modal.info({
@@ -567,7 +571,7 @@ const OrderPage = () =&gt; {
               <div className="max-w-[90%] whitespace-no-wrap overflow-hidden overflow-ellipsis">
                 <span className="text-[#8C8C8C]">
                   备注：
-                  {optRecord.notes === undefined ? '暂无备注' : optRecord.notes}
+                  {optRecord.notes === null ? '暂无备注' : optRecord.notes}
                 </span>
               </div>
               {/* 编辑备注按钮 */}
@@ -580,6 +584,30 @@ const OrderPage = () =&gt; {
                 }}
               />
             </Flex>
+            {roleCode === 'procure' ||
+            roleCode === 'warehouseKeeper' ||
+            roleCode === 'admin' ? (
+              <Flex title={optRecord.procureNotes}>
+                <div className="max-w-[90%] whitespace-no-wrap overflow-hidden overflow-ellipsis">
+                  <span className="text-[#8C8C8C]">
+                    采购备注：
+                    {optRecord.procureNotes === null
+                      ? '暂无备注'
+                      : optRecord.procureNotes}
+                  </span>
+                </div>
+                {/* 编辑备注按钮 */}
+                <EditTwoTone
+                  className="pl-1 hover:curcor-pointer"
+                  onClick={() => {
+                    setOrderRow(optRecord);
+                    setProcureNotesEditModalVisible(true);
+                  }}
+                />
+              </Flex>
+            ) : (
+              ''
+            )}
             {/* {optRecord.applyInvoicingNotes !== undefined &&
             optRecord.applyInvoicingNotes !== null ? (
@@ -1232,10 +1260,10 @@ const OrderPage = () =&gt; {
           </Flex>
         </Flex>
-        {userInfo?.roleSmallVO?.code === 'admin' ||
-        userInfo?.roleSmallVO?.code === 'salesManager' ||
-        userInfo?.roleSmallVO?.code === 'salesRepresentative' ||
-        userInfo?.roleSmallVO?.code === 'finance' ? (
+        {roleCode === 'admin' ||
+        roleCode === 'salesManager' ||
+        roleCode === 'salesRepresentative' ||
+        roleCode === 'finance' ? (
           <Flex title={optRecord.notes}>
             <div className="flex items-center">
               <div className="flex items-center max-w-[500px]">
@@ -1410,7 +1438,7 @@ const OrderPage = () =&gt; {
               </Flex>
             </Flex>
             <Flex className="pl-6" align="center">
-              {userInfo?.roleSmallVO?.code === 'finance' ? (
+              {roleCode === 'finance' ? (
                 <div
                   title={enumValueToLabel(
                     record.receivingCompany,
@@ -1432,11 +1460,7 @@ const OrderPage = () =&gt; {
                 ''
               )}
-              {userInfo?.roleSmallVO?.code === 'finance' ? (
-                <Divider type="vertical" />
-              ) : (
-                ''
-              )}
+              {roleCode === 'finance' ? <Divider type="vertical" /> : ''}
               <div title={record.notes}>
                 <div className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis">
@@ -1530,7 +1554,7 @@ const OrderPage = () =&gt; {
                     ''
                   )}
-                  {record.mainPath?.includes('orderChangeRequest') && false ? (
+                  {record.mainPath?.includes('orderChangeRequest') ? (
                     <Button
                       className="p-0"
                       type="link"
@@ -1881,8 +1905,8 @@ const OrderPage = () =&gt; {
                             selectedSubOrders[index].orderStatus;
                           //仓库管理员在审核之后的任何时候都可以编辑
                           if (
-                            userInfo?.roleSmallVO?.code !== 'warehouseKeeper' &&
-                            userInfo?.roleSmallVO?.code !== 'admin'
+                            roleCode !== 'warehouseKeeper' &&
+                            roleCode !== 'admin'
                           ) {
                             //是审核通过及之后的订单
                             if (
@@ -1898,7 +1922,7 @@ const OrderPage = () =&gt; {
                           } else {
                             //仓库管理员只能编辑是还未审核的订单
                             if (
-                              userInfo?.roleSmallVO?.code !== 'admin' &&
+                              roleCode !== 'admin' &&
                               (orderStatus === 'UNAUDITED' ||
                                 orderStatus === 'AUDIT_FAILED')
                             ) {
@@ -2389,10 +2413,7 @@ const OrderPage = () =&gt; {
       /**
        * 采购的订单状态筛选内容
        */
-      if (
-        userInfo?.roleSmallVO?.code === 'procure' &&
-        item.dataIndex === 'orderStatus'
-      ) {
+      if (roleCode === 'procure' && item.dataIndex === 'orderStatus') {
         item.valueEnum = enumToProTableEnumValue(
           PROCURE_PRIMARY_ORDER_STATUS_OPTIONS,
         );
@@ -2402,10 +2423,7 @@ const OrderPage = () =&gt; {
   );
   //判断是否是采购，是的话新增一个筛选条件
-  if (
-    userInfo?.roleSmallVO?.code === 'procure' ||
-    userInfo?.roleSmallVO?.code === 'admin'
-  ) {
+  if (roleCode === 'procure' || roleCode === 'admin') {
     mainOrdersColumns.push({
       title: '采购下单状态',
       dataIndex: 'procureOrderStatus',
@@ -2416,7 +2434,6 @@ const OrderPage = () =&gt; {
   }
   function toolBarRender() {
-    let roleCode = userInfo?.roleSmallVO?.code;
     let toolBtns = [];
     if (
@@ -2546,6 +2563,28 @@ const OrderPage = () =&gt; {
       onClick: () => {},
     };
+    if (rolePath?.includes('mergeAudit')) {
+      toolBtns.push(
+        <Button
+          type="primary"
+          key="out"
+          onClick={() => {
+            //选中订单
+            let mainOrderList = [];
+            for (let order of mainOrderSelectedMap.values()) {
+              mainOrderList.push(order);
+            }
+            setIsMainOrder(true);
+            setSelectedRows(mainOrderList);
+            setProcureCheckModalVisible(true);
+          }}
+          disabled={selectedItems?.length === 0}
+        >
+          一键审核
+        </Button>,
+      );
+    }
+
     if (rolePath?.includes('mergeApplyInvoicing')) {
       toolBtns.push(
         <Button
@@ -2564,7 +2603,7 @@ const OrderPage = () =&gt; {
           }}
           disabled={selectedItems?.length === 0}
         >
-          {userInfo?.roleSmallVO?.code === 'admin' ? '合并(销售)' : '合并开票'}
+          {roleCode === 'admin' ? '合并(销售)' : '合并开票'}
         </Button>,
       );
     }
@@ -2605,7 +2644,7 @@ const OrderPage = () =&gt; {
           }}
           disabled={selectedItems?.length === 0}
         >
-          {userInfo?.roleSmallVO?.code === 'admin' ? '合并(财务)' : '合并开票'}
+          {roleCode === 'admin' ? '合并(财务)' : '合并开票'}
         </Button>,
       );
     }
@@ -2884,6 +2923,19 @@ const OrderPage = () =&gt; {
           onClose={() => {
             setNotesEditVisible(false);
             setOrderRow({});
+            setIsMainOrder(false);
+            refreshTable();
+          }}
+        />
+      )}
+
+      {procureNotesEditModalVisible && (
+        <ProcureNotesEditModal
+          setNotesEditVisible={setProcureNotesEditModalVisible}
+          data={orderRow}
+          onClose={() => {
+            setProcureNotesEditModalVisible(false);
+            setOrderRow({});
             refreshTable();
           }}
         />
@@ -3039,11 +3091,13 @@ const OrderPage = () =&gt; {
         <ProcureCheckModal
           setCheckVisible={setProcureCheckModalVisible}
           data={orderRow}
-          subOrders={selectedRows}
+          isMainOrder={isMainOrder}
+          orders={selectedRows}
           onClose={() => {
             setProcureCheckModalVisible(false);
             setOrderRow({});
             setSelectedRows({});
+            setIsMainOrder(false);
             refreshTable();
           }}
         />
@@ -1132,6 +1132,12 @@ export interface ProcureConvertProcureDto {
   subIds?: Array<number>;
 }
+export interface ProcureNotesEditDto {
+  procureNotes?: string;
+  /** @format int64 */
+  subOrderId?: number;
+}
+
 export interface ProcureOrderDto {
   /**
    * @description
@@ -49,6 +49,7 @@ import type {
   OrderUnlockFieldApplyVO,
   OrderUpdateVO,
   ProcureConvertProcureDto,
+  ProcureNotesEditDto,
   ProcureOrderDto,
   ProcurePrintDto,
   ProductInformationDto,
@@ -6322,7 +6323,7 @@ export type PostServiceOrderAfterSalesCheckResponseSuccess =
   PostServiceOrderAfterSalesCheckResponse[200];
 /**
  * @description
- *   售后审核
+ *   修改订单审核
  * @tags 内部订单
  * @produces *
  * @consumes application/json
@@ -6465,7 +6466,7 @@ export type PostServiceOrderApplyAfterSalesResponseSuccess =
   PostServiceOrderApplyAfterSalesResponse[200];
 /**
  * @description
- *   申请售后
+ *   申请修改订单
  * @tags 内部订单
  * @produces *
  * @consumes application/json
@@ -6536,7 +6537,7 @@ export type PostServiceOrderApplyInvoicingResponseSuccess =
   PostServiceOrderApplyInvoicingResponse[200];
 /**
  * @description
- *   销售发起开票
+ *   申请开票
  * @tags 内部订单
  * @produces *
  * @consumes application/json
@@ -6907,7 +6908,7 @@ export type PostServiceOrderErrorExcelInformationResponseSuccess =
   PostServiceOrderErrorExcelInformationResponse[200];
 /**
  * @description
- *   错误表格导入
+ *   错误表格导出
  * @tags 内部订单
  * @produces *
  * @consumes multipart/form-data
@@ -7316,7 +7317,7 @@ export type PostServiceOrderInvoicingResponseSuccess =
   PostServiceOrderInvoicingResponse[200];
 /**
  * @description
- *   开票
+ *   财务开票
  * @tags 内部订单
  * @produces *
  * @consumes application/json
@@ -8051,6 +8052,77 @@ export const postServiceOrderProcureConvertWarehouseKeeper =
     return request;
   })();
+/** @description request parameter type for postServiceOrderProcureNotesEdit */
+export interface PostServiceOrderProcureNotesEditOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: ProcureNotesEditDto;
+  };
+}
+
+/** @description response type for postServiceOrderProcureNotesEdit */
+export interface PostServiceOrderProcureNotesEditResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderProcureNotesEditResponseSuccess =
+  PostServiceOrderProcureNotesEditResponse[200];
+/**
+ * @description
+ *   编辑采购备注
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderProcureNotesEdit = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/procureNotesEdit';
+  function request(
+    option: PostServiceOrderProcureNotesEditOption,
+  ): Promise<PostServiceOrderProcureNotesEditResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderProcureNotesEditResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderProcureOrder */
 export interface PostServiceOrderProcureOrderOption {
   /**
@@ -9287,7 +9359,7 @@ export type PostServiceOrderQueryServiceOrderResponseSuccess =
   PostServiceOrderQueryServiceOrderResponse[200];
 /**
  * @description
- *   订单页查询
+ *   查询订单列表
  * @tags 内部订单
  * @produces *
  * @consumes application/json