diff --git a/src/pages/MerchantMgm/MerchantInfo/loadable.jsx b/src/pages/MerchantMgm/MerchantInfo/loadable.jsx index 5897fb7..b598b93 100644 --- a/src/pages/MerchantMgm/MerchantInfo/loadable.jsx +++ b/src/pages/MerchantMgm/MerchantInfo/loadable.jsx @@ -709,7 +709,7 @@ const MerchantInfo = (props) => { } ) } catch (errorInfo) { - message.error("必填字段不能为空",2.5) + message.error("请正确填写内容项",2.5) console.log(errorInfo) } diff --git a/src/pages/OperationCenter/OperationSales/InformationMgm/loadable.jsx b/src/pages/OperationCenter/OperationSales/InformationMgm/loadable.jsx index 05b4666..ae85635 100644 --- a/src/pages/OperationCenter/OperationSales/InformationMgm/loadable.jsx +++ b/src/pages/OperationCenter/OperationSales/InformationMgm/loadable.jsx @@ -152,7 +152,7 @@ function InformationMgm() { // 操作-下拉 const items = [ - { key: "0", label: 预览 }, + // { key: "0", label: 预览 }, { key: "1", label: 详情 }, { key: "2", label: 发布 }, { key: "3", label: 编辑 }, @@ -1148,11 +1148,11 @@ function InformationMgm() { onChange={(e) => handleForm("isReprint", e.target.value)} > 原创 - 转载 + {/* 转载 */}
- + */} @@ -1659,10 +1659,10 @@ function InformationMgm() { />
-
+ {/*
预览链接:
{rowData?.jumpUrl || "-"}
-
+
*/}
最后操作人:
{rowData?.updateUserName || "-"}
diff --git a/src/pages/OutRoadMgm/OutPersonMgm/TollCollector/index.jsx b/src/pages/OutRoadMgm/OutPersonMgm/TollCollector/index.jsx index 4b71df6..2ed7369 100644 --- a/src/pages/OutRoadMgm/OutPersonMgm/TollCollector/index.jsx +++ b/src/pages/OutRoadMgm/OutPersonMgm/TollCollector/index.jsx @@ -1,6 +1,6 @@ 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 { useSessionStorageState } from "ahooks"; import moment from "moment"; @@ -111,7 +111,16 @@ function TollCollector() { dataIndex: "administer_parking", key: "administer_parking", align: "center", + ellipsis: true, render: (text, record, index) => text || "--", + // ellipsis: { + // showTitle: false, + // }, + // render: (text, record, index) => ( + // e.parentNode} zIndex={1000}> + // {text || "--"} + // + // ) }, { title: "添加时间", @@ -297,6 +306,7 @@ function TollCollector() { } else { let reg = /[`~!@#$%^&*()_\-+=<>?:"{}|,./;'\\[\]·~!@#¥%……&*()——\-+={}|《》?:“”【】、;‘',。、]/g.test(value?.person_number); 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("请输入账号!"); } else { let reg = /^(?![0-9]+$)/g.test(value?.account_number); - console.log(reg); if(!reg) return message.error("您输入的账号不合法,不能为纯数字!"); + if(value?.account_number?.length > 17 || value?.account_number?.length < 3) return message.error("账号只允许输入3~16个字符"); }; // 手机号