diff --git a/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx b/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx index 5260b77..d665b93 100644 --- a/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx +++ b/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx @@ -29,6 +29,7 @@ import AuditModifyModal from "./AuditModifyModal"; function RoadConf() { const navigate = useNavigate(); const [searchForm] = Form.useForm(); + const columns = [ { title: "序号", @@ -629,9 +630,9 @@ function RoadConf() { onCancel={handleClose} footer={false} className="handleCloseDetail" + destroyOnClose={true} > diff --git a/src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx b/src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx index 79bdf8e..278a703 100644 --- a/src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx +++ b/src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx @@ -278,7 +278,7 @@ function StuffMgm(props) { } console.log('region_id', findParents(getCanCaDer, record.region_id[0])); setGetEditData(Object.assign({}, getEditData, { - region_id: findParents(getCanCaDer, record.region_id[0]), + region_id: record.region_id, operatorid: record.operatorid, code: record.code, name: record.goods_name, @@ -353,7 +353,7 @@ function StuffMgm(props) { setAjaxLoading(true) let arr = data.region_id let newArr = arr[arr.length - 1]; - ajax.assetsList({ ...data, region_id: newArr }).then(res => { + ajax.assetsList({ ...data}).then(res => { setAjaxLoading(false) if (res.status === 20000) { utils.tableScrollTop() @@ -500,8 +500,7 @@ function StuffMgm(props) { let arr = checkData.region_id let newArr = arr[arr.length - 1]; let data = { - ...checkData, - region_id: newArr + ...checkData } console.log(data); if (checkData.region_id.length == []) { @@ -555,7 +554,6 @@ function StuffMgm(props) { let data = { ...getEditData, id: getId.id, - region_id: newArr } if (getEditData.region_id.length == []) { message.error('请选择区域') diff --git a/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx index 47e8d69..be7463a 100644 --- a/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx +++ b/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx @@ -204,10 +204,12 @@ function StaggeredMgm(props) { const editModal = () => { setEditVisible(false) setGetSaleMsg([infoData]) + setGetOperatorId('') setGetCarMsg({ operator_id: '', road: '' }) + setGetRoadName([]) } //重置数据 const getResetData = () => { @@ -432,6 +434,12 @@ function StaggeredMgm(props) { message.error('请输入错峰卡数量') return } + let reg = /^[1-9]\d*$/ + console.log(reg.test(infoArr[result]?.num)); + if (!reg.test(infoArr[result]?.num)) { + message.error('错峰卡数量只能输入正整数') + return + } if (!infoArr[result]?.price) { message.error('请输入销售价格') return @@ -465,6 +473,7 @@ function StaggeredMgm(props) { const checkStaggeredBtn = () => { setCheckVisible(false) setGetSaleMsg([infoData]) + setGetOperatorId('') setGetCarMsg({ operator_id: '', road: '' @@ -515,10 +524,6 @@ function StaggeredMgm(props) { } }) } - const placeBtn = () => { - setEditVisible(false) - setGetSaleMsg([infoData]) - } const addplaceBtn = () => { setAddVisible(false) setGetCarMsg({ @@ -616,22 +621,22 @@ function StaggeredMgm(props) {
- +
- 共检索到{resultData.total_records}条结果 - + 共检索到{resultData.total_records}条结果 +
@@ -836,6 +842,7 @@ function StaggeredMgm(props) { @@ -1021,6 +1028,7 @@ function StaggeredMgm(props) { @@ -1204,7 +1212,7 @@ function StaggeredMgm(props) { -