From e68013d52526dd93f51565d07dcae9a8c75ea18e Mon Sep 17 00:00:00 2001
From: zhangrui <zr15972328402@163.com>
Date: Tue, 21 Apr 2026 14:02:46 +0800
Subject: [PATCH] 1

---
 .../member/change/record/index.html           |  7 +++++--
 .../member/change/submit/index.html           | 20 +++++++++++++++++--
 .../staffmanage/member/info/input/index.html  |  8 --------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/record/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/record/index.html
index 2dfe33b1..3ab08b2e 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/record/index.html
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/record/index.html
@@ -32,8 +32,11 @@ layout("/layouts/platform.html"){
                                      code="USER_PERSON_TYPE"></dict-select>
                     </search-item>
                     <search-item label="变更类型">
-                        <dict-select v-model="pageForm.changeType" placeholder="变更类型" @change="doSearch"
-                                     code="MEMBER_CHANGE_TYPE"></dict-select>
+                        <el-select v-model="pageForm.changeType" placeholder="变更类型" @change="doSearch"
+                                   clearable filterable style="width: 100%">
+                            <el-option :key="item.code" :label="item.changeTypeName" :value="item.code"
+                                       v-for="item in changeTypeData"></el-option>
+                        </el-select>
                     </search-item>
                     <search-item label="人员分类">
                         <dict-select v-model="pageForm.aidFundMemberUserType" placeholder="请选择人员分类" @change="doSearch"
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html
index 1e88122a..37b1dcba 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html
@@ -27,8 +27,11 @@ layout("/layouts/platform.html"){
 
 				<el-descriptions-item label="民族">
 					<el-form-item prop="nation">
-						<dict-select style="width: 100%" placeholder="请选择民族" v-model="formData.nation"
-						             :disabled="allowFields('nation')" code="USER_NATION"></dict-select>
+						<el-select style="width: 100%" placeholder="请选择民族" v-model="formData.nation"
+						           :disabled="allowFields('nation')" clearable filterable>
+							<el-option v-for="item in nationOptions" :key="item.code" :label="item.name"
+							           :value="item.code"></el-option>
+						</el-select>
 					</el-form-item>
 				</el-descriptions-item>
 				<el-descriptions-item label="出生日期">
@@ -292,6 +295,8 @@ layout("/layouts/platform.html"){
 				taskId: GetQueryString("taskId"),
 				units: [],
 				unions: [],
+				// 民族下拉需要保留原字典顺序，仅在存在“汉族”时将其置顶。
+				nationOptions: [],
 				// 允许变更的字段
 				allowChangeFields: [],
 				formData: {
@@ -434,6 +439,16 @@ layout("/layouts/platform.html"){
 			allowFields(prop) {
 				return !this.allowChangeFields.map(v => v.code).includes(prop)
 			},
+			// 民族字典按页面要求处理排序，如果存在“汉族”则优先显示在第一位。
+			async initNationOptions() {
+				const nationOptions = await this.$businessTool.getDictOptions("USER_NATION")
+				const hanIndex = nationOptions.findIndex(item => item && item.name === "汉族")
+				if (hanIndex > 0) {
+					const hanNation = nationOptions.splice(hanIndex, 1)[0]
+					nationOptions.unshift(hanNation)
+				}
+				this.nationOptions = nationOptions
+			},
 			// 初始化表单数据
 			async init(userId){
 				if (userId) {
@@ -451,6 +466,7 @@ layout("/layouts/platform.html"){
 				} else {
 					this.units = await this.$businessTool.listUnit(this.user.union.id)
 				}
+				await this.initNationOptions()
 			},
 			// 获取根据userId获取用户信息
 			async getUserById(userId){
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/info/input/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/info/input/index.html
index a5b4abcd..b8751ded 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/member/info/input/index.html
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/info/input/index.html
@@ -46,14 +46,6 @@ layout("/layouts/platform.html"){
                     <search-item label="教职工类别">
                         <dict-select v-model="pageForm.personType" placeholder="请选择教职工类别" @change="doSearch" code="USER_PERSON_TYPE"></dict-select>
                     </search-item>
-                    <search-item label="编制类别">
-                        <dict-select
-                                v-model="pageForm.preparedBy"
-                                placeholder="请选择编制类别"
-                                @change="doSearch"
-                                code="USER_PREPARED_BY_TYPE"
-                        ></dict-select>
-                    </search-item>
                     <search-item label="人员分类">
                         <dict-select v-model="pageForm.aidFundMemberUserType" placeholder="请选择人员分类" @change="doSearch" code="AIDFUND_MEMBER_USER_TYPE"></dict-select>
                     </search-item>