Browse Source

fix():修改路内bug

master
guoxin 1 year ago
parent
commit
48fa43788c
  1. 19
      src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx
  2. 6
      src/pages/InRoadMgm/PersonMgm/AuditMgm/AuditCheck/loadable.jsx
  3. 5
      src/pages/InRoadMgm/PersonMgm/MesNotification/loadable.jsx
  4. 30
      src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx
  5. 12
      src/pages/InRoadMgm/RecordInquiry/GeomagneticSignalMgm/loadable.jsx
  6. 21
      src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx

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

@ -246,15 +246,18 @@ const FormModal = (props) => {
}; };
useEffect(() => { useEffect(() => {
let newObj = { ...defaultData }
if (JSON.stringify(yisaData) != "{}") {
newObj = handelDate(yisaData, 2)
if(yisaData){
let newObj = { ...defaultData }
if (JSON.stringify(yisaData) != "{}") {
newObj = handelDate(yisaData, 2)
}
newObj.rules = newObj?.source?.rules
// delete newObj.source
//
init(newObj);
form.setFieldsValue(newObj);
} }
newObj.rules = newObj?.source?.rules
// delete newObj.source
//
init(newObj);
form.setFieldsValue(newObj);
}, [yisaData]); }, [yisaData]);
useEffect(() => { useEffect(() => {

6
src/pages/InRoadMgm/PersonMgm/AuditMgm/AuditCheck/loadable.jsx

@ -306,6 +306,7 @@ function AuditCheck() {
function search(date) { function search(date) {
console.log(date); console.log(date);
let result = searchForm.getFieldsValue(); let result = searchForm.getFieldsValue();
console.log(result);
if (type === "1") { if (type === "1") {
result = { ...result, ...reportTime, ...pageData }; result = { ...result, ...reportTime, ...pageData };
} else { } else {
@ -373,7 +374,8 @@ function AuditCheck() {
operator_id: "0", operator_id: "0",
report_time: "", report_time: "",
type_id: "0", type_id: "0",
road_name: ""
road_name: "",
status:-1
}; };
// //
function renderSearch(params) { function renderSearch(params) {
@ -441,7 +443,7 @@ function AuditCheck() {
</Col> </Col>
<Col span={24}> <Col span={24}>
<Form.Item label="所属路段" name="road_name"> <Form.Item label="所属路段" name="road_name">
<Input placeholder="请输入记录编号" {...inputParams} />
<Input placeholder="请输入所属路段" {...inputParams} />
</Form.Item> </Form.Item>
</Col> </Col>
<Col span={24}> <Col span={24}>

5
src/pages/InRoadMgm/PersonMgm/MesNotification/loadable.jsx

@ -48,9 +48,6 @@ function MesNotification(props) {
} }
return result; return result;
} }
const sendModal = () => {
setSendVisible(false)
}
// //
const getResetData = () => { const getResetData = () => {
setSendVisible(true) setSendVisible(true)
@ -308,7 +305,7 @@ function MesNotification(props) {
</div> </div>
<Modal <Modal
visible={sendVisible} visible={sendVisible}
onCancel={sendModal}
onCancel={placeBtn}
footer={null} footer={null}
title='发送短信' title='发送短信'
className="sendModal" className="sendModal"

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

@ -8,6 +8,7 @@ import moment from "moment";
import "./index.scss"; import "./index.scss";
import { SearchOutlined } from '@ant-design/icons'; import { SearchOutlined } from '@ant-design/icons';
import ajax from '@/services' import ajax from '@/services'
import { useSetState } from "ahooks";
function SalesStat(props) { function SalesStat(props) {
@ -266,7 +267,7 @@ function SalesStat(props) {
const exportNow = () => { const exportNow = () => {
let data = { let data = {
...formData, ...formData,
export_type:""
export_type: ""
} }
ajax.salesExport(data).then(res => { ajax.salesExport(data).then(res => {
window.open(res.data.url) window.open(res.data.url)
@ -274,10 +275,10 @@ function SalesStat(props) {
}) })
} }
const exportAll = () => { const exportAll = () => {
let data = { let data = {
...formData, ...formData,
export_type:"all"
export_type: "all"
} }
ajax.salesExport(data).then(res => { ajax.salesExport(data).then(res => {
window.open(res.data.url) window.open(res.data.url)
@ -288,6 +289,7 @@ function SalesStat(props) {
const revenueModal = () => { const revenueModal = () => {
setRevenueVisible(false) setRevenueVisible(false)
} }
const [textL, setTextL] = useState('')
useEffect(() => { useEffect(() => {
getData() getData()
}, []) }, [])
@ -327,10 +329,10 @@ function SalesStat(props) {
]} ]}
/> />
<div className="btnBox"> <div className="btnBox">
<Button type="primary" className="yisa-btn colorBtn" onClick={() => { getSearchData() }}>
查询
<Button type="primary" className="yisa-btn colorBtn" onClick={() => { getSearchData() }}>
查询
</Button> </Button>
</div> </div>
</div> </div>
</div> </div>
@ -339,8 +341,8 @@ function SalesStat(props) {
<div className="result-info-row"> <div className="result-info-row">
<span className="font">共检索到<em>{resultData.total_records}</em>条结果</span> <span className="font">共检索到<em>{resultData.total_records}</em>条结果</span>
<Button type="primary" className="yisa-btn colorBtn" onClick={() => { salesData() }}> <Button type="primary" className="yisa-btn colorBtn" onClick={() => { salesData() }}>
导出
</Button>
导出
</Button>
</div> </div>
<ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.data ? resultData.data : []}> <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.data ? resultData.data : []}>
<Table <Table
@ -388,7 +390,7 @@ function SalesStat(props) {
}></div> }></div>
{/* 外层做显示区域,里边元素滚动 */} {/* 外层做显示区域,里边元素滚动 */}
<div className="list-view"> <div className="list-view">
<div className="tab-top" style={{ transform: `translateX(${-getValue * 100}px)` }}>
<div className="tab-top" style={{ transform: `translateX(${- textL * 14 * getValue}px)` }}>
{ {
getTabData && getTabData &&
getTabData.map((item, index) => { getTabData.map((item, index) => {
@ -398,10 +400,16 @@ function SalesStat(props) {
</div> </div>
</div> </div>
<div style={{ lineHeight: 4, marginLeft: 6 }} <div style={{ lineHeight: 4, marginLeft: 6 }}
className="curpoint"
className="curpoint"
onClick={() => { onClick={() => {
getValue < getTabData.length - 1 &&
if (getValue < getTabData.length - 1) {
setGetValue(getValue + 1) setGetValue(getValue + 1)
let Arritem = getTabData.filter((item) => item.value == getValue + 1)[0]
setTextL(Arritem.text.length)
console.log(textL);
setCheckData(Arritem.children)
setGetTotal(Arritem.total_records)
}
} }
} }
></div> ></div>

12
src/pages/InRoadMgm/RecordInquiry/GeomagneticSignalMgm/loadable.jsx

@ -300,14 +300,14 @@ function GeomagneticSignalMgm() {
}, },
{ {
title: "实付金额", title: "实付金额",
dataIndex: "actual_amount",
key: "actual_amount",
dataIndex: "paid_in_money",
key: "paid_in_money",
align: "center", align: "center",
}, },
{ {
title: "支付类型", title: "支付类型",
dataIndex: "pay_road",
key: "pay_road",
dataIndex: "pay_type_name",
key: "pay_type_name",
align: "center", align: "center",
}, },
{ {
@ -330,8 +330,8 @@ function GeomagneticSignalMgm() {
}, },
{ {
title: "付款路段", title: "付款路段",
dataIndex: "road",
key: "road",
dataIndex: "pay_road",
key: "pay_road",
align: "center", align: "center",
}, },
{ {

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

@ -95,7 +95,7 @@ function StaggeredMgm(props) {
// }; // };
// //
const handleParkName = (v) => { const handleParkName = (v) => {
setFormData({ ...formData, road: v})
setFormData({ ...formData, road: v })
} }
// //
const handleDeployType = (value) => { const handleDeployType = (value) => {
@ -396,10 +396,6 @@ function StaggeredMgm(props) {
const placeSaveBtn = () => { const placeSaveBtn = () => {
let infoArr = [...getSaleMsg] let infoArr = [...getSaleMsg]
infoArr.map((item, index) => { infoArr.map((item, index) => {
if (item.week.length != []) {
item.week = item.week.join(',')
}
let data = { let data = {
...getCarMsg, ...getCarMsg,
info: infoArr info: infoArr
@ -412,11 +408,14 @@ function StaggeredMgm(props) {
message.error('请选择错峰日期') message.error('请选择错峰日期')
} else if (item?.start_time === '' || item?.end_time === '') { } else if (item?.start_time === '' || item?.end_time === '') {
message.error('请选择错峰时间') message.error('请选择错峰时间')
} else if (item?.num === '') {
} else if (item?.num === '') {
message.error('请输入错峰卡数量') message.error('请输入错峰卡数量')
} else if (item?.price === '') { } else if (item?.price === '') {
message.error('请输入销售价格') message.error('请输入销售价格')
} else { } else {
if (item.week.length != []) {
item.week = item.week.join(',')
}
ajax.getAddStaggered(data).then(res => { ajax.getAddStaggered(data).then(res => {
if (res.status === 20000) { if (res.status === 20000) {
message.success(res.message) message.success(res.message)
@ -567,13 +566,13 @@ function StaggeredMgm(props) {
</div> </div>
<div className="timePicker yisa-search"> <div className="timePicker yisa-search">
<div className="btnBox"> <div className="btnBox">
<Button type="primary" className="yisa-btn colorBtn" onClick={() => { getSearchData() }}>
查询
<Button type="primary" className="yisa-btn colorBtn" onClick={() => { getSearchData() }}>
查询
</Button> </Button>
<Button type="primary" className="yisa-btn colorReset" onClick={() => { getResetData() }}>
<Button type="primary" className="yisa-btn colorReset" onClick={() => { getResetData() }}>
重置 重置
</Button> </Button>
<Button type="primary" className="yisa-btn colorBtn" onClick={() => { addData() }}>
<Button type="primary" className="yisa-btn colorBtn" onClick={() => { addData() }}>
添加 添加
</Button> </Button>
</div> </div>
@ -855,7 +854,7 @@ function StaggeredMgm(props) {
<div className="redLogo">*</div> <div className="redLogo">*</div>
<label>错峰日期</label> <label>错峰日期</label>
<RangePicker <RangePicker
value={[moment(item.start_date), moment(item.end_date)]}
value={[moment(item.start_date), moment(item.end_date)]}
style={{ width: 250, marginLeft: 20 }} style={{ width: 250, marginLeft: 20 }}
onChange={(date, dateString) => handleChangeDate( onChange={(date, dateString) => handleChangeDate(
date, dateString, index date, dateString, index

Loading…
Cancel
Save