Browse Source

fix(): 处理路外人员管理--收费员管理页面相应的bug等

tags/PMS_V1.0.0_Alpha6
陈宇航 1 year ago
parent
commit
92756497da
  1. 2
      src/pages/MerchantMgm/MerchantInfo/loadable.jsx
  2. 12
      src/pages/OperationCenter/OperationSales/InformationMgm/loadable.jsx
  3. 14
      src/pages/OutRoadMgm/OutPersonMgm/TollCollector/index.jsx

2
src/pages/MerchantMgm/MerchantInfo/loadable.jsx

@ -709,7 +709,7 @@ const MerchantInfo = (props) => {
} }
) )
} catch (errorInfo) { } catch (errorInfo) {
message.error("必填字段不能为空",2.5)
message.error("请正确填写内容项",2.5)
console.log(errorInfo) console.log(errorInfo)
} }

12
src/pages/OperationCenter/OperationSales/InformationMgm/loadable.jsx

@ -152,7 +152,7 @@ function InformationMgm() {
// - // -
const items = [ const items = [
{ key: "0", label: <span>预览</span> },
// { key: "0", label: <span></span> },
{ key: "1", label: <span>详情</span> }, { key: "1", label: <span>详情</span> },
{ key: "2", label: <span>发布</span> }, { key: "2", label: <span>发布</span> },
{ key: "3", label: <span>编辑</span> }, { key: "3", label: <span>编辑</span> },
@ -1148,11 +1148,11 @@ function InformationMgm() {
onChange={(e) => handleForm("isReprint", e.target.value)} onChange={(e) => handleForm("isReprint", e.target.value)}
> >
<Radio.Button value="0">原创</Radio.Button> <Radio.Button value="0">原创</Radio.Button>
<Radio.Button value="1">转载</Radio.Button>
{/* <Radio.Button value="1">转载</Radio.Button> */}
</Radio.Group> </Radio.Group>
</div> </div>
<div> <div>
<Button
{/* <Button
type="primary" type="primary"
className="green" className="green"
onClick={() => { onClick={() => {
@ -1164,7 +1164,7 @@ function InformationMgm() {
}} }}
> >
预览 预览
</Button>
</Button> */}
<Button type="primary" onClick={() => handleSaveInfo()}> <Button type="primary" onClick={() => handleSaveInfo()}>
保存 保存
</Button> </Button>
@ -1659,10 +1659,10 @@ function InformationMgm() {
/> />
</div> </div>
</div> </div>
<div className="row-line">
{/* <div className="row-line">
<div className="r-txt">预览链接</div> <div className="r-txt">预览链接</div>
<div className="r-con jump-url" title={rowData?.jumpUrl}>{rowData?.jumpUrl || "-"}</div> <div className="r-con jump-url" title={rowData?.jumpUrl}>{rowData?.jumpUrl || "-"}</div>
</div>
</div> */}
<div className="row-line"> <div className="row-line">
<div className="r-txt">最后操作人</div> <div className="r-txt">最后操作人</div>
<div className="r-con">{rowData?.updateUserName || "-"}</div> <div className="r-con">{rowData?.updateUserName || "-"}</div>

14
src/pages/OutRoadMgm/OutPersonMgm/TollCollector/index.jsx

@ -1,6 +1,6 @@
import React, { useState, useEffect } from "react"; import React, { useState, useEffect } from "react";
import { message, Pagination, Table, Select, Input, Button, Popover, Modal, Radio, DatePicker, Transfer } from "antd";
import { message, Pagination, Table, Select, Input, Button, Popover, Modal, Radio, DatePicker, Transfer, Tooltip } from "antd";
import { dictionary } from "@/config/common"; import { dictionary } from "@/config/common";
import { useSessionStorageState } from "ahooks"; import { useSessionStorageState } from "ahooks";
import moment from "moment"; import moment from "moment";
@ -111,7 +111,16 @@ function TollCollector() {
dataIndex: "administer_parking", dataIndex: "administer_parking",
key: "administer_parking", key: "administer_parking",
align: "center", align: "center",
ellipsis: true,
render: (text, record, index) => text || "--", render: (text, record, index) => text || "--",
// ellipsis: {
// showTitle: false,
// },
// render: (text, record, index) => (
// <Tooltip placement="bottom" title={text} getPopupContainer={(e) => e.parentNode} zIndex={1000}>
// {text || "--"}
// </Tooltip>
// )
}, },
{ {
title: "添加时间", title: "添加时间",
@ -297,6 +306,7 @@ function TollCollector() {
} else { } else {
let reg = /[`~!@#$%^&*()_\-+=<>?:"{}|,./;'\\[\]·~!@#¥%……&*()——\-+={}|《》?:“”【】、;‘',。、]/g.test(value?.person_number); let reg = /[`~!@#$%^&*()_\-+=<>?:"{}|,./;'\\[\]·~!@#¥%……&*()——\-+={}|《》?:“”【】、;‘',。、]/g.test(value?.person_number);
if(reg) return message.error("您输入的员工编号不合法!"); if(reg) return message.error("您输入的员工编号不合法!");
if(value?.person_number?.length > 17 || value?.person_number?.length < 3) return message.error("员工编号只允许输入3~16个字符");
}; };
// //
@ -304,8 +314,8 @@ function TollCollector() {
return message.error("请输入账号!"); return message.error("请输入账号!");
} else { } else {
let reg = /^(?![0-9]+$)/g.test(value?.account_number); let reg = /^(?![0-9]+$)/g.test(value?.account_number);
console.log(reg);
if(!reg) return message.error("您输入的账号不合法,不能为纯数字!"); if(!reg) return message.error("您输入的账号不合法,不能为纯数字!");
if(value?.account_number?.length > 17 || value?.account_number?.length < 3) return message.error("账号只允许输入3~16个字符");
}; };
// //

Loading…
Cancel
Save