feat(Order): 修复一些bug

曾国涛
1 parent 98ce63ab
Showing 11 changed files with 485 additions and 12 deletions
.umirc.ts
src/pages/Invoice/Invoice/index.tsx
src/pages/Invoice/InvoiceRecord/index.tsx
src/pages/Invoice/waitFlushInvoice/index.tsx
src/pages/Order/Order/index.tsx
src/pages/Order/OrderList/OrderList.tsx
src/pages/Order/WarningWhitelist/index.tsx
src/pages/Order/constant.ts
src/pages/Prepaid/constant.tsx
src/pages/integral/index.tsx
src/services/exportRequest.ts
@@ -102,7 +102,7 @@ export default defineConfig({
         },
         {
           name: '待红冲发票',
-          path: 'waitFlushInvoice',
+          path: 'wnpmaitFlushInvoice',
           icon: 'BookOutlined',
           access: 'canReadAdminAndFinanceAndSales',
           component: './Invoice/waitFlushInvoice',
@@ -184,7 +184,7 @@ const InvoiceRecord = () =&gt; {
               text="删除"
               onConfirm={async () => {
                 let res = await postServiceInvoiceDeleteInvoice({
-                  data: { invoiceId: record.id },
+                  data: { invoiceIds: [record.id] },
                 });
                 if (res) {
                   message.success(res.message);
@@ -446,6 +446,7 @@ const InvoiceRecord = () =&gt; {
                   () => {
                     messageApi.destroy();
                   },
+                  '开票记录',
                 );
               }}
             >
@@ -19,7 +19,6 @@ const InvoiceRecord = () =&gt; {
   const [invoiceVerificationVisible, setInvoiceVerificationVisible] =
     useState(false);
   const [invoiceId, setInvoiceId] = useState(undefined);
-  const [setPerms] = useState([]);
   const [messageApi, contextHolder] = message.useMessage();
   const reloadInvoiceTable = () => {
     invoiceActionRef.current?.reload();
@@ -101,7 +100,7 @@ const InvoiceRecord = () =&gt; {
             title: '收款单位',
             dataIndex: 'payee',
             valueType: 'text',
-            width: 200,
+            width: 250,
             valueEnum: enumToProTableEnumValue(PAYEE_OPTIONS),
           },
           {
@@ -123,7 +122,7 @@ const InvoiceRecord = () =&gt; {
             key: 'option',
             fixed: 'right',
             width: 160,
-            render: ({ record }) => {
+            render: (record) => {
               let btns = [];
               if (record.paths?.includes('queryInvoiceDetails')) {
                 btns.push(
@@ -234,7 +233,6 @@ const InvoiceRecord = () =&gt; {
             },
           });
           if (res) {
-            setPerms(res?.data?.specialPath);
             return {
               data: res?.data?.data || [],
               total: res?.data?.total || 0,
@@ -5,11 +5,12 @@ import {
 } from '@/services';
 import { getUserInfo } from '@/utils/user';
 import { useModel } from '@umijs/max';
-import { Button, Card, Col, Modal, Row } from 'antd';
+import { Button, Card, Col, Modal, Row, message } from 'antd';
 import { useEffect, useState } from 'react';
 import OrderList from '../OrderList/OrderList';
 import './index.less';
 // import { useNavigate } from 'react-router-dom';
+import { excelExport } from '@/services/exportRequest';
 import { ProCard, ProTable } from '@ant-design/pro-components';
 import { history } from '@umijs/max';
 // import { format } from 'fecha';
@@ -46,6 +47,7 @@ const OrderPage = () =&gt; {
   const [pendingDelivery, setPendingDelivery] = useState(0);
   const [pendingCompletion, setPendingCompletion] = useState(0);
   const [deliveryOpen, setDeliveryOpen] = useState(false);
+  const [messageApi, contextHolder] = message.useMessage();
   async function getInvoiceWarningNum() {
     const res = await postServiceOrderWarningOrderStatistics({
       data: {
@@ -118,7 +120,7 @@ const OrderPage = () =&gt; {
     <div className="order-page-container">
       <div id="resizeDiv"></div>
       <div id="resizeDiv"></div>
-      {roleCode === 'SALES_REPRESENTATIVE' && (
+      {roleCode !== 'SALES_MANAGER' && (
         <Modal
           title="订单预警提醒"
           open={open}
@@ -535,6 +537,45 @@ const OrderPage = () =&gt; {
                   return res.data;
                 }}
                 rowKey="index"
+                search={{
+                  labelWidth: 'auto',
+                  defaultCollapsed: false,
+                  optionRender: (searchConfig, formProps, dom) => [
+                    ...dom,
+                    <Button
+                      key="out"
+                      onClick={() => {
+                        const searchParams =
+                          searchConfig?.form?.getFieldsValue();
+                        const values = {
+                          ...searchConfig?.form?.getFieldsValue(),
+                          limitOrderDatetimeGe: searchParams?.limitDatetime
+                            ? searchParams.limitDatetime[0]
+                            : null,
+                          limitOrderDatetimeLe: searchParams?.limitDatetime
+                            ? searchParams.limitDatetime[1]
+                            : null,
+                        };
+                        messageApi.open({
+                          type: 'loading',
+                          content: '正在导出文件...',
+                        });
+                        excelExport(
+                          '/api/service/order/exportLockOrders',
+                          {
+                            ...values,
+                          },
+                          () => {
+                            messageApi.destroy();
+                          },
+                          '锁单',
+                        );
+                      }}
+                    >
+                      导出
+                    </Button>,
+                  ],
+                }}
                 pagination={{ pageSize: 10 }}
               />
             </ProCard.TabPane>
@@ -661,7 +702,7 @@ const OrderPage = () =&gt; {
           </Row>
         </Modal>
       )}
-
+      {contextHolder}
       <OrderList paramsNew={{}} searchShow={true} toolbarShow={true} />
     </div>
   );
@@ -18,6 +18,7 @@ import {
   postServiceOrderProcureOrder,
   postServiceOrderProcurePrint,
   postServiceOrderProvideProcurementRoles,
+  postServiceOrderPurchaseRejectionToSale,
   postServiceOrderQueryServiceOrder,
   postServiceOrderSaleCancelInvoicing,
   postServiceOrderSalesConfirm,
@@ -67,6 +68,7 @@ import {
   Flex,
   FloatButton,
   Image,
+  Input,
   MenuProps,
   Modal,
   Popconfirm,
@@ -232,7 +234,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
       .flat()
       .every((subItem) => subItem.paths?.includes('applyInvoicing_old'));
   }, [selectedSubOrderKeys]);
-
+  const [procureNotes, setProcureNotes] = useState<string>('');
   console.log(JSON.stringify(userInfo));
   const triggerRecordOptNode = async (id) => {
     const res = await postServiceOrderGetCurrentOptNode({
@@ -1972,6 +1974,42 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               ''
             )}
  
+            {optRecord.paths?.includes('procureReject') && (
+              <Popconfirm
+                title="是否驳回至销售"
+                description={
+                  <div>
+                    <Input.TextArea
+                      placeholder="请填写备注"
+                      onChange={(e: any) => {
+                        setProcureNotes(e.target.value);
+                      }}
+                      rows={4}
+                    ></Input.TextArea>
+                  </div>
+                }
+                onConfirm={async () => {
+                  let res = await postServiceOrderPurchaseRejectionToSale({
+                    data: {
+                      subIds: [optRecord.id],
+                      procureNotes: procureNotes,
+                    },
+                  });
+
+                  if (res?.result === RESPONSE_CODE.SUCCESS) {
+                    message.success(res.message);
+                    clearOptObject();
+                    setIsMainOrder(false);
+                    refreshTable();
+                    return true;
+                  }
+                }}
+                okText="确定"
+                cancelText="取消"
+              >
+                <Button type="link">驳回至销售</Button>
+              </Popconfirm>
+            )}
             {optRecord.paths?.includes('procureConvertProcure') ? (
               <Button
                 className="p-0"
@@ -4646,6 +4684,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
         columns={mainOrdersColumns}
         rowKey="id"
         pagination={{
+          pageSizeOptions: [10, 20, 50, 100, 200],
           showQuickJumper: true,
           pageSize: pageSize,
           current: currentPage,
@@ -208,7 +208,7 @@ const WarningWhitelist = () =&gt; {
           onConfirm={async () => {
             await postServiceOrderDeleteWarningOrderWhiteList({
               query: {
-                id: record.id,
+                orderId: record.orderId,
               },
             });
             action?.reload();
@@ -264,6 +264,8 @@ export const AFTER_INVOICING_STATUS = {
   COMPLETE_INVOICING: '完全开票',
   INVOICING: '开票中',
   REISSUE: '重新开票',
+  WAIT_FLUSH: '待冲红',
+  FLUSHED: '已冲红',
 };
  
 export const TAGS_COLOR = new Map<string, string>([
@@ -247,6 +247,13 @@ export const BALANCE_CHANGE_COLUMNS = [
     width: 200,
   },
   {
+    title: '关联订单id',
+    dataIndex: 'linkId',
+    key: 'linkId',
+    dataType: 'text',
+    width: 200,
+  },
+  {
     title: '类型',
     dataIndex: 'title',
     key: 'title',
+import ButtonConfirm from '@/components/ButtomConfirm';
+import EllipsisDiv from '@/components/Div/EllipsisDiv';
+import { RESPONSE_CODE } from '@/constants/enum';
+import {} from '@/pages/Invoice/constant';
+import {
+  postCanrdApiUserList,
+  postPrepaidDelete,
+  postPrepaidList,
+} from '@/services';
+import { enumValueToLabel, formatDateTime } from '@/utils';
+import { PlusOutlined } from '@ant-design/icons';
+import { ActionType, ProTable } from '@ant-design/pro-components';
+import { Button, Divider, Image, Tabs, message } from 'antd';
+import { cloneDeep } from 'lodash';
+import React, { useRef, useState } from 'react';
+import CheckModal from '../Order/Order/components/CheckModal';
+import { CHECK_TYPE } from '../Order/constant';
+import BalanceChangeRecordsModal from './components/BalanceChangeRecordsModal';
+import RechargePrepaymentModal from './components/RechargePrepaymentModal';
+import {
+  ACCOUNT_COLUMNS,
+  PREPAID_STATUS_OPTIONS,
+  SALES_RECHARGE_PREPAYMENT_COLUMNS,
+} from './constant';
+import './index.less';
+const PrepaidPage = () => {
+  const prepaidActionRef = useRef<ActionType>();
+  const accountActionRef = useRef<ActionType>();
+  const [rechargePrepaymentModalVisible, setRechargePrepaymentModalVisible] =
+    useState(false);
+  const [currentOptPrepaymentObj, setCurrentOptPrepaymentObj] = useState(null);
+  const [currentOptUserObj, setCurrentOptUserObj] = useState(null);
+  const [checkVisible, setCheckVisible] = useState(false);
+  const [
+    balanceChangeRecordsModalVisible,
+    setBalanceChangeRecordsModalVisible,
+  ] = useState(false);
+
+  const reloadPrepaidTable = () => {
+    prepaidActionRef.current?.reload();
+  };
+
+  const reloadAccountTable = () => {
+    accountActionRef.current?.reload();
+  };
+
+  const getTableCellText = (target: any) => {
+    if (!target) {
+      return '';
+    }
+
+    if (target.props) {
+      return target.props.text;
+    }
+
+    return target;
+  };
+
+  /**
+   * 加载发票列表表格的各个列格式
+   */
+  const prepaidColumnsInit = () => {
+    let columns = SALES_RECHARGE_PREPAYMENT_COLUMNS.map((item) => {
+      let newItem = { ...item };
+      let dataIndex = item.dataIndex;
+
+      newItem.render = (text, record) => {
+        let textValue = record[dataIndex];
+
+        if (dataIndex === 'status') {
+          textValue = enumValueToLabel(textValue, PREPAID_STATUS_OPTIONS);
+        }
+
+        if (dataIndex.endsWith('Time')) {
+          textValue = formatDateTime(textValue);
+        }
+
+        if (
+          dataIndex === 'proofImages' &&
+          textValue !== null &&
+          textValue !== undefined
+        ) {
+          console.log(textValue);
+          return (
+            <Image.PreviewGroup
+              className="mr-10"
+              preview={{
+                onChange: (current, prev) =>
+                  console.log(`current index: ${current}, prev index: ${prev}`),
+              }}
+            >
+              {textValue.map((item, index) => (
+                <React.Fragment key={index}>
+                  {index > 0 ? <Divider type="vertical" /> : ''}
+                  <Image
+                    className="max-h-[35px] max-w-[45px]"
+                    src={item}
+                    title={item}
+                  />{' '}
+                </React.Fragment>
+              ))}
+            </Image.PreviewGroup>
+          );
+        }
+
+        return <EllipsisDiv text={textValue} />;
+      };
+
+      return newItem;
+    });
+
+    columns.push({
+      title: '操作',
+      valueType: 'option',
+      key: 'option',
+      fixed: 'right',
+      width: 120,
+      render: (text, record) => {
+        let btns = [];
+        let opts = record.operations;
+        if (opts?.includes('modify')) {
+          btns.push(
+            <Button
+              className="p-0"
+              key="modify"
+              type="link"
+              onClick={() => {
+                setRechargePrepaymentModalVisible(true);
+                setCurrentOptPrepaymentObj(cloneDeep(record));
+              }}
+            >
+              编辑
+            </Button>,
+          );
+        }
+
+        if (opts?.includes('audit')) {
+          btns.push(
+            <Button
+              className="p-0"
+              key="view"
+              type="link"
+              onClick={() => {
+                setCurrentOptPrepaymentObj(record);
+                setCheckVisible(true);
+              }}
+            >
+              审核
+            </Button>,
+          );
+        }
+
+        if (opts?.includes('delete')) {
+          btns.push(
+            <ButtonConfirm
+              key="delete"
+              className="p-0"
+              title={'确认删除这条预存记录吗？'}
+              text="删除"
+              onConfirm={async () => {
+                let res = await postPrepaidDelete({
+                  data: { ids: [record.id] },
+                });
+                if (res && res.result === RESPONSE_CODE.SUCCESS) {
+                  message.success(res.message);
+                  reloadPrepaidTable();
+                }
+              }}
+            />,
+          );
+        }
+        return btns;
+      },
+    });
+
+    return columns;
+  };
+
+  const accountColumnsInit = () => {
+    let columns = ACCOUNT_COLUMNS.map((item) => {
+      let newItem = { ...item };
+      let dataIndex = item.dataIndex;
+
+      newItem.render = (text, record) => {
+        let textValue = record[dataIndex];
+        return <EllipsisDiv text={getTableCellText(textValue)} />;
+      };
+
+      return newItem;
+    });
+
+    columns.push({
+      title: '操作',
+      valueType: 'option',
+      key: 'option',
+      fixed: 'right',
+      width: 120,
+      render: (text, record) => {
+        let btns = [];
+        btns.push(
+          <Button
+            className="p-0"
+            key="view"
+            type="link"
+            onClick={() => {
+              setCurrentOptUserObj(record);
+              setBalanceChangeRecordsModalVisible(true);
+            }}
+          >
+            消费记录
+          </Button>,
+        );
+        return btns;
+      },
+    });
+
+    return columns;
+  };
+
+  const tabsItems = [
+    {
+      key: 1,
+      label: '预存充值',
+      children: (
+        <ProTable
+          columns={prepaidColumnsInit()}
+          actionRef={prepaidActionRef}
+          cardBordered
+          pagination={{
+            pageSize: 10,
+          }}
+          request={async (params) => {
+            const res = await postPrepaidList({
+              data: { ...params },
+            });
+            return {
+              data: res?.data?.data || [],
+              total: res?.data?.total || 0,
+            };
+          }}
+          columnsState={{
+            persistenceKey: 'pro-table-singe-prepaid',
+            persistenceType: 'localStorage',
+            defaultValue: {
+              option: { fixed: 'right', disable: true },
+            },
+            onChange(value) {
+              console.log('value: ', value);
+            },
+          }}
+          rowKey="id"
+          search={{
+            labelWidth: 'auto',
+          }}
+          options={{
+            setting: {
+              listsHeight: 400,
+            },
+          }}
+          form={{}}
+          dateFormatter="string"
+          headerTitle="预存充值"
+          scroll={{ x: 1400 }}
+          toolBarRender={() => [
+            <Button
+              key="button"
+              icon={<PlusOutlined />}
+              onClick={() => {
+                setCurrentOptPrepaymentObj(null);
+                setRechargePrepaymentModalVisible(true);
+              }}
+              type="primary"
+            >
+              新增充值
+            </Button>,
+          ]}
+        />
+      ),
+    },
+    {
+      key: 2,
+      label: '账号列表',
+      children: (
+        <ProTable
+          columns={accountColumnsInit()}
+          actionRef={accountActionRef}
+          cardBordered
+          pagination={{
+            pageSize: 10,
+          }}
+          request={async (params) => {
+            const res = await postCanrdApiUserList({
+              data: { ...params },
+            });
+            return {
+              data: res?.data?.data || [],
+              total: res?.data?.total || 0,
+            };
+          }}
+          columnsState={{
+            persistenceKey: 'pro-table-singe-account',
+            persistenceType: 'localStorage',
+            defaultValue: {
+              option: { fixed: 'right', disable: true },
+            },
+            onChange(value) {
+              console.log('value: ', value);
+            },
+          }}
+          rowKey="id"
+          search={{
+            labelWidth: 'auto',
+          }}
+          options={{
+            setting: {
+              listsHeight: 400,
+            },
+          }}
+          form={{}}
+          dateFormatter="string"
+          headerTitle="账号列表"
+          scroll={{ x: 1400 }}
+          toolBarRender={() => []}
+        />
+      ),
+    },
+  ];
+  return (
+    <div className="prepaid-index">
+      <Tabs
+        defaultActiveKey="1"
+        items={tabsItems}
+        onChange={(value) => {
+          if (value === '1') {
+            reloadPrepaidTable();
+          } else {
+            reloadAccountTable();
+          }
+        }}
+      />
+
+      {rechargePrepaymentModalVisible && (
+        <RechargePrepaymentModal
+          setVisible={setRechargePrepaymentModalVisible}
+          onClose={() => {
+            setRechargePrepaymentModalVisible(false);
+            reloadPrepaidTable();
+          }}
+          prepaymentObject={currentOptPrepaymentObj}
+        />
+      )}
+
+      {checkVisible && (
+        <CheckModal
+          setCheckVisible={(val: boolean) => {
+            setCheckVisible(val);
+          }}
+          data={[currentOptPrepaymentObj]}
+          subOrders={[currentOptPrepaymentObj]}
+          orderCheckType={CHECK_TYPE.PREPAID_AUDIT}
+          openOrderDrawer={false}
+          onClose={() => {
+            setCheckVisible(false);
+            reloadPrepaidTable();
+          }}
+        />
+      )}
+
+      {balanceChangeRecordsModalVisible && (
+        <BalanceChangeRecordsModal
+          setVisible={(val: boolean) => {
+            setBalanceChangeRecordsModalVisible(val);
+          }}
+          userInfoObj={currentOptUserObj}
+          onClose={() => {
+            setBalanceChangeRecordsModalVisible(false);
+          }}
+        />
+      )}
+    </div>
+  );
+};
+
+export default PrepaidPage;
@@ -4,6 +4,7 @@ export const excelExport = async (
   url: any = '',
   data: any = {},
   exportLoadingDestory: any,
+  fileName,
 ) => {
   axios({
     url: url,
@@ -23,7 +24,7 @@ export const excelExport = async (
       let a = document.createElement('a');
       a.style.display = 'none';
       a.href = fileUrl;
-      a.download = '开票记录.xlsx';
+      a.download = fileName + '.xlsx';
       document.body.appendChild(a);
       a.click();
       window.URL.revokeObjectURL(a.href);