Merge remote-tracking branch 'origin/master' into zgt

# Conflicts: # src/services/definition.ts # src/services/request.ts

Merge remote-tracking branch 'origin/master' into zgt
# Conflicts: # src/services/definition.ts # src/services/request.ts
曾国涛
2 parents 79e282c5 702fac0f
Showing 3 changed files with 113 additions and 47 deletions
src/pages/ResearchGroup/components/AuditModal.tsx
src/pages/ResearchGroup/constant.tsx
src/pages/ResearchGroup/index.tsx
@@ -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);
-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: '审核通过',
@@ -37,12 +40,53 @@ export const RESEARCH_GROUP_COLUMNS = [
     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}
         />
       )}