From e5a70efeaa9fd96ce1242e5d582c8237319fade4 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期五, 10 四月 2026 11:13:15 +0800
Subject: [PATCH] Merge branch 'dev_天津_阳光印刷' of http://114.132.189.42:9002/r/product-inventory-management into dev_天津_阳光印刷
---
src/views/personnelManagement/employeeRecord/components/BasicInfoSection.vue | 61 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/src/views/personnelManagement/employeeRecord/components/BasicInfoSection.vue b/src/views/personnelManagement/employeeRecord/components/BasicInfoSection.vue
index f6291e5..3985596 100644
--- a/src/views/personnelManagement/employeeRecord/components/BasicInfoSection.vue
+++ b/src/views/personnelManagement/employeeRecord/components/BasicInfoSection.vue
@@ -32,9 +32,9 @@
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="鍒悕" prop="aliasName">
+ <el-form-item label="鍒悕" prop="alias">
<el-input
- v-model="form.aliasName"
+ v-model="form.alias"
placeholder="璇疯緭鍏�"
clearable
maxlength="50"
@@ -124,11 +124,56 @@
clearable
style="width: 100%"
>
- <el-option label="鏈" value="single" />
- <el-option label="宸插" value="married" />
- <el-option label="绂诲紓" value="divorced" />
- <el-option label="涓у伓" value="widowed" />
+ <el-option label="鏈" value="鏈" />
+ <el-option label="宸插" value="宸插" />
+ <el-option label="绂诲紓" value="绂诲紓" />
+ <el-option label="涓у伓" value="涓у伓" />
</el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <el-row :gutter="24">
+ <el-col :span="10">
+ <el-form-item label="瑙掕壊" prop="roleId">
+ <el-select
+ v-model="form.roleId"
+ placeholder="璇烽�夋嫨"
+ clearable
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in roleOptions"
+ :key="item.roleId"
+ :label="item.roleName"
+ :value="item.roleId"
+ :disabled="item.status == 1"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="10">
+ <el-form-item label="鍛樺伐閫氳鍦板潃" prop="contactAddress">
+ <el-input
+ v-model="form.contactAddress"
+ type="text"
+ placeholder="璇疯緭鍏�"
+ clearable
+ maxlength="100"
+ show-word-limit
+ />
+ </el-form-item>
+ </el-col>
+ <el-col v-if="operationType === 'add'" :span="10">
+ <el-form-item label="榛樿鍒濆鍖栧瘑鐮�" prop="defaultPassword">
+ <el-input
+ v-model="form.defaultPassword"
+ type="text"
+ placeholder="璇疯緭鍏�"
+ clearable
+ maxlength="50"
+ show-word-limit
+ />
</el-form-item>
</el-col>
</el-row>
@@ -141,9 +186,10 @@
const props = defineProps({
form: { type: Object, required: true },
operationType: { type: String, default: "add" },
+ roleOptions: { type: Array, default: () => [] },
});
-const { form, operationType } = toRefs(props);
+const { form, operationType, roleOptions } = toRefs(props);
</script>
<style scoped>
@@ -156,4 +202,3 @@
margin-right: 4px;
}
</style>
-
--
Gitblit v1.9.3