feat(Order): 课题组选择bug修复

曾国涛
1 parent 53bf932d
Showing 3 changed files with 555 additions and 84 deletions
src/pages/Order/OrderList/OrderDrawer.tsx
src/services/definition.ts
src/services/request.ts
@@ -11,7 +11,7 @@ import {
   postKingdeeRepMaterialUnit,
   postKingdeeRepMeasureUnit,
   postPrepaidPhoneAvailableList,
-  postResearchGroupsNameSet,
+  postResearchGroupsListNotPage,
   postServiceConstCompanyType,
   postServiceConstOrderSource,
   postServiceConstPlatformType,
@@ -1243,38 +1243,55 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             {({ companyType }) => {
               const renderInstitutionContactName = () => (
                 <Group>
+                  {/* 下拉选择框 */}
                   <ProFormSelect
-                    key="institutionContactName"
-                    width="xl"
+                    key="researchGroupSelect"
+                    width="md"
                     showSearch
-                    name="institutionContactName"
-                    rules={[{ required: true, message: '请输入课题组名称!' }]}
-                    request={async (value) => {
-                      const keywords = value?.keyWords || '';
-                      const res = await postResearchGroupsNameSet({
-                        data: { status: 'ADD_AUDIT_PASS', groupName: keywords },
-                      });
-                      return Object.entries(res?.data || {}).map(
-                        ([researchGroupsId, researchGroupsName]) => ({
-                          label: researchGroupsName,
-                          value: researchGroupsName, // 使用 researchGroupsId 作为 value
-                          key: researchGroupsId,
-                          id: researchGroupsId,
-                        }),
-                      );
-                    }}
+                    label="选择课题组"
+                    placeholder="请选择课题组"
                     fieldProps={{
                       filterOption: () => true,
-                      onChange: (_, option) => {
+                      onChange: (value, option) => {
+                        const selectedOption = Array.isArray(option)
+                          ? option[0]
+                          : option;
                         form.setFieldsValue({
-                          researchGroupId: option?.id || '',
+                          researchGroupId: value, // 存储ID到隐藏字段
+                          institutionContactName: selectedOption?.groupName, // 显示名称
                         });
                       },
                     }}
+                    request={async (value) => {
+                      const keywords = value?.keyWords || '';
+                      const res = await postResearchGroupsListNotPage({
+                        data: { status: 'ADD_AUDIT_PASS', groupName: keywords },
+                      });
+                      return res.data.map((item) => ({
+                        label: `${item.groupName} | ${item.companyName} | ${item.id}`,
+                        value: item.id.toString(),
+                        key: item.id.toString(),
+                        groupName: item.groupName,
+                      }));
+                    }}
                     debounceTime={1000}
+                  />
+                  {/* 显示框 - 只读显示选中的课题组名称 */}
+                  <ProFormText
+                    name="institutionContactName"
                     label="课题组名称"
-                    placeholder="请输入名称"
+                    width="xl"
+                    readonly
+                    fieldProps={{
+                      readOnly: true,
+                      style: {
+                        backgroundColor: '#f5f5f5',
+                        cursor: 'not-allowed',
+                      },
+                    }}
+                    rules={[{ required: true, message: '请重新选择课题组!' }]}
                   />
+
                   <ProFormDigit
                     readonly
                     key="researchGroupId"
@@ -1556,6 +1556,32 @@ export interface ExchangeRecordsRequestDto {
   total?: number;
 }
  
+export interface File {
+  absolute?: boolean;
+  absoluteFile?: File;
+  absolutePath?: string;
+  canonicalFile?: File;
+  canonicalPath?: string;
+  directory?: boolean;
+  executable?: boolean;
+  file?: boolean;
+  /** @format int64 */
+  freeSpace?: number;
+  hidden?: boolean;
+  /** @format int64 */
+  lastModified?: number;
+  name?: string;
+  parent?: string;
+  parentFile?: File;
+  path?: string;
+  readable?: boolean;
+  /** @format int64 */
+  totalSpace?: number;
+  /** @format int64 */
+  usableSpace?: number;
+  writable?: boolean;
+}
+
 export interface FilePathDto {
   url?: string;
 }
@@ -3838,6 +3864,12 @@ export interface ResearchGroupListRequest {
   end?: number;
   /**
    * @description
+   *   课题组ID
+   * @format int64
+   */
+  groupId?: number;
+  /**
+   * @description
    *   课题组名称
    */
   groupName?: string;
@@ -4134,6 +4166,12 @@ export interface ResearchGroupsAccessDTO {
   deleteFlag?: number;
   /**
    * @description
+   *   课题组id
+   * @format int64
+   */
+  groupId?: number;
+  /**
+   * @description
    *   课题组名称
    */
   groupName?: string;
@@ -4244,7 +4282,7 @@ export interface ResetPwdVO {
  
 export interface Resource {
   description?: string;
-  file?: TsgFile;
+  file?: File;
   filename?: string;
   inputStream?: InputStream;
   open?: boolean;
@@ -4952,32 +4990,6 @@ export interface CompanyInfo {
   taxIdIsNotNull?: boolean;
 }
  
-export interface TsgFile {
-  absolute?: boolean;
-  absoluteFile?: TsgFile;
-  absolutePath?: string;
-  canonicalFile?: TsgFile;
-  canonicalPath?: string;
-  directory?: boolean;
-  executable?: boolean;
-  file?: boolean;
-  /** @format int64 */
-  freeSpace?: number;
-  hidden?: boolean;
-  /** @format int64 */
-  lastModified?: number;
-  name?: string;
-  parent?: string;
-  parentFile?: TsgFile;
-  path?: string;
-  readable?: boolean;
-  /** @format int64 */
-  totalSpace?: number;
-  /** @format int64 */
-  usableSpace?: number;
-  writable?: boolean;
-}
-
 export interface InvoiceDetail {
   createByName?: string;
   /** @format date-time */
@@ -74,6 +74,7 @@ import type {
   MeasureUnitListRes,
   MergeIntegralDto,
   MessageQueryDTO,
+  ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
@@ -3834,9 +3835,7 @@ export interface GetErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Unauthorized
@@ -3857,9 +3856,9 @@ export interface GetErrorResponse {
 export type GetErrorResponseSuccess = GetErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  */
 export const getError = /* #__PURE__ */ (() => {
   const method = 'get';
@@ -3883,9 +3882,7 @@ export interface PutErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -3911,9 +3908,9 @@ export interface PutErrorResponse {
 export type PutErrorResponseSuccess = PutErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const putError = /* #__PURE__ */ (() => {
@@ -3938,9 +3935,7 @@ export interface PostErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -3966,9 +3961,9 @@ export interface PostErrorResponse {
 export type PostErrorResponseSuccess = PostErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const postError = /* #__PURE__ */ (() => {
@@ -3993,9 +3988,7 @@ export interface DeleteErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -4016,9 +4009,9 @@ export interface DeleteErrorResponse {
 export type DeleteErrorResponseSuccess = DeleteErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  */
 export const deleteError = /* #__PURE__ */ (() => {
   const method = 'delete';
@@ -4042,9 +4035,7 @@ export interface OptionsErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -4065,9 +4056,9 @@ export interface OptionsErrorResponse {
 export type OptionsErrorResponseSuccess = OptionsErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const optionsError = /* #__PURE__ */ (() => {
@@ -4092,9 +4083,7 @@ export interface HeadErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -4115,9 +4104,9 @@ export interface HeadErrorResponse {
 export type HeadErrorResponseSuccess = HeadErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const headError = /* #__PURE__ */ (() => {
@@ -4142,9 +4131,7 @@ export interface PatchErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -4165,9 +4152,9 @@ export interface PatchErrorResponse {
 export type PatchErrorResponseSuccess = PatchErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const patchError = /* #__PURE__ */ (() => {
@@ -15311,6 +15298,153 @@ export const postResearchGroupsList = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
+/** @description request parameter type for postResearchGroupsListNotPage */
+export interface PostResearchGroupsListNotPageOption {
+  /**
+   * @description
+   *   request
+   */
+  body: {
+    /**
+        @description
+          request */
+    request: ResearchGroupListRequest;
+  };
+}
+
+/** @description response type for postResearchGroupsListNotPage */
+export interface PostResearchGroupsListNotPageResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostResearchGroupsListNotPageResponseSuccess =
+  PostResearchGroupsListNotPageResponse[200];
+/**
+ * @description
+ *   课题组名称列表
+ * @tags research-groups-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postResearchGroupsListNotPage = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/research/groups/listNotPage';
+  function request(
+    option: PostResearchGroupsListNotPageOption,
+  ): Promise<PostResearchGroupsListNotPageResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostResearchGroupsListNotPageResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postResearchGroupsMemberExists */
+export interface PostResearchGroupsMemberExistsOption {
+  /**
+   * @description
+   *   customerContact
+   */
+  query?: {
+    /**
+        @description
+          customerContact */
+    customerContact?: string;
+    /**
+        @description
+          researchGroupId
+        @format int64 */
+    researchGroupId?: number;
+  };
+}
+
+/** @description response type for postResearchGroupsMemberExists */
+export interface PostResearchGroupsMemberExistsResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: boolean;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostResearchGroupsMemberExistsResponseSuccess =
+  PostResearchGroupsMemberExistsResponse[200];
+/**
+ * @description
+ *   查询课题组成员
+ * @tags research-groups-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postResearchGroupsMemberExists = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/research/groups/memberExists';
+  function request(
+    option?: PostResearchGroupsMemberExistsOption,
+  ): Promise<PostResearchGroupsMemberExistsResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostResearchGroupsMemberExistsResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postResearchGroupsNameSet */
 export interface PostResearchGroupsNameSetOption {
   /**
@@ -21089,6 +21223,314 @@ export const postServiceOrderAuditPaymentReceipt = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
+/** @description response type for postServiceOrderBatchCaculateAndSetIntegral */
+export interface PostServiceOrderBatchCaculateAndSetIntegralResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderBatchCaculateAndSetIntegralResponseSuccess =
+  PostServiceOrderBatchCaculateAndSetIntegralResponse[200];
+/**
+ * @description
+ *   计算积分
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderBatchCaculateAndSetIntegral =
+  /* #__PURE__ */ (() => {
+    const method = 'post';
+    const url = '/service/order/batchCaculateAndSetIntegral';
+    function request(): Promise<PostServiceOrderBatchCaculateAndSetIntegralResponseSuccess> {
+      return requester(request.url, {
+        method: request.method,
+      }) as unknown as Promise<PostServiceOrderBatchCaculateAndSetIntegralResponseSuccess>;
+    }
+
+    /** http method */
+    request.method = method;
+    /** request url */
+    request.url = url;
+    return request;
+  })();
+
+/** @description request parameter type for postServiceOrderBatchCaculateAndSetIntegralByMainIds */
+export interface PostServiceOrderBatchCaculateAndSetIntegralByMainIdsOption {
+  /**
+   * @description
+   *   ids
+   */
+  query: {
+    /**
+        @description
+          ids */
+    ids: Array<number>;
+  };
+}
+
+/** @description response type for postServiceOrderBatchCaculateAndSetIntegralByMainIds */
+export interface PostServiceOrderBatchCaculateAndSetIntegralByMainIdsResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderBatchCaculateAndSetIntegralByMainIdsResponseSuccess =
+  PostServiceOrderBatchCaculateAndSetIntegralByMainIdsResponse[200];
+/**
+ * @description
+ *   计算积分
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderBatchCaculateAndSetIntegralByMainIds =
+  /* #__PURE__ */ (() => {
+    const method = 'post';
+    const url = '/service/order/batchCaculateAndSetIntegralByMainIds';
+    function request(
+      option: PostServiceOrderBatchCaculateAndSetIntegralByMainIdsOption,
+    ): Promise<PostServiceOrderBatchCaculateAndSetIntegralByMainIdsResponseSuccess> {
+      return requester(request.url, {
+        method: request.method,
+        ...option,
+      }) as unknown as Promise<PostServiceOrderBatchCaculateAndSetIntegralByMainIdsResponseSuccess>;
+    }
+
+    /** http method */
+    request.method = method;
+    /** request url */
+    request.url = url;
+    return request;
+  })();
+
+/** @description response type for postServiceOrderBatchCaculateAndSetPrePaidIntegral */
+export interface PostServiceOrderBatchCaculateAndSetPrePaidIntegralResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderBatchCaculateAndSetPrePaidIntegralResponseSuccess =
+  PostServiceOrderBatchCaculateAndSetPrePaidIntegralResponse[200];
+/**
+ * @description
+ *   计算积分
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderBatchCaculateAndSetPrePaidIntegral =
+  /* #__PURE__ */ (() => {
+    const method = 'post';
+    const url = '/service/order/batchCaculateAndSetPrePaidIntegral';
+    function request(): Promise<PostServiceOrderBatchCaculateAndSetPrePaidIntegralResponseSuccess> {
+      return requester(request.url, {
+        method: request.method,
+      }) as unknown as Promise<PostServiceOrderBatchCaculateAndSetPrePaidIntegralResponseSuccess>;
+    }
+
+    /** http method */
+    request.method = method;
+    /** request url */
+    request.url = url;
+    return request;
+  })();
+
+/** @description response type for postServiceOrderBatchCaculateAndSetStoreIntegral */
+export interface PostServiceOrderBatchCaculateAndSetStoreIntegralResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderBatchCaculateAndSetStoreIntegralResponseSuccess =
+  PostServiceOrderBatchCaculateAndSetStoreIntegralResponse[200];
+/**
+ * @description
+ *   计算积分
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderBatchCaculateAndSetStoreIntegral =
+  /* #__PURE__ */ (() => {
+    const method = 'post';
+    const url = '/service/order/batchCaculateAndSetStoreIntegral';
+    function request(): Promise<PostServiceOrderBatchCaculateAndSetStoreIntegralResponseSuccess> {
+      return requester(request.url, {
+        method: request.method,
+      }) as unknown as Promise<PostServiceOrderBatchCaculateAndSetStoreIntegralResponseSuccess>;
+    }
+
+    /** http method */
+    request.method = method;
+    /** request url */
+    request.url = url;
+    return request;
+  })();
+
+/** @description request parameter type for postServiceOrderBatchReceiveIntegral */
+export interface PostServiceOrderBatchReceiveIntegralOption {
+  /**
+   * @description
+   *   ids
+   */
+  query: {
+    /**
+        @description
+          ids */
+    ids: Array<number>;
+  };
+}
+
+/** @description response type for postServiceOrderBatchReceiveIntegral */
+export interface PostServiceOrderBatchReceiveIntegralResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderBatchReceiveIntegralResponseSuccess =
+  PostServiceOrderBatchReceiveIntegralResponse[200];
+/**
+ * @description
+ *   计算积分
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderBatchReceiveIntegral = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/batchReceiveIntegral';
+  function request(
+    option: PostServiceOrderBatchReceiveIntegralOption,
+  ): Promise<PostServiceOrderBatchReceiveIntegralResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderBatchReceiveIntegralResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderCancelSend */
 export interface PostServiceOrderCancelSendOption {
   /**