From 1c47f3c982344038a348925290986ee66f9c1721 Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期三, 10 十二月 2025 14:36:49 +0800
Subject: [PATCH] 修改新增

---
 src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue |  135 +++++++++++++++++++++++++--------------------
 1 files changed, 75 insertions(+), 60 deletions(-)

diff --git a/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue b/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue
index ed1311d..21160d9 100644
--- a/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue
@@ -24,28 +24,27 @@
         <el-form-item label="年龄:" prop="age" v-if="state.title !== '修改密码'">
           <el-input v-model.number.trim="state.form.age" type="number" :disabled="disabled" placeholder="请输入年龄"></el-input>
         </el-form-item>
-        <el-form-item label="学历:" prop="qualification" v-if="state.title !== '修改密码'">
-          <el-select
-              v-model="state.form.qualification"
-              placeholder="请选择学历"
-              style="width: 100%"
-          >
-            <el-option
-                v-for="item in state.quaList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="职称:" prop="positional" v-if="state.title !== '修改密码'">
-<!--          <el-input v-model.trim="state.form.positional" :disabled="disabled" placeholder="请输入职称"></el-input>-->
-          <el-radio-group v-model="state.form.positional"  :disabled="disabled">
-            <el-radio label="1">初级</el-radio>
-            <el-radio label="2">中级</el-radio>
-            <el-radio label="3">高级</el-radio>
-          </el-radio-group>
-        </el-form-item>
+<!--        <el-form-item label="学历:" prop="qualification" v-if="state.title !== '修改密码'">-->
+<!--          <el-select-->
+<!--              v-model="state.form.qualification"-->
+<!--              placeholder="请选择学历"-->
+<!--              style="width: 100%"-->
+<!--          >-->
+<!--            <el-option-->
+<!--                v-for="item in state.quaList"-->
+<!--                :key="item.id"-->
+<!--                :label="item.name"-->
+<!--                :value="item.id"-->
+<!--            />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="职称:" prop="positional" v-if="state.title !== '修改密码'">-->
+<!--          <el-radio-group v-model="state.form.positional"  :disabled="disabled">-->
+<!--            <el-radio label="1">初级</el-radio>-->
+<!--            <el-radio label="2">中级</el-radio>-->
+<!--            <el-radio label="3">高级</el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
         <el-form-item label="人员类别:"  prop="personType" v-if="state.title !== '修改密码'">
           <el-radio-group v-model="state.form.personType"  :disabled="disabled">
             <el-radio :label="1">技术</el-radio>
@@ -54,31 +53,31 @@
             <el-radio :label="4">特殊作业</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="身份证号:"  prop="idCard" v-if="state.title !== '修改密码'">
-          <el-input v-model.trim="state.form.idCard" :maxlength="18" :disabled="disabled" placeholder="请输入身份证号"></el-input>
+        <el-form-item label="是否公司人员:" prop="internal" v-if="state.title !== '修改密码'">
+          <el-radio-group v-model="state.form.internal"  :disabled="disabled">
+            <el-radio :label="0">是</el-radio>
+            <el-radio :label="1">否</el-radio>
+          </el-radio-group>
         </el-form-item>
-        <el-form-item label="入职时间:" prop="entryTime" v-if="state.title !== '修改密码'" >
-          <el-date-picker
-              v-model="state.form.entryTime"
-              type="date"
-              value-format="YYYY-MM-DD"
-              placeholder="请选择入职时间"
-          />
-        </el-form-item>
-        <el-form-item label="离职时间:" prop="resignTime" v-if="state.title !== '修改密码'" >
-          <el-date-picker
-              v-model="state.form.resignTime"
-              type="date"
-              value-format="YYYY-MM-DD"
-              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="idCard" v-if="state.title !== '修改密码'">-->
+<!--          <el-input v-model.trim="state.form.idCard" :maxlength="18" :disabled="disabled" placeholder="请输入身份证号"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="入职时间:" prop="entryTime" v-if="state.title !== '修改密码'" >-->
+<!--          <el-date-picker-->
+<!--              v-model="state.form.entryTime"-->
+<!--              type="date"-->
+<!--              value-format="YYYY-MM-DD"-->
+<!--              placeholder="请选择入职时间"-->
+<!--          />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="离职时间:" prop="resignTime" v-if="state.title !== '修改密码'" >-->
+<!--          <el-date-picker-->
+<!--              v-model="state.form.resignTime"-->
+<!--              type="date"-->
+<!--              value-format="YYYY-MM-DD"-->
+<!--              placeholder="请选择离职时间"-->
+<!--          />-->
+<!--        </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>
@@ -178,10 +177,10 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="职务:" prop="duty" v-if="state.title !== '修改密码' && state.form.userType !== 0">
+        <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 !== '修改密码'">
@@ -201,6 +200,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 !='查看'">
@@ -237,11 +248,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)=>{
@@ -269,15 +280,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)=>{
@@ -334,6 +345,7 @@
     post: '',
     age: null,
     personType: null,
+    internal: null,
     qualification: null,
     positional: '',
     roles: []
@@ -351,6 +363,7 @@
     entryTime: [{ required: true, message: '请选择入职时间', trigger: 'blur' }],
     age: [{ required: true, message: '请输入年龄', trigger: 'blur' }],
     personType: [{ required: true, message: '请选择人员类别', trigger: 'blur' }],
+    internal: [{ required: true, message: '请选择是否公司人员', trigger: 'blur' }],
     post: [{ required: true, message: '请输入专业', trigger: 'blur' }],
     qualification: [{ required: true, message: '请选择学历', trigger: 'blur' }],
     positional: [{ required: true, message: '请输入职称', trigger: 'blur' }],
@@ -505,6 +518,7 @@
         companyName: data.companyName,
         age: data.age,
         personType: data.personType,
+        internal: data.internal,
         qualification: data.qualification,
         positional: data.positional,
         roles: data.roles
@@ -612,6 +626,7 @@
     post: '',
     age: null,
     personType: null,
+    internal: null,
     qualification: null,
     positional: '',
     roles: []

--
Gitblit v1.9.2