diff --git a/src/assets/css/base.scss b/src/assets/css/base.scss
index 784805c..84d4fbe 100644
--- a/src/assets/css/base.scss
+++ b/src/assets/css/base.scss
@@ -9,7 +9,9 @@
p {
margin-bottom: 0;
}
-
+em{
+ font-style: normal;
+}
#root,
html,
body {
diff --git a/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx b/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx
index bc442aa..d7bc760 100644
--- a/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx
+++ b/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx
@@ -2107,7 +2107,15 @@ function CollectorWorkStat(props) {
</div>
<div className="operation">
图片
- <span className="font"><img style={{ width: 100 }} src={getCheckData.image1} alt="" /></span>
+ <span className="font">
+ {getCheckData.image&&
+ getCheckData.image?.map(item=>{
+ return(
+ <Image style={{ width: 100 }} src={getCheckData.image1} alt="" />
+ )
+ })
+ }
+ </span>
</div>
</div>
</div>
diff --git a/src/pages/InRoadMgm/PersonMgm/AuditMgm/AuditCheck/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/AuditMgm/AuditCheck/loadable.jsx
index bd448ec..a3447ae 100644
--- a/src/pages/InRoadMgm/PersonMgm/AuditMgm/AuditCheck/loadable.jsx
+++ b/src/pages/InRoadMgm/PersonMgm/AuditMgm/AuditCheck/loadable.jsx
@@ -405,7 +405,9 @@ function AuditCheck() {
</Form>
);
}
-
+ const handleReset=()=>{
+ searchForm.resetFields()
+ }
useEffect(() => {
getProgressData();
getAllOperator();
@@ -430,7 +432,7 @@ function AuditCheck() {
<div className="searchWrap">
{renderSearch()}
<div className="bottomBox">
- <Button className="reset">清空</Button>
+ <Button className="reset" onClick={handleReset}>清空</Button>
<Button type="primary" className="submit" onClick={search}>
查询
</Button>
diff --git a/src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx
index 14ddb43..b8cec25 100644
--- a/src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx
@@ -624,7 +624,7 @@ function DisabledCarParkRecordTotal() {
e.type = 1
}
ajax({
- url: "/api/bpm/record/get_record_list",
+ url: "/api/bpm/record/get_record_cj",
type: "post",
data: { ...e, cj_temporary: 1 },
}).then((res) => {
diff --git a/src/pages/OperationCenter/ArrearsRecover/ArrearsCarTask/loadable.jsx b/src/pages/OperationCenter/ArrearsRecover/ArrearsCarTask/loadable.jsx
index dccd397..74bf3d6 100644
--- a/src/pages/OperationCenter/ArrearsRecover/ArrearsCarTask/loadable.jsx
+++ b/src/pages/OperationCenter/ArrearsRecover/ArrearsCarTask/loadable.jsx
@@ -410,18 +410,18 @@ function ArrearsCarTask(props) {
}
//检索数据
const getSearchData = (data = formData) => {
- console.log(formData.refund_amount_max, formData.refund_amount_min);
+ console.log(formData.refund_amount_min, 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('欠费金额输入不正确，请重新输入1')
+ } else if (formData.refund_amount_min > formData.refund_amount_max) {
+ message.error('欠费金额输入不正确，请重新输入')
} else if (!regex2.test(formData.sms_recovery_count_min) || !regex2.test(formData.sms_recovery_count_max)) {
message.error('追缴次数输入不正确，请重新输入')
- } else if (formData.sms_recovery_count_max < formData.sms_recovery_count_min) {
- message.error('追缴次数输入不正确，请重新输入2')
+ } else if (formData.sms_recovery_count_min > formData.sms_recovery_count_max) {
+ message.error('追缴次数输入不正确，请重新输入')
} else {
setFormData({ ...formData, pn: 1 })
getData(Object.assign({}, formData, { pn: 1 }))
diff --git a/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx
index eed6099..a2b9aaa 100644
--- a/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx
+++ b/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx
@@ -34,6 +34,18 @@ function StaggeredMgm(props) {
const [checkVisible, setCheckVisible] = useState(false)
const [editVisible, setEditVisible] = useState(false)
const [addVisible, setAddVisible] = useState(false)
+ let infoData = {
+ start_date: moment().subtract(30, 'days').startOf('day').format('YYYY-MM-DD'),
+ end_date: moment().format('YYYY-MM-DD'),
+ start_time: moment().format('HH:mm:ss'),
+ end_time: moment().format('HH:mm:ss'),
+ week: '',
+ num: '',
+ price: '',
+ text: '',
+ }
+ const [getSaleMsg, setGetSaleMsg] = useState([infoData])
+
//物品类型
const handleParkName = (v) => {
setFormData({ ...formData, road: v.target.value })
@@ -95,8 +107,8 @@ function StaggeredMgm(props) {
return <>
<Popover content={
<div className="operateBtn">
- <div onClick={() => { CheckBtn(record) }}>查看</div>
- <div onClick={() => { translateBtn(record) }}>编辑</div>
+ <div onClick={() => CheckBtn(record) }>查看</div>
+ <div onClick={() => translateBtn(record) }>编辑</div>
</div>}>
<button className="scheduleBtn colorBtn">操作</button>
</Popover>
@@ -110,14 +122,7 @@ function StaggeredMgm(props) {
setGetRecordData(record)
let str = record.info
let newArr = []
-
- str.forEach(item => {
- newArr.push(item)
- for (let i = 0; i < newArr.length; i++) {
- newArr[i].disabled = true;
- }
- })
- setGetSaleMsg(newArr);
+ setGetSaleMsg(record.info);
setCheckVisible(true)
}
const checkModal = () => {
@@ -231,21 +236,12 @@ function StaggeredMgm(props) {
road: ''
})
}
- let infoData = {
- start_date: moment().subtract(30, 'days').startOf('day').format('YYYY-MM-DD'),
- end_date: moment().format('YYYY-MM-DD'),
- start_time: moment().format('HH:mm:ss 00:00:00'),
- end_time: moment().format('HH:mm:ss 23:59:59'),
- week: '',
- num: '',
- price: '',
- text: '',
- }
+
const [getCarMsg, setGetCarMsg] = useState({
operator_id:'',
road:''
})
- const [getSaleMsg, setGetSaleMsg] = useState([infoData])
+
//商户名称
const handleAddDeployType = (value) => {
setGetCarMsg({
@@ -302,13 +298,11 @@ function StaggeredMgm(props) {
}
//错峰时间
const handleChangeTime = (time, timeString, index) => {
- console.log(time, timeString, index);
let times = getSaleMsg[index]
times.start_time = timeString[0]
times.end_time = timeString[1]
}
const handleChance = (v, index, key) => {
- console.log(v, index, key);
let str = [...getSaleMsg]
if (key == 'num') {
str[index][key] = v
@@ -420,14 +414,16 @@ function StaggeredMgm(props) {
})
useEffect(() => {
if (sessionTabList && Object.values(sessionTabList).length > 0) {
- setFormData({
- road: sessionTabList?.road,
- operator_id: sessionTabList?.operator_id,
- user: sessionTabList?.user,
- pn: sessionTabList?.pn,
- page_size: sessionTabList?.page_size,
- })
+ // setFormData({
+ // road: sessionTabList?.road,
+ // operator_id: sessionTabList?.operator_id,
+ // user: sessionTabList?.user,
+ // pn: sessionTabList?.pn,
+ // page_size: sessionTabList?.page_size,
+ // })
}
+ getData()
+ merchantDataName()
}, [])
useEffect(() => {
setSessionTabList({
@@ -435,8 +431,7 @@ function StaggeredMgm(props) {
})
}, [formData])
useEffect(() => {
- getData()
- merchantDataName()
+
}, [])
return <>
<div className="paid-StaggeredMgm">
@@ -561,9 +556,8 @@ function StaggeredMgm(props) {
</div>
</div>
- {getSaleMsg.length ?
- getSaleMsg?.map((item, index) => {
- console.log(item);
+ {getSaleMsg&&getSaleMsg.length ?
+ getSaleMsg.map((item, index) => {
return (
<>
<div className="carTitle">
@@ -578,9 +572,7 @@ function StaggeredMgm(props) {
disabled={true}
defaultValue={[moment(item.start_date), moment(item.end_date)]}
style={{ width: 250, marginLeft: 20 }}
- onChange={(date, dateString) => handleChangeDate(
- date, dateString, index
- )}
+ onChange={(date, dateString) => handleChangeDate(date, dateString, index)}
/>
</div>
<div className="yisa-search">
@@ -588,12 +580,10 @@ function StaggeredMgm(props) {
<label>错峰时间</label>
<TimePicker.RangePicker
disabled={true}
- value={[moment(item.start_time), moment(item.end_time)]}
+ defaultValue={[moment(item.start_time, 'HH:mm:ss'),moment(item.end_time, 'HH:mm:ss')]}
style={{ width: 250, marginLeft: 20 }}
format="HH:mm:ss"
- onChange={(time, timeString) => handleChangeTime(
- time, timeString, index
- )}
+ onChange={(time, timeString) => handleChangeTime(time, timeString, index)}
/>
</div>
<div className="yisa-search" style={{marginLeft:15}}>
@@ -673,14 +663,14 @@ function StaggeredMgm(props) {
}) : ''
}
<div className="submitBtn">
- <Button type="primary" className="cancel colorReset" onClick={() => { checkStaggeredBtn() }}>
+ <Button type="primary" className="cancel colorReset" onClick={checkStaggeredBtn}>
关闭
</Button>
</div>
</Modal>
<Modal
visible={addVisible}
- onCancel={addModal}
+ onCancel={addplaceBtn}
footer={null}
className="staggered-add"
>
@@ -837,10 +827,10 @@ function StaggeredMgm(props) {
}
<div className="submitBtn">
- <Button type="primary" className="submit colorBtn" onClick={() => { placeSaveBtn() }}>
+ <Button type="primary" className="submit colorBtn" onClick={placeSaveBtn}>
提交
</Button>
- <Button type="primary" className="cancel colorReset" onClick={() => { addplaceBtn() }}>
+ <Button type="primary" className="cancel colorReset" onClick={addplaceBtn}>
取消
</Button>
</div>
@@ -895,9 +885,8 @@ function StaggeredMgm(props) {
</div>
</div>
- {getSaleMsg.length ?
+ {getSaleMsg&&getSaleMsg.length ?
getSaleMsg?.map((item, index) => {
- // console.log(item);
return (
<>
<div className="carTitle">
@@ -922,7 +911,7 @@ function StaggeredMgm(props) {
<label>错峰时间</label>
<TimePicker.RangePicker
disabled={item.disabled}
- defaultValue={[moment(item.start_time), moment(item.end_time)]}
+ defaultValue={[moment(item.start_time, 'HH:mm:ss'),moment(item.end_time, 'HH:mm:ss')]}
style={{ width: 250, marginLeft: 20 }}
format="HH:mm:ss"
onChange={(time, timeString) => handleChangeTime(
diff --git a/src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx b/src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx
index 2af1a26..d33b6e6 100644
--- a/src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx
+++ b/src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx
@@ -755,7 +755,7 @@ function BusinessConf(props) {
onCancel={editModal}
footer={null}
className="editMsg"
- title='添加/修改管理员'
+ title='修改管理员'
>
<div className="addAdmin">
<div className="yisa-search">
diff --git a/src/pages/SystemMgm/RoleMgm/loadable.jsx b/src/pages/SystemMgm/RoleMgm/loadable.jsx
index 880cb07..ca5166b 100644
--- a/src/pages/SystemMgm/RoleMgm/loadable.jsx
+++ b/src/pages/SystemMgm/RoleMgm/loadable.jsx
@@ -589,7 +589,7 @@ function RoleMgm(props) {
onCancel={imgModal}
footer={null}
className="checkMsg"
- title='添加/修改角色'
+ title='添加角色'
>
<div className="addAdmin">
<div className="yisa-search">