From ec094f39a630ac9c453b37ba7f733a91b326eb85 Mon Sep 17 00:00:00 2001
From: "1213317725@qq.com" <1213317725@qq.com>
Date: Tue, 24 Jun 2025 17:16:20 +0800
Subject: [PATCH] 1

---
 .../customer_resources/customer_resources.vue | 17 +++++++++--
 .../personnel/components/personnel-edit.vue   | 28 +++++++++++--------
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/admin/src/app/views/customer_resources/customer_resources.vue b/admin/src/app/views/customer_resources/customer_resources.vue
index b3494c81..1d0eda23 100644
--- a/admin/src/app/views/customer_resources/customer_resources.vue
+++ b/admin/src/app/views/customer_resources/customer_resources.vue
@@ -11,14 +11,24 @@
 
 			<el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
 				<el-form :inline="true" :model="customerResourcesTable.searchParam" ref="searchFormRef">
+					
+					<el-form-item label="校区" prop="campus_name">
+						<el-input v-model="customerResourcesTable.searchParam.campus_name" placeholder="请输入校区" />
+					</el-form-item>
+					
+					
 					<el-form-item :label="t('name')" prop="name">
 						<el-input v-model="customerResourcesTable.searchParam.name"
 							:placeholder="t('namePlaceholder')" />
 					</el-form-item>
-
+					
+					
+					
 					<el-form-item label="年龄" prop="age">
 						<el-input v-model="customerResourcesTable.searchParam.age" placeholder="请输入年龄" />
 					</el-form-item>
+					
+					
 
 
 					<el-form-item label="性别" prop="gender">
@@ -63,6 +73,8 @@
 					<template #empty>
 						<span>{{ !customerResourcesTable.loading ? t('emptyData') : '' }}</span>
 					</template>
+					<el-table-column prop="campus_name" label="校区" min-width="120" :show-overflow-tooltip="true" />
+					
 					<el-table-column :label="t('source')" min-width="180" align="center" :show-overflow-tooltip="true">
 						<template #default="{ row }">
 							<div v-for="(item, index) in sourceList">
@@ -246,7 +258,8 @@
 			"member_label": "",
 			'type': '',
 			"created_at": "",
-			"updated_at": ""
+			"updated_at": "",
+			"campus_name" : ""
 		}
 	})
 
diff --git a/admin/src/app/views/personnel/components/personnel-edit.vue b/admin/src/app/views/personnel/components/personnel-edit.vue
index 9c5e53ea..6a1da609 100644
--- a/admin/src/app/views/personnel/components/personnel-edit.vue
+++ b/admin/src/app/views/personnel/components/personnel-edit.vue
@@ -193,7 +193,7 @@
 					</el-row>
 					
 					
-					<el-row :gutter="20">
+<!-- 					<el-row :gutter="20">
 						<el-col :span="12">
 							<el-form-item label="学历" prop="info.education">
 								<el-input v-model="formData.info.education" placeholder="请填写学历" class="input-width" />
@@ -206,9 +206,15 @@
 							</el-form-item>
 						</el-col>
 						
-					</el-row>
+					</el-row> -->
 					
 					<el-row :gutter="20">
+						<el-col :span="12">
+							<el-form-item label="专业" prop="info.major">
+								<el-input v-model="formData.info.major" placeholder="请填写专业" class="input-width" />
+							</el-form-item>
+						</el-col>
+						
 						<el-col :span="12">
 							<el-form-item label="毕业时间" prop="info.graduation_date">
 							  <el-date-picker
@@ -222,16 +228,15 @@
 							
 						</el-col>
 						
-						<el-col :span="12">
-							<el-form-item label="籍贯" prop="info.native_place">
-								<el-input v-model="formData.info.native_place" placeholder="请填写籍贯" class="input-width" />
-							</el-form-item>
-						</el-col>
+				
 						
 					</el-row>
 					
 					
 					<el-row :gutter="20">
+						
+					
+						
 						<el-col :span="12">
 							<el-form-item label="户籍所在地" prop="info.household_place">
 								<el-input v-model="formData.info.household_place" placeholder="请填写户籍所在地" class="input-width" />
@@ -247,7 +252,7 @@
 					</el-row>
 					
 					
-					<el-row :gutter="20">
+			<!-- 		<el-row :gutter="20">
 						<el-col :span="12">
 							<el-form-item label="户籍地址" prop="info.household_address">
 								<el-input v-model="formData.info.household_address" placeholder="请填写户籍地址" class="input-width" />
@@ -260,9 +265,9 @@
 							</el-form-item>
 						</el-col>
 						
-					</el-row>
-					
+					</el-row> -->
 					
+		<!-- 			
 					<el-row :gutter="20">
 						<el-col :span="12">
 							<el-form-item label="紧急联系人" prop="info.emergency_contact">
@@ -276,7 +281,7 @@
 							</el-form-item>
 						</el-col>
 						
-					</el-row>
+					</el-row> -->
 					
 					
 					<el-row :gutter="20">
@@ -348,6 +353,7 @@
 						</el-col>
 						
 						<el-col :span="12">
+							
 							<el-form-item label="备注" prop="info.remark">
 								<el-input v-model="formData.info.remark" placeholder="请填写备注" class="input-width" />
 							</el-form-item>