From 48b0cd51b939a9b9c9f02be4f40e46e161eedaf6 Mon Sep 17 00:00:00 2001 From: guoxin Date: Fri, 5 Jan 2024 15:46:31 +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/TableModule/index.jsx | 2 +- .../BusinessMgm/SpecialRecord/loadable.jsx | 4 +- .../PersonMgm/Attendance/Fence/loadable.jsx | 27 ++++++------ .../PersonMgm/Attendance/ScheduleMgm/loadable.jsx | 2 + .../PersonMgm/Performance/SalesStat/loadable.jsx | 11 +++-- .../InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx | 6 ++- .../InRoadMgm/Stuff/CategroyConf/loadable.jsx | 2 +- .../Staggered/StaggeredMgm/loadable.jsx | 44 +++++++++++++------ src/pages/SystemMgm/AdminMgm/loadable.jsx | 1 + src/pages/SystemMgm/RoleMgm/loadable.jsx | 50 +++++++++++----------- 10 files changed, 87 insertions(+), 62 deletions(-) diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx index cb6236f..1c774b2 100644 --- a/src/components/TableModule/index.jsx +++ b/src/components/TableModule/index.jsx @@ -272,7 +272,7 @@ const TableModule = forwardRef((props, ref) => { setFormData({ ...searchForm.getFieldsValue(), plateValue: '' }) //search({ ...searchForm.getFieldsValue() }) setTimeGroup({ - timeType: '', + timeType: '1', timeRanges: { start_time: moment().subtract(1, "day").format('YYYY-MM-DD 00:00:00'), end_time: moment().format("YYYY-MM-DD 23:59:59"), diff --git a/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx b/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx index e8c6bc0..dc744a5 100644 --- a/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx +++ b/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx @@ -473,8 +473,8 @@ function CollectorWorkStat(props) { } else { fileList.map(res => { imgUrl.push(res.response?.data) - getImage.map(item => { - imgUrl.push(item) + getImage?.map(item => { + imgUrl?.push(item) }) }) } diff --git a/src/pages/InRoadMgm/PersonMgm/Attendance/Fence/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/Attendance/Fence/loadable.jsx index e542a6c..afeab8f 100644 --- a/src/pages/InRoadMgm/PersonMgm/Attendance/Fence/loadable.jsx +++ b/src/pages/InRoadMgm/PersonMgm/Attendance/Fence/loadable.jsx @@ -65,11 +65,11 @@ function Fence(props) { // } let res = []; if (options) { - let last = options[options.length - 1]; - if (last.children) { - addChild(last, res); - } - res.push(last.id); + let last = options[options.length - 1]; + if (last.children) { + addChild(last, res); + } + res.push(last.id); } console.log(res); setAreaSelectedList(res); @@ -157,7 +157,7 @@ function Fence(props) { key: 'attendDistance', render: (text, record) => { return <> -
{record.attendDistance == '1' ? '无电子围栏' : '指定范围'}
+
{record.attendmin == '' ? '无电子围栏' : record.attendmin + '米'}
} }, @@ -246,9 +246,9 @@ function Fence(props) { } //检索数据 const getSearchData = (data = formData) => { - setFormData(Object.assign({}, formData, { pn: 1})) + setFormData(Object.assign({}, formData, { pn: 1 })) setLastFormData(Object.assign({}, lastFormData, { pn: 1 })) - getData({...data, pn: 1}) + getData({ ...data, pn: 1 }) } //批量设置 const setUp = () => { @@ -283,7 +283,7 @@ function Fence(props) { setGetEditModal({ ...getEditModal, attendDistance: v }) setGetMap(v) if (v === '1') { - setGetEditModal({ ...getEditModal, attendDistance: v ,attendmin:''}) + setGetEditModal({ ...getEditModal, attendDistance: v, attendmin: '' }) } } //有效范围输入区间 @@ -317,8 +317,9 @@ function Fence(props) { console.log(reg.test(getModalData.attendmin)); if (getModalData.attendmin === '' && getStatus == '2') { message.error('请输入有效范围') - } else if (!reg.test(getModalData.attendmin)) { - message.error('有效范围输入区间为[100,2000]') + if (!reg.test(getModalData.attendmin)) { + message.error('有效范围输入区间为[100,2000]') + } } else if (getScopeValue === '2' && targetKeys.length === 0) { message.error('请选择停车场') } else { @@ -487,8 +488,8 @@ function Fence(props) {
- diff --git a/src/pages/InRoadMgm/Stuff/CategroyConf/loadable.jsx b/src/pages/InRoadMgm/Stuff/CategroyConf/loadable.jsx index 6d18162..973a2a7 100644 --- a/src/pages/InRoadMgm/Stuff/CategroyConf/loadable.jsx +++ b/src/pages/InRoadMgm/Stuff/CategroyConf/loadable.jsx @@ -104,7 +104,7 @@ function CategroyConf(props) { id: getRecord } ajax.saveGoodDeleteData(data).then((res) => { - if (res.status = 20000) { + if (res.status === 20000) { message.success('删除成功') setDeleteVisible(false) getData(formData) diff --git a/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx index a945af4..4af513f 100644 --- a/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx +++ b/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx @@ -468,20 +468,38 @@ function StaggeredMgm(props) { ...getCarMsg, info: infoArr } - if (getEditData.operator_id === undefined) { - message.error('请选择所属商户') - } else if (getEditData.road === undefined) { - message.error('请输入车场名称') - } else { - ajax.getEditStaggered(data).then(res => { - if (res.status === 20000) { - message.success(res.message) - setEditVisible(false) - } else { - message.error(res.message) - } - }) + for (var result = 0; result < infoArr.length; result++) { + console.log(infoArr[result]); + if (!infoArr[result]?.start_date || !infoArr[result]?.end_date) { + message.error('请选择错峰日期') + return + } + if (!infoArr[result]?.start_time || !infoArr[result]?.end_time) { + message.error('请选择错峰时间') + return + } + if (!infoArr[result]?.num) { + message.error('请输入错峰卡数量') + return + } + if (!infoArr[result]?.price) { + message.error('请输入销售价格') + return + } + if (!infoArr[result].week.length) { + message.error('请选择星期配置') + return + } + infoArr[result].week = infoArr[result].week.join(',') } + ajax.getEditStaggered(data).then(res => { + if (res.status === 20000) { + message.success(res.message) + setEditVisible(false) + } else { + message.error(res.message) + } + }) } const placeBtn = () => { setEditVisible(false) diff --git a/src/pages/SystemMgm/AdminMgm/loadable.jsx b/src/pages/SystemMgm/AdminMgm/loadable.jsx index bfcc02e..e0ce2d4 100644 --- a/src/pages/SystemMgm/AdminMgm/loadable.jsx +++ b/src/pages/SystemMgm/AdminMgm/loadable.jsx @@ -136,6 +136,7 @@ function AdminMgm(props) { console.log(res); if (res.status === 20000) { setAddManage(Object.assign({},addManage,{ + deptName: v, government_style:res.data.control_type, government_area:res.data.control_area })) diff --git a/src/pages/SystemMgm/RoleMgm/loadable.jsx b/src/pages/SystemMgm/RoleMgm/loadable.jsx index b761cbd..8a13fae 100644 --- a/src/pages/SystemMgm/RoleMgm/loadable.jsx +++ b/src/pages/SystemMgm/RoleMgm/loadable.jsx @@ -135,7 +135,7 @@ function RoleMgm(props) { console.log(arr); setGetCheckVlue(true) // getCheckValue - setGetAdminId({ ...getAdminId, auth: string }) + setGetImg({ ...getImg, auth: string }) } else { setCheckedKeys([]) } @@ -277,19 +277,15 @@ function RoleMgm(props) { } }] //图片 - // const [getAdminId, setGetAdminId] = useState({ - // remark: '', - // name: '', - // depart_id: '', - // auth: '' - // }) - const [getAdminId, setGetAdminId] = useState({ + const [getImg, setGetImg] = useState({ remark: '', name: '', depart_id: '', auth: '' }) + const [getAdminId, setGetAdminId] = useState({}) const [getAuthId, setGetAuthId] = useState({}) + const [getDepart, setGetDepart] = useState([]) //编辑 const CheckApplyBtn = (record) => { setEditVisible(true) @@ -303,15 +299,17 @@ function RoleMgm(props) { if (res.status === 20000) { setEditVisible(true) setGetAdminId(res.data) - + let str=res.data.depart_arr + let arr = str.split(','); + setGetDepart(arr) } }) let str = record.auth let strArr = str.split(","); let num = strArr.map(Number) setCheckedKeys(num) - // let newArr = record.depart_arr.split(',') - // setGetAdminId(Object.assign({}, getAdminId, { + let newArr = record.depart_arr.split(',') + // setGetImg(Object.assign({}, getImg, { // name: record.name, // remark: record.remark, // depart_id: newArr @@ -321,7 +319,7 @@ function RoleMgm(props) { } } - console.log(getAdminId); + console.log(getImg); //所属类型 const [getPlateColor, setGetPlateColor] = useState([]) const plateColor = () => { @@ -457,20 +455,20 @@ function RoleMgm(props) { const placeEditBtn = () => { let arr = checkedKeys let str = arr.toString() - let arrStr = getAdminId.depart_id + let arrStr = getImg.depart_id let lastElement = arrStr[arrStr.length - 1]; let data = { - ...getAdminId, + ...getImg, auth: str, id: getAdminId.id, depart_id: lastElement, depart_arr: arrStr.toString() } - if (getAdminId.name == "") { + if (getImg.name == "") { message.error('角色名称不能为空') return - } else if (getAdminId.depart_id == "") { + } else if (getImg.depart_id == "") { message.error('请选择所属部门') return } @@ -481,7 +479,7 @@ function RoleMgm(props) { getData(formData) setGetGovernment(0) setGetAuthId({}) - setGetAdminId({ + setGetImg({ remark: '', name: '', depart_id: '', @@ -729,8 +727,8 @@ function RoleMgm(props) { value={getAdminId.name} style={{ width: 260, marginLeft: 50 }} onChange={(v) => { - setGetAdminId( - Object.assign({}, getAdminId, { name: v.target.value }) + setGetImg( + Object.assign({}, getImg, { name: v.target.value }) ); }} /> @@ -742,8 +740,8 @@ function RoleMgm(props) { value={getAdminId.remark} style={{ width: 260, marginLeft: 78 }} onChange={(v) => { - setGetAdminId( - Object.assign({}, getAdminId, { remark: v.target.value }) + setGetImg( + Object.assign({}, getImg, { remark: v.target.value }) ); }} /> @@ -754,12 +752,12 @@ function RoleMgm(props) { { - setGetAdminId( - Object.assign({}, getAdminId, { depart_id: v }) + setGetImg( + Object.assign({}, getImg, { depart_id: v }) ); setGetAuthId({}) let arrStr = v @@ -781,8 +779,8 @@ function RoleMgm(props) { style={{ width: 260, marginLeft: 14 }} defaultSelectedKeys={checkedKeys} onCheck={(checkedKeysValue, info) => { - setGetAdminId( - Object.assign({}, getAdminId, { auth: checkedKeysValue }) + setGetImg( + Object.assign({}, getImg, { auth: checkedKeysValue }) ); setCheckedKeys(checkedKeysValue) }}