Merge branch 'master' of lizhiqi/yongxu-web into master

src/pages/ReportHomeManagement/check.tsx

@@ -64,6 +64,10 @@ const Check: React.FC<checkProps> = (props) => {
         <Descriptions.Item label="跟进人" span={2}>
           {data?.follow_people}
         </Descriptions.Item>
+        <Descriptions.Item label="报备人">{data?.created_name}</Descriptions.Item>
+        <Descriptions.Item label="所属公司" span={2}>
+          {data?.company}
+        </Descriptions.Item>
         <Descriptions.Item label="图片" span={3}>
           {handleImg()}
         </Descriptions.Item>

src/pages/ReportHomeManagement/index.tsx

@@ -181,7 +181,7 @@ const CommunityManagement: React.FC = () => {
   const toCheck = (record: any) => {
     queryReportHomeDetail(record.record_id).then((res) => {
       if (res?.code === 0) {
-        setCheckData(record);
+        setCheckData(res.data);
         setCheckVisible(true);
       }
     });

src/pages/ReportingManagement/check.tsx

@@ -98,6 +98,8 @@ const Check: React.FC<checkProps> = (props) => {
             : ''}
         </Descriptions.Item>
         <Descriptions.Item label="跟进人">{data?.follow_people}</Descriptions.Item>
+        <Descriptions.Item label="报备人">{data?.created_name}</Descriptions.Item>
+        <Descriptions.Item label="所属公司">{data?.company}</Descriptions.Item>
         <Descriptions.Item label="成功几率">{data?.success_probability}</Descriptions.Item>
         <Descriptions.Item label="成功几率分析" span={3}>
           {data?.success_probability_analysis}

src/pages/ReportingManagement/index.tsx

@@ -157,7 +157,7 @@ const ReportingManagement: React.FC = () => {
   const toCheck = (record: any) => {
     reportingDetailQuery(record.record_id).then((res) => {
       if (res?.code === 0) {
-        setCheckData(record);
+        setCheckData(res.data);
         setCheckVisible(true);
       }
     });

src/pages/setting/UserManagement/check.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { Descriptions, Modal, Image } from 'antd';
+import { Descriptions, Modal } from 'antd';
 import { queryUserDetail } from '@/services/setting';
 import moment from 'moment';
 
@@ -17,9 +17,7 @@ interface detailType {
   created_at: string;
   updated_at: string;
   status: string;
-  province: string;
-  city: string;
-  district: string;
+  districts: any;
 }
 
 /**
@@ -37,9 +35,7 @@ const Check: React.FC<userCheckPros> = (props) => {
     created_at: '',
     status: '',
     updated_at: '',
-    province: '',
-    city: '',
-    district: '',
+    districts: [],
   });
 
   useEffect(() => {
@@ -72,7 +68,7 @@ const Check: React.FC<userCheckPros> = (props) => {
           </span>
         </Descriptions.Item>
         <Descriptions.Item label="地区">
-          {dataDetail?.province}-{dataDetail?.city}-{dataDetail?.district}
+          {dataDetail?.districts.map((el: any) => el.district_name).join(', ')}
         </Descriptions.Item>
         <Descriptions.Item label="创建时间">
           {dataDetail?.created_at
@@ -84,9 +80,6 @@ const Check: React.FC<userCheckPros> = (props) => {
             ? moment(dataDetail?.updated_at).format('YYYY-MM-DD HH:ss:mm')
             : '暂无'}
         </Descriptions.Item>
-        <Descriptions.Item label="头像">
-          <Image width={100} src={dataDetail?.photo} />
-        </Descriptions.Item>
       </Descriptions>
     </Modal>
   );

src/pages/setting/UserManagement/edit.tsx

@@ -279,7 +279,10 @@ const Edit: React.FC<userEditPros> = (props) => {
               label="地区"
               rules={[{ required: true, message: '请选择地区' }]}
               initialValue={
-                detailData?.districts.map((item: any) => [item.province_id, item.district_id]) || []
+                detailData?.districts.map((item: any) => [
+                  item.province_id,
+                  ...(item.district_id ? [item.district_id] : []),
+                ]) || []
               }
             >
               <Cascader