Merge remote-tracking branch 'origin/master'

zhongnanhuang
2 parents bff8eafa dacbb1cc
Showing 6 changed files with 245 additions and 25 deletions
.idea/inspectionProfiles/Project_Default.xml
package-lock.json
src/pages/Invoice/components/AddInvoiceDrawerForm.tsx
src/pages/Invoice/index.tsx
src/pages/Order/components/HistoryModal.tsx
src/pages/Order/index.tsx
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="Stylelint" enabled="true" level="ERROR" enabled_by_default="true" />
   </profile>
 </component>
 \ No newline at end of file
@@ -12,7 +12,6 @@
         "@ant-design/pro-components": "^2.6.32",
         "@inspir/assembly-css": "1.0.0-alpha",
         "@react-buddy/ide-toolbox": "^2.4.0",
-        "@react-buddy/palette-antd": "^5.3.0",
         "@umijs/max": "^4.0.87",
         "antd": "^5.10.2",
         "axios": "^1.6.1",
@@ -3988,19 +3987,6 @@
         "react": "^17.0.0 || ^18.0.0"
       }
     },
-    "node_modules/@react-buddy/palette-antd": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/@react-buddy/palette-antd/-/palette-antd-5.3.1.tgz",
-      "integrity": "sha512-G75Pik29FnmyvANiGLSpMFpru4Uzv5woq/IFrkmfYmJb+5vW3lhc+Y/PftLqatSH9fjXs/UOszuSbPzlykT9cw==",
-      "dependencies": {
-        "@react-buddy/ide-toolbox": "^2.4.0"
-      },
-      "peerDependencies": {
-        "@ant-design/icons": "^5.1.4",
-        "antd": "^5.3.0",
-        "react": "^17.0.0 || ^18.0.0"
-      }
-    },
     "node_modules/@sinclair/typebox": {
       "version": "0.27.8",
       "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
@@ -28469,14 +28455,6 @@
       "integrity": "sha512-TWHX6gwa0Gop7215uHhjFMbYLLdjM/b9rr0wYE3E0m7GNJ56gbPpbZiq86w9uI8zksl827acqGeT437MkuO64w==",
       "requires": {}
     },
