From be408252d4fb7be84f853931ff19f97cf7120420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=AE=87=E8=88=AA?= <740464440@qq.com> Date: Thu, 30 Nov 2023 10:14:45 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E7=AC=AC=E4=BA=8C=E6=AC=A1=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=B9=BF=E5=91=8A=E7=AE=A1=E7=90=86bug(=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=92=8C=E6=9F=A5=E7=9C=8B=E6=97=B6=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E7=AD=89=E9=97=AE=E9=A2=98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParkingRecordModal/RecordReviewModal.jsx | 15 +++++--- .../ExceptionDeal/DealRecordAudit/index.jsx | 4 +++ .../ExceptionDeal/DealRecordList/index.jsx | 41 ++++++++++++++++++++-- .../ExceptionDeal/StartExceptionDeal/index.jsx | 4 +++ .../OperationSales/AdsMgm/loadable.jsx | 4 +-- 5 files changed, 59 insertions(+), 9 deletions(-) diff --git a/src/components/ParkingRecordModal/RecordReviewModal.jsx b/src/components/ParkingRecordModal/RecordReviewModal.jsx index a778746..61a26cc 100644 --- a/src/components/ParkingRecordModal/RecordReviewModal.jsx +++ b/src/components/ParkingRecordModal/RecordReviewModal.jsx @@ -18,6 +18,7 @@ const RecordReviewModal = (props) => { disabledAuditReason = false, onCancel, // 关闭弹框 onChangeSubmit, // 提交审核 + buttonLoad = false, // 提交/退回审核加载 carOutTimeColor="", // 车辆出场时间样式 } = props; // 默认数据 @@ -93,6 +94,7 @@ const RecordReviewModal = (props) => { const [getValueList, setGetValueList] = useState(4); // 变更项下拉框 const [adjustmentValue, setAdjustmentValue] = useState(1); // 调整基于选择框值 const [plateCalorData, setPlateCalorData] = useState([]); + const [loading, setLoading] = useState(false); // 提交/退回审核加载 // 获取车牌颜色数据 const $plateColor = () => { @@ -103,6 +105,7 @@ const RecordReviewModal = (props) => { // 关闭模态框 const $onCancelModal = () => { + if(loading) return; if (onCancel) onCancel(false); setResultData([]); setExpandedRowKeys([0]); @@ -157,6 +160,10 @@ const RecordReviewModal = (props) => { }; }, [data]); + useEffect(()=> { + setLoading(buttonLoad); + }, [buttonLoad]); + useEffect(() => { $plateColor(); }, []); @@ -413,17 +420,17 @@ const RecordReviewModal = (props) => { : null } {type == "处理" ? - + : null } {type== "审核" && !processView ? <> - - + + : null } - + diff --git a/src/pages/FinancialMgm/ExceptionDeal/DealRecordAudit/index.jsx b/src/pages/FinancialMgm/ExceptionDeal/DealRecordAudit/index.jsx index 15a4c83..85346b1 100644 --- a/src/pages/FinancialMgm/ExceptionDeal/DealRecordAudit/index.jsx +++ b/src/pages/FinancialMgm/ExceptionDeal/DealRecordAudit/index.jsx @@ -25,6 +25,7 @@ function DealRecordAudit() { const [recordReviewModal, setRecordReviewModal] = useState({open: false, data: []}); // 订单记录审核数据 const [processViewData, setProcessViewData] = useState({}); // 查看流程数据 const [auditSubmitId, setAuditSubmitId] = useState(""); // 提交 退回审核的id + const [buttonLoad, setButtonLoad] = useState(false); // 提交/退回审核加载 // 表格返回数据 const [resultData, setResultData] = useState({ @@ -227,11 +228,13 @@ function DealRecordAudit() { // 提交 退回审核 const $auditSubmit = (value) => { if(!value?.examine_reason) return message.error("处理理由不能为空！"); + setButtonLoad(true); let _data = { ...value, id: auditSubmitId, }; ajax.getStartExceptionExamineAbnormal(_data).then((res) => { + setButtonLoad(false); if (res.status == 20000 || res.status == 0) { message.success(res?.message || "提交审核成功"); setRecordReviewModal({open: false, data: []}); @@ -475,6 +478,7 @@ function DealRecordAudit() { setFormData({ ...formData, business_type: v || 0})} diff --git a/src/pages/FinancialMgm/ExceptionDeal/StartExceptionDeal/index.jsx b/src/pages/FinancialMgm/ExceptionDeal/StartExceptionDeal/index.jsx index 63e0913..541bbcf 100644 --- a/src/pages/FinancialMgm/ExceptionDeal/StartExceptionDeal/index.jsx +++ b/src/pages/FinancialMgm/ExceptionDeal/StartExceptionDeal/index.jsx @@ -32,6 +32,7 @@ function StartExceptionDeal() { const [parkingRecordModal, setParkingRecordModal] = useState({open: false, tableData: {}}); // 详情弹框 const [recordReviewModal, setRecordReviewModal] = useState({open: false, data: []}); // 订单记录审核数据 const [auditSubmitId, setAuditSubmitId] = useState([]); // 提交审核的id + const [buttonLoad, setButtonLoad] = useState(false); // 提交/退回审核加载 // 表格返回数据 const [resultData, setResultData] = useState({ total: 0, @@ -294,12 +295,14 @@ function StartExceptionDeal() { if(value?.examine_reason_id == 1 && !value?.update_value) return message.error("日期不能为空！"); if(value?.examine_reason_id == 2 && !value?.update_value) return message.error("车牌号不能为空！"); if(value?.examine_reason_id == 3 && !value?.update_value) return message.error("金额不能为空！"); + setButtonLoad(true); let _data = { ...value, id: auditSubmitId, change_content: value?.examine_reason_id || "", }; ajax.getStartExceptionSendAbnormal(_data).then((res) => { + setButtonLoad(false); if (res.status === 20000 || res.status == 0) { message.success(res?.message || "提交审核成功"); setRecordReviewModal({open: false, data: []}) @@ -559,6 +562,7 @@ function StartExceptionDeal() { {setRecordReviewModal({open: false, data: []})}} onChangeSubmit={$auditSubmit} diff --git a/src/pages/OperationCenter/OperationSales/AdsMgm/loadable.jsx b/src/pages/OperationCenter/OperationSales/AdsMgm/loadable.jsx index 92646f5..074ba21 100644 --- a/src/pages/OperationCenter/OperationSales/AdsMgm/loadable.jsx +++ b/src/pages/OperationCenter/OperationSales/AdsMgm/loadable.jsx @@ -290,7 +290,7 @@ function AdsMgm() { // 操作 const clickDropDown = (param, record) => { // console.log(param.key, record); - setRowData({...record, areaIds: record?.areaId?.split(',')}); + setRowData({...record, areaIds: record?.areaId}); if (param.key == "3") { // 下架 offItem(record?.advertId); @@ -379,6 +379,7 @@ function AdsMgm() { : "", advertId: postData?.advertId, title: postData?.title, + location: postData?.location }; // console.log(postData, newObj); setTabLoading(true); @@ -793,7 +794,6 @@ function AdsMgm() { useEffect(() => { setSessionAdsMgm({...formData}); }, [formData]); - console.log(rowData); return (
{/* 主页 */}