chenglb
/
PMS_Frontend_v1.0.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix():修改路内bug

tags/PMS_V1.0.0_Alpha5
guoxin 1 year ago
parent
48149bb5cf
commit
98413a8764
4 changed files with 177 additions and 69 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      src/pages/InRoadMgm/PersonMgm/Performance/CollectorWorkStat/loadable.jsx
  2. 35
      src/pages/InRoadMgm/PersonMgm/Performance/InspectorWorkStat/loadable.jsx
  3. 158
      src/pages/OperationCenter/ArrearsRecover/ArrearsTask/loadable.jsx
  4. 37
      src/pages/SystemMgm/RoleMgm/loadable.jsx

16
src/pages/InRoadMgm/PersonMgm/Performance/CollectorWorkStat/loadable.jsx
View File

@ -26,7 +26,9 @@ function CollectorWorkStat(props) {
job_status: '0',//在职状态
start_time: moment().subtract(30, 'days').startOf('day').format('YYYY-MM-DD') ,
end_time: moment().format('YYYY-MM-DD'),
pn:1,
page_size: Number(pageSizeOptions[0]), // 每页条数
type: typeTime
}
let dataTime={
start_time: moment().subtract(30, 'days').startOf('day').format('YYYY-MM') ,
@ -144,22 +146,22 @@ function CollectorWorkStat(props) {
getData({...data, pn: 1})
}
const setType = (v) => {
setTypeTime(v)
if (v === 'day') {
setFormData(parameter)
setFormData({
...parameter,
type: v
})
} else {
setFormData({
...parameter,
...dataTime
...dataTime,
type: v
})
}
}
useEffect(()=>{
console.log(formData);
},[formData])
console.log(typeTime);
const [getOperationName, setGetOperationName] = useState([])
const operationName = () => {
ajax.getAllOperator().then(res => {

35
src/pages/InRoadMgm/PersonMgm/Performance/InspectorWorkStat/loadable.jsx
View File

@ -24,13 +24,14 @@ function InspectorWorkStat(props) {
name: '',//登录名
operator_id: '0',//所属运营商
job_status: '0',//在职状态
start_time: moment().subtract(30, 'days').startOf('day').format('YYYY-MM-DD') ,
start_time: moment().subtract(30, 'days').startOf('day').format('YYYY-MM-DD'),
end_time: moment().format('YYYY-MM-DD'),
pn: 1,
page_size: Number(pageSizeOptions[0]), // 每页条数
type: typeTime
}
let dataTime={
start_time: moment().subtract(30, 'days').startOf('day').format('YYYY-MM') ,
let dataTime = {
start_time: moment().subtract(30, 'days').startOf('day').format('YYYY-MM'),
end_time: moment().format('YYYY-MM'),
}
const [formData, setFormData] = useState(parameter)
@ -120,8 +121,8 @@ function InspectorWorkStat(props) {
if (lastFormData.page_size === length) {
setFormData(Object.assign({}, formData, { pn: pn, page_size: length }))
setLastFormData(Object.assign({}, lastFormData, { pn: pn, page_size: length }))
lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn, page_size: length})
getData(Object.assign({}, formData, { pn: pn , page_size: length}))
lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn, page_size: length })
getData(Object.assign({}, formData, { pn: pn, page_size: length }))
}
}
//切换每页条数
@ -133,18 +134,22 @@ function InspectorWorkStat(props) {
}
//检索数据
const getSearchData = (data = formData) => {
setFormData(Object.assign({}, formData, { pn: 1}))
setFormData(Object.assign({}, formData, { pn: 1 }))
setLastFormData(Object.assign({}, lastFormData, { pn: 1 }))
getData({...data, pn: 1})
getData({ ...data, pn: 1 })
}
const setType = (v) => {
setTypeTime(v)
if (v === 'day') {
setFormData(parameter)
setFormData({
...parameter,
type: v
})
} else {
setFormData({
...parameter,
...dataTime
...dataTime,
type: v
})
}
}
@ -220,8 +225,8 @@ function InspectorWorkStat(props) {
end_time: dateString[1],
type: typeTime
})
}}
value={[moment(formData.start_time), moment(formData.end_time)]}
}}
value={[moment(formData.start_time), moment(formData.end_time)]}
/> :
<RangePicker picker="month" onChange={(value, dateString) => {
// let first =dateString[0].substr(0,7);
@ -237,14 +242,14 @@ function InspectorWorkStat(props) {
end_time: dateString[1],
type: typeTime
})
}}
value={[moment(formData.start_time), moment(formData.end_time)]}
}}
value={[moment(formData.start_time), moment(formData.end_time)]}
/>
}
</Space>
<div className="btnBox">
<Button type="primary" className="yisa-btn colorBtn" onClick={() => { getSearchData() }}>
查询
<Button type="primary" className="yisa-btn colorBtn" onClick={() => { getSearchData() }}>
查询
</Button>
</div>
</div>

