From 3bb8705e45db17e6949694bbaa1b2a61a0020ee2 Mon Sep 17 00:00:00 2001
From: red-deng-deng <1924913374@qq.com>
Date: Thu, 11 Nov 2021 14:58:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/input/main.js                       |  2 +-
 src/components/input/main.less                     |  2 +-
 .../system/account/add/adduserinfo/adduserinfo.js  | 14 +++-----------
 src/pages/system/station/main.js                   |  8 ++++++--
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/components/input/main.js b/src/components/input/main.js
index 22b84cd8..77da6daf 100644
--- a/src/components/input/main.js
+++ b/src/components/input/main.js
@@ -86,7 +86,7 @@ import classNames from 'classnames'
   }
   // 焦点事件,伸展宽度
   focusFn(e){
-    if(this.props.placeholder.length>7){
+    if(this.props.placeholder.length>10){
       this.setState({'focus':0});
     }
 
diff --git a/src/components/input/main.less b/src/components/input/main.less
index 1678593a..abc3d1c6 100644
--- a/src/components/input/main.less
+++ b/src/components/input/main.less
@@ -3,7 +3,7 @@
 .iptfillself{
   display: flex;
   align-items: center;
-  margin-bottom: 30px;
+  // margin-bottom: 24px!important;
   .label{
     margin-right: 58px;
     .warning{
diff --git a/src/pages/system/account/add/adduserinfo/adduserinfo.js b/src/pages/system/account/add/adduserinfo/adduserinfo.js
index 98a4a2fa..0c8b1cc8 100644
--- a/src/pages/system/account/add/adduserinfo/adduserinfo.js
+++ b/src/pages/system/account/add/adduserinfo/adduserinfo.js
@@ -63,14 +63,14 @@ function Adduser(){
 	{
 		return {
 		  name: 'error',
-		  message: '清输入电话',
+		  message: '请输入电话',
 		};
 	}
 	else if(values.password == "")
 	{
 		return {
 		  name: 'error',
-		  message: '清输入电话',
+		  message: '请输入密码',
 		};
 	}
   }
@@ -153,15 +153,7 @@ function Adduser(){
       style={{marginLeft:'10px'}}
       onSubmit={onSubmit}
     >
-    <FormImageUploadField
-        name="imageUpload"
-        label="头像上传"
-        props={{
-          maxAmount: 1,
-          maxSize: 1024 * 1024 * 2,
-        }}
-        validators={[Validators.minLength(1, '请上传头像')]}
-      />
+
 	  
 	  
 	  
diff --git a/src/pages/system/station/main.js b/src/pages/system/station/main.js
index 3cba426e..c35b7175 100644
--- a/src/pages/system/station/main.js
+++ b/src/pages/system/station/main.js
@@ -59,7 +59,7 @@ export default class station extends React.Component{
       if( e.innerHTML=="保存"){
         if(this.hasVal(cssname,e.parentNode.parentNode.children[0].value)>-1){
           Notify.clear()
-          Notify.warn(`公司名重复`);
+          Notify.warn(`${placeholder}重复,请重新增加`);
         }else{
           e.parentNode.firstChild.innerHTML='删除';
           e.parentNode.parentNode.children[0].disabled="disabled";
@@ -104,16 +104,20 @@ export default class station extends React.Component{
   sureFn(e,rp,placeholder){
     if(e.target.value&&e.keyCode==13){
       let cssname=null;
+      let stationame=[];
       if(placeholder=='公司'){
         cssname='companyBtn';
+        stationame=this.state.company;
       }else if(placeholder=='部门'){
         cssname='departmentBtn';
+        stationame=this.state.department;
       }else if(placeholder=='岗位'){
         cssname='postBtn';
+        stationame=this.state.post;
       }
       if(this.hasVal(this.state.company,e.target.value)>-1){
         Notify.clear()
-        Notify.warn(`公司名重复`);
+        Notify.warn(`${placeholder}重复,请重新增加`);
       }else{
         rp.parentNode.children[1].firstChild.innerHTML='删除';
         rp.disabled="disabled";