feat(user): add hire_date and probation_months to sys_user and user admin
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
b1b15da624
commit
b22777fa2d
8 files changed
+113
-19
No files matched your search
@@ -132,6 +132,8 @@ export function fetchCreateUser(data: {
|
||||
supervisorUserId?: string
|
||||
email?: string
|
||||
phoneNo?: string
|
||||
hireDate?: string
|
||||
probationMonths?: number | null
|
||||
sex?: string
|
||||
avatar?: string
|
||||
status?: string
|
||||
@@ -155,6 +157,8 @@ export function fetchUpdateUser(
|
||||
supervisorUserId: string
|
||||
email: string
|
||||
phoneNo: string
|
||||
hireDate: string | null
|
||||
probationMonths: number | null
|
||||
sex: string
|
||||
avatar: string
|
||||
status: string
|
||||
|
||||
Vendored
+2
@@ -43,6 +43,8 @@ declare namespace Api {
|
||||
nickName: string
|
||||
email: string
|
||||
phoneNo: string
|
||||
hireDate?: string
|
||||
probationMonths?: number | null
|
||||
sex: string
|
||||
avatar: string
|
||||
status: string
|
||||
|
||||
@@ -313,6 +313,27 @@
|
||||
<el-form-item label="邮箱">
|
||||
<el-input v-model="formData.email" placeholder="可选" />
|
||||
</el-form-item>
|
||||
<el-form-item label="入职日期">
|
||||
<el-date-picker
|
||||
v-model="formData.hireDate"
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
placeholder="可选"
|
||||
class="w-full"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="试用期(月)">
|
||||
<el-input-number
|
||||
v-model="formData.probationMonths"
|
||||
:min="0"
|
||||
:precision="0"
|
||||
controls-position="right"
|
||||
placeholder="月数"
|
||||
class="w-full"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="性别">
|
||||
<el-select v-model="formData.sex" placeholder="请选择">
|
||||
<el-option label="男" value="0" />
|
||||
@@ -479,6 +500,8 @@
|
||||
supervisorUserId: '' as string,
|
||||
email: '',
|
||||
phoneNo: '',
|
||||
hireDate: '' as string,
|
||||
probationMonths: null as number | null,
|
||||
sex: '0',
|
||||
avatar: '',
|
||||
status: '1',
|
||||
@@ -584,6 +607,8 @@
|
||||
formData.supervisorUserId = ''
|
||||
formData.email = ''
|
||||
formData.phoneNo = ''
|
||||
formData.hireDate = ''
|
||||
formData.probationMonths = null
|
||||
formData.sex = '0'
|
||||
formData.avatar = ''
|
||||
formData.status = '1'
|
||||
@@ -618,6 +643,11 @@
|
||||
formData.supervisorUserId = detail.supervisorUserId || ''
|
||||
formData.email = detail.email || ''
|
||||
formData.phoneNo = detail.phoneNo || ''
|
||||
formData.hireDate = detail.hireDate || ''
|
||||
formData.probationMonths =
|
||||
detail.probationMonths === null || detail.probationMonths === undefined
|
||||
? null
|
||||
: Number(detail.probationMonths)
|
||||
formData.sex = detail.sex || '0'
|
||||
formData.avatar = detail.avatar || ''
|
||||
formData.status = detail.status || '1'
|
||||
@@ -651,6 +681,8 @@
|
||||
supervisorUserId: formData.supervisorUserId || '',
|
||||
email: formData.email?.trim() || undefined,
|
||||
phoneNo: formData.phoneNo?.trim() || undefined,
|
||||
hireDate: formData.hireDate || null,
|
||||
probationMonths: formData.probationMonths,
|
||||
sex: formData.sex,
|
||||
status: formData.status,
|
||||
orderNum: formData.orderNum,
|
||||
@@ -666,6 +698,8 @@
|
||||
supervisorUserId: formData.supervisorUserId || undefined,
|
||||
email: formData.email?.trim() || undefined,
|
||||
phoneNo: formData.phoneNo?.trim() || undefined,
|
||||
hireDate: formData.hireDate || undefined,
|
||||
probationMonths: formData.probationMonths ?? undefined,
|
||||
sex: formData.sex,
|
||||
status: formData.status,
|
||||
orderNum: formData.orderNum,
|
||||
@@ -769,6 +803,14 @@
|
||||
{ label: '所属组织', value: formatUserDeptDisplay(row) },
|
||||
{ label: '手机号', value: row.phoneNo },
|
||||
{ label: '邮箱', value: row.email },
|
||||
{ label: '入职日期', value: row.hireDate || '—' },
|
||||
{
|
||||
label: '试用期',
|
||||
value:
|
||||
row.probationMonths === null || row.probationMonths === undefined
|
||||
? '—'
|
||||
: `${row.probationMonths} 个月`
|
||||
},
|
||||
{
|
||||
label: '性别',
|
||||
value:
|
||||
|
||||
Reference in new issue
Block a user