-    "@react-buddy/palette-antd": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/@react-buddy/palette-antd/-/palette-antd-5.3.1.tgz",
-      "integrity": "sha512-G75Pik29FnmyvANiGLSpMFpru4Uzv5woq/IFrkmfYmJb+5vW3lhc+Y/PftLqatSH9fjXs/UOszuSbPzlykT9cw==",
-      "requires": {
-        "@react-buddy/ide-toolbox": "^2.4.0"
-      }
-    },
     "@sinclair/typebox": {
       "version": "0.27.8",
       "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+import { RESPONSE_CODE } from '@/constants/enum';
+import { PAYEE_OPTIONS } from '@/pages/Order/constant';
+import {
+  postServiceInvoiceAddInvoice,
+  postServiceOrderQuerySalesCode,
+} from '@/services';
+import { enumToSelect } from '@/utils';
+import { PlusOutlined } from '@ant-design/icons';
+import {
+  DrawerForm,
+  ProFormDateTimePicker,
+  ProFormGroup,
+  ProFormList,
+  ProFormMoney,
+  ProFormSelect,
+  ProFormText,
+  ProFormTextArea,
+} from '@ant-design/pro-components';
+import { Button, Form, message } from 'antd';
+import { useEffect, useState } from 'react';
+
+export default ({ onClose }) => {
+  const [form] = Form.useForm<{
+    invoiceNumber: '';
+    invoiceStatus: '';
+    purchaser: '';
+    payee: '';
+    contacts: '';
+    sale: '';
+    invoicingTime: '';
+    notes: '';
+    mainOrderIdObjs: [
+      {
+        mainOrderId: '';
+      },
+    ];
+    money: '';
+  }>();
+  const [salesCodeOptions, setSalesCodeOptions] = useState([]);
+  const getSalesCodeOptions = async () => {
+    const res = await postServiceOrderQuerySalesCode();
+    let options = res.data?.map((item) => {
+      return {
+        label: item.userName,
+        value: item.userName,
+        number: item.number,
+      };
+    });
+    setSalesCodeOptions(options);
+  };
+  useEffect(() => {
+    getSalesCodeOptions();
+  }, []);
+  return (
+    <DrawerForm<{
+      invoiceNumber: string;
+      invoiceStatus: string;
+      purchaser: string;
+      payee: string;
+      contacts: string;
+      sale: string;
+      invoicingTime: Date;
+      notes: string;
+      mainOrderIdObjs: [
+        {
+          mainOrderId: string;
+        },
+      ];
+      money: string;
+    }>
+      title="新增开票"
+      resize={{
+        onResize() {
+          console.log('resize!');
+        },
+        maxWidth: window.innerWidth * 0.8,
+        minWidth: 500,
+      }}
+      form={form}
+      trigger={
+        <Button type="primary">
+          <PlusOutlined />
+          新增
+        </Button>
+      }
+      autoFocusFirstInput
+      drawerProps={{
+        destroyOnClose: true,
+      }}
+      submitTimeout={2000}
+      onFinish={async (values) => {
+        console.log(values);
+        const mainOrderIds = values.mainOrderIdObjs.flatMap(
+          (item) => item.mainOrderId,
+        );
+        let attrs = { ...values, mainOrderIds };
+        let res = await postServiceInvoiceAddInvoice({
+          data: { ...attrs },
+        });
+        if (res.result === RESPONSE_CODE.SUCCESS) {
+          message.success(res.message);
+        } else {
+          message.error(res.message);
+          return false;
+        }
+        onClose();
+        // 不返回不会关闭弹框
+        return true;
+      }}
+    >
+      <ProFormText
+        name="invoiceNumber"
+        width="md"
+        label="发票号码"
+        placeholder="请输入名称"
+        rules={[{ required: true, message: '请输入名称!' }]}
+      />
+      <ProFormSelect
+        name="invoiceStatus"
+        label="发票类型"
+        valueEnum={{
+          SPECIALLY_INVOICED: '专票',
+          COMMON_INVOICED: '普票',
+        }}
+        rules={[{ required: true, message: '请选择发票类型!' }]}
+      />
+      <ProFormText
+        name="purchaser"
+        width="md"
+        label="购买方"
+        placeholder="请输入购买方"
+        rules={[{ required: true, message: '请输入购买方!' }]}
+      />
+      <ProFormSelect
+        placeholder="收款单位"
+        name="payee"
+        width="lg"
+        key="payee"
+        showSearch
+        label="开票收款单位"
+        tooltip="财务开票将依据这个字段，选择对应的公司开票"
+        options={enumToSelect(PAYEE_OPTIONS)}
+      />
+      <ProFormText
+        name="contacts"
+        width="md"
+        label="联系人"
+        placeholder="请输入联系人"
+        rules={[{ required: true, message: '请输入联系人!' }]}
+      />
+      <ProFormSelect
+        name="sale"
+        key="sale"
+        width="lg"
+        showSearch
+        label="销售代表"
+        placeholder="请选择销售代表"
+        options={salesCodeOptions}
+      />
+      <ProFormDateTimePicker
+        name="invoicingTime"
+        label="开票时间"
+        fieldProps={{
+          format: (value) => value.format('YYYY-MM-DD'),
+        }}
+        rules={[{ required: true, message: '请输入开票时间!' }]}
+      />
+      <ProFormTextArea name="notes" label="备注" placeholder="请输入名称" />
+      <ProFormList
+        name="mainOrderIdObjs"
+        label="订单号"
+        min={1}
+        copyIconProps={false}
+        deleteIconProps={{
+          tooltipText: '删除',
+        }}
+        initialValue={[
+          {
+            mainOrderId: '',
+          },
+        ]}
+      >
+        <ProFormGroup key="group">
+          <ProFormText
+            rules={[{ required: true, message: '请输入关联订单!' }]}
+            name="mainOrderId"
+          />
+        </ProFormGroup>
+      </ProFormList>
+      <ProFormMoney
+        label="金额"
+        name="money"
+        customSymbol="￥"
+        min={0}
+        rules={[{ required: true, message: '请输入金额!' }]}
+      />
+    </DrawerForm>
+  );
+};
 import ButtonConfirm from '@/components/ButtomConfirm';
 import EllipsisDiv from '@/components/Div/EllipsisDiv';
 import { RESPONSE_CODE } from '@/constants/enum';
+import AddInvoiceDrawerForm from '@/pages/Invoice/components/AddInvoiceDrawerForm';
 import {
   BANK_STATEMENT_COLUMNS,
   INVOICE_COLUMNS,
@@ -338,6 +339,15 @@ const InvoicePage = () =&gt; {
           dateFormatter="string"
           headerTitle="发票列表"
           scroll={{ x: 1400, y: 360 }}
+          toolBarRender={() => [
+            <AddInvoiceDrawerForm
+              onClose={() => {
+                invoiceActionRef.current?.reload();
+                bankActionRef.current?.reload();
+              }}
+              key="add"
+            ></AddInvoiceDrawerForm>,
+          ]}
         />
       ),
     },
@@ -2,7 +2,6 @@ import { postServiceOrderQueryHistoryOrderRecord } from &#39;@/services&#39;;
 import { formatDateTime } from '@/utils';
 import { Button, Col, Empty, Flex, Modal, Row, Spin } from 'antd';
 import { useEffect, useState } from 'react';
-import { HISTORY_OPT_TYPE } from '../constant';
  
 export default ({ subOrders, isCancelledOrder, onClose }) => {
   let subOrderIds = subOrders?.map((subOrder: any) => {
@@ -75,7 +74,7 @@ export default ({ subOrders, isCancelledOrder, onClose }) =&gt; {
     } else {
       record.push(
         <span className="text-[#3b83e5]">
-          {HISTORY_OPT_TYPE.get(history.record) +
+          {history.recordText +
             (history.record === 'INVOICING'
               ? '(开票号码：' + history.invoiceNumber + ')'
               : '')}
@@ -2067,6 +2067,41 @@ const OrderPage = () =&gt; {
         ) : (
           ''
         )}
+
+        {isAdmin() || isSales() || isFinance() ? (
+          <Flex title={optRecord.notes} className="pt-2">
+            <div className="flex items-center">
+              <div className="flex items-center max-w-[500px]">
+                <div className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis">
+                  <Tooltip title={optRecord.reissueNotes} placement="topLeft">
+                    <span className="text-[#8C8C8C]">
+                      重新开票备注：
+                      {optRecord.reissueNotes === undefined ||
+                      optRecord.reissueNotes === null
+                        ? '暂无备注'
+                        : optRecord.reissueNotes}
+                    </span>
+                  </Tooltip>
+                </div>
+
+                <Tooltip title="编辑">
+                  <EditTwoTone
+                    className="pl-1 hover:curcor-pointer"
+                    onClick={() => {
+                      setNotesEditVisible(true);
+                      setSelectedRows([optRecord.id]);
+                      setNotes(optRecord.reissueNotes);
+                      setNotesType(5);
+                    }}
+                  />
+                </Tooltip>
+              </div>
+              <Divider type="vertical" className="mx-5" />
+            </div>
+          </Flex>
+        ) : (
+          ''
+        )}
       </>
     );
   };