feat: 课题组优化

曾国涛
1 parent 6b037d6d
Showing 6 changed files with 442 additions and 118 deletions
src/pages/ResearchGroup/components/AuditModal.tsx
src/pages/ResearchGroup/components/ResearchGroupAddModal.tsx
src/pages/ResearchGroup/constant.tsx
src/pages/ResearchGroup/index.tsx
src/services/definition.ts
src/services/request.ts
@@ -5,7 +5,7 @@ import { Button, Form, message } from &#39;antd&#39;;
 import { cloneDeep } from 'lodash';
  
 // import { cloneDeep } from 'lodash';
-export default ({ setVisible, ids, onClose }) => {
+export default ({ setVisible, ids, onClose, auditType }) => {
   const [form] = Form.useForm();
   let auditIds = cloneDeep(ids);
  
@@ -15,7 +15,7 @@ export default ({ setVisible, ids, onClose }) =&gt; {
   };
  
   const doAudit = async (values: any) => {
-    values.type = 'research_group_member_request_audit';
+    values.type = auditType;
     let res = await postCommonAudit({ data: values });
     if (res && res.result === RESPONSE_CODE.SUCCESS) {
       message.success(res.message);
@@ -337,13 +337,13 @@ export default ({ setVisible, researchGroupId, onClose }) =&gt; {
         <Spin spinning={modalLoading} tip="加载中...">
           <ProForm.Group>
             <ProFormText
-              name="group"
+              name="groupName"
               label="课题组名称"
               placeholder="请输入课题组名称"
               rules={[{ required: true, message: '请输入课题组名称' }]}
             />
             <ProFormSelect
-              name="leader"
+              name="leaderName"
               key="leader"
               width="lg"
               showSearch
@@ -352,6 +352,12 @@ export default ({ setVisible, researchGroupId, onClose }) =&gt; {
               rules={[{ required: true, message: '请输入课题组负责人' }]}
               options={salesCodeOptions}
             />
+            <ProFormText
+              name="companyName"
+              label="单位名称"
+              placeholder="请输入单位名称"
+              rules={[{ required: true, message: '请输入单位名称' }]}
+            />
           </ProForm.Group>
  
           <ProFormSelect
-import { enumToProTableEnumValue } from '@/utils';
+import { postServiceConstListResearchGroupsStatus } from '@/services';
+import { enumToProTableEnumValue, enumToSelect } from '@/utils';
+import { MessageTwoTone } from '@ant-design/icons';
+import { Space, Tooltip } from 'antd';
 export const AUDIT_STATUS_OPTIONS = {
   CREATED: '未审核',
   AUDIT_PASS: '审核通过',
@@ -28,12 +31,62 @@ export const RESEARCH_GROUP_COLUMNS = [
     },
   },
   {
+    title: '单位名称',
+    dataIndex: 'companyName',
+    key: 'companyName',
+    fieldProps: {
+      placeholder: '请输入单位名称',
+    },
+    hideInSearch: true,
+  },
+  {
+    title: '单位名称',
+    dataIndex: 'companyNameLike',
+    key: 'companyNameLike',
+    fieldProps: {
+      placeholder: '请输入单位名称',
+    },
+    hideInTable: true,
+  },
+  {
     title: '预存账号',
     dataIndex: 'accounts',
     key: 'accounts',
     hideInSearch: true,
   },
   {
+    title: '状态',
+    dataIndex: 'statusText',
+    key: 'statusText',
+    hideInSearch: true,
+    render: (_, record) => {
+      console.log('1111' + JSON.stringify(record));
+      return (
+        <>
+          <Space>
+            {record.statusText}
+            {record.statusNotes && (
+              <Tooltip title={record.statusNotes}>
+                <MessageTwoTone />
+              </Tooltip>
+            )}
+          </Space>
+        </>
+      );
+    },
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    key: 'status',
+    valueType: 'select',
+    request: async () => {
+      const groupStatus = await postServiceConstListResearchGroupsStatus();
+      return enumToSelect(groupStatus.data);
+    },
+    hideInTable: true,
+  },
+  {
     title: '预存手机号',
     dataIndex: 'accountPhone',
     key: 'accountPhone',
@@ -48,6 +48,7 @@ const PrepaidPage = () =&gt; {
     researchGroupMemberRequestAddModalVisible,
     setResearchGroupMemberRequestAddModalVisible,
   ] = useState(false);
+  const [auditType, setAuditType] = useState('');
   // const [checkVisible, setCheckVisible] = useState(false);
   const [accountInfo, setAccountInfo] = useState({
     realName: '',
@@ -244,55 +245,57 @@ const PrepaidPage = () =&gt; {
     let columns = RESEARCH_GROUP_COLUMNS.map((item) => {
       let newItem = { ...item };
       let dataIndex = item.dataIndex;
+      if (!newItem.render) {
+        newItem.render = (text, record, index) => {
+          let textValue = record[dataIndex];
+          if (dataIndex.endsWith('Time')) {
+            textValue = formatDateTime(textValue);
+          }
  
-      newItem.render = (text, record, index) => {
-        let textValue = record[dataIndex];
-
-        if (dataIndex.endsWith('Time')) {
-          textValue = formatDateTime(textValue);
-        }
-
-        if (dataIndex === 'members') {
-          return renderMembersCell(textValue);
-        }
+          if (dataIndex === 'members') {
+            return renderMembersCell(textValue);
+          }
  
-        if (dataIndex === 'accounts') {
-          return renderAccountsCell(textValue);
-        }
+          if (dataIndex === 'accounts') {
+            return renderAccountsCell(textValue);
+          }
  
-        if (dataIndex === 'index') {
-          textValue = index + 1;
-        }
+          if (dataIndex === 'index') {
+            textValue = index + 1;
+          }
  
-        if (
-          dataIndex === 'proofImages' &&
-          textValue !== null &&
-          textValue !== undefined
-        ) {
-          return (
-            <Image.PreviewGroup
-              className="mr-10"
-              preview={{
-                onChange: (current, prev) =>
-                  console.log(`current index: ${current}, prev index: ${prev}`),
-              }}
-            >
-              {textValue.map((item, index) => (
-                <React.Fragment key={index}>
-                  {index > 0 ? <Divider type="vertical" /> : ''}
-                  <Image
-                    className="max-h-[35px] max-w-[45px]"
-                    src={item}
-                    title={item}
-                  />{' '}
-                </React.Fragment>
-              ))}
-            </Image.PreviewGroup>
-          );
-        }
+          if (
+            dataIndex === 'proofImages' &&
+            textValue !== null &&
+            textValue !== undefined
+          ) {
+            return (
+              <Image.PreviewGroup
+                className="mr-10"
+                preview={{
+                  onChange: (current, prev) =>
+                    console.log(
+                      `current index: ${current}, prev index: ${prev}`,
+                    ),
+                }}
+              >
+                {textValue.map((item, index) => (
+                  <React.Fragment key={index}>
+                    {index > 0 ? <Divider type="vertical" /> : ''}
+                    <Image
+                      className="max-h-[35px] max-w-[45px]"
+                      src={item}
+                      title={item}
+                    />{' '}
+                  </React.Fragment>
+                ))}
+              </Image.PreviewGroup>
+            );
+          }
  
-        return <EllipsisDiv text={textValue} />;
-      };
+          return <EllipsisDiv text={textValue} />;
+        };
+      }
  
       return newItem;
     });
@@ -334,6 +337,22 @@ const PrepaidPage = () =&gt; {
             />,
           );
         }
+        if (record.paths?.includes('ADD_AUDIT')) {
+          btns.push(
+            <Button
+              key="audit"
+              className="p-0"
+              type="link"
+              onClick={async () => {
+                setAuditIds([record.id]);
+                setAuditModalVisible(true);
+                setAuditType('research_groups_add_audit');
+              }}
+            >
+              审核
+            </Button>,
+          );
+        }
         return btns;
       },
     });
@@ -447,6 +466,7 @@ const PrepaidPage = () =&gt; {
               type="link"
               onClick={async () => {
                 setAuditIds([record.id]);
+                setAuditType('research_group_member_request_audit');
                 setAuditModalVisible(true);
               }}
             >
@@ -732,7 +752,9 @@ const PrepaidPage = () =&gt; {
             setAuditModalVisible(false);
             setAuditIds([]);
             reloadMemberApplyTable();
+            researchGroupActionRef.current?.reload();
           }}
+          auditType={auditType}
         />
       )}
  
@@ -94,6 +94,11 @@ export interface AdminClientDto {
    *   单位地址
    */
   companyAddress?: string;
+  /**
+   * @description
+   *   单位地址
+   */
+  companyAddressText?: string;
   companyId?: string;
   /**
    * @description
@@ -2047,75 +2052,72 @@ export interface ReissueInvoiceDto {
   purchaser?: string;
 }
  
-export interface ResearchGroupAccountAddRequest {
+export interface ResearchGroupAddRequest {
+  accounts?: Array<ResearchGroupAccounts>;
   /**
    * @description
-   *   关联的账号id
-   * @format int64
+   *   单位名称
    */
-  accountId?: number;
+  companyName?: string;
   /**
    * @description
-   *   关联的账号名称
+   *   创建人
    */
-  accountName?: string;
+  createByName?: string;
   /**
    * @description
-   *   关联的账号手机号
+   *   创建时间
+   * @format date-time
    */
-  accountPhone?: string;
+  createTime?: string;
   /**
    * @description
-   *   课题组id
-   * @format int64
+   *   课题组名称
    */
-  groupId?: number;
-}
-
-export interface ResearchGroupAccountEditRequest {
+  groupName?: string;
   /**
    * @description
-   *   关联的账号id
+   *   主键id
    * @format int64
    */
-  accountId?: number;
+  id?: number;
   /**
    * @description
-   *   关联的账号名称
+   *   负责人
    */
-  accountName?: string;
+  leaderName?: string;
+  members?: Array<ResearchGroupMembers>;
   /**
    * @description
-   *   关联的账号手机号
+   *   操作
    */
-  accountPhone?: string;
+  paths?: Array<string>;
   /**
    * @description
-   *   课题组id
-   * @format int64
+   *   状态
    */
-  groupId?: number;
+  status?: string;
   /**
    * @description
-   *   主键id
-   * @format int64
+   *   冗余字段，当前状态备注
    */
-  id?: number;
-}
-
-export interface ResearchGroupAddRequest {
-  accounts?: Array<ResearchGroupAccountAddRequest>;
+  statusNotes?: string;
   /**
    * @description
-   *   课题组名称
+   *   状态文本
    */
-  group?: string;
+  statusText?: string;
   /**
    * @description
-   *   课题组负责人
+   *   上次修改人
    */
-  leader?: string;
-  members?: Array<ResearchGroupMemberAddRequest>;
+  updateByName?: string;
+  /**
+   * @description
+   *   上次修改时间
+   * @format date-time
+   */
+  updateTime?: string;
 }
  
 export interface ResearchGroupDeleteRequest {
@@ -2136,16 +2138,28 @@ export interface ResearchGroupDetailRequest {
 }
  
 export interface ResearchGroupEditRequest {
+  accounts?: Array<ResearchGroupAccounts>;
+  /**
+   * @description
+   *   单位名称
+   */
+  companyName?: string;
+  /**
+   * @description
+   *   创建人
+   */
+  createByName?: string;
   /**
    * @description
-   *   课题组预存账号
+   *   创建时间
+   * @format date-time
    */
-  accounts?: Array<ResearchGroupAccountEditRequest>;
+  createTime?: string;
   /**
    * @description
    *   课题组名称
    */
-  group?: string;
+  groupName?: string;
   /**
    * @description
    *   主键id
@@ -2154,14 +2168,41 @@ export interface ResearchGroupEditRequest {
   id?: number;
   /**
    * @description
-   *   课题组负责人
+   *   负责人
+   */
+  leaderName?: string;
+  members?: Array<ResearchGroupMembers>;
+  /**
+   * @description
+   *   操作
+   */
+  paths?: Array<string>;
+  /**
+   * @description
+   *   状态
+   */
+  status?: string;
+  /**
+   * @description
+   *   冗余字段，当前状态备注
+   */
+  statusNotes?: string;
+  /**
+   * @description
+   *   状态文本
    */
-  leader?: string;
+  statusText?: string;
+  /**
+   * @description
+   *   上次修改人
+   */
+  updateByName?: string;
   /**
    * @description
-   *   课题组成员集合
+   *   上次修改时间
+   * @format date-time
    */
-  members?: Array<ResearchGroupMemberEditRequest>;
+  updateTime?: string;
 }
  
 export interface ResearchGroupListRequest {
@@ -2170,6 +2211,11 @@ export interface ResearchGroupListRequest {
    *   预存账号手机号
    */
   accountPhone?: string;
+  /**
+   * @description
+   *   公司名称
+   */
+  companyNameLike?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -2181,6 +2227,11 @@ export interface ResearchGroupListRequest {
   groupName?: string;
   /**
    * @description
+   *   id
+   */
+  idIn?: Array<number>;
+  /**
+   * @description
    *   课题组负责人
    */
   leaderName?: string;
@@ -2202,26 +2253,33 @@ export interface ResearchGroupListRequest {
   total?: number;
 }
  
-export interface ResearchGroupMemberAddRequest {
+export interface ResearchGroupMemberRequestAddRequest {
   /**
    * @description
-   *   课题组ID
-   * @format int64
+   *   审核备注
    */
-  groupId?: number;
+  auditNotes?: string;
   /**
    * @description
-   *   成员名称
+   *   审核状态：CREATED-未审核 AUDIT_FAIL-审核不通过 AUDIT_PASS-审核通过
    */
-  memberName?: string;
+  auditStatus?: string;
   /**
    * @description
-   *   成员手机号
+   *   审核状态：CREATED-未审核 AUDIT_FAIL-审核不通过 AUDIT_PASS-审核通过
    */
-  memberPhone?: string;
-}
-
-export interface ResearchGroupMemberEditRequest {
+  auditStatusText?: string;
+  /**
+   * @description
+   *   创建人
+   */
+  createByName?: string;
+  /**
+   * @description
+   *   创建时间
+   * @format date-time
+   */
+  createTime?: string;
   /**
    * @description
    *   课题组ID
@@ -2230,10 +2288,16 @@ export interface ResearchGroupMemberEditRequest {
   groupId?: number;
   /**
    * @description
+   *   课题组名称
+   */
+  groupName?: string;
+  /**
+   * @description
    *   主键id
    * @format int64
    */
   id?: number;
+  logicDelete?: boolean;
   /**
    * @description
    *   成员名称
@@ -2244,26 +2308,33 @@ export interface ResearchGroupMemberEditRequest {
    *   成员手机号
    */
   memberPhone?: string;
-}
-
-export interface ResearchGroupMemberRequestAddRequest {
+  members?: Array<ResearchGroupMembers>;
   /**
    * @description
-   *   课题组ID
-   * @format int64
+   *   权限
    */
-  groupId?: number;
+  permissions?: Array<string>;
   /**
    * @description
-   *   课题组名称
+   *   申请备注
    */
-  groupName?: string;
-  members?: Array<ResearchGroupMemberAddRequest>;
+  requestNotes?: string;
   /**
    * @description
-   *   申请备注
+   *   申请类型：APPEND-新增 REMOVE-删除 MODIFY-修改
    */
-  requestNotes?: string;
+  requestType?: string;
+  /**
+   * @description
+   *   上次修改人
+   */
+  updateByName?: string;
+  /**
+   * @description
+   *   上次修改时间
+   * @format date-time
+   */
+  updateTime?: string;
 }
  
 export interface ResearchGroupMemberRequestDeleteRequest {
@@ -2286,6 +2357,32 @@ export interface ResearchGroupMemberRequestDetailRequest {
 export interface ResearchGroupMemberRequestEditRequest {
   /**
    * @description
+   *   审核备注
+   */
+  auditNotes?: string;
+  /**
+   * @description
+   *   审核状态：CREATED-未审核 AUDIT_FAIL-审核不通过 AUDIT_PASS-审核通过
+   */
+  auditStatus?: string;
+  /**
+   * @description
+   *   审核状态：CREATED-未审核 AUDIT_FAIL-审核不通过 AUDIT_PASS-审核通过
+   */
+  auditStatusText?: string;
+  /**
+   * @description
+   *   创建人
+   */
+  createByName?: string;
+  /**
+   * @description
+   *   创建时间
+   * @format date-time
+   */
+  createTime?: string;
+  /**
+   * @description
    *   课题组ID
    * @format int64
    */
@@ -2301,6 +2398,7 @@ export interface ResearchGroupMemberRequestEditRequest {
    * @format int64
    */
   id?: number;
+  logicDelete?: boolean;
   /**
    * @description
    *   成员名称
@@ -2313,9 +2411,30 @@ export interface ResearchGroupMemberRequestEditRequest {
   memberPhone?: string;
   /**
    * @description
+   *   权限
+   */
+  permissions?: Array<string>;
+  /**
+   * @description
    *   申请备注
    */
   requestNotes?: string;
+  /**
+   * @description
+   *   申请类型：APPEND-新增 REMOVE-删除 MODIFY-修改
+   */
+  requestType?: string;
+  /**
+   * @description
+   *   上次修改人
+   */
+  updateByName?: string;
+  /**
+   * @description
+   *   上次修改时间
+   * @format date-time
+   */
+  updateTime?: string;
 }
  
 export interface ResearchGroupMemberRequestsRequest {
@@ -2787,6 +2906,76 @@ export interface TsgFile {
   writable?: boolean;
 }
  
+export interface ResearchGroupAccounts {
+  /**
+   * @description
+   *   关联的账号id
+   * @format int64
+   */
+  accountId?: number;
+  /**
+   * @description
+   *   关联的账号名称
+   */
+  accountName?: string;
+  /**
+   * @description
+   *   关联的账号手机号
+   */
+  accountPhone?: string;
+  createByName?: string;
+  /** @format date-time */
+  createTime?: string;
+  /**
+   * @description
+   *   课题组id
+   * @format int64
+   */
+  groupId?: number;
+  /**
+   * @description
+   *   主键id
+   * @format int64
+   */
+  id?: number;
+  logicDelete?: boolean;
+  updateByName?: string;
+  /** @format date-time */
+  updateTime?: string;
+}
+
+export interface ResearchGroupMembers {
+  createByName?: string;
+  /** @format date-time */
+  createTime?: string;
+  /**
+   * @description
+   *   课题组ID
+   * @format int64
+   */
+  groupId?: number;
+  /**
+   * @description
+   *   主键id
+   * @format int64
+   */
+  id?: number;
+  logicDelete?: boolean;
+  /**
+   * @description
+   *   成员名称
+   */
+  memberName?: string;
+  /**
+   * @description
+   *   成员手机号
+   */
+  memberPhone?: string;
+  updateByName?: string;
+  /** @format date-time */
+  updateTime?: string;
+}
+
 export interface SalesRechargePrepaymentAuditRequest {
   /**
    * @description
@@ -10452,7 +10452,7 @@ export type PostResearchGroupMemberRequestsAddResponseSuccess =
 /**
  * @description
  *   新增申请信息
- * @tags research-group-member-requests-controller
+ * @tags research-group-request-controller
  * @produces *
  * @consumes application/json
  */
@@ -10523,7 +10523,7 @@ export type PostResearchGroupMemberRequestsDeleteResponseSuccess =
 /**
  * @description
  *   删除申请信息
- * @tags research-group-member-requests-controller
+ * @tags research-group-request-controller
  * @produces *
  * @consumes application/json
  */
@@ -10594,7 +10594,7 @@ export type PostResearchGroupMemberRequestsDetailResponseSuccess =
 /**
  * @description
  *   查询申请信息
- * @tags research-group-member-requests-controller
+ * @tags research-group-request-controller
  * @produces *
  * @consumes application/json
  */
@@ -10665,7 +10665,7 @@ export type PostResearchGroupMemberRequestsEditResponseSuccess =
 /**
  * @description
  *   编辑申请信息
- * @tags research-group-member-requests-controller
+ * @tags research-group-request-controller
  * @produces *
  * @consumes application/json
  */
@@ -10736,7 +10736,7 @@ export type PostResearchGroupMemberRequestsListResponseSuccess =
 /**
  * @description
  *   申请列表
- * @tags research-group-member-requests-controller
+ * @tags research-group-request-controller
  * @produces *
  * @consumes application/json
  */
@@ -11635,6 +11635,60 @@ export const postServiceConstClientLevels = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
+/** @description response type for postServiceConstListResearchGroupsStatus */
+export interface PostServiceConstListResearchGroupsStatusResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceConstListResearchGroupsStatusResponseSuccess =
+  PostServiceConstListResearchGroupsStatusResponse[200];
+/**
+ * @description
+ *   获取课题组状态
+ * @tags front-const-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceConstListResearchGroupsStatus = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/const/listResearchGroupsStatus';
+  function request(): Promise<PostServiceConstListResearchGroupsStatusResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+    }) as unknown as Promise<PostServiceConstListResearchGroupsStatusResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description response type for postServiceConstTradeStatus */
 export interface PostServiceConstTradeStatusResponse {
   /**