feats

src/components/XForm/ImageListUpload.jsx

@@ -15,55 +15,68 @@ class ImageListUpload extends React.Component {
   };
 
   getFileList = () => {
-    return (this.props.value || []).map((img, inx) => ({ uid: inx, url: getImgURL(img), status: 'done' }))
-  }
+    return (this.props.value || []).map((img, inx) => ({
+      uid: inx,
+      url: getImgURL(img),
+      status: 'done',
+    }));
+  };
 
   handleCancel = () => this.setState({ previewVisible: false });
 
   handlePreview = async file => {
     this.setState({
-      previewImage: file.url ,
+      previewImage: file.url,
       previewVisible: true,
     });
   };
 
-  handleChange = (e) => {
-    if (e.file.status === "uploading") {
+  handleChange = e => {
+    if (e.file.status === 'uploading') {
       this.setState({ loading: true });
       return;
     }
-console.log(e,'handleChange')
+    console.log(e, 'handleChange');
     // const fileList = (this.props.value || []).filter(x => x != e.file.url);
     // this.props.onChange(fileList);
 
     // console.log('删除图片触发了', e.file)
     if (e.file.status === 'removed') {
-      console.log(e,'handleChange22')
-      const fileList = (this.props.value || []).filter(x => getImgURL(x) != e.file.url);
-      this.props.onChange(fileList);
+      console.log(e, 'handleChange22');
+
+      Modal.confirm({
+        title: '确认要删除该图片吗？',
+        okText: '确认',
+        okType: 'danger',
+        cancelText: '取消',
+        onOk() {
+          const fileList = (this.props.value || []).filter(x => getImgURL(x) != e.file.url);
+          this.props.onChange(fileList);
+        },
+      });
     }
 
-    if (e.file.status === "done") {
+    if (e.file.status === 'done') {
       this.setState({
         loading: false,
-      })
+      });
 
       if (e.file.response && e.file.response.url) {
         if (typeof this.props.onChange === 'function') {
-          const fileList = this.getFileList()
-          this.props.onChange([...fileList || [], e.file.response.url]);
+          const fileList = this.getFileList();
+          this.props.onChange([...(fileList || []), e.file.response.url]);
         }
       }
     }
   };
 
-  handleUploadSucess = (url) => {
+  handleUploadSucess = url => {
     this.setState({ loading: false });
     if (typeof this.props.onChange === 'function') {
       const fileList = this.props.value || [];
       this.props.onChange([...fileList, url]);
     }
-  }
+  };
 
   render() {
     const { previewVisible, previewImage } = this.state;
@@ -71,7 +84,10 @@ console.log(e,'handleChange')
 
     const uploadButton = (
       <div>
-        <Icon style={{ fontSize: '2em', color: '#aaa' }} type={this.state.loading ? "loading" : "plus"}  />
+        <Icon
+          style={{ fontSize: '2em', color: '#aaa' }}
+          type={this.state.loading ? 'loading' : 'plus'}
+        />
       </div>
     );
     return (
@@ -82,13 +98,14 @@ console.log(e,'handleChange')
           fileList={fileList}
           onPreview={this.handlePreview}
           onChange={this.handleChange}
-          { ...uploaderProps }
+          {...uploaderProps}
           onSuccess={this.handleUploadSucess}
         >
           {/* unlimited 表示上传无限制数量 */}
-          {(this.props.unlimited && uploadButton) || ((fileList || images).length >= 8 ? null : uploadButton)}
+          {(this.props.unlimited && uploadButton) ||
+            ((fileList || images).length >= 8 ? null : uploadButton)}
         </Upload>
-        <Modal visible={previewVisible} footer={null} onCancel={this.handleCancel}>
+        <Modal id={'ImageListUpload-preview'} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
           <img alt="example" style={{ width: '100%' }} src={getImgURL(previewImage)} />
         </Modal>
       </div>

src/pages/activity/groupRoomActivity/detail.jsx

@@ -31,7 +31,7 @@ const cancelPage = () => {
 
 const getSignList = dynamicId => {
   router.push({
-    pathname: '/activity/SignupActivity/registrationRecord',
+    pathname: '/activity/groupRoomActivity/registrationRecord',
     query: {
       dynamicId,
     },

src/pages/activity/lookHouseActivity/detail.jsx

@@ -31,7 +31,7 @@ const cancelPage = () => {
 
 const getSignList = dynamicId => {
   router.push({
-    pathname: '/activity/SignupActivity/registrationRecord',
+    pathname: '/activity/lookHouseActivity/registrationRecord',
     query: {
       dynamicId,
     },

src/pages/building/Edit/Apartment/Form.jsx

@@ -148,11 +148,11 @@ const AMForm = props => {
           rules: [{ validator: validMinNum }],
         })(<InputNumber precision={2} min={0} step={0.01} addonAfter="㎡" />)}
       </Form.Item>
-      <Form.Item label="使用面积">
+      {/* <Form.Item label="使用面积">
         {getFieldDecorator('insideArea', {
           rules: [{ validator: validMinNum }],
         })(<InputNumber precision={2} min={0} step={0.01} addonAfter="㎡" />)}
-      </Form.Item>
+      </Form.Item> */}
       <Form.Item label="权重" help="数值越大越靠前">
         {getFieldDecorator('orderNo', {
           rules: [{ validator: validMinNum }],

src/pages/building/Edit/Basic/form.js

@@ -72,7 +72,7 @@ export function saveData(formData) {
   //
   data.videoImage = videoImage ? [{ imgType: 'videoImage', url: data.videoImage, orderNo: 1 }] : []
   // 项目标签
-  data.tag = tag.map((item, _) => ({ tagName: item }))
+  data.tag = (tag || []).map((item, _) => ({ tagName: item }))
 
   const request = fetch(data.buildingId ? apis.building.updateBuilding : apis.building.addBuilding)
   return request({ data })

src/pages/building/Edit/Basic/index.jsx

@@ -173,28 +173,30 @@ const BuildingBasic = React.forwardRef((props, ref) => {
         </Form.Item>
         <FormGroupItem>
           <Form.Item label="文旅商办" help="是否将本项目归纳在【首页-文旅商办】中"  {...gourpItemLayout.ab.a}>
-            {getFieldDecorator('isCommerce')(<Switch />)}
+            {getFieldDecorator('isCommerce', { valuePropName: 'checked' })(<Switch />)}
           </Form.Item>
           <Form.Item label="近期开盘" help="本项目是否近期开盘" {...gourpItemLayout.ab.b}>
-            {getFieldDecorator('isRecentOpening')(<Switch />)}
+            {getFieldDecorator('isRecentOpening', { valuePropName: 'checked' })(<Switch />)}
           </Form.Item>
         </FormGroupItem>
         <Form.Item label="列表均价" help="项目列表展示价格，示例：约10000元/㎡、约1000万元/套起">
-          {getFieldDecorator('price')(<Input />)}
+          {getFieldDecorator('price', {
+              rules: [{ required: true, message: '请输入列表均价' }],
+          })(<Input />)}
         </Form.Item>
         <FormGroupItem>
-          <Form.Item label="开盘时间" {...gourpItemLayout.ab.a} >
+          <Form.Item label="开盘日期" {...gourpItemLayout.ab.a} >
             {getFieldDecorator('openingDate')(
-              <OpenTimePicker placeholder="请选择开盘时间" style={fullWidth} />
+              <OpenTimePicker placeholder="请选择开盘日期" style={fullWidth} />
             )}
           </Form.Item>
           <Form.Item label="电话" {...gourpItemLayout.ab.b } >
             {getFieldDecorator('tel')(<Input placeholder="手机或者座机号码" />)}
           </Form.Item>
         </FormGroupItem>
-        <Form.Item label="项目说明" >
+        {/* <Form.Item label="项目说明" >
           {getFieldDecorator('dynamic')(<Input placeholder="项目标签补充，不超过30个字" maxLength={30}/>)}
-        </Form.Item>
+        </Form.Item> */}
         {/* <Form.Item label="物业类型" >
           {getFieldDecorator('propertyType')(<Input />)}
         </Form.Item> */}
@@ -212,7 +214,17 @@ const BuildingBasic = React.forwardRef((props, ref) => {
         </Form.Item>
         <Form.Item label="项目标签" >
           {getFieldDecorator('tag')(
-            <Select mode="tags" placeholder="输入后选中" style={fullWidth} />
+            <Select mode='multiple' placeholder="项目标签" style={fullWidth}>
+            <Select.Option value="临地铁">临地铁</Select.Option>
+            <Select.Option value="改善盘">改善盘</Select.Option>
+            <Select.Option value="刚需盘">刚需盘</Select.Option>
+            <Select.Option value="配套成熟">配套成熟</Select.Option>
+            <Select.Option value="人车分流">人车分流</Select.Option>
+            <Select.Option value="康养社区">康养社区</Select.Option>
+            <Select.Option value="旅游地产">旅游地产</Select.Option>
+            <Select.Option value="品牌房企">品牌房企</Select.Option>
+            <Select.Option value="海外地产">海外地产</Select.Option>
+          </Select>,
           )}
         </Form.Item>
 
@@ -457,11 +469,11 @@ const BuildingBasic = React.forwardRef((props, ref) => {
             rules: [{ max: 30, message: '不超过30个字' }]
           })(<Input placeholder="不超过30个字" />)}
         </Form.Item>
-        {/* <Form.Item label="预售许可证" >
-          {getFieldDecorator('preSalePermit')(
-            <ImageUpload />,
-          )}
-        </Form.Item> */}
+        <Form.Item label="预售许可证" >
+          {getFieldDecorator('preSalePermit',{
+            rules: [{ max: 30, message: '不超过30个字' }]
+          })(<Input placeholder="不超过30个字" />)}
+        </Form.Item>
 
         <Form.Item label=" " colon={false}>
           <AuthButton name="building.detail.save">

src/pages/building/Edit/components/BuildingTypeDetail.jsx

@@ -20,7 +20,7 @@ const noBorderInput = {
 
 const BuildingTypeDetail = (props) => {
   const { title, dataset, form, visible, onClose, onSubmit } = props
-  const { getFieldDecorator, validateFieldsAndScroll } = form
+  const { getFieldDecorator, validateFieldsAndScroll,getFieldValue } = form
   const [priceType, setPriceType] = useState()
 
   const handleSubmit = () => {
@@ -78,7 +78,7 @@ const BuildingTypeDetail = (props) => {
             {getFieldDecorator('endPrice')(
               <Input placeholder="最高价" style={{width: 'calc(50% - 60px)', borderLeft: 0, borderRight: 0}} />
               )}
-            {<Input style={{...noBorderInput, width: '80px', textAlign: 'right'}} placeholder={priceUnit[priceType]} disabled />}
+            {<Input style={{...noBorderInput, width: '80px', textAlign: 'right'}} placeholder={priceUnit[getFieldValue('priceType')]} disabled  />}
           </Input.Group>
         </Item>
         <Item label="销售状态" {...formItemLayout}>

src/pages/building/Edit/components/OpenTimePicker.jsx

@@ -8,20 +8,20 @@ import { DatePicker } from 'antd';
  */
 export default (props) => {
   const { value, onChange, ...leftProps } = props;
-  const [val, setVal] = useState(value ? moment(value, 'YYYY-MM-DD HH:mm') : undefined);
+  const [val, setVal] = useState(value ? moment(value, 'YYYY-MM-DD') : undefined);
 
   const handelChange = (e) => {
     if (onChange) {
-      onChange(e ? e.format('YYYY-MM-DD HH:mm') : undefined);
+      onChange(e ? e.format('YYYY-MM-DD') : undefined);
     }
   }
 
   useEffect(() => {
-    setVal(value ? moment(value, 'YYYY-MM-DD HH:mm') : undefined);
+    setVal(value ? moment(value, 'YYYY-MM-DD') : undefined);
   }, [value])
 
   return (
-    <DatePicker value={val} showTime={{ format: 'HH:mm' }} format="YYYY-MM-DD HH:mm"  {...leftProps} onChange={handelChange} />
+    <DatePicker value={val} format="YYYY-MM-DD"  {...leftProps} onChange={handelChange} />
   )
 }
 

src/pages/channel/Channel/List/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useRef } from 'react';
-import { Button, message, Table, Card } from 'antd';
+import { Button, message, Table, Popconfirm } from 'antd';
 import router from 'umi/router';
 import QueryTable from '@/components/QueryTable';
 import AuthButton from '@/components/AuthButton';
@@ -154,9 +154,9 @@ export default function ChannelList(props) {
       align: 'center',
       render: (text, record) => (
         <AuthButton name="channel.delete" noRight={null}>
-          <Button type="link" onClick={() => onDelete(record)}>
-            删除
-          </Button>
+          <Popconfirm title="确定要进行删除操作 ?" onConfirm={() => onDelete(record)}>
+            <Button type="link">删除</Button>
+          </Popconfirm>
         </AuthButton>
       ),
     },

src/pages/channel/independentList/index.jsx

@@ -523,9 +523,9 @@ function body(props) {
                 </Button>
               </AuthButton>
               <AuthButton name="channel.disable" noRight={null}>
-                <Button type="link" onClick={() => onDelete(record)}>
-                  删除
-                </Button>
+                <Popconfirm title="确定要进行删除操作 ?" onConfirm={() => onDelete(record)}>
+                  <Button type="link">删除</Button>
+                </Popconfirm>
               </AuthButton>
             </>
           }
@@ -583,9 +583,9 @@ function body(props) {
         </Form.Item>
         <Form.Item style={{ position: 'absolute', right: '38px' }}>
           {/* <AuthButton name="admin.major.search" noRight={null}> */}
-            <Button type="primary" htmlType="submit">
-              搜索
-            </Button>
+          <Button type="primary" htmlType="submit">
+            搜索
+          </Button>
           {/* </AuthButton> */}
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
             重置

src/pages/customer/Customer/PublicCustomer/AssistConsultant/AssistConsultant.jsx

@@ -67,7 +67,7 @@ const AssistConsultant = props => {
     request({
       ...apis.customer.consultantAssist,
       urlData: { id: data.customerId },
-      data: { userId: record.userId, buildingId: data.buildingName || data.buildingId },
+      data: { userId: record.userId, buildingId:  data.buildingName || data.buildingId },
     })
       .then(res => {
         // eslint-disable-next-line no-unused-expressions

src/pages/customer/Customer/PublicCustomer/components/AssistConsultant.jsx

@@ -16,7 +16,8 @@ const AssistConsultant = props => {
 
   const [tableData, setTableData] = useState({});
   const [loading, setLoading] = useState(false);
-
+  const [buildingId, setBuildingId] = useState();
+  
   const openNotificationWithIcon = (type, message) => {
     notification[type]({
       message,
@@ -52,11 +53,12 @@ const AssistConsultant = props => {
 
   // 分页
   function onChange(pageNum) {
-    getList({ pageNumber: pageNum, pageSize: 5 });
+    getList({ pageNumber: pageNum, pageSize: 5,buildingId: buildingId||data.buildingId });
   }
 
   function changBuilding(buildingId) {
     if (buildingId) {
+      setBuildingId(buildingId)
       getList({ pageNumber: 1, pageSize: 5, buildingId: buildingId });
     }
   }
@@ -67,7 +69,7 @@ const AssistConsultant = props => {
     request({
       ...apis.customer.consultantAssist,
       urlData: { id: data.customerId },
-      data: { userId: record.userId, buildingId: data.buildingName || data.buildingId },
+      data: { userId: record.userId, buildingId: buildingId || data.buildingId },
     })
       .then(res => {
         // eslint-disable-next-line no-unused-expressions
@@ -141,7 +143,7 @@ const AssistConsultant = props => {
               </>
             )} */}
             {data?.buildingId == null && (
-              <BuildSelect onChange={e => changBuilding(e)} value={data?.buildingName} />
+              <BuildSelect onChange={e => changBuilding(e)} value={buildingId||data?.buildingId} />
             )}
             <Table
               dataSource={tableData.records}

src/pages/customer/Customer/PublicCustomer/index.jsx

@@ -201,11 +201,11 @@ const PublicCustomer = () => {
             </Button>
           </AuthButton>,
 
-          // <AuthButton name="customer.consultant.dispatch" noRight={null}>
-          //   <Button type="link" onClick={() => handShowModel(record, actionList.assistConsultant)}>
-          //     分配置业顾问
-          //   </Button>
-          // </AuthButton>,
+          <AuthButton name="customer.consultant.dispatch" noRight={null}>
+            <Button type="link" onClick={() => handShowModel(record, actionList.assistConsultant)}>
+              分配置业顾问
+            </Button>
+          </AuthButton>,
         ]),
       },
     ];

src/pages/news/list/List.jsx

@@ -18,8 +18,8 @@ export default props => {
   const [loading, setLoading] = useState(false);
   const [page, setPage] = useState({ current: 1, pageSize: 10 });
   const onPublish = useCallback(row => {
-    const buidingStatus = row.status === 1 ? 2 : 1;
-    request({ ...apis.building.updateStatus, data: { id: row.buildingId, status: buidingStatus } })
+    const newsStatus = row.newsStatus === 1 ? 0 : 1;
+    request({ ...apis.news.put, urlData: { id: row.newsId }, data: { ...row, newsStatus } })
       .then(() => {
         notification.success({ message: '操作成功' });
         setLoading(false);
@@ -43,7 +43,7 @@ export default props => {
 
   const onDelete = useCallback(row => {
     setLoading(true);
-    request({ ...apis.building.deleteBuilding, urlData: { id: row.buildingId } })
+    request({ ...apis.news.delete, urlData: { id: row.newsId } })
       .then(() => {
         notification.success({ message: '操作成功' });
         setLoading(false);

src/pages/staff/staff/Edit/index.jsx

@@ -74,7 +74,7 @@ const StaffEdit = props => {
     console.log(val, userId, '----------111------------');
     // val.institutionIdLis =  val?.institutionIdLis?.split(',')
     // console.log(val,userId,'----------------------')
-    if (val.loginName) {
+    if (!val.loginName) {
       val.loginName = val.phone;
     }