From 92756497daae28871f6f32e713e85c8398f48735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=AE=87=E8=88=AA?= <740464440@qq.com>
Date: Fri, 26 Jan 2024 21:10:09 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E5=A4=84=E7=90=86=E8=B7=AF=E5=A4=96?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86--=E6=94=B6=E8=B4=B9?=
 =?UTF-8?q?=E5=91=98=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E7=9B=B8=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84bug=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/MerchantMgm/MerchantInfo/loadable.jsx            |  2 +-
 .../OperationSales/InformationMgm/loadable.jsx             | 12 ++++++------
 src/pages/OutRoadMgm/OutPersonMgm/TollCollector/index.jsx  | 14 ++++++++++++--
 3 files changed, 19 insertions(+), 9 deletions(-)

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: <span>预览</span> },
+    // { key: "0", label: <span>预览</span> },
     { key: "1", label: <span>详情</span> },
     { key: "2", label: <span>发布</span> },
     { key: "3", label: <span>编辑</span> },
@@ -1148,11 +1148,11 @@ function InformationMgm() {
               onChange={(e) => handleForm("isReprint", e.target.value)}
             >
               <Radio.Button value="0">原创</Radio.Button>
-              <Radio.Button value="1">转载</Radio.Button>
+              {/* <Radio.Button value="1">转载</Radio.Button> */}
             </Radio.Group>
           </div>
           <div>
-            <Button
+            {/* <Button
               type="primary"
               className="green"
               onClick={() => {
@@ -1164,7 +1164,7 @@ function InformationMgm() {
               }}
             >
               预览
-            </Button>
+            </Button> */}
             <Button type="primary" onClick={() => handleSaveInfo()}>
               保存
             </Button>
@@ -1659,10 +1659,10 @@ function InformationMgm() {
                   />
                 </div>
               </div>
-              <div className="row-line">
+              {/* <div className="row-line">
                 <div className="r-txt">预览链接：</div>
                 <div className="r-con jump-url" title={rowData?.jumpUrl}>{rowData?.jumpUrl || "-"}</div>
-              </div>
+              </div> */}
               <div className="row-line">
                 <div className="r-txt">最后操作人：</div>
                 <div className="r-con">{rowData?.updateUserName || "-"}</div>
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) => (
+      //   <Tooltip placement="bottom" title={text} getPopupContainer={(e) => e.parentNode} zIndex={1000}>
+      //     {text || "--"}
+      //   </Tooltip>
+      // )
     },
     {
       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个字符");
     };
 
     // 手机号