feat: update订单查询

PurelzMgnead
1 parent e9ef594b
Showing 4 changed files with 300 additions and 342 deletions
src/pages/Order/constant.ts
src/pages/ZoNing/components/table.tsx
src/services/definition.ts
src/services/request.ts
-import { postServiceOrderQueryCustomerInformation } from '@/services';
+import {
+  postOrderErpOrderZoNingSelectSaleUserHasZoning,
+  postServiceOrderQueryCustomerInformation,
+} from '@/services';
 import { enumToProTableEnumValue } from '@/utils';
 import { getReceivingCompanyOptions, isSupplier } from '@/utils/order';
 export const COMFIR_RECEIPT_IMAGES_NUMBER = 3;
@@ -592,6 +595,25 @@ export const MAIN_ORDER_COLUMNS = [
     valueEnum: enumToProTableEnumValue(PRODUCT_BELONG_DEPARTMENT_OPTIONS),
   },
   {
+    title: '所属大区',
+    dataIndex: 'orderZoning',
+    valueType: 'select',
+    hideInTable: true,
+    request: async () => {
+      const res = await postOrderErpOrderZoNingSelectSaleUserHasZoning({
+        data: JSON.parse(localStorage.getItem('userInfo')).id,
+      });
+      let sel = [];
+      res.data.forEach((item) => {
+        sel.push({
+          label: item.zoning,
+          value: item.id,
+        });
+      });
+      return sel;
+    },
+  },
+  {
     title: '创建日期',
     dataIndex: 'createTime',
     valueType: 'dateTimeRange',
@@ -110,6 +110,7 @@ export default () =&gt; {
       key: 'state',
       dataIndex: 'orderUserShowList',
       valueType: 'select',
+      ellipsis: true,
       width: 200,
     },
     {
@@ -1810,6 +1810,31 @@ export interface QueryBankStatementDto {
   total?: number;
 }
  
+export interface QueryClientDto {
+  companyAddressLike?: string;
+  companyIds?: Array<number>;
+  companyNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
+  /** @format int32 */
+  current?: number;
+  /** @format int32 */
+  end?: number;
+  hasScheme?: string;
+  level?: string;
+  namelike?: string;
+  /** @format int32 */
+  pageSize?: number;
+  phoneNumber?: string;
+  /** @format int32 */
+  start?: number;
+  /** @format int32 */
+  total?: number;
+  tradeStatus?: string;
+}
+
 export interface QueryCustomerInformationDto {
   /**
    * @description
@@ -2214,325 +2239,6 @@ export interface ResearchGroupMemberRequestsRequest {
   total?: number;
 }
  
-export interface ResearchGroupAccountAddRequest {
-  /**
-   * @description
-   *   关联的账号id
-   * @format int64
-   */
-  accountId?: number;
-  /**
-   * @description
-   *   关联的账号名称
-   */
-  accountName?: string;
-  /**
-   * @description
-   *   关联的账号手机号
-   */
-  accountPhone?: string;
-  /**
-   * @description
-   *   课题组id
-   * @format int64
-   */
-  groupId?: number;
-}
-
-export interface ResearchGroupAccountEditRequest {
-  /**
-   * @description
-   *   关联的账号id
-   * @format int64
-   */
-  accountId?: number;
-  /**
-   * @description
-   *   关联的账号名称
-   */
-  accountName?: string;
-  /**
-   * @description
-   *   关联的账号手机号
-   */
-  accountPhone?: string;
-  /**
-   * @description
-   *   课题组id
-   * @format int64
-   */
-  groupId?: number;
-  /**
-   * @description
-   *   主键id
-   * @format int64
-   */
-  id?: number;
-}
-
-export interface ResearchGroupAddRequest {
-  accounts?: Array<ResearchGroupAccountAddRequest>;
-  /**
-   * @description
-   *   课题组名称
-   */
-  group?: string;
-  /**
-   * @description
-   *   课题组负责人
-   */
-  leader?: string;
-  members?: Array<ResearchGroupMemberAddRequest>;
-}
-
-export interface ResearchGroupDeleteRequest {
-  /**
-   * @description
-   *   主键id
-   */
-  ids?: Array<number>;
-}
-
-export interface ResearchGroupDetailRequest {
-  /**
-   * @description
-   *   主键id
-   * @format int64
-   */
-  id?: number;
-}
-
-export interface ResearchGroupEditRequest {
-  /**
-   * @description
-   *   课题组预存账号
-   */
-  accounts?: Array<ResearchGroupAccountEditRequest>;
-  /**
-   * @description
-   *   课题组名称
-   */
-  group?: string;
-  /**
-   * @description
-   *   主键id
-   * @format int64
-   */
-  id?: number;
-  /**
-   * @description
-   *   课题组负责人
-   */
-  leader?: string;
-  /**
-   * @description
-   *   课题组成员集合
-   */
-  members?: Array<ResearchGroupMemberEditRequest>;
-}
-
-export interface ResearchGroupListRequest {
-  /**
-   * @description
-   *   预存账号手机号
-   */
-  accountPhone?: string;
-  /** @format int32 */
-  current?: number;
-  /** @format int32 */
-  end?: number;
-  /**
-   * @description
-   *   课题组名称
-   */
-  groupName?: string;
-  /**
-   * @description
-   *   课题组负责人
-   */
-  leaderName?: string;
-  /**
-   * @description
-   *   课题组成员名称
-   */
-  memberName?: string;
-  /**
-   * @description
-   *   课题组成员手机号
-   */
-  memberPhone?: string;
-  /** @format int32 */
-  pageSize?: number;
-  /** @format int32 */
-  start?: number;
-  /** @format int32 */
-  total?: number;
-}
-
-export interface ResearchGroupMemberAddRequest {
-  /**
-   * @description
-   *   课题组ID
-   * @format int64
-   */
-  groupId?: number;
-  /**
-   * @description
-   *   成员名称
-   */
-  memberName?: string;
-  /**
-   * @description
-   *   成员手机号
-   */
-  memberPhone?: string;
-}
-
-export interface ResearchGroupMemberEditRequest {
-  /**
-   * @description
-   *   课题组ID
-   * @format int64
-   */
-  groupId?: number;
-  /**
-   * @description
-   *   主键id
-   * @format int64
-   */
-  id?: number;
-  /**
-   * @description
-   *   成员名称
-   */
-  memberName?: string;
-  /**
-   * @description
-   *   成员手机号
-   */
-  memberPhone?: string;
-}
-
-export interface ResearchGroupMemberRequestAddRequest {
-  /**
-   * @description
-   *   课题组ID
-   * @format int64
-   */
-  groupId?: number;
-  /**
-   * @description
-   *   课题组名称
-   */
-  groupName?: string;
-  members?: Array<ResearchGroupMemberAddRequest>;
-  /**
-   * @description
-   *   申请备注
-   */
-  requestNotes?: string;
-}
-
-export interface ResearchGroupMemberRequestDeleteRequest {
-  /**
-   * @description
-   *   主键id
-   */
-  ids?: Array<number>;
-}
-
-export interface ResearchGroupMemberRequestDetailRequest {
-  /**
-   * @description
-   *   主键id
-   * @format int64
-   */
-  id?: number;
-}
-
-export interface ResearchGroupMemberRequestEditRequest {
-  /**
-   * @description
-   *   课题组ID
-   * @format int64
-   */
-  groupId?: number;
-  /**
-   * @description
-   *   课题组名称
-   */
-  groupName?: string;
-  /**
-   * @description
-   *   主键id
-   * @format int64
-   */
-  id?: number;
-  /**
-   * @description
-   *   成员名称
-   */
-  memberName?: string;
-  /**
-   * @description
-   *   成员手机号
-   */
-  memberPhone?: string;
-  /**
-   * @description
-   *   申请备注
-   */
-  requestNotes?: string;
-}
-
-export interface ResearchGroupMemberRequestsRequest {
-  /**
-   * @description
-   *   审核备注
-   */
-  auditNotes?: string;
-  /**
-   * @description
-   *   审核状态
-   */
-  auditStatus?: string;
-  /**
-   * @description
-   *   创建人
-   */
-  createByName?: string;
-  /** @format int32 */
-  current?: number;
-  /** @format int32 */
-  end?: number;
-  /**
-   * @description
-   *   课题组名称
-   */
-  groupName?: string;
-  /**
-   * @description
-   *   成员名称
-   */
-  memberName?: string;
-  /**
-   * @description
-   *   成员手机号
-   */
-  memberPhone?: string;
-  /** @format int32 */
-  pageSize?: number;
-  /**
-   * @description
-   *   申请备注
-   */
-  requestNotes?: string;
-  /** @format int32 */
-  start?: number;
-  /** @format int32 */
-  total?: number;
-}
-
 export interface ResetPwdVO {
   /** @format int64 */
   userId?: number;
@@ -56,7 +56,6 @@ import type {
   MaterialUnitListRes,
   MeasureUnitListRes,
   MessageQueryDTO,
-  ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
@@ -80,6 +79,7 @@ import type {
   QueryAfterSalesInfoSnapshotDto,
   QueryAnnexDto,
   QueryBankStatementDto,
+  QueryClientDto,
   QueryCustomerInformationDto,
   QueryHistoryRecordDto,
   QueryInvoiceDetailDto,
@@ -124,6 +124,77 @@ import type {
   UserNowMoneyCheckRequest,
 } from './definition';
  
+/** @description request parameter type for postAdminClientQueryClientPage */
+export interface PostAdminClientQueryClientPageOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: QueryClientDto;
+  };
+}
+
+/** @description response type for postAdminClientQueryClientPage */
+export interface PostAdminClientQueryClientPageResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostAdminClientQueryClientPageResponseSuccess =
+  PostAdminClientQueryClientPageResponse[200];
+/**
+ * @description
+ *   客户管理
+ * @tags 客户管理
+ * @produces *
+ * @consumes application/json
+ */
+export const postAdminClientQueryClientPage = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/admin/client/queryClientPage';
+  function request(
+    option: PostAdminClientQueryClientPageOption,
+  ): Promise<PostAdminClientQueryClientPageResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostAdminClientQueryClientPageResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postApiLocalStorageUpload */
 export interface PostApiLocalStorageUploadOption {
   /**
@@ -1839,6 +1910,78 @@ export const postDistrictAddOrderAndProvince = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
+/** @description request parameter type for postDistrictFindProvinceAndCityAndDistrict */
+export interface PostDistrictFindProvinceAndCityAndDistrictOption {
+  /**
+   * @description
+   *   str
+   */
+  body: {
+    /**
+        @description
+          str */
+    str: string;
+  };
+}
+
+/** @description response type for postDistrictFindProvinceAndCityAndDistrict */
+export interface PostDistrictFindProvinceAndCityAndDistrictResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostDistrictFindProvinceAndCityAndDistrictResponseSuccess =
+  PostDistrictFindProvinceAndCityAndDistrictResponse[200];
+/**
+ * @description
+ *   读取字符串中的数据
+ * @tags order-district-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postDistrictFindProvinceAndCityAndDistrict =
+  /* #__PURE__ */ (() => {
+    const method = 'post';
+    const url = '/district/findProvinceAndCityAndDistrict';
+    function request(
+      option: PostDistrictFindProvinceAndCityAndDistrictOption,
+    ): Promise<PostDistrictFindProvinceAndCityAndDistrictResponseSuccess> {
+      return requester(request.url, {
+        method: request.method,
+        ...option,
+      }) as unknown as Promise<PostDistrictFindProvinceAndCityAndDistrictResponseSuccess>;
+    }
+
+    /** http method */
+    request.method = method;
+    /** request url */
+    request.url = url;
+    return request;
+  })();
+
 /** @description request parameter type for postDistrictSelOrderProvince */
 export interface PostDistrictSelOrderProvinceOption {
   /**
@@ -2319,7 +2462,9 @@ export interface GetErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Unauthorized
@@ -2340,9 +2485,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';
@@ -2366,7 +2511,9 @@ export interface PutErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Created
@@ -2392,9 +2539,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__ */ (() => {
@@ -2419,7 +2566,9 @@ export interface PostErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Created
@@ -2445,9 +2594,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__ */ (() => {
@@ -2472,7 +2621,9 @@ export interface DeleteErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -2493,9 +2644,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';
@@ -2519,7 +2670,9 @@ export interface OptionsErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -2540,9 +2693,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__ */ (() => {
@@ -2567,7 +2720,9 @@ export interface HeadErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -2588,9 +2743,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__ */ (() => {
@@ -2615,7 +2770,9 @@ export interface PatchErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -2636,9 +2793,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__ */ (() => {
@@ -7868,6 +8025,78 @@ export const postOrderErpOrderZoNingSelectSaleUserByProvince =
     return request;
   })();
  
+/** @description request parameter type for postOrderErpOrderZoNingSelectSaleUserHasZoning */
+export interface PostOrderErpOrderZoNingSelectSaleUserHasZoningOption {
+  /**
+   * @description
+   *   id
+   */
+  body: {
+    /**
+        @description
+          id */
+    id: number;
+  };
+}
+
+/** @description response type for postOrderErpOrderZoNingSelectSaleUserHasZoning */
+export interface PostOrderErpOrderZoNingSelectSaleUserHasZoningResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostOrderErpOrderZoNingSelectSaleUserHasZoningResponseSuccess =
+  PostOrderErpOrderZoNingSelectSaleUserHasZoningResponse[200];
+/**
+ * @description
+ *   查询出该销售所在的大区
+ * @tags order-zo-ning-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postOrderErpOrderZoNingSelectSaleUserHasZoning =
+  /* #__PURE__ */ (() => {
+    const method = 'post';
+    const url = '/order/erp/orderZoNing/selectSaleUserHasZoning';
+    function request(
+      option: PostOrderErpOrderZoNingSelectSaleUserHasZoningOption,
+    ): Promise<PostOrderErpOrderZoNingSelectSaleUserHasZoningResponseSuccess> {
+      return requester(request.url, {
+        method: request.method,
+        ...option,
+      }) as unknown as Promise<PostOrderErpOrderZoNingSelectSaleUserHasZoningResponseSuccess>;
+    }
+
+    /** http method */
+    request.method = method;
+    /** request url */
+    request.url = url;
+    return request;
+  })();
+
 /** @description response type for getOrderErpOrderZoNingSelectUserAll */
 export interface GetOrderErpOrderZoNingSelectUserAllResponse {
   /**