From ea6f80179c8c45d743d45aa02e54640aad6355f7 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Mon, 02 Feb 2026 13:39:16 +0800
Subject: [PATCH] 修改

---
 src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue |   47 +++++++++++++++++++++++++++--------------------
 1 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue b/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue
index e6e0ca7..c62ee18 100644
--- a/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue
@@ -78,12 +78,6 @@
 <!--              placeholder="请选择离职时间"-->
 <!--          />-->
 <!--        </el-form-item>-->
-        <el-form-item label="密码:" prop="password" v-if="state.title == '新增' || state.title == '修改密码'">
-          <el-input v-model.trim="state.form.password" type="password" show-password placeholder="请输入密码"></el-input>
-        </el-form-item>
-        <el-form-item label="重复密码:" prop="confirmPassword" v-if="state.title == '新增' || state.title == '修改密码'">
-          <el-input v-model.trim="state.form.confirmPassword" type="password" show-password placeholder="请输入确认密码"></el-input>
-        </el-form-item>
         <el-form-item label="手机号:" prop="phone" v-if="state.title !== '修改密码'" >
           <el-input v-model.trim="state.form.phone" :maxlength="11" :disabled="disabled" placeholder="请输入手机号"></el-input>
         </el-form-item>
@@ -96,7 +90,8 @@
 <!--            <el-radio :label="3">车间(岗位)级</el-radio>-->
 <!--            <el-radio :label="4" v-if="state.currentUserType == 0">其他</el-radio>-->
           </el-radio-group>
-          <span v-else>{{state.currentUserType === 0 ? '系统管理员' : state.currentUserType === 1 ? '企业用户' : state.currentUserType === 6 ? '企业管理员' : state.currentUserType === 2 ? '部门级' : state.currentUserType === 3 ? '车间级' :'其他'}}</span>
+<!--          <span v-else>{{state.currentUserType === 0 ? '系统管理员' : state.currentUserType === 1 ? '企业用户' : state.currentUserType === 6 ? '企业管理员' : state.currentUserType === 2 ? '部门级' : state.currentUserType === 3 ? '车间级' :'其他'}}</span>-->
+          <span v-else>{{state.form.userType === 0 ? '系统管理员' : state.form.userType === 1 ? '企业用户' : state.form.userType === 6 ? '企业管理员' : state.form.userType === 2 ? '部门级' : state.form.userType === 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>-->
           <!--          <el-radio-group v-model="state.form.userType"  :disabled="disabled" @change="changeType" v-else-if="state.title == '编辑'">-->
 <!--            <el-radio :label="0" v-if="state.currentUserType == 0">管理员</el-radio>-->
@@ -186,7 +181,7 @@
         <el-form-item label="职务:" v-if="state.title !== '修改密码' && state.form.userType !== 0">
           <el-input v-model.trim="state.form.duty" :disabled="disabled" placeholder="请输入职务"></el-input>
         </el-form-item>
-        <el-form-item label="专业:" prop="post" v-if="state.title !== '修改密码' && state.form.userType !== 0">
+        <el-form-item label="专业:" prop="post" v-if="state.title !== '修改密码'">
           <el-input v-model.trim="state.form.post" :disabled="disabled" placeholder="请输入专业"></el-input>
         </el-form-item>
         <el-form-item label="角色:" prop="roles" v-if="state.title !== '修改密码'">
@@ -206,6 +201,18 @@
                 :value="item.roleId"
             />
           </el-select>
+        </el-form-item>
+        <el-form-item label="密码:" prop="password" v-if="state.title == '新增' || state.title == '修改密码'">
+          <el-input v-model.trim="state.form.password" type="password" show-password placeholder="请输入密码"></el-input>
+        </el-form-item>
+        <el-form-item label="密码:" v-else>
+          <el-input v-model.trim="state.form.password" type="password" show-password placeholder="请输入密码"></el-input>
+        </el-form-item>
+        <el-form-item label="重复密码:" prop="confirmPassword" v-if="state.title == '新增' || state.title == '修改密码'">
+          <el-input v-model.trim="state.form.confirmPassword" type="password" show-password placeholder="请输入确认密码"></el-input>
+        </el-form-item>
+        <el-form-item label="重复密码:" v-else>
+          <el-input v-model.trim="state.form.confirmPassword" type="password" show-password placeholder="请输入确认密码"></el-input>
         </el-form-item>
       </el-form>
       <template #footer v-if="state.title !='查看'">
@@ -242,11 +249,11 @@
 
 
 const equalToPassword = (rule, value, callback) => {
-  if (state.form.password !== value) {
-    callback(new Error("两次输入的密码不一致"));
-  } else {
-    callback();
-  }
+    if (state.form.password !== value) {
+      callback(new Error("两次输入的密码不一致"));
+    } else {
+      callback();
+    }
 };
 
 const validateUserPhone = (rule, value, callback)=>{
@@ -274,15 +281,15 @@
 }
 
 let validatePwd = (rule, value, callback)=>{
-  if(value === ''){
-    callback(new Error('请输入密码'))
-  }else{
-    if(!verifyPwd(value)){
-      callback(new Error('密码须包含字母、数字、特殊字符,长度在6-16之间'))
+    if(value === ''){
+      callback(new Error('请输入密码'))
     }else{
-      callback()
+      if(!verifyPwd(value)){
+        callback(new Error('密码须包含字母、数字、特殊字符,长度在6-16之间'))
+      }else{
+        callback()
+      }
     }
-  }
 }
 const startUsername = ref('');
 const validateUsername = (rule, value, callback)=>{

--
Gitblit v1.9.2