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

src/pages/house/edit/components/shareRecord.jsx

@@ -18,7 +18,7 @@ const header = (props) => {
   const {salesBatchId} = props.salesBatchId
 
   useEffect(() => {
-    getList({ pageNum: 1, pageSize: 10, salesBatchId : props.salesBatchId});
+    getList({ pageNum: 1, pageSize: 10, salesBatchId : salesBatchId});
   },[])
 
   // 查询列表
@@ -84,7 +84,7 @@ const header = (props) => {
   ];
   
   const changePageNum = (pageNumber) => {
-      getList({ pageNum: pageNumber, pageSize: 10, salesBatchId : props.salesBatchId, ...props.form.getFieldsValue() })
+      getList({ pageNum: pageNumber, pageSize: 10, salesBatchId : salesBatchId, ...props.form.getFieldsValue() })
   }
 
   // 提交事件
@@ -93,7 +93,7 @@ const handleSubmit = (e, props) => {
     props.form.validateFields((err, values) => {
       if (!err) {
         console.log('提交数据: ', values)
-        getList({ pageNum: 1, pageSize: 10, ...values, showType: 'banner' })
+        getList({ pageNum: 1, pageSize: 10, salesBatchId : salesBatchId,  ...values })
       }
     });
   }

src/pages/house/list/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, notification } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import router from 'umi/router';
 import moment from 'moment';
@@ -17,9 +17,9 @@ const header = props => {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [data, setData] = useState({ list: [], total: 0 })
   //   const [page, changePage] = useState({})
+  const [houseIdList, setHouseIdList] = useState([])
   const [time, setTime] = useState('')
 
-  //==========看这里-- 新功能都用house为中间单词，我已经创建好了，你只要修改list的指向链接就行，看完删除=========
   // 查询列表
   const getList = params => {
     request({ ...apis.house.taSalesBatch, params: { ...params } }).then(data => {
@@ -33,7 +33,7 @@ const header = props => {
     getList({ pageNum: 1, pageSize: 10 });
   }, [])
 
-  // 跳转到编辑商品
+  // 跳转到编辑
   const toAddHouse = rowData => () => {
     if(rowData) {
       router.push({
@@ -50,6 +50,30 @@ const header = props => {
     });
   }
 
+  function openNotificationWithIcon(type, message) {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  }
+
+  
+  const toDelBatch = rowData => () =>{
+    console.log(houseIdList, 'houseIdListhouseIdList')
+    if(houseIdList.length < 1){
+      openNotificationWithIcon('error', '请先选择需要删除的批次')
+      return
+    }
+    console.log(houseIdList,'houseIdListhouseIdList');
+    request({ ...apis.house.deleteTaSalesBatch, data: houseIdList, }).then((data) => {
+      message.info("操作成功")
+      getList({ pageNum: 1, pageSize: 10 });
+    }).catch((err) => {
+      // message.info(err.msg)
+    })
+  }
+
   const newQrcode = row => {
     const x = new XMLHttpRequest();
     const resourceUrl = row.qrCode
@@ -66,23 +90,6 @@ const header = props => {
     x.send();
   }
 
-  const getActivityDetail = (dynamicId) => () => {
-    router.push({
-      pathname: '/activity/detailActivity',
-      query: {
-        dynamicId,
-      },
-    });
-  }
-
-  const getJoinPeople = (dynamicId) => () => {
-    router.push({
-      pathname: '/activity/SignList',
-      query: {
-        dynamicId,
-      },
-    });
-  }
   /**
    *
    *
@@ -140,98 +147,17 @@ const header = props => {
     });
   }
 
-  const finishDynamic = row => {
-    Modal.confirm({
-      title: '活动会被强制结束，小程序端无法再发起或参与此活动，如果不想让客户看到活动，请再点击取消发布按钮',
-      okText: '确定',
-      cancelText: '取消',
-      onOk () {
-        request({ ...apis.activity.finish, data: { dynamicId: row.dynamicId, top: '' } }).then(data => {
-          console.log(data)
-          message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
-        }).catch(err => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
-      },
-    });
-  }
-
-  //   置顶
-  const topDynamic = row => () => {
-    const weight = Math.abs(row.weight - 1)
-    request({ ...apis.activity.weight, params: { dynamicId: row.dynamicId, weight } }).then(data => {
-      console.log(data)
-      message.info('操作成功！')
-      getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
-    }).catch(err => {
-      console.log(err)
-      message.info(err.msg || err.message)
-    })
-  }
-
-  //   推首页
-  const homeDynamic = row => () => {
-    const home = Math.abs(row.home - 1)
-    request({ ...apis.activity.home, params: { dynamicId: row.dynamicId, home } }).then(data => {
-      console.log(data)
-      message.info('操作成功！')
-      getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
-    }).catch(err => {
-      console.log(err)
-      message.info(err.msg || err.message)
-    })
-  }
-
-  const sendOrPublicDynamic = row => {
-    if (row.status === 1) {
-      cancelDynamic(row)
-    } else {
-      sendDynamic(row)
-    }
-  }
-
-  // 取消活动
-  const cancelDynamic = row => {
-    Modal.confirm({
-      title: '活动会在小程序端隐藏，后台可以继续编辑重新发布',
-      okText: '确认',
-      cancelText: '取消',
-      onOk() {
-        request({ ...apis.activity.cancel, urlData: { id: row.dynamicId } }).then(data => {
-          message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue()  })
-        }).catch(err => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
-      }
-    });
-  }
-
-  // 发布活动
-  const sendDynamic = row => {
-    Modal.confirm({
-      title: '确定发布吗？',
-      okText: '确认',
-      cancelText: '取消',
-      onOk() {
-        request({ ...apis.activity.send, urlData: { id: row.dynamicId } }).then(data => {
-          message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
-        }).catch(err => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
-      }
-    });
-  }
-
   const changePageNum = pageNumber => {
     getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
   }
 
+  const rowSelection = {
+    onChange: (selectedRowKeys, selectedRows) => {
+      console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
+      setHouseIdList(selectedRows)
+    },
+  };
+
   // 提交事件
   const handleSubmit = e => {
     e.preventDefault();
@@ -302,10 +228,13 @@ const header = props => {
             </Button>
         </Form.Item>
       </Form>
-      <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>
+      <AuthButton name="admin.salesBatch.add.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toAddHouse()}>新增</Button>
       </AuthButton>
-      <Table
+      <AuthButton name="admin.salesBatch.del" noRight={null}>
+        <Button type="primary" className={styles.addBtn} onClick={toDelBatch()} style={{marginLeft:'30px'}}>删除</Button>
+      </AuthButton>
+      <Table rowSelection={rowSelection}
        dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current}/>

src/services/apis.js

@@ -1114,6 +1114,11 @@ export default {
     method: 'put',
     action: 'admin.taHouseShare.put',
   },
+  deleteTaSalesBatch:{
+    url: `${prefix}/taSalesBatch`,
+    method: 'put',
+    action: 'admin.taHouseShare.put',
+  },
   taHousingResources: {
     method: 'GET',
     url: `${prefix}/taHousingResources`,