feat: update 销售收款记录编辑功能

zhongnanhuang
1 parent 98b84d37
Showing 5 changed files with 192 additions and 112 deletions
src/pages/Order/components/FinancialReceiptsModal.tsx
src/pages/Order/constant.ts
src/pages/Order/index.tsx
src/services/definition.ts
src/services/request.ts
+import { postServiceOrderUpdateHirePurchase } from '@/services';
 import {
   EditableProTable,
   ModalForm,
@@ -8,65 +9,70 @@ import { Form } from &#39;antd&#39;;
 import { useState } from 'react';
 // import { cloneDeep } from 'lodash';
-export default ({ setVisible, onClose }) => {
+export default ({ setVisible, datas, onClose }) => {
   const [form] = Form.useForm<{ name: string; company: string }>();
   type DataSourceType = {
     id: React.Key;
-    receiptsType?: string;
-    receiptsPrice?: number;
-    receiptsTime?: string;
+    hirePurchaseMethod?: string;
+    hirePurchaseMethodName?: string;
+    money?: number;
+    updateTime?: string;
     notes?: string;
   };
   const defaultData: DataSourceType[] = [
     {
       id: 1,
-      receiptsType: '预付款',
-      receiptsPrice: 1234,
-      receiptsTime: '2023-01-02',
-      notes: '备注',
+      hirePurchaseMethod: 'ADVANCE_CHARGE',
+      hirePurchaseMethodName: '预付款',
+      money: undefined,
+      updateTime: undefined,
+      notes: undefined,
     },
     {
       id: 2,
-      receiptsType: '发货款',
-      receiptsPrice: 1234,
-      receiptsTime: '2023-01-02',
-      notes: '备注',
+      hirePurchaseMethod: 'PAYMENT_FOR_SHIPMENT',
+      hirePurchaseMethodName: '发货款',
+      money: undefined,
+      updateTime: undefined,
+      notes: undefined,
     },
     {
       id: 3,
-      receiptsType: '验收款',
-      receiptsPrice: 1234,
-      receiptsTime: '2023-01-02',
-      notes: '备注',
+      hirePurchaseMethod: 'ACCEPTANCE_PAYMENT',
+      hirePurchaseMethodName: '验收款',
+      money: undefined,
+      updateTime: undefined,
+      notes: undefined,
     },
     {
       id: 4,
-      receiptsType: '尾款',
-      receiptsPrice: 1234,
-      receiptsTime: '2023-01-02',
-      notes: '备注',
+      hirePurchaseMethod: 'BALANCE_PAYMENT',
+      hirePurchaseMethodName: '尾款',
+      money: undefined,
+      updateTime: undefined,
+      notes: undefined,
     },
   ];
   const [editableKeys, setEditableRowKeys] = useState<React.Key[]>(() =>
     // defaultData.map((item) => item.id),
-    [3, 4],
+    [1, 2, 3, 4],
   );
   const columns: ProColumns<DataSourceType>[] = [
     {
       title: '款项',
-      dataIndex: 'receiptsType',
+      dataIndex: 'hirePurchaseMethodName',
       editable: false,
       width: '10%',
     },
     {
       title: '已收金额',
-      dataIndex: 'receiptsPrice',
+      dataIndex: 'money',
       valueType: 'digit',
       width: '15%',
     },
     {
       title: '收款时间',
-      dataIndex: 'receiptsTime',
+      dataIndex: 'updateTime',
       valueType: 'dateTime',
       width: '25%',
     },
@@ -95,7 +101,13 @@ export default ({ setVisible, onClose }) =&gt; {
           },
         }}
         onFinish={async (values) => {
-          console.log(values);
+          let res = await postServiceOrderUpdateHirePurchase({
+            data: {
+              mainOrderId: datas[0].id,
+              list: values.dataSource,
+            },
+          });
+          console.log(res);
           onClose();
         }}
         onOpenChange={setVisible}
@@ -9,6 +9,13 @@ export const PAYMENT_CHANNEL_OPTIONS = {
   BANK_TRANSFER: '银行转账',
 };
+export const RECEIPTS_RECORD_TYPES = {
+  ADVANCE_CHARGE: '预付款',
+  PAYMENT_FOR_SHIPMENT: '发货款',
+  ACCEPTANCE_PAYMENT: '验收款',
+  BALANCE_PAYMENT: '尾款',
+};
+
 export const PAYMENT_METHOD_OPTIONS = {
   UNPAID: '未付款',
   TAOBAO_ORDER_HAS_BEEN_PAID: '淘宝订单已付款',
@@ -16,6 +23,7 @@ export const PAYMENT_METHOD_OPTIONS = {
   WITHHOLDING_ADVANCE_DEPOSIT: '扣预存',
   PLATFORM_SETTLEMENT: '平台结算',
   CASH_ON_DELIVERY: '货到付款',
+  HIRE_PURCHASE: '分期付款',
 };
 export const PRODUCT_BELONG_DEPARTMENT_OPTIONS = {
@@ -898,23 +898,6 @@ const OrderPage = () =&gt; {
               ''
             )}
-            {false ? (
-              <Button
-                className="p-0"
-                type="link"
-                onClick={() => {
-                  setFinancialReceiptsModalVisible(true);
-                  setOrderRow(record);
-                  setSelectedRows([optRecord]);
-                  setIsEdit(true);
-                }}
-              >
-                收款记录
-              </Button>
-            ) : (
-              ''
-            )}
-
             {optRecord.subPath?.includes('invoicing') ? (
               <Button
                 className="p-0"
@@ -1419,6 +1402,22 @@ const OrderPage = () =&gt; {
             <Flex justify="flex-end">
               <Space.Compact direction="vertical" align="end">
                 <Space>
+                  {record.mainPath?.includes('updateHirePurchase') ? (
+                    <Button
+                      className="p-0"
+                      type="link"
+                      onClick={() => {
+                        setFinancialReceiptsModalVisible(true);
+                        setOrderRow(record);
+                        setSelectedRows([record]);
+                        setIsEdit(true);
+                      }}
+                    >
+                      收款记录
+                    </Button>
+                  ) : (
+                    ''
+                  )}
                   {record.mainPath?.includes('procureConvertProcure') ? (
                     <Button
                       className="p-0"
@@ -2696,6 +2695,7 @@ const OrderPage = () =&gt; {
       {financialReceiptsModalVisible && (
         <FinancialReceiptsModal
           setVisible={setFinancialReceiptsModalVisible}
+          datas={selectedRows}
           onClose={() => {
             setFinancialReceiptsModalVisible(false);
             setSelectedRows({});
@@ -891,6 +891,30 @@ export interface SysLogQueryVO {
   username?: string;
 }
+export interface UpdateHirePurchase {
+  /**
+   * @description
+   *   分期付款支付方式
+   */
+  hirePurchaseMethod?: string;
+  /**
+   * @description
+   *   金额
+   */
+  money?: number;
+  /**
+   * @description
+   *   备注
+   */
+  notes?: string;
+  /**
+   * @description
+   *   修改时间
+   * @format date-time
+   */
+  updateTime?: string;
+}
+
 export interface UpdatePwdVO {
   confirmPassword?: string;
   password?: string;
@@ -26,7 +26,6 @@ import type {
   DictionaryQueryVO,
   DictionaryVO,
   Dto,
-  ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
@@ -229,7 +228,9 @@ export interface GetErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Unauthorized
@@ -250,9 +251,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';
@@ -276,7 +277,9 @@ export interface PutErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Created
@@ -302,9 +305,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__ */ (() => {
@@ -329,7 +332,9 @@ export interface PostErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Created
@@ -355,9 +360,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__ */ (() => {
@@ -382,7 +387,9 @@ export interface DeleteErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -403,9 +410,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';
@@ -429,7 +436,9 @@ export interface OptionsErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -450,9 +459,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__ */ (() => {
@@ -477,7 +486,9 @@ export interface HeadErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -498,9 +509,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__ */ (() => {
@@ -525,7 +536,9 @@ export interface PatchErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -546,9 +559,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__ */ (() => {
@@ -567,54 +580,6 @@ export const patchError = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
-/** @description response type for getKingdeeTestGetToken */
-export interface GetKingdeeTestGetTokenResponse {
-  /**
-   * @description
-   *   OK
-   */
-  200: string;
-  /**
-   * @description
-   *   Unauthorized
-   */
-  401: any;
-  /**
-   * @description
-   *   Forbidden
-   */
-  403: any;
-  /**
-   * @description
-   *   Not Found
-   */
-  404: any;
-}
-
-export type GetKingdeeTestGetTokenResponseSuccess =
-  GetKingdeeTestGetTokenResponse[200];
-/**
- * @description
- *   getToken
- * @tags kingdee-test-controller
- * @produces *
- */
-export const getKingdeeTestGetToken = /* #__PURE__ */ (() => {
-  const method = 'get';
-  const url = '/kingdee/test/getToken';
-  function request(): Promise<GetKingdeeTestGetTokenResponseSuccess> {
-    return requester(request.url, {
-      method: request.method,
-    }) as unknown as Promise<GetKingdeeTestGetTokenResponseSuccess>;
-  }
-
-  /** http method */
-  request.method = method;
-  /** request url */
-  request.url = url;
-  return request;
-})();
-
 /** @description request parameter type for postOfficialWebsiteUploadAliOss */
 export interface PostOfficialWebsiteUploadAliOssOption {
   /**
@@ -8127,6 +8092,77 @@ export const postServiceOrderUpdateAnnex = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceOrderUpdateHirePurchase */
+export interface PostServiceOrderUpdateHirePurchaseOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: Dto;
+  };
+}
+
+/** @description response type for postServiceOrderUpdateHirePurchase */
+export interface PostServiceOrderUpdateHirePurchaseResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderUpdateHirePurchaseResponseSuccess =
+  PostServiceOrderUpdateHirePurchaseResponse[200];
+/**
+ * @description
+ *   修改分期付款信息
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderUpdateHirePurchase = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/updateHirePurchase';
+  function request(
+    option: PostServiceOrderUpdateHirePurchaseOption,
+  ): Promise<PostServiceOrderUpdateHirePurchaseResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderUpdateHirePurchaseResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderUpdateOrder */
 export interface PostServiceOrderUpdateOrderOption {
   /**