Browse Source

fix() 处理相关bug等

tags/PMS_V1.0.0_Alpha6
lisf 1 year ago
parent
commit
704113ee1a
  1. 2
      src/pages/NewEnergy/ChargingMgm/BillingRule/index.scss
  2. 31
      src/pages/NewEnergy/ChargingMgm/BillingRule/loadable.jsx
  3. 2
      src/pages/NewEnergy/ChargingMgm/IllegalRuleConfigMgm/index.scss
  4. 27
      src/pages/NewEnergy/ChargingMgm/IllegalRuleConfigMgm/loadable.jsx
  5. 2
      src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/index.scss
  6. 27
      src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/loadable.jsx

2
src/pages/NewEnergy/ChargingMgm/BillingRule/index.scss

@ -171,7 +171,7 @@ $color-primary: var(--color-primary);
border-color: var(--color-border);
}
.totalModal {
.bill-rule-modal {
.ruleTitle {
font-size: 16px;
font-weight: 700;

31
src/pages/NewEnergy/ChargingMgm/BillingRule/loadable.jsx

@ -15,7 +15,7 @@ import {
Timeline,
Popover
} from "antd";
import { dictionary } from "@/config/common";
import { utils } from "@/config/common";
import ajax from "@/services";
import { TableModule } from "@/components";
import moment from 'moment'
@ -139,10 +139,17 @@ function BillingRule() {
//
const search = (params) => {
utils.tableScrollTop("parent-table-scroll");
let data = {
...params,
type:1
}
let regEn = /[`~!@#$%^&*()_+<>?:"{},.\/;'[\]]/im,
regCn = /[·!#¥(——):;“”‘、,|《。》?、【】[\]]/im;
if(regEn.test(data.rule_name) || regCn.test(data.rule_name)){
message.error("输入不能包含特殊字符,请重新输入")
return
}
ajax.getRegularList(data).then((res) => {
if (res.status === 20000) {
setTableData(res.data.list);
@ -167,19 +174,25 @@ function BillingRule() {
// ok
const handleConfirm = () => {
let data = {
...modalData,
rule_name:modalData?.rule_name.replace(/\s/g,""),
rule_code:modalData?.rule_code.replace(/\s/g,""),
type:1
}
setDetailVisible(true)
if(!modalData?.operator_id){
if(!data?.operator_id){
message.warning("运营商名称不能为空")
return
}else if(!modalData?.rule_name){
}else if(!data?.rule_name){
message.warning("规则名称不能为空")
return
}else if(!modalData?.rule_code){
}else if(!data?.rule_code){
message.warning("规则编码不能为空")
return
}
//
ajax.addRule({...modalData,type:1}).then(res => {
ajax.addRule(data).then(res => {
if (res.status === 20000) {
message.success(res.message)
tableRef.current.fetch()
@ -222,7 +235,7 @@ function BillingRule() {
<Modal
open={detailVisible}
width={650}
className="totalModal"
className="bill-rule-modal"
onCancel={() => {
setModalData({...params,username:modalData?.username})
setDetailVisible(false);
@ -254,7 +267,7 @@ function BillingRule() {
placeholder="请输入名称"
value={modalData.rule_name}
style={{ width: 660, marginLeft: 10 }}
maxLength={30}
maxLength={20}
onChange={(v) => {setModalData({...modalData,rule_name:v.target.value})}}
/>
</div>
@ -265,7 +278,7 @@ function BillingRule() {
placeholder="请输入编码"
value={modalData.rule_code}
style={{ width: 660, marginLeft: 10 }}
maxLength={30}
maxLength={20}
onChange={(v) => {setModalData({...modalData,rule_code:v.target.value})}}
/>
</div>
@ -315,7 +328,7 @@ function BillingRule() {
}}
>
<div className="ruleTitle">
<span className="font">新增规则</span>
<span className="font">规则详情</span>
</div>
<div className="ltc-content">
<div className="ltc-item">

2
src/pages/NewEnergy/ChargingMgm/IllegalRuleConfigMgm/index.scss

@ -172,7 +172,7 @@ $color-primary: var(--color-primary);
}
.totalModal {
.illegal-rule-modal {
.ruleTitle {
font-size: 16px;
font-weight: 700;

27
src/pages/NewEnergy/ChargingMgm/IllegalRuleConfigMgm/loadable.jsx

@ -16,7 +16,7 @@ import {
Popover,
Popconfirm
} from "antd";
import { dictionary } from "@/config/common";
import { utils } from "@/config/common";
import ajax from "@/services";
import { TableModule } from "@/components";
import moment from 'moment'
@ -200,10 +200,17 @@ const getAllStation =() => {
}
//
const search = (params) => {
utils.tableScrollTop("parent-table-scroll");
let data = {
...params,
type:3
}
let regEn = /[`~!@#$%^&*()_+<>?:"{},.\/;'[\]]/im,
regCn = /[·!#¥(——):;“”‘、,|《。》?、【】[\]]/im;
if(regEn.test(data.rule_name) || regCn.test(data.rule_name)){
message.error("输入不能包含特殊字符,请重新输入")
return
}
ajax.getRegularList(data).then((res) => {
if (res.status === 20000) {
setTableData(res.data.list);
@ -228,14 +235,20 @@ const handelAdd = () => {
// ok
const handleConfirm = () => {
let data = {
...modalData,
rule_name:modalData?.rule_name.replace(/\s/g,""),
rule_code:modalData?.rule_code.replace(/\s/g,""),
type:3
}
setDetailVisible(true)
if(!modalData?.operator_id){
message.warning("运营商名称不能为空")
return
}else if(!modalData?.rule_name){
}else if(!data?.rule_name){
message.warning("规则名称不能为空")
return
}else if(!modalData?.rule_code){
}else if(!data?.rule_code){
message.warning("规则编码不能为空")
return
}else if(!modalData?.effective_place){
@ -246,7 +259,7 @@ const handleConfirm = () => {
return
}
//
ajax.addRule({...modalData,type:3}).then(res => {
ajax.addRule(data).then(res => {
if (res.status === 20000) {
message.success(res.message)
tableRef.current.fetch()
@ -290,7 +303,7 @@ return (
<Modal
open={detailVisible}
width={650}
className="totalModal"
className="illegal-rule-modal"
onCancel={() => {
setModalData({...params,username:modalData?.username})
setDetailVisible(false);
@ -322,7 +335,7 @@ return (
placeholder="请输入名称"
value={modalData.rule_name}
style={{ width: 660, marginLeft: 10 }}
maxLength={30}
maxLength={20}
onChange={(v) => {setModalData({...modalData,rule_name:v.target.value})}}
/>
</div>
@ -333,7 +346,7 @@ return (
placeholder="请输入编码"
value={modalData.rule_code}
style={{ width: 660, marginLeft: 10 }}
maxLength={30}
maxLength={20}
onChange={(v) => {setModalData({...modalData,rule_code:v.target.value})}}
/>
</div> <div className="yisa-search" style={{marginLeft:13}}>

2
src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/index.scss

@ -172,7 +172,7 @@ $color-primary: var(--color-primary);
}
.totalModal {
.order-rule-modal {
.ruleTitle {
font-size: 16px;
font-weight: 700;

27
src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/loadable.jsx

@ -16,7 +16,7 @@ import {
Popover,
Popconfirm
} from "antd";
import { dictionary } from "@/config/common";
import { utils } from "@/config/common";
import ajax from "@/services";
import { TableModule } from "@/components";
import moment from 'moment'
@ -188,10 +188,17 @@ const openModal = (index, record) => {
//
const search = (params) => {
utils.tableScrollTop("parent-table-scroll");
let data = {
...params,
type:2
}
let regEn = /[`~!@#$%^&*()_+<>?:"{},.\/;'[\]]/im,
regCn = /[·!#¥(——):;“”‘、,|《。》?、【】[\]]/im;
if(regEn.test(data.rule_name) || regCn.test(data.rule_name)){
message.error("输入不能包含特殊字符,请重新输入")
return
}
ajax.getRegularList(data).then((res) => {
if (res.status === 20000) {
setTableData(res.data.list);
@ -216,14 +223,20 @@ const handelAdd = () => {
// ok
const handleConfirm = () => {
let data = {
...modalData,
rule_name:modalData?.rule_name.replace(/\s/g,""),
rule_code:modalData?.rule_code.replace(/\s/g,""),
type:2
}
setDetailVisible(true)
if(!modalData?.operator_id){
message.warning("运营商名称不能为空")
return
}else if(!modalData?.rule_name){
}else if(!data?.rule_name){
message.warning("规则名称不能为空")
return
}else if(!modalData?.rule_code){
}else if(!data?.rule_code){
message.warning("规则编码不能为空")
return
}else if(modalData?.status === ""){
@ -231,7 +244,7 @@ const handleConfirm = () => {
return
}
//
ajax.addRule({...modalData,type:2}).then(res => {
ajax.addRule(data).then(res => {
if (res.status === 20000) {
message.success(res.message)
tableRef.current.fetch()
@ -274,7 +287,7 @@ return (
<Modal
open={detailVisible}
width={650}
className="totalModal"
className="order-rule-modal"
onCancel={() => {
setModalData({...params,username:modalData?.username})
setDetailVisible(false);
@ -306,7 +319,7 @@ return (
placeholder="请输入名称"
value={modalData.rule_name}
style={{ width: 660, marginLeft: 10 }}
maxLength={30}
maxLength={20}
onChange={(v) => {setModalData({...modalData,rule_name:v.target.value})}}
/>
</div>
@ -317,7 +330,7 @@ return (
placeholder="请输入编码"
value={modalData.rule_code}
style={{ width: 660, marginLeft: 10 }}
maxLength={30}
maxLength={20}
onChange={(v) => {setModalData({...modalData,rule_code:v.target.value})}}
/>
</div>

Loading…
Cancel
Save