c-chenxs1/zhgh_zjnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 优化

Browse Source
This commit is contained in:
c-chenxs1
2026-10-23 11:03:32 +08:00
parent 5d160f660f
commit 6e351c6829
6 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/db/data_center_person_type.sql
+32
View File
@@ -0,0 +1,32 @@
-- 信息中心人员类型编码映射，使用 USER_PERSON_TYPE 字典。
INSERT INTO sys_data_dict (
parentCode, name, code, createdBy, createdAt, updatedBy, updatedAt, delFlag
)
SELECT
'USER_PERSON_TYPE', source.name, source.code,
'', UNIX_TIMESTAMP(NOW()) * 1000,
'', UNIX_TIMESTAMP(NOW()) * 1000, 0
FROM (
SELECT '1' AS code, '在编类' AS name
UNION ALL SELECT '1001', '聘用合同制（享受人事代理待遇）'
UNION ALL SELECT '101', '在编'
UNION ALL SELECT '102', '兰溪编制'
UNION ALL SELECT '2', '非在编类'
UNION ALL SELECT '202', '派遣人员'
UNION ALL SELECT '204', '博士后'
UNION ALL SELECT '206', '挂职人员'
UNION ALL SELECT '208', '外籍教师'
UNION ALL SELECT '209', '兼职教师'
UNION ALL SELECT '210', '非学校聘用人员'
UNION ALL SELECT '214', '单位返聘'
UNION ALL SELECT '215', '附属单位'
UNION ALL SELECT '902', '聘用合同制'
UNION ALL SELECT '904', '聘用制专家'
UNION ALL SELECT '905', '人事代理'
UNION ALL SELECT '909', '其他'
) source
WHERE NOT EXISTS (
SELECT 1 FROM sys_data_dict existing
WHERE existing.parentCode = 'USER_PERSON_TYPE'
AND existing.code = source.code
);
src/main/resources/static/components/module/activity/UserDataScope.vue
+2 -2
View File
@@ -92,7 +92,7 @@
</div>-->
<div class="search-item">
<div class="search-item-label">教职工类别</div>
<div class="search-item-label">人员类型</div>
<div class="search-item-option">
<dict-select v-model="pageForm.personType" code="USER_PERSON_TYPE" @change="doSearch"
style="width: 100%"></dict-select>
@@ -236,7 +236,7 @@ module.exports = {
{prop: "sex", label: "性别", sortable: true},
{prop: "birthday", label: "出生年月", formatter: this.formatDate},
{prop: "mobile", label: "联系电话"},
{prop: "personType", label: "教职工类别", sortable: true},
{prop: "personType", label: "人员类型", sortable: true},
{prop: "userState", label: "在职状态", sortable: true},
{prop: "unitName", label: "所属单位", sortable: true},
{prop: "unionName", label: "所属工会", sortable: true},
src/main/resources/static/components/module/activity/UserScope.vue
+2 -2
View File
@@ -71,7 +71,7 @@
</el-row>
<el-row class="query-row" v-if="is_A06 || is_sysadmin || is_H04">
<el-col class="query-title">教职工类别：</el-col>
<el-col class="query-title">人员类型：</el-col>
<el-col class="query-content">
<el-tag
v-for="item in personTypeOptions"
@@ -463,7 +463,7 @@ module.exports = {
{ prop: "birthday", label: "出生年月", sortable: true },
{ prop: "age", label: "年龄", sortable: true },
{ prop: "mobile", label: "联系电话" },
{ prop: "personType", label: "教职工类别", sortable: true },
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true }
src/main/resources/static/components/module/userInfo/index.vue
+1 -1
View File
@@ -22,7 +22,7 @@
{{ viewData.arrivalAtSchoolDate ? $moment(viewData.arrivalAtSchoolDate).format("YYYY-MM-DD") : null }}
</el-descriptions-item>
<el-descriptions-item label="身份类别">{{ viewData.identityType }}</el-descriptions-item>
<el-descriptions-item label="教职工类别">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item label="人员类型">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>
<el-descriptions-item label="预计离退休时间">
{{ viewData.retireDate ? $moment(viewData.retireDate).format("YYYY-MM-DD") : null }}