Browse Source

fix():修改路内BUG

tags/PMS_Frontend_v1.0.5-develop
guoxin 1 year ago
parent
commit
e7aabbe742
  1. 1
      src/components/layout/Tabs/index.jsx
  2. 74
      src/pages/OperationCenter/ArrearsRecover/ArrearsCarTask/loadable.jsx
  3. 64
      src/pages/OperationCenter/ArrearsRecover/ArrearsTask/loadable.jsx

1
src/components/layout/Tabs/index.jsx

@ -35,6 +35,7 @@ export default function Tabs() {
const handleClose = (data, index) => { const handleClose = (data, index) => {
let _tabList = tabList.filter(item => { return item.name != data.name }) let _tabList = tabList.filter(item => { return item.name != data.name })
dispatch(setTabList(_tabList)) dispatch(setTabList(_tabList))
console.log(_tabList);
sessionStorage.setItem('tabList', JSON.stringify(_tabList)) sessionStorage.setItem('tabList', JSON.stringify(_tabList))
sessionStorage.removeItem(data.name + '_formData') sessionStorage.removeItem(data.name + '_formData')
sessionStorage.removeItem(data.name + '_formData1') sessionStorage.removeItem(data.name + '_formData1')

74
src/pages/OperationCenter/ArrearsRecover/ArrearsCarTask/loadable.jsx

@ -6,9 +6,10 @@ import {
} from '@/config/character.config.js' } from '@/config/character.config.js'
import "./index.scss"; import "./index.scss";
import moment from "moment"; import moment from "moment";
import { dictionary, utils } from "@/config/common";
import { SearchOutlined, DeleteOutlined } from '@ant-design/icons'; import { SearchOutlined, DeleteOutlined } from '@ant-design/icons';
import ajax from '@/services' import ajax from '@/services'
import { useSessionStorageState } from "ahooks"
// import { useSessionStorageState } from "ahooks"
function ArrearsCarTask(props) { function ArrearsCarTask(props) {
const [ajaxLoading, setAjaxLoading] = useState(false) const [ajaxLoading, setAjaxLoading] = useState(false)
const [resultData, setResultData] = useState({ const [resultData, setResultData] = useState({
@ -24,7 +25,7 @@ function ArrearsCarTask(props) {
if_call: '0', if_call: '0',
sms_recovery_count_min: '', sms_recovery_count_min: '',
sms_recovery_count_max: '', sms_recovery_count_max: '',
start_out_time: moment().format('YYYY-MM-DD 00:00:00'),
start_out_time: moment().subtract(30, 'days').startOf('day').format('YYYY-MM-DD 00:00:00'),
end_out_time: moment().format("YYYY-MM-DD 23:59:59"), end_out_time: moment().format("YYYY-MM-DD 23:59:59"),
pn: 1, pn: 1,
page_size: Number(pageSizeOptions[0]), // page_size: Number(pageSizeOptions[0]), //
@ -122,7 +123,7 @@ function ArrearsCarTask(props) {
title: '操作', title: '操作',
render: (text, record) => { render: (text, record) => {
return <> return <>
<a onClick={() => { amountDetail({ id: record.id, page_size: Number(pageSizeOptions[0]), pn: 1 }) }}>欠费详情</a>
<a onClick={() => { amountDetail({ id: record.car_id, page_size: Number(pageSizeOptions[0]), pn: 1 }) }}>欠费详情</a>
</> </>
}, },
}] }]
@ -215,9 +216,8 @@ function ArrearsCarTask(props) {
const [detailFormData, setDetailFormData] = useState(formData) const [detailFormData, setDetailFormData] = useState(formData)
const detailFormDataRef = useRef(formData) const detailFormDataRef = useRef(formData)
const amountDetail = (record) => { const amountDetail = (record) => {
// console.log(record);
console.log(getDetailData);
setGetDetailList(record) setGetDetailList(record)
console.log(record);
let data = { let data = {
...record ...record
} }
@ -227,7 +227,7 @@ function ArrearsCarTask(props) {
if (res.status === 20000) { if (res.status === 20000) {
setDetailVisible(true) setDetailVisible(true)
let resDataArr = res.data.list.map((item) => { let resDataArr = res.data.list.map((item) => {
item.key = item.id
item.key = item.car_id
return item return item
}) })
setGetDetail({ setGetDetail({
@ -255,7 +255,7 @@ function ArrearsCarTask(props) {
setAjaxLoading(false) setAjaxLoading(false)
if (res.status === 20000) { if (res.status === 20000) {
let resDataArr = res.data.list.map((item) => { let resDataArr = res.data.list.map((item) => {
item.key = item.id
item.key = item.car_id
return item return item
}) })
setResultData({ setResultData({
@ -382,7 +382,7 @@ function ArrearsCarTask(props) {
detailFormDataRef.current = Object.assign({}, detailFormData, { pn: pn, page_size: length }) detailFormDataRef.current = Object.assign({}, detailFormData, { pn: pn, page_size: length })
setTimeout(() => { setTimeout(() => {
console.log(pn); console.log(pn);
amountDetail({ pn: pn, page_size: length, id: getDetailList.id })
amountDetail({ pn: pn, page_size: length, id: getDetailList.car_id })
}, 500) }, 500)
} }
} }
@ -401,8 +401,10 @@ function ArrearsCarTask(props) {
} }
// //
const getSearchData = (data = formData) => { const getSearchData = (data = formData) => {
let regex2 = /^$|^[0-9]+$/;;
if (!regex2.test(formData.refund_amount_min) || !regex2.test(formData.refund_amount_max)) {
let regex2 = /^$|^[0-9]+$/;
if (formData.plate != '' && !utils?.validationPlate(formData.plate)) {
message.error('请输入完整的车牌号码')
} else if (!regex2.test(formData.refund_amount_min) || !regex2.test(formData.refund_amount_max)) {
message.error('欠费金额输入不正确,请重新输入') message.error('欠费金额输入不正确,请重新输入')
} else if (formData.refund_amount_max > formData.refund_amount_min) { } else if (formData.refund_amount_max > formData.refund_amount_min) {
message.error('欠费金额输入不正确,请重新输入') message.error('欠费金额输入不正确,请重新输入')
@ -418,32 +420,32 @@ function ArrearsCarTask(props) {
const [sessionTabList, setSessionTabList] = useSessionStorageState('ArrearsCarTask', {
value: {
}
})
useEffect(() => {
console.log(location)
if (sessionTabList && Object.values(sessionTabList).length > 0) {
setFormData({
plate: sessionTabList?.plate,
refund_amount_min: sessionTabList?.refund_amount_min,
refund_amount_max: sessionTabList?.refund_amount_max,
if_call: sessionTabList?.if_call,
sms_recovery_count_min: sessionTabList?.sms_recovery_count_min,
sms_recovery_count_max: sessionTabList?.sms_recovery_count_max,
start_out_time: sessionTabList?.start_out_time,
end_out_time: sessionTabList?.end_out_time,
pn: sessionTabList?.pn,
page_size: sessionTabList?.page_size,
})
}
}, [])
useEffect(() => {
setSessionTabList({
...formData
})
}, [formData])
// const [sessionTabList, setSessionTabList] = useSessionStorageState('ArrearsCarTask', {
// value: {
// }
// })
// useEffect(() => {
// console.log(location)
// if (sessionTabList && Object.values(sessionTabList).length > 0) {
// setFormData({
// plate: sessionTabList?.plate,
// refund_amount_min: sessionTabList?.refund_amount_min,
// refund_amount_max: sessionTabList?.refund_amount_max,
// if_call: sessionTabList?.if_call,
// sms_recovery_count_min: sessionTabList?.sms_recovery_count_min,
// sms_recovery_count_max: sessionTabList?.sms_recovery_count_max,
// start_out_time: sessionTabList?.start_out_time,
// end_out_time: sessionTabList?.end_out_time,
// pn: sessionTabList?.pn,
// page_size: sessionTabList?.page_size,
// })
// }
// }, [])
// useEffect(() => {
// setSessionTabList({
// ...formData
// })
// }, [formData])
useEffect(() => { useEffect(() => {
getData() getData()
}, []) }, [])

64
src/pages/OperationCenter/ArrearsRecover/ArrearsTask/loadable.jsx

@ -5,10 +5,11 @@ import {
pageSizeOptions pageSizeOptions
} from '@/config/character.config.js' } from '@/config/character.config.js'
import "./index.scss"; import "./index.scss";
import { dictionary, utils } from "@/config/common";
import moment from "moment"; import moment from "moment";
import { SearchOutlined, DeleteOutlined } from '@ant-design/icons'; import { SearchOutlined, DeleteOutlined } from '@ant-design/icons';
import ajax from '@/services' import ajax from '@/services'
import { useSessionStorageState } from "ahooks"
// import { useSessionStorageState } from "ahooks"
const { TextArea } = Input; const { TextArea } = Input;
function arrearsTask(props) { function arrearsTask(props) {
const [ajaxLoading, setAjaxLoading] = useState(false) const [ajaxLoading, setAjaxLoading] = useState(false)
@ -422,47 +423,40 @@ function arrearsTask(props) {
// //
const getSearchData = (data = formData) => { const getSearchData = (data = formData) => {
let regex2 = /^$|^[0-9]+$/;; let regex2 = /^$|^[0-9]+$/;;
if (!regex2.test(formData.recovery_amount) || !regex2.test(formData.amount)) {
message.error('欠费金额输入不正确,请重新输入')
} else if (formData.amount > formData.recovery_amount) {
message.error('欠费金额输入不正确,请重新输入')
} else if (!regex2.test(formData.recovery_order_num) || !regex2.test(formData.amount_order_num)) {
message.error('追缴次数输入不正确,请重新输入')
} else if (formData.amount_order_num > formData.recovery_order_num) {
message.error('追缴次数输入不正确,请重新输入')
if (formData.plate != '' && !utils?.validationPlate(formData.plate)) {
message.error('请输入完整的车牌号码')
} else { } else {
getData(data) getData(data)
} }
} }
const [sessionTabList, setSessionTabList] = useSessionStorageState('arrearsTask', {
value: {
}
})
useEffect(() => {
console.log(location)
if (sessionTabList && Object.values(sessionTabList).length > 0) {
setFormData({
audit_status: sessionTabList?.audit_status,
plate: sessionTabList?.plate,
recovery_amount: sessionTabList?.recovery_amount,
amount: sessionTabList?.amount,
if_call: sessionTabList?.if_call,
recovery_order_num: sessionTabList?.recovery_order_num,
amount_order_num: sessionTabList?.amount_order_num,
pn: sessionTabList?.pn,
page_size: sessionTabList?.page_size,
})
}
}, [])
useEffect(() => {
setSessionTabList({
...formData
})
}, [formData])
// const [sessionTabList, setSessionTabList] = useSessionStorageState('arrearsTask', {
// value: {
// }
// })
// useEffect(() => {
// console.log(location)
// if (sessionTabList && Object.values(sessionTabList).length > 0) {
// setFormData({
// audit_status: sessionTabList?.audit_status,
// plate: sessionTabList?.plate,
// recovery_amount: sessionTabList?.recovery_amount,
// amount: sessionTabList?.amount,
// if_call: sessionTabList?.if_call,
// recovery_order_num: sessionTabList?.recovery_order_num,
// amount_order_num: sessionTabList?.amount_order_num,
// pn: sessionTabList?.pn,
// page_size: sessionTabList?.page_size,
// })
// }
// }, [])
// useEffect(() => {
// setSessionTabList({
// ...formData
// })
// }, [formData])
useEffect(() => { useEffect(() => {
getData() getData()
}, []) }, [])

Loading…
Cancel
Save