From 7aa71a93fd5d97506077ea0f894d98a777ccd7aa Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期四, 10 七月 2025 13:43:20 +0800
Subject: [PATCH] 修改

---
 src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue |   48 +++++++++++++++++++++++++++++-------------------
 1 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue b/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue
index fdef075..41e255b 100644
--- a/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue
@@ -12,8 +12,8 @@
         <el-form-item label="用户名:"  prop="username" v-if="state.title !== '修改密码'">
           <el-input v-model.trim="state.form.username" :disabled="state.title =='编辑' || state.title =='查看'" placeholder="请输入用户名" ></el-input>
         </el-form-item>
-        <el-form-item label="名称:"  prop="name" v-if="state.title !== '修改密码'">
-          <el-input v-model.trim="state.form.name" :disabled="disabled" placeholder="请输入公司、部门或者车间岗位名"></el-input>
+        <el-form-item label="姓名:"  prop="name" v-if="state.title !== '修改密码'">
+          <el-input v-model.trim="state.form.name" :disabled="disabled" placeholder="请输入姓名"></el-input>
         </el-form-item>
         <el-form-item label="性别:"  prop="sex" v-if="state.title !== '修改密码'">
           <el-radio-group v-model="state.form.sex"  :disabled="disabled">
@@ -43,11 +43,11 @@
         </el-form-item>
         <el-form-item label="用户类型:" v-if="state.title !== '修改密码'" prop="userType">
           <el-radio-group v-model="state.form.userType"  :disabled="disabled" @change="changeType" v-if="state.title == '新增'">
-            <el-radio :label="0" v-if="state.currentUserType == 0">管理员</el-radio>
-            <el-radio :label="1" v-if="state.currentUserType == 0 ">企业级</el-radio>
-            <el-radio :label="2" v-if="state.currentUserType == 1 ">部门级</el-radio>
-            <el-radio :label="3" v-if="!state.isAdmin">车间(岗位)级</el-radio>
-            <el-radio :label="4" v-if="state.currentUserType == 0">其他</el-radio>
+            <el-radio :label="0">系统管理员</el-radio>
+            <el-radio :label="1">企业管理员</el-radio>
+            <el-radio :label="2">企业用户</el-radio>
+<!--            <el-radio :label="3" v-if="!state.isAdmin">车间(岗位)级</el-radio>-->
+<!--            <el-radio :label="4" v-if="state.currentUserType == 0">其他</el-radio>-->
           </el-radio-group>
           <span v-else-if="state.title == '查看'">{{state.currentUserType === 0 ? '管理员' : state.currentUserType === 1 ? '企业级' : state.currentUserType === 2 ? '部门级' : state.currentUserType === 3 ? '车间级' :'其他'}}</span>
           <span v-else-if="state.title == '编辑'">{{state.form.userType === 0 ? '管理员' : state.form.userType === 1 ? '企业级' : state.form.userType === 2 ? '部门级' : state.form.userType === 3 ? '车间级' :'其他'}}</span>
@@ -156,7 +156,7 @@
 import { View } from "@element-plus/icons-vue";
 import scorllSelect from '@/components/scrollSelect/index.vue'
 import {ElMessage} from "element-plus";
-import {verifyPhone, verifyPwd, verifyUsername} from "@/utils/validate";
+import {verifyPhone, verifyPwd, verifyUsername,verifyIdCard} from "@/utils/validate";
 import { checkUserName, checkPhone } from "@/api/login"
 import {addUser, editUser, getUserById, resetPwd} from "@/api/onlineEducation/user"
 import {Base64} from "js-base64"
@@ -184,10 +184,22 @@
 
 const validateUserPhone = (rule, value, callback)=>{
   if(value === ''){
-    callback(new Error('请输入手机号'))
+    callback()
   }else{
     if(!verifyPhone(value)){
       callback(new Error('手机号格式有误'))
+    }else{
+      callback()
+    }
+  }
+}
+
+const verifyId = (rule, value, callback)=>{
+  if(value === ''){
+    callback()
+  }else{
+    if(!verifyIdCard(value)){
+      callback(new Error('身份证号格式有误'))
     }else{
       callback()
     }
@@ -259,23 +271,21 @@
     post: ''
   },
   formRules:{
-    name: [{ required: true, message: '请输入公司、部门或者车间岗位名称', trigger: 'blur' }],
+    name: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
     companyName: [{ required: true, message: '请选择所在企业', trigger: 'blur' }],
-    deptId: [{ required: true, message: '请选择部门', trigger: 'blur' }],
-    username: [{ required: true, trigger: "blur", validator: validateUsername }],
+    // deptId: [{ required: true, message: '请选择部门', trigger: 'blur' }],
+    username: [{ required: true, message: '请选择用户名', trigger: 'blur' }],
     password: [{ required: true, validator: validatePwd, trigger: 'blur' }],
     confirmPassword: [{ required: true, validator: equalToPassword, trigger: 'blur' }],
-    phone: [{ required: true, validator: validateUserPhone, trigger: 'blur' }],
+    phone: [{ validator: validateUserPhone, trigger: 'blur' }],
     userType: [{ required: true, message: '请选择用户类型', trigger: 'blur' }],
-    idCard: [{ required: true, message: '请输入身份证号', trigger: 'blur' }],
+    idCard: [{ validator: verifyId, trigger: 'blur' }],
     entryTime: [{ required: true, message: '请选择入职时间', trigger: 'blur' }],
-    duty: [{ required: true, message: '请输入职务', trigger: 'blur' }],
-    post: [{ required: true, message: '请输入专业', trigger: 'blur' }],
+    // duty: [{ required: true, message: '请输入职务', trigger: 'blur' }],
+    // post: [{ required: true, message: '请输入专业', trigger: 'blur' }]
   },
   companyList: [],
-  userList: [
-
-  ],
+  userList: [],
   keyword:'',
   pageNum: 1,
   pageSize: 10,

--
Gitblit v1.9.2