158
src/pages/OperationCenter/ArrearsRecover/ArrearsTask/loadable.jsx
View File

@ -68,17 +68,14 @@ function arrearsTask(props) {
let result = [...deployListColumns];
return result;
}
//欠费详情列表
const handleDetailColumns = (tab) => {
let result = [...deployDetailColumns];
return result;
}
//重置数据
const getResetData = () => {
setFormData({
...parameter
})
getData({...parameter,pn: 1} )
getData({ ...parameter, pn: 1 })
}
//列表
const deployListColumns = [
@ -158,6 +155,16 @@ function arrearsTask(props) {
</div>
},
}]
const handleDetailColumns = () => {
let result = [...deployDetailColumns];
return result;
}
const handleColumns2 = () => {
let result = [...columns2];
return result;
}
const [getDetailList, setGetDetailList] = useState({})
const [getDetail, setGetDetail] = useState([])
const [getDetailData, seteGetDetailData] = useState({
@ -202,10 +209,13 @@ function arrearsTask(props) {
})
}
const [getStatus, setGetStatus] = useState(0)
const [getRecordList, setGetRecordList] = useState({})
console.log(getRecordList);
//查看详情
const checkDetail = (record) => {
console.log(record);
amountDetail(record)
setGetRecordList(record)
if (record.audit_status == 0) {
setGetStatus(1)
setDetailVisible(true)
@ -270,9 +280,72 @@ function arrearsTask(props) {
title: '欠费金额',
dataIndex: 'arrears_mount',
key: 'arrears_mount',
}]
},
{
title: '缴费时间',
dataIndex: 'pay_time',
key: 'pay_time',
},
{
title: '追缴金额',
dataIndex: 'recovery_mount',
key: 'recovery_mount',
}
]
//审核查看
const columns2 = [
{
title: "序号",
render: (text, record, index) => index + 1,
},
{
title: '订单ID',
dataIndex: 'park_id',
render: (text, record, index) => (
<div style={{ width: "150px", wordBreak: "break-all" }}>{record.park_id}</div>
)
},
{
title: '车牌号',
render: (text, record, index) => (
<div style={{ width: "100px", wordBreak: "break-all" }}>{record.plate}</div>
)
},
{
title: '欠费路段',
render: (text, record, index) => (
<div style={{ width: "100px", wordBreak: "break-all" }}>{record.road_name}</div>
)
},
{
title: '入场时间',
dataIndex: 'in_time',
render: (text, record, index) => (
<div style={{ width: "200px", wordBreak: "break-all" }}>{record.in_time}</div>
)
},
{
title: '出场时间',
dataIndex: 'out_time',
render: (text, record, index) => (
<div style={{ width: "200px", wordBreak: "break-all" }}>{record.out_time}</div>
)
},
{
title: '停车时长',
dataIndex: 'parking_duration',
render: (text, record, index) => (
<div style={{ width: "150px", wordBreak: "break-all" }}>{record.parking_duration}</div>
)
},
{
title: '欠费金额',
dataIndex: 'arrears_mount',
key: 'arrears_mount',
}
]
// 获取列表数据
const getData = (data = formData) => {
setAjaxLoading(true)
@ -316,7 +389,7 @@ function arrearsTask(props) {
let data = {
id: getRecord,
audit_status: type,
remark:[]
remark: []
}
ajax.getDeployTask(data).then(res => {
if (res.status === 20000) {
@ -564,13 +637,13 @@ function arrearsTask(props) {
</div>
<div className="timePicker ">
<div className="btnBox">
<Button type="primary" className="yisa-btn colorReset" onClick={() => { getResetData() }}>
<Button type="primary" className="yisa-btn colorReset" onClick={() => { getResetData() }}>
重置
</Button>
<Button type="primary" className="yisa-btn colorBtn" onClick={() => { getSearchData() }}>
查询
查询
</Button>
</div>
</div>
<div className="timePicker ">
@ -618,15 +691,29 @@ function arrearsTask(props) {
title='审核详情'
>
<ResultFlowResult ajaxLoad={ajaxLoading} resultData={getDetail.data ? getDetail.data : []}>
<Table
bordered
dataSource={getDetail.data}
columns={
handleDetailColumns()
}
pagination={false}
loading={ajaxLoading}
/>
{
getRecordList.audit_status === 1 ?
<Table
bordered
dataSource={getDetail.data}
columns={
handleDetailColumns()
}
pagination={false}
loading={ajaxLoading}
/> :
<Table
bordered
dataSource={getDetail.data}
columns={
handleColumns2()
}
pagination={false}
loading={ajaxLoading}
/>
}
<Pagination
className="pagination-common"
showTotal={() => `共 ${getDetail.total_records} 条`}
@ -671,15 +758,28 @@ function arrearsTask(props) {
title='欠费详情'
>
<ResultFlowResult ajaxLoad={ajaxLoading} resultData={getDetail.data ? getDetail.data : []}>
<Table
bordered
dataSource={getDetail.data}
columns={
handleDetailColumns()
}
pagination={false}
loading={ajaxLoading}
/>
{
getRecordList.audit_status === 1 ?
<Table
bordered
dataSource={getDetail.data}
columns={
handleDetailColumns()
}
pagination={false}
loading={ajaxLoading}
/> :
<Table
bordered
dataSource={getDetail.data}
columns={
handleColumns2()
}
pagination={false}
loading={ajaxLoading}
/>
}
<Pagination
className="pagination-common"
showTotal={() => `共 ${getDetail.total_records} 条`}

37
src/pages/SystemMgm/RoleMgm/loadable.jsx
View File

@ -135,7 +135,7 @@ function RoleMgm(props) {
console.log(arr);
setGetCheckVlue(true)
// getCheckValue
setGetImg({ ...getImg, auth: string })
setGetAdminId({ ...getAdminId, auth: string })
} else {
setCheckedKeys([])
}
@ -277,13 +277,13 @@ function RoleMgm(props) {
}
}]
//图片
const [getImg, setGetImg] = useState({
const [getAdminId, setGetAdminId] = useState({
remark: '',
name: '',
depart_id: '',
auth: ''
})
const [getAdminId, setGetAdminId] = useState({})
const [getAuthId, setGetAuthId] = useState({})
const [getDepart, setGetDepart] = useState([])
//编辑
@ -309,7 +309,7 @@ function RoleMgm(props) {
let num = strArr.map(Number)
setCheckedKeys(num)
let newArr = record.depart_arr.split(',')
// setGetImg(Object.assign({}, getImg, {
// setGetAdminId(Object.assign({}, getAdminId, {
// name: record.name,
// remark: record.remark,
// depart_id: newArr
@ -319,7 +319,7 @@ function RoleMgm(props) {
}
}
console.log(getImg);
console.log(getAdminId);
//所属类型
const [getPlateColor, setGetPlateColor] = useState([])
const plateColor = () => {
@ -455,20 +455,20 @@ function RoleMgm(props) {
const placeEditBtn = () => {
let arr = checkedKeys
let str = arr.toString()
let arrStr = getImg.depart_id
let arrStr = getAdminId.depart_id
let lastElement = arrStr[arrStr.length - 1];
let data = {
...getImg,
...getAdminId,
auth: str,
id: getAdminId.id,
depart_id: lastElement,
depart_arr: arrStr.toString()
}
if (getImg.name == "") {
if (getAdminId.name == "") {
message.error('角色名称不能为空')
return
} else if (getImg.depart_id == "") {
} else if (getAdminId.depart_id == "") {
message.error('请选择所属部门')
return
}
@ -479,7 +479,7 @@ function RoleMgm(props) {
getData(formData)
setGetGovernment(0)
setGetAuthId({})
setGetImg({
setGetAdminId({
remark: '',
name: '',
depart_id: '',
@ -727,8 +727,8 @@ function RoleMgm(props) {
value={getAdminId.name}
style={{ width: 260, marginLeft: 50 }}
onChange={(v) => {
setGetImg(
Object.assign({}, getImg, { name: v.target.value })
setGetAdminId(
Object.assign({}, getAdminId, { name: v.target.value })
);
}}
/>
@ -740,8 +740,8 @@ function RoleMgm(props) {
value={getAdminId.remark}
style={{ width: 260, marginLeft: 78 }}
onChange={(v) => {
setGetImg(
Object.assign({}, getImg, { remark: v.target.value })
setGetAdminId(
Object.assign({}, getAdminId, { remark: v.target.value })
);
}}
/>
@ -756,13 +756,14 @@ function RoleMgm(props) {
options={getPlateColor}
changeOnSelect
onChange={(v) => {
setGetImg(
Object.assign({}, getImg, { depart_id: v })
setGetAdminId(
Object.assign({}, getAdminId, { depart_id: v })
);
setGetAuthId({})
let arrStr = v
let lastElement = arrStr[arrStr.length - 1];
setGetGovernment(lastElement)
setGetDepart(v)
}}
fieldNames={{
label: 'name',
@ -779,8 +780,8 @@ function RoleMgm(props) {
style={{ width: 260, marginLeft: 14 }}
defaultSelectedKeys={checkedKeys}
onCheck={(checkedKeysValue, info) => {
setGetImg(
Object.assign({}, getImg, { auth: checkedKeysValue })
setGetAdminId(
Object.assign({}, getAdminId, { auth: checkedKeysValue })
);
setCheckedKeys(checkedKeysValue)
}}

Write Preview
Loading…
Cancel
Save