Sfoglia il codice sorgente

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

zhoulisen 5 anni fa
parent
commit
f782f249e0

+ 3
- 3
src/pages/channel/newCustomer/dataRecord.jsx Vedi File

8
 
8
 
9
 const dataRecord = props => {
9
 const dataRecord = props => {
10
     const [data, setData] = useState({})
10
     const [data, setData] = useState({})
11
-    const { targetId, targetType, channelId, targetName, buildingId, newCustomers } = props.location.query
11
+    const { targetId, targetType, channelId, targetName, buildingId, newCustomers, startDate, endDate } = props.location.query
12
 
12
 
13
     useEffect(() => {
13
     useEffect(() => {
14
         getList({ pageNum: 1, pageSize: 10 })
14
         getList({ pageNum: 1, pageSize: 10 })
16
     }, [])
16
     }, [])
17
 
17
 
18
     const getList = params => {
18
     const getList = params => {
19
-        request({ ...apis.channelList.newuserList, params: { ...params, targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId } }).then(data => {
19
+        request({ ...apis.channelList.newuserList, params: { ...params, targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId,startDate: startDate, endDate: endDate } }).then(data => {
20
             console.log(data,"dddddddddddd")
20
             console.log(data,"dddddddddddd")
21
           setData(data)
21
           setData(data)
22
         }).catch(e => {
22
         }).catch(e => {
71
     const exportExcel = () => {
71
     const exportExcel = () => {
72
         // const fieldsValue = getFieldsValue()
72
         // const fieldsValue = getFieldsValue()
73
         // console.log('fieldsValue', fieldsValue)
73
         // console.log('fieldsValue', fieldsValue)
74
-        request({ ...apis.channelList.newuserListExport, params: { targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId } })
74
+        request({ ...apis.channelList.newuserListExport, params: { targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId,startDate: startDate, endDate: endDate } })
75
           .then(data => {
75
           .then(data => {
76
             if (!data) {
76
             if (!data) {
77
               return
77
               return

+ 3
- 3
src/pages/channel/newCustomer/personNum.jsx Vedi File

17
 
17
 
18
 const dataRecord = props => {
18
 const dataRecord = props => {
19
       const [data, setData] = useState({})
19
       const [data, setData] = useState({})
20
-      const { targetId, targetType, channelId, targetName, buildingId, visitPersons } = props.location.query
20
+      const { targetId, targetType, channelId, targetName, buildingId, visitPersons, startDate, endDate } = props.location.query
21
 
21
 
22
     useEffect(() => {
22
     useEffect(() => {
23
         getList({ pageNum: 1, pageSize: 10 })
23
         getList({ pageNum: 1, pageSize: 10 })
26
 
26
 
27
     const getList = params => {
27
     const getList = params => {
28
         console.log(params)
28
         console.log(params)
29
-        request({ ...apis.channelList.personNumList, params: { ...params, targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId} }).then(data => {
29
+        request({ ...apis.channelList.personNumList, params: { ...params, targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId,startDate: startDate, endDate: endDate} }).then(data => {
30
           setData(data)
30
           setData(data)
31
         }).catch(e => {
31
         }).catch(e => {
32
           console.log(e)
32
           console.log(e)
80
     const exportExcel = () => {
80
     const exportExcel = () => {
81
         // const fieldsValue = getFieldsValue()
81
         // const fieldsValue = getFieldsValue()
82
         // console.log('fieldsValue', fieldsValue)
82
         // console.log('fieldsValue', fieldsValue)
83
-        request({ ...apis.channelList.personNumListExport, params: { targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId} })
83
+        request({ ...apis.channelList.personNumListExport, params: { targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId,startDate: startDate, endDate: endDate} })
84
           .then(data => {
84
           .then(data => {
85
             if (!data) {
85
             if (!data) {
86
               return
86
               return

+ 3
- 3
src/pages/channel/newCustomer/visitNum.jsx Vedi File

17
 
17
 
18
 const dataRecord = props => {
18
 const dataRecord = props => {
19
     const [data, setData] = useState({})
19
     const [data, setData] = useState({})
20
-    const { targetId, targetType, channelId, targetName, buildingId, visitNum } = props.location.query
20
+    const { targetId, targetType, channelId, targetName, buildingId, visitNum, startDate, endDate } = props.location.query
21
 
21
 
22
     useEffect(() => {
22
     useEffect(() => {
23
         getList({ pageNum: 1, pageSize: 10 })
23
         getList({ pageNum: 1, pageSize: 10 })
26
 
26
 
27
     const getList = params => {
27
     const getList = params => {
28
         console.log(params)
28
         console.log(params)
29
-        request({ ...apis.channelList.visitNumList, params: { ...params, targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId } }).then(data => {
29
+        request({ ...apis.channelList.visitNumList, params: { ...params, targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId,startDate: startDate, endDate: endDate } }).then(data => {
30
           console.log(data)
30
           console.log(data)
31
           setData(data)
31
           setData(data)
32
         }).catch(e => {
32
         }).catch(e => {
81
     const exportExcel = () => {
81
     const exportExcel = () => {
82
         // const fieldsValue = getFieldsValue()
82
         // const fieldsValue = getFieldsValue()
83
         // console.log('fieldsValue', fieldsValue)
83
         // console.log('fieldsValue', fieldsValue)
84
-        request({ ...apis.channelList.visitNumListExport, params: { targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId } })
84
+        request({ ...apis.channelList.visitNumListExport, params: { targetId: targetId,targetType: targetType,channelId: channelId,buildingId: buildingId,startDate: startDate, endDate: endDate } })
85
           .then(data => {
85
           .then(data => {
86
             if (!data) {
86
             if (!data) {
87
               return
87
               return