From bf3d44dfce0f7adda23e2dd6023c96d7fac7519c Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Sat, 22 Nov 2025 14:04:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=BC=96=E5=88=B6=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/system/user/form.vue  | 11 +++++++++--
 src/views/admin/system/user/index.vue | 23 +++++++++++++++++------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/views/admin/system/user/form.vue b/src/views/admin/system/user/form.vue
index c579883..17c0dda 100644
--- a/src/views/admin/system/user/form.vue
+++ b/src/views/admin/system/user/form.vue
@@ -70,11 +70,17 @@
 							<el-input clearable placeholder="请输入昵称" v-model="dataForm.nickname"></el-input>
 						</el-form-item>
 					</el-col>
+					<el-col :span="12" class="mb20">
+						<el-form-item label="编制" prop="staffingType">
+							<dict-select :disabled="!auth('user_sysUser_editStaffingType')"
+								v-model="dataForm.staffingType" dict-code="user_staffing_type" />
+						</el-form-item>
+					</el-col>
 					<el-col :span="12" class="mb20">
 						<el-form-item :label="$t('sysuser.lockFlag')" prop="lockFlag">
 							<el-radio-group v-model="dataForm.lockFlag">
-								<el-radio :key="index" :label="item.value" border v-for="(item, index) in lock_flag">{{
-									item.label }}
+								<el-radio :key="index" :label="item.value" border v-for="(item, index) in lock_flag">
+									{{ item.label }}
 								</el-radio>
 							</el-radio-group>
 						</el-form-item>
@@ -145,6 +151,7 @@ const dataForm = reactive({
 	nickname: "",
 	name: "",
 	email: "",
+	staffingType: "2",
 	post: [] as string[],
 	role: [] as string[],
 })
diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue
index 69324e5..9d3b6e0 100644
--- a/src/views/admin/system/user/index.vue
+++ b/src/views/admin/system/user/index.vue
@@ -22,6 +22,9 @@
 							<el-form-item style="width: 250px" label="角色" prop="role">
 								<select-role v-model="state.queryForm.role" clearable />
 							</el-form-item>
+							<el-form-item style="width: 250px" label="编制情况" prop="staffingType">
+								<dict-select v-model="state.queryForm.staffingType" dict-code="user_staffing_type" />
+							</el-form-item>
 							<el-form-item>
 								<el-button icon="Search" type="primary" @click="getDataList">查询</el-button>
 								<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -64,12 +67,6 @@
 						<el-table-column label="姓名" prop="name" show-overflow-tooltip min-width="150" />
 						<el-table-column label="手机号" prop="phone" show-overflow-tooltip min-width="150" />
 						<el-table-column label="部门" prop="deptName" show-overflow-tooltip min-width="150" />
-						<el-table-column label="角色" show-overflow-tooltip min-width="150">
-							<template #default="scope">
-								<el-tag v-for="(item, index) in scope.row.roleList" :key="index">{{ item.roleName
-								}}</el-tag>
-							</template>
-						</el-table-column>
 						<el-table-column label="启用" show-overflow-tooltip min-width="150">
 							<template #default="{ row }">
 								<el-switch :disabled="!auth('sys_user_edit') || row.processStatus != '2'"
@@ -77,6 +74,17 @@
 									inactive-value="9"></el-switch>
 							</template>
 						</el-table-column>
+						<el-table-column label="编制" min-width="80">
+							<template #default="{ row }">
+								<dict-tag :options="user_staffing_type" :value="row.staffingType" />
+							</template>
+						</el-table-column>
+						<el-table-column label="角色" show-overflow-tooltip min-width="150">
+							<template #default="scope">
+								<el-tag v-for="(item, index) in scope.row.roleList" :key="index">
+									{{ item.roleName }}</el-tag>
+							</template>
+						</el-table-column>
 						<el-table-column label="人脸">
 							<template #default="{ row }">
 								<preview-image :src="row.faceImgs" />
@@ -158,6 +166,7 @@ import { useI18n } from "vue-i18n"
 import { auth } from "/@/utils/authFunction"
 import { getDicts } from "/@/api/admin/dict"
 import ProcessDrawer from "/@/components/processDrawer/index.vue"
+import { useDict } from "/@/hooks/dict"
 
 const UserForm = defineAsyncComponent(() => import("./form.vue"))
 const FaceManage = defineAsyncComponent(() => import("./face-manage.vue"))
@@ -197,6 +206,8 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 })
 const { getDataList, currentChangeHandle, sizeChangeHandle, postDownBlobFile, tableStyle } = useTable(state)
 
+const { user_staffing_type } = useDict("user_staffing_type")
+
 // 清空搜索条件
 const resetQuery = () => {
 	queryRef.value?.resetFields()