Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into v3.5.1

src/pages/building/list/add/components/base.jsx

@@ -55,6 +55,24 @@ function AddBuilding(props) {
       }
   }, [buildingId])
 
+  useEffect(() => {
+    setPoiTagValue()
+  }, [poi])
+
+
+  // 把地图设置在的数据设置在 tag控件上 上
+  function setPoiTagValue() {
+    if (poi) {
+      console.log('poi: ', poi)
+   
+      
+      poi.map(x => {
+        // console.log('x.data: ', JSON.parse(x.data))
+        setFormMapScopeTagValue(x.key, { data: JSON.parse(x.data) })
+      })
+    }
+  }
+
    // 获取详情信息
    function getById(currentId) {
     request({ ...apis.building.buildingGetById, urlData: { id: currentId } }).then(res => {
@@ -71,7 +89,8 @@ function AddBuilding(props) {
       res.avatarImage = res.buildingImg.map(item => item.url)
       
       if (res.buildingListImg) {
-        res.listImage = res.buildingListImg.map(item => item.url)
+        // res.listImage = res.buildingListImg.map(item => item.url)
+        res.listImage = res.buildingListImg.map(item => item.url)[0]
       }
       res.mapCoordinate = res.coordinate
       if (res.videoUrl) {
@@ -81,8 +100,35 @@ function AddBuilding(props) {
       if (res.videoImage) {
         res.videoImage = res.videoImage[0].url
       }
-      // setPoi(res.mapJson || [])
+      if (res.buildingTransport) {
+        const arr = res.buildingTransport.split(',')
+        res.buildingTransport = arr.map(x => ({ tagName: x, delete: true }))
+      }
+      if (res.buildingMall) {
+        const arr = res.buildingMall.split(',')
+        res.buildingMall = arr.map(x => ({ tagName: x, delete: true }))
+      }
+      if (res.buildingEdu) {
+        const arr = res.buildingEdu.split(',')
+        res.buildingEdu = arr.map(x => ({ tagName: x, delete: true }))
+      }
+      if (res.buildingHospital) {
+        const arr = res.buildingHospital.split(',')
+        res.buildingHospital = arr.map(x => ({ tagName: x, delete: true }))
+      }
+      if (res.buildingBank) {
+        const arr = res.buildingBank.split(',')
+        res.buildingBank = arr.map(x => ({ tagName: x, delete: true }))
+      }
+      if (res.buildingRestaurant) {
+        const arr = res.buildingRestaurant.split(',')
+        res.buildingRestaurant = arr.map(x => ({ tagName: x, delete: true }))
+      }
+
+      
       props.form.setFieldsValue(res)
+      // console.log('mapJson: ', JSON.parse(res.mapJson))
+      setPoi((res.mapJson && JSON.parse(res.mapJson)) || [])
       props.onSuccess(res)
     })
   }
@@ -107,7 +153,7 @@ function AddBuilding(props) {
     // 项目主图
     data.img = data.avatarImage && data.avatarImage.map((item, index) => ({ imgType: 'banner', url: item, orderNo: index + 1 }))
     // 列表图
-    data.listImg = data.listImage && data.listImage.map((item, index) => ({ imgType: 'list', url: item, orderNo: index + 1 }))
+    data.listImg = data.listImage && [{ imgType: 'list', url: data.listImage, orderNo: 1 }]
     if (data.videoUrl) {
       // console.log(data.videoUrl[0])
       data.videoUrl = data.videoUrl[0]
@@ -121,6 +167,25 @@ function AddBuilding(props) {
       data.videoImage = [{ imgType: 'videoImage', url: data.videoImage, orderNo: 1 }]
     }
 
+    if (data.buildingTransport) {
+      data.buildingTransport = data.buildingTransport.filter(f => f.delete === true).map(x => x.tagName).join(',')
+    }
+    if (data.buildingMall) {
+      data.buildingMall = data.buildingMall.filter(f => f.delete === true).map(x => x.tagName).join(',')
+    }
+    if (data.buildingEdu) {
+      data.buildingEdu = data.buildingEdu.filter(f => f.delete === true).map(x => x.tagName).join(',')
+    }
+    if (data.buildingHospital) {
+      data.buildingHospital = data.buildingHospital.filter(f => f.delete === true).map(x => x.tagName).join(',')
+    }
+    if (data.buildingBank) {
+      data.buildingBank = data.buildingBank.filter(f => f.delete === true).map(x => x.tagName).join(',')
+    }
+    if (data.buildingRestaurant) {
+      data.buildingRestaurant = data.buildingRestaurant.filter(f => f.delete === true).map(x => x.tagName).join(',')
+    }
+
     const api = data.buildingId === undefined ? apis.building.addBuilding : apis.building.updateBuilding
     request({ ...api, data: { ...data } }).then(res => {
       openNotificationWithIcon('success', '操作成功')
@@ -183,7 +248,7 @@ function AddBuilding(props) {
     })
     
     // 设置表单值
-    getFormMapScopeName(key, { data: poiArray })
+    setFormMapScopeTagValue(key, { data: poiArray })
 
     const poiData = [].concat(POI_TYPES)
     const newPoi = poiData.map(m => {
@@ -192,28 +257,37 @@ function AddBuilding(props) {
       }
       return m
     })
+    
     setPoi(newPoi)
+    return newPoi
   }
 
-  function getFormMapScopeName(keyType, item) {
+  function setFormMapScopeTagValue(keyType, item) {
+    const tag = item.data.map(t => ({ tagName: t.name, delete: false }))
     switch (keyType) {
       case POI_TYPES_KETY.Transport:
-        props.form.setFieldsValue({ buildingTransport: item.data.map(t => t.name).join(',') })
+        const buildingTransportValue = (props.form.getFieldValue('buildingTransport') || [])
+        props.form.setFieldsValue({ buildingTransport: tag.concat(buildingTransportValue) })
         return 'buildingTransport';
       case POI_TYPES_KETY.Bank:
-        props.form.setFieldsValue({ buildingBank: item.data.map(t => t.name).join(',') })
+        const buildingBankValue = (props.form.getFieldValue('buildingBank') || [])
+        props.form.setFieldsValue({ buildingBank: tag.concat(buildingBankValue) })
         return 'buildingBank';
       case POI_TYPES_KETY.Edu:
-        props.form.setFieldsValue({ buildingEdu: item.data.map(t => t.name).join(',') })
+        const buildingEduValue = (props.form.getFieldValue('buildingEdu') || [])
+        props.form.setFieldsValue({ buildingEdu: tag.concat(buildingEduValue) })
         return 'buildingEdu';
       case POI_TYPES_KETY.Hospital:
-        props.form.setFieldsValue({ buildingHospital: item.data.map(t => t.name).join(',') })
+        const buildingHospitalValue = (props.form.getFieldValue('buildingHospital') || [])
+        props.form.setFieldsValue({ buildingHospital: tag.concat(buildingHospitalValue) })
         return 'buildingHospital';
       case POI_TYPES_KETY.Restaurant:
-        props.form.setFieldsValue({ buildingRestaurant: item.data.map(t => t.name).join(',') })
+        const buildingRestaurantValue = (props.form.getFieldValue('buildingRestaurant') || [])
+        props.form.setFieldsValue({ buildingRestaurant: tag.concat(buildingRestaurantValue) })
         return 'buildingRestaurant';
       case POI_TYPES_KETY.Mall:
-        props.form.setFieldsValue({ buildingMall: item.data.map(t => t.name).join(',') })
+        const buildingMallValue = (props.form.getFieldValue('buildingMall') || [])
+        props.form.setFieldsValue({ buildingMall: tag.concat(buildingMallValue) })
         return 'buildingMall';
       default:
     }
@@ -312,7 +386,7 @@ function AddBuilding(props) {
             {getFieldDecorator('listImage', {
               rules: [{ required: true, message: '请选择列表图' }],
             })(
-              <ImageListUpload />,
+              <ImageUpload />,
             )}
           </Form.Item>
           {/* <Form.Item label="地址图片" help="建议图片尺寸：750px*455px">

src/pages/building/list/add/components/buildingImage.jsx

@@ -45,11 +45,13 @@ function ModalEdi(props) {
   function handleOk(e) {
     // console.log(e);
     props.onCancel();
+    props.form.resetFields();
   }
 
   function handleCancel(e) {
     // console.log(e);
     props.onCancel();
+    props.form.resetFields();
   }
 
   function handleSubmit(e) {
@@ -200,12 +202,21 @@ function BuildingImageModel(props) {
   }
 
   function deletePhoto() {
-    request({ ...apis.building.buildingApartmentDelete, urlData: { id: props.apartment.apartmentId } }).then(() => {
-      openNotificationWithIcon('success', '操作成功')
-      props.onSuccess()
-    }).catch(err => {
-
-    })
+    Modal.confirm({
+      title: '确认删除当前相册',
+      // content: 'Bla bla ...',
+      okText: '确认',
+      cancelText: '取消',
+      onOk: () => {
+        request({ ...apis.building.buildingApartmentDelete, urlData: { id: props.apartment.apartmentId } }).then(() => {
+          openNotificationWithIcon('success', '操作成功')
+          props.onSuccess()
+        }).catch(err => {
+    
+        })
+      },
+    });
+    
   }
 
   return (

src/pages/building/list/add/components/imageSet.jsx

@@ -131,7 +131,7 @@ function imageSet(props) {
       title: '创建时间',
       dataIndex: 'createDate',
       key: 'createDate',
-      render: (_, record) => <span>{ moment(record.createDate).format('YYYY-MM-DD') }</span>,
+      render: (_, record) => <span>{ moment(record.createDate).format('YYYY-MM-DD HH:mm:ss') }</span>,
     },
     {
       title: '操作',

src/pages/building/list/add/components/tags.jsx

@@ -11,7 +11,8 @@ class EditableTagGroup extends React.Component {
   getTags = () => {
     // (this.props.value || '').split(',')
     if (this.props.value) {
-      return this.props.value.split(',')
+      // return this.props.value.split(',')
+      return this.props.value
     }
 
     return []
@@ -19,12 +20,13 @@ class EditableTagGroup extends React.Component {
 
   toggleOnChange = tags => {
     if (typeof this.props.onChange === 'function') {
-      this.props.onChange(tags.join(','))
+      // this.props.onChange(tags.join(','))
+      this.props.onChange(tags)
     }
   }
 
   handleClose = removedTag => {
-    const tags = this.getTags().filter(tag => tag !== removedTag);
+    const tags = this.getTags().filter(tag => tag.tagName !== removedTag);
     // this.setState({ tags });
     this.toggleOnChange(tags)
   };
@@ -41,9 +43,11 @@ class EditableTagGroup extends React.Component {
     const { inputValue } = this.state;
 
     const tags = this.getTags()
-    if (inputValue && tags.indexOf(inputValue) === -1) {
+    const tagList = tags.map(x => x.tagName)
+    if (inputValue && tagList.indexOf(inputValue) === -1) {
       // 如果有新的值，就把这个值追加到 tags 原本值的后面，在通过onChange事件传递出去
-      this.toggleOnChange(tags.concat(inputValue))
+      console.log(tags.concat([{ tagName: inputValue, delete: true }]))
+      this.toggleOnChange(tags.concat([{ tagName: inputValue, delete: true }]))
     }
 
     this.setState({
@@ -62,12 +66,12 @@ class EditableTagGroup extends React.Component {
         {this.getTags().map((tag, index) => {
           const isLongTag = tag.length > 20;
           const tagElem = (
-            <Tag key={tag} closable onClose={() => this.handleClose(tag)}>
-              {isLongTag ? `${tag.slice(0, 20)}...` : tag}
+            <Tag key={`${tag.tagName}${index}`} closable={ tag.delete } onClose={() => this.handleClose(tag.tagName)}>
+              {isLongTag ? `${tag.slice(0, 20)}...` : tag.tagName}
             </Tag>
           );
           return isLongTag ? (
-            <Tooltip title={tag} key={tag}>
+            <Tooltip title={tag.tagName} key={`${tag.tagName}${index}`}>
               {tagElem}
             </Tooltip>
           ) : (

src/pages/customer/customerlist/index.jsx

@@ -366,7 +366,7 @@ function body(props) {
           </AuthButton>
             &nbsp;
           <AuthButton name="admin.mine.taPointsRecords.id.get" noRight={null}>
-            <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecommend(record.customerId)}>推荐客户</Button>
+            <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecommend(record.personId)}>推荐客户</Button>
           </AuthButton>
         </>
       ),