From e7aabbe742be0233cb5b73bb1b8bbb09f976a041 Mon Sep 17 00:00:00 2001 From: guoxin Date: Wed, 20 Dec 2023 11:23:29 +0800 Subject: [PATCH] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=86=85BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/layout/Tabs/index.jsx | 1 + .../ArrearsRecover/ArrearsCarTask/loadable.jsx | 74 +++++++++++----------- .../ArrearsRecover/ArrearsTask/loadable.jsx | 64 +++++++++---------- 3 files changed, 68 insertions(+), 71 deletions(-) diff --git a/src/components/layout/Tabs/index.jsx b/src/components/layout/Tabs/index.jsx index 495f518..b4d2d0b 100644 --- a/src/components/layout/Tabs/index.jsx +++ b/src/components/layout/Tabs/index.jsx @@ -35,6 +35,7 @@ export default function Tabs() { const handleClose = (data, index) => { let _tabList = tabList.filter(item => { return item.name != data.name }) dispatch(setTabList(_tabList)) + console.log(_tabList); sessionStorage.setItem('tabList', JSON.stringify(_tabList)) sessionStorage.removeItem(data.name + '_formData') sessionStorage.removeItem(data.name + '_formData1') diff --git a/src/pages/OperationCenter/ArrearsRecover/ArrearsCarTask/loadable.jsx b/src/pages/OperationCenter/ArrearsRecover/ArrearsCarTask/loadable.jsx index 0aad166..891e300 100644 --- a/src/pages/OperationCenter/ArrearsRecover/ArrearsCarTask/loadable.jsx +++ b/src/pages/OperationCenter/ArrearsRecover/ArrearsCarTask/loadable.jsx @@ -6,9 +6,10 @@ import { } from '@/config/character.config.js' import "./index.scss"; import moment from "moment"; +import { dictionary, utils } from "@/config/common"; import { SearchOutlined, DeleteOutlined } from '@ant-design/icons'; import ajax from '@/services' -import { useSessionStorageState } from "ahooks" +// import { useSessionStorageState } from "ahooks" function ArrearsCarTask(props) { const [ajaxLoading, setAjaxLoading] = useState(false) const [resultData, setResultData] = useState({ @@ -24,7 +25,7 @@ function ArrearsCarTask(props) { if_call: '0', sms_recovery_count_min: '', 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"), pn: 1, page_size: Number(pageSizeOptions[0]), // 每页条数 @@ -122,7 +123,7 @@ function ArrearsCarTask(props) { title: '操作', render: (text, record) => { return <> - { amountDetail({ id: record.id, page_size: Number(pageSizeOptions[0]), pn: 1 }) }}>欠费详情 + { amountDetail({ id: record.car_id, page_size: Number(pageSizeOptions[0]), pn: 1 }) }}>欠费详情 }, }] @@ -215,9 +216,8 @@ function ArrearsCarTask(props) { const [detailFormData, setDetailFormData] = useState(formData) const detailFormDataRef = useRef(formData) const amountDetail = (record) => { - // console.log(record); - console.log(getDetailData); setGetDetailList(record) + console.log(record); let data = { ...record } @@ -227,7 +227,7 @@ function ArrearsCarTask(props) { if (res.status === 20000) { setDetailVisible(true) let resDataArr = res.data.list.map((item) => { - item.key = item.id + item.key = item.car_id return item }) setGetDetail({ @@ -255,7 +255,7 @@ function ArrearsCarTask(props) { setAjaxLoading(false) if (res.status === 20000) { let resDataArr = res.data.list.map((item) => { - item.key = item.id + item.key = item.car_id return item }) setResultData({ @@ -382,7 +382,7 @@ function ArrearsCarTask(props) { detailFormDataRef.current = Object.assign({}, detailFormData, { pn: pn, page_size: length }) setTimeout(() => { console.log(pn); - amountDetail({ pn: pn, page_size: length, id: getDetailList.id }) + amountDetail({ pn: pn, page_size: length, id: getDetailList.car_id }) }, 500) } } @@ -401,8 +401,10 @@ function ArrearsCarTask(props) { } //检索数据 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('欠费金额输入不正确，请重新输入') } else if (formData.refund_amount_max > formData.refund_amount_min) { 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(() => { getData() }, []) diff --git a/src/pages/OperationCenter/ArrearsRecover/ArrearsTask/loadable.jsx b/src/pages/OperationCenter/ArrearsRecover/ArrearsTask/loadable.jsx index f3f7f38..5a986f4 100644 --- a/src/pages/OperationCenter/ArrearsRecover/ArrearsTask/loadable.jsx +++ b/src/pages/OperationCenter/ArrearsRecover/ArrearsTask/loadable.jsx @@ -5,10 +5,11 @@ import { pageSizeOptions } from '@/config/character.config.js' import "./index.scss"; +import { dictionary, utils } from "@/config/common"; import moment from "moment"; import { SearchOutlined, DeleteOutlined } from '@ant-design/icons'; import ajax from '@/services' -import { useSessionStorageState } from "ahooks" +// import { useSessionStorageState } from "ahooks" const { TextArea } = Input; function arrearsTask(props) { const [ajaxLoading, setAjaxLoading] = useState(false) @@ -422,47 +423,40 @@ function arrearsTask(props) { //检索数据 const getSearchData = (data = formData) => { 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 { 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(() => { getData() }, [])