diff --git a/src/pages/NewEnergy/ChargingMgm/BillingRule/index.scss b/src/pages/NewEnergy/ChargingMgm/BillingRule/index.scss index 247000e..fbe0b76 100644 --- a/src/pages/NewEnergy/ChargingMgm/BillingRule/index.scss +++ b/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; diff --git a/src/pages/NewEnergy/ChargingMgm/BillingRule/loadable.jsx b/src/pages/NewEnergy/ChargingMgm/BillingRule/loadable.jsx index d5b054a..a564909 100644 --- a/src/pages/NewEnergy/ChargingMgm/BillingRule/loadable.jsx +++ b/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() { { 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})}} /> @@ -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})}} /> @@ -315,7 +328,7 @@ function BillingRule() { }} >
- 新增规则 + 规则详情
diff --git a/src/pages/NewEnergy/ChargingMgm/IllegalRuleConfigMgm/index.scss b/src/pages/NewEnergy/ChargingMgm/IllegalRuleConfigMgm/index.scss index 9a67b18..7553620 100644 --- a/src/pages/NewEnergy/ChargingMgm/IllegalRuleConfigMgm/index.scss +++ b/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; diff --git a/src/pages/NewEnergy/ChargingMgm/IllegalRuleConfigMgm/loadable.jsx b/src/pages/NewEnergy/ChargingMgm/IllegalRuleConfigMgm/loadable.jsx index 9d43e99..2f0c00a 100644 --- a/src/pages/NewEnergy/ChargingMgm/IllegalRuleConfigMgm/loadable.jsx +++ b/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 ( { 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})}} />
@@ -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})}} />
diff --git a/src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/index.scss b/src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/index.scss index 6664878..31f6143 100644 --- a/src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/index.scss +++ b/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; diff --git a/src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/loadable.jsx b/src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/loadable.jsx index 58381f1..2c106ce 100644 --- a/src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/loadable.jsx +++ b/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 ( { 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})}} />
@@ -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})}} />