Browse Source

fix():修改路内bug

master
guoxin 1 year ago
parent
commit
f6d036a5b8
  1. 4
      src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx
  2. 35
      src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx
  3. 2
      src/pages/InRoadMgm/Stuff/CategroyConf/loadable.jsx

4
src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx

@ -32,7 +32,7 @@ const FormModal = (props) => {
const defaultData = {
feeName: '',
freeTimeAble: 0,
operator_name: '',
operationId: '',
feeCode: '',
freeTime: '',
extend_time: '',
@ -564,7 +564,7 @@ const FormModal = (props) => {
</Form.Item>
<Form.Item
name="operator_name"
name="operationId"
label="商户名称"
className="yisa-label inputSearch"
rules={[{ required: true, message: "请选择${label}" }]}

35
src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx

@ -29,18 +29,20 @@ function SalesStat(props) {
}
const [tabData, setTabData] = useState({
pn: 1,
length: Number(pageSizeOptions[0])
length: Number(pageSizeOptions[0]),
uid: '',
start: '',
end: ''
})
const [formData, setFormData] = useState(parameter)
const [lastFormData, setLastFormData] = useState(formData)
const lastFormDataRef = useRef(formData)
const lastTabDataRef = useRef()
const lastTabDataRef = useRef(tabData)
const [lastTotalData, setLastTotalData] = useState(tabData)
const [revenueVisible, setRevenueVisible] = useState(false)
const [exportVisible, setExportVisible] = useState(false)
const [lastTotalData, setLastTotalData] = useState(tabData)
const [getTabData, setGetTabData] = useState([])
const [getTabTitle, setGetTabTitle] = useState([])
console.log(lastTotalData);
const [checkData, setCheckData] = useState([])
const [getValue, setGetValue] = useState({})
const [getTotal, setGetTotal] = useState({})
@ -58,6 +60,11 @@ function SalesStat(props) {
end: v.endDateTime,
time: v.time
})
setTabData({
...tabData,
start: v.startDateTime,
end: v.endDateTime,
})
}
//
const handleColumns = (tab) => {
@ -177,13 +184,18 @@ function SalesStat(props) {
dataIndex: 'persent',
key: 'persent',
}]
const [getDetailId, setDetailId] = useState({})
const getDetailData = (record) => {
setDetailId(record)
setTabData(Object.assign({}, tabData, { uid: record.id }))
getDetailList(record)
}
const getDetailList = (record) => {
let data = {
...lastTotalData,
uid: record.id,
start: getTime.startDateTime,
end: getTime.endDateTime
...tabData,
pn: record.pn == null ? tabData.pn : record.pn,
length: record.length == null ? tabData.length : record.length,
uid: record.id || tabData.id,
}
ajax.revenueData(data).then(res => {
if (res.status === 20000) {
@ -236,9 +248,10 @@ function SalesStat(props) {
setTabData(Object.assign({}, tabData, { pn: pn, length: length }))
setLastTotalData(Object.assign({}, lastTotalData, { pn: pn, length: length }))
lastTabDataRef.current = Object.assign({}, lastTotalData, { pn: pn, length: length })
getDetailData(Object.assign({}, lastTotalData, { pn: pn, length: length }))
getDetailData(Object.assign({}, tabData, { pn: pn, length: length, ...getDetailId }))
}
}
console.log(tabData);
//
const changeLength = (pn, length) => {
setFormData(Object.assign({}, formData, { pn: 1, length: length }))
@ -299,7 +312,7 @@ function SalesStat(props) {
setCheckData(item.children)
setGetTotal(item.total_records)
}
console.log(getTotal);
// console.log(getTotal);
return <>
<div className="paid-sales">
<div className="paid-search">

2
src/pages/InRoadMgm/Stuff/CategroyConf/loadable.jsx

@ -108,6 +108,8 @@ function CategroyConf(props) {
message.success('删除成功')
setDeleteVisible(false)
getData(formData)
}else{
message.error(res.message)
}
})
}

Loading…
Cancel
Save