refactor(order): 优化订单相关组件和接口定义

- 修改 DeliverInfoDrawer 组件中的 fetchData 方法参数结构 - 更新 ProcureCheckModal 组件中的字段名称 -调整 productCollectBill 页面的表格渲染函数 - 移除 definition.ts 中冗余的日期时间格式注释 - 更新 .umirc.ts 中的菜单名称

refactor(order): 优化订单相关组件和接口定义
- 修改 DeliverInfoDrawer 组件中的 fetchData 方法参数结构 - 更新 ProcureCheckModal 组件中的字段名称 -调整 productCollectBill 页面的表格渲染函数 - 移除 definition.ts 中冗余的日期时间格式注释 - 更新 .umirc.ts 中的菜单名称
曾国涛
1 parent 2eeef652
Showing 7 changed files with 325 additions and 166 deletions
.umirc.ts
src/pages/Order/OrderList/DeliverInfoDrawer.tsx
src/pages/Order/OrderList/OrderDrawer.tsx
src/pages/Order/OrderList/ProcureCheckModal.tsx
src/pages/productCollectBill/index.tsx
src/services/definition.ts
src/services/request.ts
@@ -151,7 +151,7 @@ export default defineConfig({
       access: 'canReadAdmin',
     },
     {
-      name: '礼品认领',
+      name: '礼品申领',
       path: '/productCollectBill',
       component: './productCollectBill',
       icon: 'BookOutlined',
@@ -14,7 +14,9 @@ export default ({ data, onClose }) =&gt; {
     const fetchData = async () => {
       if (data.id !== undefined) {
         const resp = await postDistrictSelOrderProvince({
-          data: data.id,
+          data: {
+            oid: data.id,
+          },
         });
         if (resp && resp.data) {
           if (resp.data.province) {
@@ -12,6 +12,9 @@ import {
   postKingdeeRepMeasureUnit,
   postPrepaidPhoneAvailableList,
   postResearchGroupsNameSet,
+  postServiceConstCompanyType,
+  postServiceConstOrderSource,
+  postServiceConstPlatformType,
   postServiceOrderAddOrder,
   postServiceOrderAfterSalesQuerySnapshotOrder,
   postServiceOrderApplyAfterSales,
@@ -33,6 +36,7 @@ import {
   FormListActionType,
   ProCard,
   ProFormDateTimePicker,
+  ProFormDependency,
   ProFormDigit,
   ProFormList,
   ProFormSelect,
@@ -40,6 +44,7 @@ import {
   ProFormTextArea,
   ProFormUploadDragger,
 } from '@ant-design/pro-components';
+import { Group } from '@ant-design/pro-form';
 import { Button, Form, message, Modal } from 'antd';
 import { cloneDeep } from 'lodash';
 import { useEffect, useRef, useState } from 'react';
@@ -1250,38 +1255,141 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           placeholder="请输入课题组"
           rules={[{ required: true, message: '课题组必填' }]}
         />*/}
-        <ProFormSelect
-          key={'institutionContactName'}
-          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,
-              },
-            });
-            let options = res?.data?.map((c: any) => {
-              return {
-                label: c,
-                value: c,
-                key: c,
-              };
-            });
-            return options;
-          }}
-          fieldProps={{
-            filterOption() {
-              return true;
-            },
-          }}
-          debounceTime={1000}
-          label="课题组名称"
-          placeholder="请输入名称"
-        />
+        <Group>
+          <ProFormSelect
+            request={async () => {
+              const res = await postServiceConstCompanyType();
+              return Object.entries(res?.data).map(([value, label]) => ({
+                label,
+                value,
+              }));
+            }}
+            width="md"
+            rules={[{ required: true, message: '单位类型必填' }]}
+            name="companyType"
+            label="单位类型"
+          />
+          <ProFormDependency name={['companyType']}>
+            {({ companyType }) => {
+              const renderInstitutionContactName = () => (
+                <ProFormSelect
+                  key="institutionContactName"
+                  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 res?.data?.map((c) => ({
+                      label: c,
+                      value: c,
+                      key: c,
+                    }));
+                  }}
+                  fieldProps={{ filterOption: () => true }}
+                  debounceTime={1000}
+                  label="课题组名称"
+                  placeholder="请输入名称"
+                />
+              );
+
+              const renderPlatformType = (fieldKey) => (
+                <ProFormSelect
+                  key={fieldKey}
+                  width="md"
+                  showSearch
+                  name="platformType"
+                  rules={[{ required: true, message: '请选择平台类型!' }]}
+                  request={async () => {
+                    const res = await postServiceConstPlatformType({
+                      query: { companyType },
+                    });
+                    return Object.entries(res?.data).map(([value, label]) => ({
+                      label,
+                      value,
+                    }));
+                  }}
+                  fieldProps={{ filterOption: () => true }}
+                  debounceTime={1000}
+                  label="平台类型"
+                  placeholder="请输入平台类型"
+                />
+              );
+
+              if (companyType === 'school') {
+                return renderInstitutionContactName();
+              } else if (
+                ['firm', 'ECommercePlatform', 'otherPlatform'].includes(
+                  companyType,
+                )
+              ) {
+                form.setFieldValue('platformType', '');
+                return (
+                  <Group>
+                    {['ECommercePlatform', 'otherPlatform'].includes(
+                      companyType,
+                    ) && renderPlatformType(`platformType_${companyType}`)}
+                    <ProFormText
+                      width="md"
+                      name="institutionContactName"
+                      label="课题组名称"
+                      rules={[{ required: true, message: '请输入课题组名称!' }]}
+                      placeholder="请输入名称"
+                    />
+                  </Group>
+                );
+              } else if (companyType === 'officialWebsite') {
+                return (
+                  <Group>
+                    <ProFormSelect
+                      request={async () => {
+                        const res = await postServiceConstOrderSource();
+                        return Object.entries(res?.data).map(
+                          ([value, label]) => ({
+                            label,
+                            value,
+                          }),
+                        );
+                      }}
+                      width="md"
+                      name="orderSource"
+                      label="订单来源"
+                    />
+                    <ProFormDependency name={['orderSource']}>
+                      {({ orderSource }) => {
+                        if (orderSource === 'school') {
+                          return renderInstitutionContactName();
+                        } else if (orderSource === 'company') {
+                          return (
+                            <ProFormText
+                              width="md"
+                              name="institutionContactName"
+                              label="课题组名称"
+                              rules={[
+                                {
+                                  required: true,
+                                  message: '请输入课题组名称!',
+                                },
+                              ]}
+                              placeholder="请输入名称"
+                            />
+                          );
+                        }
+                        return null;
+                      }}
+                    </ProFormDependency>
+                  </Group>
+                );
+              } else {
+                return renderInstitutionContactName();
+              }
+            }}
+          </ProFormDependency>
+        </Group>
+
         <div
           style={{
             display: 'flex',
@@ -104,7 +104,7 @@ export default ({ setCheckVisible, isMainOrder, orders, onClose }) =&gt; {
                     {
                       data: {
                         subIds: ids,
-                        procureNotes: procureNotes,
+                        checkNotes: procureNotes,
                       },
                     },
                   );
@@ -140,7 +140,7 @@ export default () =&gt; {
       title: '操作',
       valueType: 'option',
       key: 'option',
-      render: ({ record }) => [
+      render: (text, record) => [
         record.paths?.includes('UPDATE') && (
           <AddOrUpdate
             record={record}
@@ -215,10 +215,6 @@ export interface AdminClientDto {
 export interface AdminDeptQueryVO {
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -265,10 +261,6 @@ export interface AdminInvoicingAccountDTO {
 export interface AdminJobQueryVO {
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -301,10 +293,6 @@ export interface AdminMenuQueryVO {
   component?: string;
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -356,10 +344,6 @@ export interface AdminMenuVO {
 export interface AdminRoleQueryVO {
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   dataScope?: string;
@@ -394,10 +378,6 @@ export interface AdminRoleVO {
 export interface AdminUserLoginByPhoneVO {
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -415,10 +395,6 @@ export interface AdminUserLoginByPhoneVO {
 export interface AdminUserLoginByPwdVO {
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -439,10 +415,6 @@ export interface AdminUserModifyPwdVO {
   confirmPassword?: string;
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -461,10 +433,6 @@ export interface AdminUserModifyPwdVO {
 export interface AdminUserPasswordRecoverEmailVO {
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -481,10 +449,6 @@ export interface AdminUserPasswordRecoverEmailVO {
 export interface AdminUserQueryVO {
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   email?: string;
@@ -511,10 +475,6 @@ export interface AdminUserRegisterVO {
   confirmPassword?: string;
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   email?: string;
@@ -747,10 +707,6 @@ export interface ApiCreateProductRequest {
 export interface ApiOrderCustomersRequest {
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -1060,10 +1016,6 @@ export interface AuditDto {
 export interface AuditVO {
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -1148,10 +1100,6 @@ export interface CancelSendOrderDto {
 export interface CaptchaMessageVO {
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -1427,10 +1375,6 @@ export interface CustomerSaveReq {
 export interface DictionaryQueryVO {
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   dictCode?: string;
@@ -2300,10 +2244,6 @@ export interface MergeIntegralDto {
 export interface MessageQueryDTO {
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -2349,10 +2289,6 @@ export interface OrderAuditLogQueryVO {
   applyId?: number;
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -2399,10 +2335,6 @@ export interface OrderBaseInfoQueryVO {
   collection?: string;
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   customerCode?: string;
@@ -2499,10 +2431,6 @@ export interface OrderFieldLockApplyQueryVO {
   auditUserId?: number;
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -2574,10 +2502,6 @@ export interface OrderMainProDo {
 export interface OrderOptLogQueryVO {
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -3001,10 +2925,6 @@ export interface QueryBankStatementDto {
   collectionDatetimeEnd?: string;
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -3187,10 +3107,6 @@ export interface QueryInvoiceDetailDto {
 export interface QueryInvoiceProjectDto {
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -3496,10 +3412,6 @@ export interface QueryUseOldInvoicingDto {
 export interface QueryUserIntegralRecordDto {
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -3668,10 +3580,6 @@ export interface ResearchGroupListRequest {
   companyNameLike?: string;
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -3824,10 +3732,6 @@ export interface ResearchGroupMemberRequestsRequest {
    */
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -4166,10 +4070,6 @@ export interface SysLogQueryVO {
   browser?: string;
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   description?: string;
@@ -4209,10 +4109,6 @@ export interface TicketsSearchVo {
   createByName?: string;
   createByNameLike?: string;
   createTime?: Array<LocalDateTime>;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   detailText?: string;
@@ -4404,10 +4300,6 @@ export interface UserAddressListRequest {
 export interface UserCenterInfoRequest {
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -4435,10 +4327,6 @@ export interface UserCenterInfoRequest {
 export interface UserDetailRequest {
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -4464,10 +4352,6 @@ export interface UserDetailRequest {
 export interface UserListRequest {
   createByName?: string;
   createByNameLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /**
@@ -4804,10 +4688,6 @@ export interface InvoiceReissueRecord {
   createDatetimeLe?: string;
   /** @format date-time */
   createTime?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -5172,10 +5052,6 @@ export interface SalesRechargePrepaymentRequest {
    * @format date-time
    */
   createTimeEndTime?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /**
@@ -15053,6 +15053,60 @@ export const postServiceConstClientWay = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description response type for postServiceConstCompanyType */
+export interface PostServiceConstCompanyTypeResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceConstCompanyTypeResponseSuccess =
+  PostServiceConstCompanyTypeResponse[200];
+/**
+ * @description
+ *   单位类型
+ * @tags front-const-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceConstCompanyType = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/const/companyType';
+  function request(): Promise<PostServiceConstCompanyTypeResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+    }) as unknown as Promise<PostServiceConstCompanyTypeResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description response type for postServiceConstGetPayeeEnum */
 export interface PostServiceConstGetPayeeEnumResponse {
   /**
@@ -15575,6 +15629,60 @@ export const postServiceConstNotCanModifyInvoiceRecordStatus =
     return request;
   })();
+/** @description response type for postServiceConstOrderSource */
+export interface PostServiceConstOrderSourceResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceConstOrderSourceResponseSuccess =
+  PostServiceConstOrderSourceResponse[200];
+/**
+ * @description
+ *   订单类型
+ * @tags front-const-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceConstOrderSource = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/const/orderSource';
+  function request(): Promise<PostServiceConstOrderSourceResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+    }) as unknown as Promise<PostServiceConstOrderSourceResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description response type for postServiceConstPayees */
 export interface PostServiceConstPayeesResponse {
   /**
@@ -15629,6 +15737,77 @@ export const postServiceConstPayees = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceConstPlatformType */
+export interface PostServiceConstPlatformTypeOption {
+  /**
+   * @description
+   *   companyType
+   */
+  query?: {
+    /**
+        @description
+          companyType */
+    companyType?: string;
+  };
+}
+
+/** @description response type for postServiceConstPlatformType */
+export interface PostServiceConstPlatformTypeResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceConstPlatformTypeResponseSuccess =
+  PostServiceConstPlatformTypeResponse[200];
+/**
+ * @description
+ *   平台类型
+ * @tags front-const-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceConstPlatformType = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/const/platformType';
+  function request(
+    option?: PostServiceConstPlatformTypeOption,
+  ): Promise<PostServiceConstPlatformTypeResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceConstPlatformTypeResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description response type for postServiceConstProcureReturnBills */
 export interface PostServiceConstProcureReturnBillsResponse {
   /**
@@ -15851,12 +16030,6 @@ export interface GetServiceInvoiceListInvoiceProjectOption {
     createByName?: string;
     createByNameLike?: string;
     /**
-        @format date-time */
-    createTimeGe?: string;
-    /**
-        @format date-time */
-    createTimeLe?: string;
-    /**
         @format int32 */
     current?: number;
     /**