Merge branch 'fix-v2-220418' into 'v2-220418'

src/pages/member/memberVisitManage/index.tsx

@@ -10,7 +10,7 @@ import { createFormActions } from '@formily/antd';
 import moment from 'moment';
 import {
   GetMemberVisitListResponseDetail,
-  // getMemberVisitDelete,
+  postMemberVisitDelete,
   getMemberVisitList,
   getMemberVisitVisitTypeItems,
 } from '@/services/MemberV2Api';
@@ -44,24 +44,24 @@ const MemberVisitManageIndex: React.FC<{}> = props => {
   };
 
   const handleDeleteMemberVisitRecord = (record: GetMemberVisitListRequestResponse) => {
-    // if (record.id === deleteLoadingKey) {
-    //   return;
-    // }
-    // const msg = message.loading({
-    //   content: '正在删除，请稍候...',
-    //   duration: 0,
-    // });
-    // setDeleteLoadingKey(record.id);
-    // getMemberVisitDelete({
-    //   id: `${record.id}`,
-    // }).then((res) => {
-    //   if (res.code === 1000) {
-    //     polymericRef.current?.reload();
-    //   }
-    // }).finally(() => {
-    //   msg();
-    //   setDeleteLoadingKey(0);
-    // });
+    if (record.id === deleteLoadingKey) {
+      return;
+    }
+    const msg = message.loading({
+      content: '正在删除，请稍候...',
+      duration: 0,
+    });
+    setDeleteLoadingKey(record.id);
+    postMemberVisitDelete({
+      id: record.id,
+    }).then((res) => {
+      if (res.code === 1000) {
+        polymericRef.current?.reload();
+      }
+    }).finally(() => {
+      msg();
+      setDeleteLoadingKey(0);
+    });
   };
 
   const columns: ColumnType<GetMemberVisitListRequestResponse>[] = [

src/pages/member/memberVisitManage/memberVisitDetails.tsx

@@ -21,11 +21,11 @@ const MemberVisitDetails: React.FC<{}> = (props) => {
       id: id,
     }).then((res) => {
       if (res.code === 1000) {
-        const { memberId, visitorId, visitDate, visitAttachments, ...rest } = res.data;
+        const { memberId, visitorId, visitor, visitDate, visitAttachments, ...rest } = res.data;
         setMemberLevelDetails({
           ...rest,
           subMember: [{ memberId: memberId, name: rest.memberName }] as any[],
-          visitorMember: [{ userId: visitorId }] as any[],
+          visitorMember: [{ userId: visitorId, name: visitor }] as any[],
           visitDate: moment(visitDate).format('YYYY-MM-DD'),
           files: visitAttachments ? visitAttachments.map((item) => normalizeFiledata(item.url)) : [],
         });

src/pages/member/memberVisitManage/modifyMemberVisit.tsx

@@ -22,11 +22,11 @@ const ModifyMemberVisit: React.FC<{}> = (props) => {
       id: id,
     }).then((res) => {
       if (res.code === 1000) {
-        const { memberId, visitorId, visitDate, visitAttachments, ...rest } = res.data;
+        const { memberId, visitorId, visitor, visitDate, visitAttachments, ...rest } = res.data;
         setMemberLevelDetails({
           ...rest,
           subMember: [{ memberId: memberId, name: rest.memberName }] as any[],
-          visitorMember: [{ userId: visitorId }] as any[],
+          visitorMember: [{ userId: visitorId, name: visitor }] as any[],
           visitDate: moment(visitDate).format('YYYY-MM-DD'),
           files: visitAttachments ? visitAttachments.map((item) => normalizeFiledata(item.url)) : [],
         });