Browse Source

我的上报&业主巡查上报

release_0.0.4
liujiangyong 2 years ago
parent
commit
f66bb27e57
  1. 49
      weapp/src/packages/patrol/index.jsx
  2. 19
      weapp/src/packages/patrolView/index.jsx
  3. 23
      weapp/src/pages/user/index.jsx

49
weapp/src/packages/patrol/index.jsx

@ -9,6 +9,9 @@ import './index.scss';
import arrowIcon from '../../static/img/patrol/arrow-down.svg'; import arrowIcon from '../../static/img/patrol/arrow-down.svg';
const Index = () => { const Index = () => {
const userInfo = Taro.getStorageSync('userInfo') || {};
const isSuperAdmin = userInfo && userInfo.username === 'SuperAdmin' ? true : false
const router = useRouter() const router = useRouter()
const { params: { type } } = router const { params: { type } } = router
const isView = type === 'view' ? true : false const isView = type === 'view' ? true : false
@ -281,28 +284,30 @@ const Index = () => {
return ( return (
<View className='patrol'> <View className='patrol'>
<View className='report-type'> {
<View className='text'>上报类型</View> !isSuperAdmin &&
<RadioGroup onChange={handleTypeChange}> <View className='report-type'>
{ <View className='text'>上报类型</View>
typeList.map((item, i) => { <RadioGroup onChange={handleTypeChange}>
return ( {
<Radio typeList.map((item, i) => {
key={i} return (
value={item.value} <Radio
checked={item.checked} key={i}
className='radio' value={item.value}
color='#346FC2' checked={item.checked}
disabled={isView} className='radio'
> color='#346FC2'
{item.text} disabled={isView}
</Radio> >
) {item.text}
}) </Radio>
} )
</RadioGroup> })
</View> }
</RadioGroup>
</View>
}
<InputPicker <InputPicker
title='工程类型:' title='工程类型:'
placeholder='请选择工程类型' placeholder='请选择工程类型'

19
weapp/src/packages/patrolView/index.jsx

@ -1,5 +1,5 @@
import React, { useState, useEffect } from 'react' import React, { useState, useEffect } from 'react'
import Taro, { useDidShow } from '@tarojs/taro' import Taro, { useDidShow, useRouter } from '@tarojs/taro'
import { View, Picker, Input, Image } from '@tarojs/components' import { View, Picker, Input, Image } from '@tarojs/components'
import moment from 'moment' import moment from 'moment'
import './index.scss' import './index.scss'
@ -15,6 +15,10 @@ import conserveIcon from '../../static/img/patrolView/conserve.svg'
import conserveActiveIcon from '../../static/img/patrolView/conserve-active.svg' import conserveActiveIcon from '../../static/img/patrolView/conserve-active.svg'
function Index() { function Index() {
const userInfo = Taro.getStorageSync('userInfo') || {};
const router = useRouter()
const { params: { limit } } = router
const [isPatrol, setIsPatrol] = useState(true) const [isPatrol, setIsPatrol] = useState(true)
const [datePicker, setDatePicker] = useState(moment().format('YYYY-MM-DD')) const [datePicker, setDatePicker] = useState(moment().format('YYYY-MM-DD'))
const [listData, setListData] = useState([]) const [listData, setListData] = useState([])
@ -42,14 +46,17 @@ function Index() {
Taro.showLoading({ title: '加载中' }) Taro.showLoading({ title: '加载中' })
request.get( request.get(
getReportList(), getReportList(),
{ startTime: datePicker + ' 00:00:00', endTime: datePicker + ' 23:59:59' }, { startTime: datePicker + ' 00:00:00', endTime: datePicker + ' 23:59:59' }
{ hideErrorToast: true, hideLoading: true }
).then(res => { ).then(res => {
Taro.hideLoading() Taro.hideLoading()
if (res.statusCode == 200) { if (res.statusCode == 200) {
setListData(res.data) let { data } = res
setShowListData(res.data.filter(item => isPatrol ? item.reportType === 'patrol' : item.reportType === 'conserve')) if (limit === 'my') {
return res.data; data = data.filter(item => item.user.name === userInfo.name)
}
setListData(data)
setShowListData(data.filter(item => isPatrol ? item.reportType === 'patrol' : item.reportType === 'conserve'))
return data;
} else { } else {
dealError(res.data.message || '请求出错'); dealError(res.data.message || '请求出错');
} }

23
weapp/src/pages/user/index.jsx

@ -16,11 +16,24 @@ const { webUrl } = cfg;
const Index = ({ ...props }) => { const Index = ({ ...props }) => {
const userInfo = Taro.getStorageSync('userInfo') || {}; const userInfo = Taro.getStorageSync('userInfo') || {};
const isSuperAdmin = userInfo && userInfo.username === 'SuperAdmin' ? true : false
const changePassword = () => { const changePassword = () => {
Taro.navigateTo({ url: '/packages/changePassword/index' }) Taro.navigateTo({ url: '/packages/changePassword/index' })
} }
const toMyReport = () => {
Taro.navigateTo({
url: '/packages/patrolView/index?limit=my'
})
}
const toPatrolReport = () => {
Taro.navigateTo({
url: '/packages/patrol/index?type=edit'
})
}
const onLogout = () => { const onLogout = () => {
Taro.showModal({ Taro.showModal({
title: '提示', title: '提示',
@ -36,7 +49,7 @@ const Index = ({ ...props }) => {
} }
}) })
} }
return ( return (
<View className='page'> <View className='page'>
<View className='myBox'> <View className='myBox'>
@ -49,9 +62,11 @@ const Index = ({ ...props }) => {
</View> </View>
</View> </View>
<View className='box' onClick={() => goRedirect(1)}> <View className='box' onClick={isSuperAdmin ? toPatrolReport : toMyReport}>
<Image className='box-img' src={reportImg} /> <Image className='box-img' src={reportImg} />
<View className='box-txt'>我的填报</View> <View className='box-txt'>
{isSuperAdmin ? '巡查上报' : '我的上报'}
</View>
<Image className='img' src={moreImg} /> <Image className='img' src={moreImg} />
</View> </View>
@ -60,7 +75,7 @@ const Index = ({ ...props }) => {
<View className='box-txt'>修改密码</View> <View className='box-txt'>修改密码</View>
<Image className='img' src={moreImg} /> <Image className='img' src={moreImg} />
</View> </View>
<View className='logout' onClick={onLogout}>退出登录</View> <View className='logout' onClick={onLogout}>退出登录</View>
</View> </View>

Loading…
Cancel
Save