Merge branch 'zgt'

曾国涛
2 parents 60aa1cb0 5d7e77f4
Showing 7 changed files with 397 additions and 45 deletions
.idea/inspectionProfiles/Project_Default.xml
package-lock.json
src/pages/Invoice/components/AddInvoiceDrawerForm.tsx
src/pages/Invoice/index.tsx
src/pages/Order/index.tsx
src/services/definition.ts
src/services/request.ts
 <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 { postServiceInvoiceAddInvoice } from '@/services';
+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';
+
+export default ({ onClose }) => {
+  const [form] = Form.useForm<{
+    invoiceNumber: '';
+    invoiceStatus: '';
+    purchaser: '';
+    payee: '';
+    contacts: '';
+    sale: '';
+    invoicingTime: '';
+    notes: '';
+    mainOrderIdObjs: [
+      {
+        mainOrderId: '';
+      },
+    ];
+    money: '';
+  }>();
+
+  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: 400,
+      }}
+      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);
+          return true;
+        } else {
+          message.error(res.message);
+        }
+        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: '请输入购买方!' }]}
+      />
+      <ProFormText
+        name="payee"
+        width="md"
+        label="收款单位"
+        placeholder="请输入收款单位"
+        rules={[{ required: true, message: '请输入收款单位!' }]}
+      />
+      <ProFormText
+        name="contacts"
+        width="md"
+        label="联系人"
+        placeholder="请输入联系人"
+        rules={[{ required: true, message: '请输入联系人!' }]}
+      />
+      <ProFormText
+        name="sale"
+        width="md"
+        label="销售"
+        placeholder="请输入销售"
+        rules={[{ required: true, message: '请输入销售!' }]}
+      />
+      <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}
+        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
+              key="addInvoiceDrawerForm"
+              onClose={() => {
+                invoiceActionRef.current?.reload();
+                bankActionRef.current?.reload();
+              }}
+            ></AddInvoiceDrawerForm>,
+          ]}
         />
       ),
     },
@@ -2047,6 +2047,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>
+        ) : (
+          ''
+        )}
       </>
     );
   };
@@ -889,6 +889,78 @@ export interface InventoryMaterialStockReq {
   materialId?: string;
 }
+export interface InvoiceDto {
+  /**
+   * @description
+   *   收款时间
+   * @format date-time
+   */
+  collectionTime?: string;
+  /**
+   * @description
+   *   联系人
+   */
+  contacts?: string;
+  /**
+   * @description
+   *   id
+   * @format int64
+   */
+  id?: number;
+  /**
+   * @description
+   *   发票号码
+   */
+  invoiceNumber?: string;
+  /**
+   * @description
+   *   发票类型
+   */
+  invoiceStatus?: string;
+  /**
+   * @description
+   *   开票日期
+   * @format date-time
+   */
+  invoicingTime?: string;
+  /**
+   * @description
+   *   关联主订单id
+   */
+  mainOrderIds?: Array<number>;
+  /**
+   * @description
+   *   金额
+   * @format int64
+   */
+  money?: number;
+  /**
+   * @description
+   *   备注
+   */
+  notes?: string;
+  /**
+   * @description
+   *   收款单位
+   */
+  payee?: string;
+  /**
+   * @description
+   *   购买方
+   */
+  purchaser?: string;
+  /**
+   * @description
+   *   销售
+   */
+  sale?: string;
+  /**
+   * @description
+   *   状态
+   */
+  status?: string;
+}
+
 export interface InvoiceRecordQueryRequest {
   /** @format date */
   createTimeGe?: string;
@@ -41,6 +41,7 @@ import type {
   DictionaryVO,
   Dto,
   InventoryMaterialStockReq,
+  InvoiceDto,
   InvoiceRecordQueryRequest,
   MainOrderqueryRequest,
   MaterialListReply,
@@ -49,7 +50,6 @@ import type {
   MaterialUnitListRes,
   MeasureUnitListRes,
   MessageQueryDTO,
-  ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
@@ -1123,7 +1123,9 @@ export interface GetErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Unauthorized
@@ -1144,9 +1146,9 @@ export interface GetErrorResponse {
 export type GetErrorResponseSuccess = GetErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  */
 export const getError = /* #__PURE__ */ (() => {
   const method = 'get';
@@ -1170,7 +1172,9 @@ export interface PutErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Created
@@ -1196,9 +1200,9 @@ export interface PutErrorResponse {
 export type PutErrorResponseSuccess = PutErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const putError = /* #__PURE__ */ (() => {
@@ -1223,7 +1227,9 @@ export interface PostErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Created
@@ -1249,9 +1255,9 @@ export interface PostErrorResponse {
 export type PostErrorResponseSuccess = PostErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const postError = /* #__PURE__ */ (() => {
@@ -1276,7 +1282,9 @@ export interface DeleteErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -1297,9 +1305,9 @@ export interface DeleteErrorResponse {
 export type DeleteErrorResponseSuccess = DeleteErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  */
 export const deleteError = /* #__PURE__ */ (() => {
   const method = 'delete';
@@ -1323,7 +1331,9 @@ export interface OptionsErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -1344,9 +1354,9 @@ export interface OptionsErrorResponse {
 export type OptionsErrorResponseSuccess = OptionsErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const optionsError = /* #__PURE__ */ (() => {
@@ -1371,7 +1381,9 @@ export interface HeadErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -1392,9 +1404,9 @@ export interface HeadErrorResponse {
 export type HeadErrorResponseSuccess = HeadErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const headError = /* #__PURE__ */ (() => {
@@ -1419,7 +1431,9 @@ export interface PatchErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -1440,9 +1454,9 @@ export interface PatchErrorResponse {
 export type PatchErrorResponseSuccess = PatchErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const patchError = /* #__PURE__ */ (() => {
@@ -7465,6 +7479,77 @@ export const postServiceBankStatementQueryBankStatement =
     return request;
   })();
+/** @description request parameter type for postServiceInvoiceAddInvoice */
+export interface PostServiceInvoiceAddInvoiceOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: InvoiceDto;
+  };
+}
+
+/** @description response type for postServiceInvoiceAddInvoice */
+export interface PostServiceInvoiceAddInvoiceResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceInvoiceAddInvoiceResponseSuccess =
+  PostServiceInvoiceAddInvoiceResponse[200];
+/**
+ * @description
+ *   添加发票
+ * @tags 发票
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceInvoiceAddInvoice = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/invoice/addInvoice';
+  function request(
+    option: PostServiceInvoiceAddInvoiceOption,
+  ): Promise<PostServiceInvoiceAddInvoiceResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceInvoiceAddInvoiceResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceInvoiceCancelInvoiceAndBankStatement */
 export interface PostServiceInvoiceCancelInvoiceAndBankStatementOption {
   /**