Browse Source

fix():修改路内bug

tags/PMS_V1.0.0_Alpha5
guoxin 1 year ago
parent
commit
d7260e04f1
  1. 3
      src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx
  2. 8
      src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx
  3. 18
      src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx

3
src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx

@ -29,6 +29,7 @@ import AuditModifyModal from "./AuditModifyModal";
function RoadConf() { function RoadConf() {
const navigate = useNavigate(); const navigate = useNavigate();
const [searchForm] = Form.useForm(); const [searchForm] = Form.useForm();
const columns = [ const columns = [
{ {
title: "序号", title: "序号",
@ -629,9 +630,9 @@ function RoadConf() {
onCancel={handleClose} onCancel={handleClose}
footer={false} footer={false}
className="handleCloseDetail" className="handleCloseDetail"
destroyOnClose={true}
> >
<ConfigRoad <ConfigRoad
handleDetail={handleDetail}
getRecordList={getRecordList} getRecordList={getRecordList}
> >
</ConfigRoad> </ConfigRoad>

8
src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx

@ -278,7 +278,7 @@ function StuffMgm(props) {
} }
console.log('region_id', findParents(getCanCaDer, record.region_id[0])); console.log('region_id', findParents(getCanCaDer, record.region_id[0]));
setGetEditData(Object.assign({}, getEditData, { setGetEditData(Object.assign({}, getEditData, {
region_id: findParents(getCanCaDer, record.region_id[0]),
region_id: record.region_id,
operatorid: record.operatorid, operatorid: record.operatorid,
code: record.code, code: record.code,
name: record.goods_name, name: record.goods_name,
@ -353,7 +353,7 @@ function StuffMgm(props) {
setAjaxLoading(true) setAjaxLoading(true)
let arr = data.region_id let arr = data.region_id
let newArr = arr[arr.length - 1]; let newArr = arr[arr.length - 1];
ajax.assetsList({ ...data, region_id: newArr }).then(res => {
ajax.assetsList({ ...data}).then(res => {
setAjaxLoading(false) setAjaxLoading(false)
if (res.status === 20000) { if (res.status === 20000) {
utils.tableScrollTop() utils.tableScrollTop()
@ -500,8 +500,7 @@ function StuffMgm(props) {
let arr = checkData.region_id let arr = checkData.region_id
let newArr = arr[arr.length - 1]; let newArr = arr[arr.length - 1];
let data = { let data = {
...checkData,
region_id: newArr
...checkData
} }
console.log(data); console.log(data);
if (checkData.region_id.length == []) { if (checkData.region_id.length == []) {
@ -555,7 +554,6 @@ function StuffMgm(props) {
let data = { let data = {
...getEditData, ...getEditData,
id: getId.id, id: getId.id,
region_id: newArr
} }
if (getEditData.region_id.length == []) { if (getEditData.region_id.length == []) {
message.error('请选择区域') message.error('请选择区域')

18
src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx

@ -204,10 +204,12 @@ function StaggeredMgm(props) {
const editModal = () => { const editModal = () => {
setEditVisible(false) setEditVisible(false)
setGetSaleMsg([infoData]) setGetSaleMsg([infoData])
setGetOperatorId('')
setGetCarMsg({ setGetCarMsg({
operator_id: '', operator_id: '',
road: '' road: ''
}) })
setGetRoadName([])
} }
// //
const getResetData = () => { const getResetData = () => {
@ -432,6 +434,12 @@ function StaggeredMgm(props) {
message.error('请输入错峰卡数量') message.error('请输入错峰卡数量')
return 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) { if (!infoArr[result]?.price) {
message.error('请输入销售价格') message.error('请输入销售价格')
return return
@ -465,6 +473,7 @@ function StaggeredMgm(props) {
const checkStaggeredBtn = () => { const checkStaggeredBtn = () => {
setCheckVisible(false) setCheckVisible(false)
setGetSaleMsg([infoData]) setGetSaleMsg([infoData])
setGetOperatorId('')
setGetCarMsg({ setGetCarMsg({
operator_id: '', operator_id: '',
road: '' road: ''
@ -515,10 +524,6 @@ function StaggeredMgm(props) {
} }
}) })
} }
const placeBtn = () => {
setEditVisible(false)
setGetSaleMsg([infoData])
}
const addplaceBtn = () => { const addplaceBtn = () => {
setAddVisible(false) setAddVisible(false)
setGetCarMsg({ setGetCarMsg({
@ -664,6 +669,7 @@ function StaggeredMgm(props) {
visible={checkVisible} visible={checkVisible}
onCancel={checkStaggeredBtn} onCancel={checkStaggeredBtn}
footer={null} footer={null}
destroyOnClose={true}
className="roadModal" className="roadModal"
> >
<div className="carTitle"> <div className="carTitle">
@ -836,6 +842,7 @@ function StaggeredMgm(props) {
<Modal <Modal
visible={addVisible} visible={addVisible}
onCancel={addplaceBtn} onCancel={addplaceBtn}
destroyOnClose={true}
footer={null} footer={null}
className="staggered-add" className="staggered-add"
> >
@ -1021,6 +1028,7 @@ function StaggeredMgm(props) {
<Modal <Modal
visible={editVisible} visible={editVisible}
onCancel={editModal} onCancel={editModal}
destroyOnClose={true}
footer={null} footer={null}
className="staggered-add" className="staggered-add"
> >
@ -1204,7 +1212,7 @@ function StaggeredMgm(props) {
<Button type="primary" className="submit colorBtn" onClick={() => { editStageredBtn() }}> <Button type="primary" className="submit colorBtn" onClick={() => { editStageredBtn() }}>
提交 提交
</Button> </Button>
<Button type="primary" className="cancel colorReset" onClick={() => { placeBtn() }}>
<Button type="primary" className="cancel colorReset" onClick={() => { editModal() }}>
取消 取消
</Button> </Button>
</div> </div>

Loading…
Cancel
Save