feat: 对接 待确认会员信息变更 相关

src/pages/member/common/schames/verifyComingSchema.ts

@@ -69,18 +69,6 @@ const verifyComingSchema: ISchema = {
                 },
               },
             },
-            source: {
-              type: 'string',
-              default: undefined,
-              enum: [],
-              'x-component-props': {
-                placeholder: '申请来源(全部)',
-                allowClear: true, 
-                style: {
-                  width: 160,
-                },
-              },
-            },
             submit: {
               'x-component': 'Submit',
               'x-mega-props': {

src/pages/member/memberPrVerifyChangeConfirm/detail.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-05-26 10:26:33
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-05-26 10:38:08
+ * @LastEditTime: 2021-06-04 14:26:56
  * @Description: 待确认会员变更详情
  */
 import React, { useState, useEffect } from 'react';
@@ -13,7 +13,7 @@ import {
 } from 'antd';
 import { usePageStatus } from '@/hooks/usePageStatus';
 import { PublicApi } from '@/services/api';
-import { GetMemberAbilityMaintenanceDetailBasicResponse } from '@/services/MemberApi';
+import { GetMemberModifyConfirmDetailResponse } from '@/services/MemberV2Api';
 import { 
   MEMBER_TYPE_CHANNEL_CORPORATE,
   MEMBER_TYPE_CHANNEL_INDIVIDUAL,
@@ -33,17 +33,16 @@ import MemberDocIncomingInfo from '../components/MemberDocIncomingInfo';
 import MemberDocQualification from '../components/MemberDocQualification';
 
 const MemberPrVerifyChangeConfirmDetail: React.FC<{}> = () => {
-  const { id, validateId } = usePageStatus();
-  const [memberInfo, setMemberInfo] = useState<GetMemberAbilityMaintenanceDetailBasicResponse>(null);
+  const { validateId } = usePageStatus();
+  const [memberInfo, setMemberInfo] = useState<GetMemberModifyConfirmDetailResponse>(null);
   const [infoLoading, setInfoLoaading] = useState(false);
 
   const getBasicInfo = () => {
-    if (!id || !validateId) {
+    if (!validateId) {
       return;
     }
     setInfoLoaading(true);
-    PublicApi.getMemberAbilityMaintenanceDetailBasic({
-      memberId: id, 
+    PublicApi.getMemberModifyConfirmDetail({
       validateId,
     }).then(res => {
       if (res.code === 1000) {
@@ -131,7 +130,7 @@ const MemberPrVerifyChangeConfirmDetail: React.FC<{}> = () => {
                 outerStatusName: memberInfo?.outerStatusName,
                 levelTag: memberInfo?.levelTag,
                 email: memberInfo?.email,
-                createTime: memberInfo?.createTime,
+                createTime: memberInfo?.registerTime,
               }}
               id="basicInfo"
             />
@@ -160,10 +159,11 @@ const MemberPrVerifyChangeConfirmDetail: React.FC<{}> = () => {
           {/* 入库信息 */}
           <Col span={24}>
             <MemberDocIncomingInfo
+              dataSource={memberInfo?.depositDetails}
               id="incomingInfo"
             />
           </Col>
-
+          
           {/* 资质证明 */}
           <Col span={24}>
             <MemberDocQualification

src/pages/member/memberPrVerifyChangeConfirm/index.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-05-26 10:26:20
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-05-26 10:37:57
+ * @LastEditTime: 2021-06-04 14:25:17
  * @Description: 待确认会员变更
  */
 import React, { useState, useRef } from 'react';
@@ -28,11 +28,10 @@ const formActions = createFormActions();
 
 const MemberPrVerifyChangeConfrim: React.FC<{}> = props => {
   const ref = useRef<any>({});
-  const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([]);
-  const [selectedList, setSelectList] = useState<any>([]);
+  const [selectedRowKeys, setSelectedRowKeys] = useState<number[]>([]);
 
   const handleJumpAudit = record => {
-    history.push(`/memberCenter/memberAbility/manage/memberPrVerifyChangeConfirm/verify?id=${record.memberId}&validateId=${record.validateId}`);
+    history.push(`/memberCenter/memberAbility/manage/memberPrVerifyChangeConfirm/verify?validateId=${record.validateId}`);
   };
 
   const defaultColumns = verifyComingColumn('/memberCenter/memberAbility/manage/memberPrVerifyChangeConfirm/detail').concat([
@@ -54,9 +53,8 @@ const MemberPrVerifyChangeConfrim: React.FC<{}> = props => {
   const [columns, columnsHandle] = useSpliceArray<ColumnType<any>>(defaultColumns);
 
   const rowSelection = {
-    onChange: (keys: any, rows: {}[]) => {
+    onChange: (keys: number[]) => {
       setSelectedRowKeys(keys);
-      setSelectList(rows);
     },
     selectedRowKeys: selectedRowKeys,
   };
@@ -72,7 +70,7 @@ const MemberPrVerifyChangeConfrim: React.FC<{}> = props => {
       payload.endDate = moment(+endDate).format('YYYY-MM-DD');
     }
 
-    const res = await PublicApi.getMemberAbilityMaintenancePage(payload);
+    const res = await PublicApi.getMemberModifyConfirmPage(payload);
 
     if (res.code === 1000) {
       return res.data;
@@ -81,7 +79,7 @@ const MemberPrVerifyChangeConfrim: React.FC<{}> = props => {
   };
 
   const handleBatch = () => {
-    if (!selectedList.length) {
+    if (!selectedRowKeys.length) {
       message.warning('未选择任何会员');
       return;
     }
@@ -90,9 +88,10 @@ const MemberPrVerifyChangeConfrim: React.FC<{}> = props => {
       icon: <QuestionCircleOutlined />,
       content: '确定要审核通过选中的会员吗？',
       onOk() {
-        const members = selectedList.map(item => ({ memberId: item.memberId, validateId: item.validateId }));
         return new Promise<void>((resolve, reject) => {
-          PublicApi.postMemberAbilityValidateCommitBatch(members)
+          PublicApi.postMemberModifyConfirmBatch({
+            validateIds: selectedRowKeys,
+          })
             .then(res => {
               if (res.code === 1000) {
                 ref.current.reload();
@@ -111,14 +110,13 @@ const MemberPrVerifyChangeConfrim: React.FC<{}> = props => {
 
   // 初始化高级筛选选项
   const fetchSearchItems = async () => {
-    const res = await PublicApi.getMemberAbilityValidateCommitPageitems();
+    const res = await PublicApi.getMemberModifyPageConditions();
     
     if (res.code === 1000) {
       const { data = {} }: any = res;
       const { 
         memberTypes = [], 
         roles = [], 
-        sources = [], 
       } = data;
 
       const memberTypeIndex = columns.findIndex((item) => item.dataIndex === 'memberTypeName');
@@ -139,13 +137,12 @@ const MemberPrVerifyChangeConfrim: React.FC<{}> = props => {
       return {
         memberTypeId: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
         roleId: roles.map(item => ({ label: item.roleName, value: item.roleId })),
-        source: sources.map(item => ({ label: item.text, value: item.id })),
       };
     }
     return {};
   };
 
-  const controllerBtns = (
+  const ControllerBtns = () => (
     <Space>
       <Button onClick={handleBatch}>
         批量审核通过
@@ -167,8 +164,8 @@ const MemberPrVerifyChangeConfrim: React.FC<{}> = props => {
           <NiceForm
             actions={formActions}
             onSubmit={values => ref.current.reload(values)}
-            expressionScope={{
-              controllerBtns,
+            components={{
+              ControllerBtns,
             }}
             effects={($, actions) => {
               useStateFilterSearchLinkageEffect(

src/pages/member/memberPrVerifyChangeConfirm/verify.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-05-26 10:26:37
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-05-26 10:49:39
+ * @LastEditTime: 2021-06-04 14:28:21
  * @Description: 确认会员变更
  */
 import React, { useState, useEffect } from 'react';
@@ -15,9 +15,10 @@ import {
 import {
   CheckCircleOutlined,
 } from '@ant-design/icons';
+import { history } from 'umi';
 import { usePageStatus } from '@/hooks/usePageStatus';
 import { PublicApi } from '@/services/api';
-import { GetMemberAbilityMaintenanceDetailBasicResponse } from '@/services/MemberApi';
+import { GetMemberModifyConfirmDetailResponse } from '@/services/MemberV2Api';
 import { 
   MEMBER_TYPE_CHANNEL_CORPORATE,
   MEMBER_TYPE_CHANNEL_INDIVIDUAL,
@@ -35,21 +36,21 @@ import MemberBasicInfo from '../components/MemberBasicInfo';
 import MemberChannelInfo from '../components/MemberChannelInfo';
 import MemberDocIncomingInfo from '../components/MemberDocIncomingInfo';
 import MemberDocQualification from '../components/MemberDocQualification';
-import VerifyModal from '../components/VerifyModal';
+import VerifyModal, { ValueType as VerifyData } from '../components/VerifyModal';
 
 const MemberPrVerifyChangeConfirmVerify: React.FC<{}> = () => {
-  const { id, validateId } = usePageStatus();
-  const [memberInfo, setMemberInfo] = useState<GetMemberAbilityMaintenanceDetailBasicResponse>(null);
+  const { validateId } = usePageStatus();
+  const [memberInfo, setMemberInfo] = useState<GetMemberModifyConfirmDetailResponse>(null);
   const [infoLoading, setInfoLoaading] = useState(false);
   const [visibleVerifyModal, setVisibleVerifyModal] = useState(false);
+  const [submitLoading, setSubmitLoading] = useState(false);
 
   const getBasicInfo = () => {
-    if (!id || !validateId) {
+    if (!validateId) {
       return;
     }
     setInfoLoaading(true);
-    PublicApi.getMemberAbilityMaintenanceDetailBasic({
-      memberId: id, 
+    PublicApi.getMemberModifyConfirmDetail({
       validateId,
     }).then(res => {
       if (res.code === 1000) {
@@ -68,8 +69,25 @@ const MemberPrVerifyChangeConfirmVerify: React.FC<{}> = () => {
     setVisibleVerifyModal(!!flag);
   };
 
-  const handleSubmit = () => {
-    console.log('表单提交')
+  const handleSubmit = (value: VerifyData) => {
+    setSubmitLoading(true);
+
+    PublicApi.postMemberModifyConfirm({
+      validateId,
+      ...value,
+    }, {
+      timeout: 0,
+    }).then(res => {
+      if (res.code !== 1000) {
+        return;
+      }
+      handleVisibleVerifyModal(false);
+      setTimeout(() => {
+        history.goBack();
+      }, 800);
+    }).finally(() => {
+      setSubmitLoading(false);
+    });
   };
 
   const anchorsArr = [
@@ -154,7 +172,7 @@ const MemberPrVerifyChangeConfirmVerify: React.FC<{}> = () => {
                 outerStatusName: memberInfo?.outerStatusName,
                 levelTag: memberInfo?.levelTag,
                 email: memberInfo?.email,
-                createTime: memberInfo?.createTime,
+                createTime: memberInfo?.registerTime,
               }}
               id="basicInfo"
             />
@@ -183,6 +201,7 @@ const MemberPrVerifyChangeConfirmVerify: React.FC<{}> = () => {
           {/* 入库信息 */}
           <Col span={24}>
             <MemberDocIncomingInfo
+              dataSource={memberInfo?.depositDetails}
               id="incomingInfo"
             />
           </Col>
@@ -211,6 +230,7 @@ const MemberPrVerifyChangeConfirmVerify: React.FC<{}> = () => {
       <VerifyModal
         visible={visibleVerifyModal}
         onClose={() => handleVisibleVerifyModal(false)}
+        submitLoading={submitLoading}
         onSubmit={handleSubmit}
       />
     </Spin>