From 42e91c9c3986c47f4d1cf1a84f044236f668bc8c Mon Sep 17 00:00:00 2001
From: "1213317725@qq.com" <1213317725@qq.com>
Date: Mon, 9 Jun 2025 18:32:51 +0800
Subject: [PATCH] 1

---
 ...customer_resources.customer_resources.json |   19 +
 .../binding_personnel/binding_personnel.vue   |   92 +-
 .../components/campus-person-role-edit.vue    |   10 +-
 .../communication_records.vue                 |    8 +-
 .../customer_resource_changes.vue             |   10 +-
 .../components/UserProfile.vue                |    6 +
 .../components/customer-resources-edit.vue    |   45 +-
 .../customer_resources/customer_resources.vue |   10 +-
 .../lesson-course-teaching-edit.vue           |    1 +
 .../lesson_course_teaching.vue                |  226 +++-
 .../personnel/components/personnel-edit.vue   | 1000 ++++++++++-------
 .../six_speed_modification_log.vue            |    7 +-
 .../CommunicationRecords.php                  |    3 +-
 .../LessonCourseTeaching.php                  |    4 +-
 .../controller/personnel/Personnel.php        |    5 +-
 niucloud/app/common.php                       |    5 +-
 .../app/model/personnel/PersonnelInfo.php     |   41 +
 .../CommunicationRecordsService.php           |    5 +
 .../LessonCourseTeachingService.php           |   52 +-
 .../admin/personnel/PersonnelService.php      |   14 +
 20 files changed, 1124 insertions(+), 439 deletions(-)
 create mode 100644 niucloud/app/model/personnel/PersonnelInfo.php

diff --git a/admin/src/app/lang/zh-cn/customer_resources.customer_resources.json b/admin/src/app/lang/zh-cn/customer_resources.customer_resources.json
index b7b631c9..e4737f12 100644
--- a/admin/src/app/lang/zh-cn/customer_resources.customer_resources.json
+++ b/admin/src/app/lang/zh-cn/customer_resources.customer_resources.json
@@ -101,5 +101,24 @@
   "updatePhysicalTest": "编辑体测",
   "physicalTestDeleteTips": "确定要删除该数据吗？",
   "startDate": "请选择开始时间",
+  "endDate": "请选择结束时间",
+  "resourceId": "资源",
+  "resourceIdPlaceholder": "全部",
+  "resourceType": "资源类型",
+  "resourceTypePlaceholder": "请输入资源类型",
+  "communicationType": "沟通类型",
+  "communicationTypePlaceholder": "请输入沟通类型",
+  "communicationResult": "沟通结果",
+  "communicationResultPlaceholder": "请输入沟通结果",
+  "communicationTime": "沟通时间",
+  "communicationTimePlaceholder": "请输入沟通时间",
+  "remarks": "备注",
+  "remarksPlaceholder": "请输入备注",
+  "tag": "标签",
+  "tagPlaceholder": "请输入标签",
+  "addCommunicationRecords": "添加沟通记录",
+  "updateCommunicationRecords": "编辑沟通记录",
+  "communicationRecordsDeleteTips": "确定要删除该数据吗？",
+  "startDate": "请选择开始时间",
   "endDate": "请选择结束时间"
 }
diff --git a/admin/src/app/views/binding_personnel/binding_personnel.vue b/admin/src/app/views/binding_personnel/binding_personnel.vue
index 4a5bc7a0..e8d22fb3 100644
--- a/admin/src/app/views/binding_personnel/binding_personnel.vue
+++ b/admin/src/app/views/binding_personnel/binding_personnel.vue
@@ -23,6 +23,44 @@
           :placeholder="t('userPhone')"
         />
       </el-form-item>
+	  
+	  
+	  
+	  <el-form-item label="角色" prop="role_id">
+	        <el-select
+	          class="input-width"
+	          v-model="lessonCourseTeachingTable.searchParam.role_id"
+	          clearable
+	          placeholder="请选择角色"
+	        >
+	          <el-option label="请选择" value=""></el-option>
+	          <el-option
+	            v-for="(item, index) in roleIdList"
+	            :key="index"
+	            :label="item['role_name']"
+	            :value="item['role_id']"
+	          />
+	        </el-select>
+	      </el-form-item>
+	  
+	     <el-form-item label="部门">
+	        <el-select
+	          class="input-width"
+	          v-model="lessonCourseTeachingTable.searchParam.dept_id"
+	          clearable
+	          placeholder="请选择部门"
+	        >
+	          <el-option label="请选择" value=""></el-option>
+	          <el-option
+	            v-for="(item, index) in deptIdList"
+	            :key="index"
+	            :label="item['department_name']"
+	            :value="item['id']"
+	          />
+	        </el-select>
+	      </el-form-item>
+		  
+		  
       <el-form-item>
         <el-button type="primary" @click="loadLessonCourseTeachingList()">{{
           t('search')
@@ -35,6 +73,7 @@
 
     <div class="mt-[10px]">
       <el-table
+	    ref="lessonCourseTableRef"
         :data="lessonCourseTeachingTable.data"
         size="large"
         v-loading="lessonCourseTeachingTable.loading"
@@ -83,16 +122,7 @@
           :show-overflow-tooltip="true"
         />
 
-<!--        <el-table-column :label="t('operation')" fixed="right" min-width="120">-->
-<!--          <template #default="{ row }">-->
-<!--            <el-button type="primary" link @click="editEvent(row)">{{-->
-<!--              t('edit')-->
-<!--            }}</el-button>-->
-<!--            <el-button type="primary" link @click="deleteEvent(row.id, 1)">{{-->
-<!--              t('delete')-->
-<!--            }}</el-button>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
+
       </el-table>
       <div class="mt-[16px] flex justify-end">
         <el-pagination
@@ -155,7 +185,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, computed, watch } from 'vue'
+import { ref, reactive, computed, watch,nextTick  } from 'vue'
 import { useDictionary } from '@/app/api/dict'
 import { t } from '@/lang'
 import type { FormInstance } from 'element-plus'
@@ -167,6 +197,12 @@ import {
   getWithPersonnelDataList,
   setBindingModule,
 } from '@/app/api/lesson_course_teaching'
+
+import {
+  role_all,
+  departments_all,
+} from '@/app/api/sys'
+
 import { ElMessage, ElMessageBox } from 'element-plus';
 let showDialog = ref(false)
 const loading = ref(false)
@@ -180,9 +216,42 @@ let lessonCourseTeachingTable = reactive({
   searchParam: {
     name: '',
     phone: '',
+	dept_id:'',
+	role_id:''
   },
 })
 
+const lessonCourseTableRef = ref()
+
+watch(
+  () => lessonCourseTeachingTable.data,
+  async (newData) => {
+    if (newData.length > 0) {
+      await nextTick()
+      newData.forEach((row) => {
+		  lessonCourseTableRef.value.toggleRowSelection(row, false)  
+		  if(lessonCourseTeachingTable.searchParam.dept_id || lessonCourseTeachingTable.searchParam.role_id){
+			lessonCourseTableRef.value.toggleRowSelection(row, true)  
+		  }
+        
+      })
+    }
+  },
+  { deep: true }
+)
+
+const roleIdList = ref([] as any[])
+const setRoleIdList = async () => {
+  roleIdList.value = await (await role_all({})).data
+}
+setRoleIdList()
+const deptIdList = ref([] as any[])
+const setDeptIdList = async () => {
+  deptIdList.value = await (await departments_all({})).data
+}
+setDeptIdList()
+
+
 const multipleSelection = ref<[]>([])
 const binding_module = ref('')
 const handleSelectionChange = (val: []) => {
@@ -190,6 +259,7 @@ const handleSelectionChange = (val: []) => {
 }
 
 const loadLessonCourseTeachingList = (page: number = 1) => {
+  multipleSelection.value = [];
   lessonCourseTeachingTable.loading = true
   lessonCourseTeachingTable.page = page
 
diff --git a/admin/src/app/views/campus_person_role/components/campus-person-role-edit.vue b/admin/src/app/views/campus_person_role/components/campus-person-role-edit.vue
index 709c8fe9..47f599b2 100644
--- a/admin/src/app/views/campus_person_role/components/campus-person-role-edit.vue
+++ b/admin/src/app/views/campus_person_role/components/campus-person-role-edit.vue
@@ -31,7 +31,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="人员" prop="person_id" v-if="!formData.person_id">
+      <el-form-item label="人员" prop="person_id" v-if="!person_id">
         <el-select
           class="input-width"
           v-model="formData.person_id"
@@ -160,9 +160,6 @@ const formRef = ref<FormInstance>()
 // 表单验证规则
 const formRules = computed(() => {
   return {
-    campus_id: [
-      { required: true, message: "请选择校区", trigger: 'blur' },
-    ],
     person_id: [
       { required: true, message: "请选择人员", trigger: 'blur' },
     ],
@@ -223,13 +220,18 @@ const setDeptIdList = async () => {
   deptIdList.value = await (await getWithDepartmentsList({})).data
 }
 setDeptIdList()
+const person_id = ref('')
 const setFormData = async (row: any = null) => {
+	person_id.value = '';
+	console.log(person_id.value)
   Object.assign(formData, initialFormData)
   if (row.dept_id) {
     formData.dept_id = parseInt(row.dept_id)
   }
+  
   if (row.person_id) {
     formData.person_id = parseInt(row.person_id)
+	person_id.value = parseInt(row.person_id)
   }
   loading.value = true
   if (row.id) {
diff --git a/admin/src/app/views/communication_records/communication_records.vue b/admin/src/app/views/communication_records/communication_records.vue
index 8c2bc896..830565ec 100644
--- a/admin/src/app/views/communication_records/communication_records.vue
+++ b/admin/src/app/views/communication_records/communication_records.vue
@@ -2,7 +2,7 @@
   <div class="main-container">
     <el-card class="box-card !border-none" shadow="never">
       <div class="flex justify-between items-center">
-        <span class="text-lg">{{ pageName }}</span>
+        <!-- <span class="text-lg">{{ pageName }}</span> -->
   <!--      <el-button type="primary" @click="addEvent">
           {{ t('addCommunicationRecords') }}
         </el-button> -->
@@ -209,6 +209,11 @@ import { useRoute } from 'vue-router'
 const route = useRoute()
 const pageName = route.meta.title
 
+const props = defineProps({
+  customer_resource_id: [String, Number]
+})
+
+
 let communicationRecordsTable = reactive({
   page: 1,
   limit: 10,
@@ -216,6 +221,7 @@ let communicationRecordsTable = reactive({
   loading: true,
   data: [],
   searchParam: {
+	customer_resource_id: props.customer_resource_id,
     name: '',
 	phone_number: '',
 	campus: '',
diff --git a/admin/src/app/views/customer_resource_changes/customer_resource_changes.vue b/admin/src/app/views/customer_resource_changes/customer_resource_changes.vue
index 8a2c8a4f..dc1386a2 100644
--- a/admin/src/app/views/customer_resource_changes/customer_resource_changes.vue
+++ b/admin/src/app/views/customer_resource_changes/customer_resource_changes.vue
@@ -3,7 +3,10 @@
     <el-card class="box-card !border-none" shadow="never">
       <div class="flex justify-between items-center">
         <span class="text-lg">{{ pageName }}</span>
+		<el-button type="default" @click="goBack">返回</el-button>
       </div>
+	  
+	  
 
       <div class="mt-[10px]">
         <el-table
@@ -72,10 +75,13 @@ import {
 import { img } from '@/utils/common'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import Edit from '@/app/views/customer_resource_changes/components/customer-resource-changes-edit.vue'
-import { useRoute } from 'vue-router'
+import { useRoute,useRouter } from 'vue-router'
 const route = useRoute()
 const pageName = route.meta.title
-
+const router = useRouter()
+const goBack = () => {
+  router.go(-1)// 或 router.go(-1)
+}
 const props = defineProps({
   value: Number
 })
diff --git a/admin/src/app/views/customer_resources/components/UserProfile.vue b/admin/src/app/views/customer_resources/components/UserProfile.vue
index a7449c72..b5028366 100644
--- a/admin/src/app/views/customer_resources/components/UserProfile.vue
+++ b/admin/src/app/views/customer_resources/components/UserProfile.vue
@@ -28,6 +28,7 @@
 			<el-tab-pane label="修改日志" name="log" />
 			<el-tab-pane label="学生情况" name="student" />
 			<el-tab-pane label="订单列表" name="orders" />
+			<el-tab-pane label="沟通记录列表" name="communication_records" />
 		</el-tabs>
 
 		<!-- 六要素信息卡片 -->
@@ -80,6 +81,10 @@
 			<orders :value="user.id"/>
 		</el-card>
 		
+		<el-card v-if="activeTab === 'communication_records'">
+			<CommunicationRecords :customer_resource_id="user.id"/>
+		</el-card>
+		
   
   </el-dialog>
 </template>
@@ -90,6 +95,7 @@
 	import Log from '@/app/views/customer_resources/components/log.vue'
 	import Student from '@/app/views/customer_resources/components/student_courses.vue'
 	import Orders from '@/app/views/customer_resources/components/order_table.vue'
+	import CommunicationRecords from '@/app/views/communication_records/communication_records.vue'
 	let showDialog = ref(false)
 
 	
diff --git a/admin/src/app/views/customer_resources/components/customer-resources-edit.vue b/admin/src/app/views/customer_resources/components/customer-resources-edit.vue
index 6abfe09e..8f18b643 100644
--- a/admin/src/app/views/customer_resources/components/customer-resources-edit.vue
+++ b/admin/src/app/views/customer_resources/components/customer-resources-edit.vue
@@ -110,18 +110,29 @@
 
 						<el-row :gutter="20">
 							<el-col :span="12">
+								
 								<el-form-item :label="t('distance')" prop="distance">
-									<el-input v-model="formData.distance" clearable
-										:placeholder="t('distancePlaceholder')" class="input-width" />
+									<el-select class="input-width" v-model="formData.distance" clearable
+										:placeholder="t('distancePlaceholder')">
+										<el-option label="远60分钟以上路程" value="远60分钟以上路程"></el-option>
+										<el-option label="适中20-60分钟路程" value="适中20-60分钟路程"></el-option>
+										<el-option label="近20分钟以内" value="近20分钟以内"></el-option>
+									</el-select>
 								</el-form-item>
 							</el-col>
 							<el-col :span="12">
 
-								<el-form-item :label="t('decisionMaker')" prop="decision_maker">
-									<el-input v-model="formData.decision_maker" clearable
-										:placeholder="t('decisionMakerPlaceholder')" class="input-width" />
-								</el-form-item>
-
+									<el-form-item :label="t('decisionMaker')" prop="decision_maker">
+										<el-select class="input-width" v-model="formData.decision_maker" clearable
+											:placeholder="t('decisionMakerPlaceholder')">
+											<el-option label="妈妈" value="妈妈"></el-option>
+											<el-option label="爸爸" value="爸爸"></el-option>
+											<el-option label="双亲" value="双亲"></el-option>
+											<el-option label="长辈" value="长辈"></el-option>
+											<el-option label="其他亲属" value="其他亲属"></el-option>
+											<el-option label="不详" value="不详"></el-option>
+										</el-select>
+									</el-form-item>
 							</el-col>
 						</el-row>
 						<el-row :gutter="20">
@@ -138,7 +149,7 @@
 							<el-col :span="12">
 								<el-form-item :label="t('campus')" prop="campus">
 									<el-select class="input-width" v-model="formData.campus" clearable
-										:placeholder="t('campusPlaceholder')">
+										:placeholder="t('campusPlaceholder')" :disabled="!!campus">
 										<el-option label="请选择" value=""></el-option>
 										<el-option v-for="(item, index) in campusList" :key="index"
 											:label="item['campus_name']" :value="item['id']" />
@@ -172,11 +183,11 @@
 					</el-form>
 				</el-tab-pane>
 
-				<el-tab-pane label="客户六要素" name="sixElements">
+				<el-tab-pane label="客户六要素" name="sixElements" v-if="pageName != '客户资源列表'">
 					<!-- 客户六要素表单内容 -->
 					<el-form :model="formData" label-width="120px">
 
-						<el-row :gutter="20">
+<!-- 						<el-row :gutter="20">
 							<el-col :span="12">
 
 								<el-form-item label="需求购买力" prop="purchase_power">
@@ -217,7 +228,7 @@
 										class="input-width" />
 								</el-form-item>
 							</el-col>
-						</el-row>
+						</el-row> -->
 						<el-row :gutter="20">
 							<el-col :span="12">
 								<el-form-item label="沟通备注" prop="communication">
@@ -271,7 +282,7 @@
 							</el-col>
 						</el-row>
 						<el-form-item label="是否关单" prop="is_closed">
-							<el-select class="input-width" v-model="formData.is_closed" clearable placeholder="请选择是否关单">
+							<el-select class="input-width" v-model="formData.is_closed" clearable placeholder="请选择是否关单" disabled >
 								<el-option label="请选择" value=""></el-option>
 								<el-option v-for="(item, index) in is_closedList" :key="index" :label="item.name"
 									:value="Number(item.value)" />
@@ -314,7 +325,10 @@
 		getSixSpeedInfo,
 		getWithCustomerResourcesList,
 	} from '@/app/api/six_speed'
-
+	import { useRouter, useRoute } from 'vue-router'
+	const route = useRoute()
+	const pageName = route.meta.title;
+	
 	const activeTab = ref('base')
 	let showDialog = ref(false)
 	const loading = ref(false)
@@ -614,7 +628,8 @@
 		resourceIdList.value = await (await getWithCustomerResourcesList({})).data
 	}
 	setResourceIdList()
-
+	const campus = ref('')
+	
 	const setFormData = async (row : any = null) => {
 		Object.assign(formData, initialFormData)
 		loading.value = true
@@ -625,6 +640,8 @@
 					if (data[key] != undefined) formData[key] = data[key]
 				})
 		}
+		
+		campus.value = formData.campus;
 		loading.value = false
 	}
 
diff --git a/admin/src/app/views/customer_resources/customer_resources.vue b/admin/src/app/views/customer_resources/customer_resources.vue
index e8d0d138..e73f250b 100644
--- a/admin/src/app/views/customer_resources/customer_resources.vue
+++ b/admin/src/app/views/customer_resources/customer_resources.vue
@@ -153,9 +153,12 @@
 					</el-table-column>
 
 
-					<el-table-column :label="t('operation')" fixed="right" min-width="300"
+					<el-table-column :label="t('operation')" fixed="right" min-width="350"
 						v-if="customerResourcesTable.searchParam.type == 'zylb'">
 						<template #default="{ row }">
+							
+							<el-button type="primary" link @click="UserPro(row)">客户详情</el-button>
+							
 							<el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
 
 							<el-button type="primary" link @click="orderList(row.id)">订单列表</el-button>
@@ -256,6 +259,11 @@
 		}
 	}
 
+	const UserPro = (row) => {
+		UserProfile(row)
+	}
+	
+	
 	// const type = pageName == '业绩分配' ? 'yjfp' : 'khzy';
 
 	// 获取全部标签
diff --git a/admin/src/app/views/lesson_course_teaching/components/lesson-course-teaching-edit.vue b/admin/src/app/views/lesson_course_teaching/components/lesson-course-teaching-edit.vue
index 5fbe83c7..8a35ab1f 100644
--- a/admin/src/app/views/lesson_course_teaching/components/lesson-course-teaching-edit.vue
+++ b/admin/src/app/views/lesson_course_teaching/components/lesson-course-teaching-edit.vue
@@ -129,6 +129,7 @@ const initialFormData = {
   type: '',
   content: '',
   status: '',
+  url:''
   // user_permission: [],
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
diff --git a/admin/src/app/views/lesson_course_teaching/lesson_course_teaching.vue b/admin/src/app/views/lesson_course_teaching/lesson_course_teaching.vue
index ad4623e4..d68c61a6 100644
--- a/admin/src/app/views/lesson_course_teaching/lesson_course_teaching.vue
+++ b/admin/src/app/views/lesson_course_teaching/lesson_course_teaching.vue
@@ -98,6 +98,8 @@
                   <el-avatar v-else icon="UserFilled" />
                 </template>
               </el-table-column>
+			  
+			  
               <el-table-column
                 :label="t('type')"
                 min-width="180"
@@ -110,6 +112,35 @@
                   </div>
                 </template>
               </el-table-column>
+			  
+				
+				<el-table-column label="预览" width="100" align="left">
+				
+				  <template #default="{ row }">
+			
+				    <template v-if="row.type == '3'">
+				      <el-image
+				        :src="row.url"
+				        style="width: 60px; height: 60px; cursor: pointer"
+				        :preview-src-list="[row.url]"
+				        preview-teleported
+				      />
+				    </template>
+				    
+				    <template v-else-if="row.type == '1'">
+				      <el-button type="primary" text @click="previewVideo(row.url)">预览视频</el-button>
+				    </template>
+				
+				    <template v-else-if="row.type == '2'">
+				      <el-button type="success" text @click="openFile(row.url)">打开文件</el-button>
+				    </template>
+				  </template>
+				</el-table-column>
+
+
+	
+				
+			  
 
               <el-table-column
                 :label="t('status')"
@@ -276,6 +307,29 @@
                   </div>
                 </template>
               </el-table-column>
+			  
+			  <el-table-column label="预览" width="100" align="left">
+			  
+			    <template #default="{ row }">
+			  			
+			      <template v-if="row.type == '3'">
+			        <el-image
+			          :src="row.url"
+			          style="width: 60px; height: 60px; cursor: pointer"
+			          :preview-src-list="[row.url]"
+			          preview-teleported
+			        />
+			      </template>
+			      
+			      <template v-else-if="row.type == '1'">
+			        <el-button type="primary" text @click="previewVideo(row.url)">预览视频</el-button>
+			      </template>
+			  
+			      <template v-else-if="row.type == '2'">
+			        <el-button type="success" text @click="openFile(row.url)">打开文件</el-button>
+			      </template>
+			    </template>
+			  </el-table-column>
 
               <el-table-column
                 :label="t('status')"
@@ -447,6 +501,29 @@
                   </div>
                 </template>
               </el-table-column>
+			  
+			  <el-table-column label="预览" width="100" align="left">
+			  
+			    <template #default="{ row }">
+			  			
+			      <template v-if="row.type == '3'">
+			        <el-image
+			          :src="row.url"
+			          style="width: 60px; height: 60px; cursor: pointer"
+			          :preview-src-list="[row.url]"
+			          preview-teleported
+			        />
+			      </template>
+			      
+			      <template v-else-if="row.type == '1'">
+			        <el-button type="primary" text @click="previewVideo(row.url)">预览视频</el-button>
+			      </template>
+			  
+			      <template v-else-if="row.type == '2'">
+			        <el-button type="success" text @click="openFile(row.url)">打开文件</el-button>
+			      </template>
+			    </template>
+			  </el-table-column>
 
               <el-table-column
                 :label="t('status')"
@@ -622,6 +699,29 @@
                   </div>
                 </template>
               </el-table-column>
+			  
+			  <el-table-column label="预览" width="100" align="left">
+			  
+			    <template #default="{ row }">
+			  			
+			      <template v-if="row.type == '3'">
+			        <el-image
+			          :src="row.url"
+			          style="width: 60px; height: 60px; cursor: pointer"
+			          :preview-src-list="[row.url]"
+			          preview-teleported
+			        />
+			      </template>
+			      
+			      <template v-else-if="row.type == '1'">
+			        <el-button type="primary" text @click="previewVideo(row.url)">预览视频</el-button>
+			      </template>
+			  
+			      <template v-else-if="row.type == '2'">
+			        <el-button type="success" text @click="openFile(row.url)">打开文件</el-button>
+			      </template>
+			    </template>
+			  </el-table-column>
 
               <el-table-column
                 :label="t('status')"
@@ -793,6 +893,29 @@
                   </div>
                 </template>
               </el-table-column>
+			  
+			  <el-table-column label="预览" width="100" align="left">
+			  
+			    <template #default="{ row }">
+			  			
+			      <template v-if="row.type == '3'">
+			        <el-image
+			          :src="row.url"
+			          style="width: 60px; height: 60px; cursor: pointer"
+			          :preview-src-list="[row.url]"
+			          preview-teleported
+			        />
+			      </template>
+			      
+			      <template v-else-if="row.type == '1'">
+			        <el-button type="primary" text @click="previewVideo(row.url)">预览视频</el-button>
+			      </template>
+			  
+			      <template v-else-if="row.type == '2'">
+			        <el-button type="success" text @click="openFile(row.url)">打开文件</el-button>
+			      </template>
+			    </template>
+			  </el-table-column>
 
               <el-table-column
                 :label="t('status')"
@@ -964,6 +1087,30 @@
                   </div>
                 </template>
               </el-table-column>
+			  
+			  
+			  <el-table-column label="预览" width="100" align="left">
+			  
+			    <template #default="{ row }">
+			  			
+			      <template v-if="row.type == '3'">
+			        <el-image
+			          :src="row.url"
+			          style="width: 60px; height: 60px; cursor: pointer"
+			          :preview-src-list="[row.url]"
+			          preview-teleported
+			        />
+			      </template>
+			      
+			      <template v-else-if="row.type == '1'">
+			        <el-button type="primary" text @click="previewVideo(row.url)">预览视频</el-button>
+			      </template>
+			  
+			      <template v-else-if="row.type == '2'">
+			        <el-button type="success" text @click="openFile(row.url)">打开文件</el-button>
+			      </template>
+			    </template>
+			  </el-table-column>
 
               <el-table-column
                 :label="t('status')"
@@ -1135,6 +1282,29 @@
                   </div>
                 </template>
               </el-table-column>
+			  
+			  <el-table-column label="预览" width="100" align="left">
+			  
+			    <template #default="{ row }">
+			  			
+			      <template v-if="row.type == '3'">
+			        <el-image
+			          :src="row.url"
+			          style="width: 60px; height: 60px; cursor: pointer"
+			          :preview-src-list="[row.url]"
+			          preview-teleported
+			        />
+			      </template>
+			      
+			      <template v-else-if="row.type == '1'">
+			        <el-button type="primary" text @click="previewVideo(row.url)">预览视频</el-button>
+			      </template>
+			  
+			      <template v-else-if="row.type == '2'">
+			        <el-button type="success" text @click="openFile(row.url)">打开文件</el-button>
+			      </template>
+			    </template>
+			  </el-table-column>
 
               <el-table-column
                 :label="t('status')"
@@ -1306,6 +1476,29 @@
                   </div>
                 </template>
               </el-table-column>
+			  
+			  <el-table-column label="预览" width="100" align="left">
+			  
+			    <template #default="{ row }">
+			  			
+			      <template v-if="row.type == '3'">
+			        <el-image
+			          :src="row.url"
+			          style="width: 60px; height: 60px; cursor: pointer"
+			          :preview-src-list="[row.url]"
+			          preview-teleported
+			        />
+			      </template>
+			      
+			      <template v-else-if="row.type == '1'">
+			        <el-button type="primary" text @click="previewVideo(row.url)">预览视频</el-button>
+			      </template>
+			  
+			      <template v-else-if="row.type == '2'">
+			        <el-button type="success" text @click="openFile(row.url)">打开文件</el-button>
+			      </template>
+			    </template>
+			  </el-table-column>
 
               <el-table-column
                 :label="t('status')"
@@ -1383,7 +1576,7 @@
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref, watch } from 'vue'
+import { reactive, ref, watch,h } from 'vue'
 import { t } from '@/lang'
 import { useDictionary } from '@/app/api/dict'
 import {
@@ -1415,6 +1608,37 @@ const route = useRoute()
 const pageName = route.meta.title
 const active = 'CourseSyllabus'
 
+
+
+const previewVideo = (url: string) => {
+  // 可使用弹窗播放视频，例如用 el-dialog + video 标签
+  ElMessageBox({
+    title: '视频预览',
+    message: h('video', {
+      src: url,
+      controls: true,
+      style: 'width: 100%',
+      autoplay: true
+    }),
+    customClass: 'video-preview-box',
+    showCancelButton: false,
+    showConfirmButton: false,
+    dangerouslyUseHTMLString: true,
+  });
+};
+
+const openFile = (url: string) => {
+  window.open(`${import.meta.env.VITE_IMG_DOMAIN}/${url}`, '_blank');
+};
+
+const downloadFile = (url: string) => {
+  const a = document.createElement('a');
+  a.href = `${import.meta.env.VITE_IMG_DOMAIN}/${url}`;
+  a.download = '';
+  a.click();
+};
+
+
 let lessonCourseTeachingTable = reactive({
   page: 1,
   limit: 10,
diff --git a/admin/src/app/views/personnel/components/personnel-edit.vue b/admin/src/app/views/personnel/components/personnel-edit.vue
index 8af314de..9c5e53ea 100644
--- a/admin/src/app/views/personnel/components/personnel-edit.vue
+++ b/admin/src/app/views/personnel/components/personnel-edit.vue
@@ -1,388 +1,628 @@
 <template>
-  <el-dialog
-    v-model="showDialog"
-    :title="formData.id ? t('updatePersonnel') : t('addPersonnel')"
-    width="50%"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('name')" prop="name">
-        <el-input
-          v-model="formData.name"
-          clearable
-          :placeholder="t('namePlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('gender')">
-        <el-radio-group
-          v-model="formData.gender"
-          :placeholder="t('genderPlaceholder')"
-        >
-          <el-radio
-            v-for="(item, index) in genderList"
-            :key="index"
-            :label="item.value"
-          >
-            {{ item.name }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item :label="t('phone')" prop="phone">
-        <el-input
-          v-model="formData.phone"
-          clearable
-          :placeholder="t('phonePlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('address')">
-        <el-input
-          v-model="formData.address"
-          clearable
-          :placeholder="t('addressPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('nativePlace')">
-        <el-input
-          v-model="formData.native_place"
-          clearable
-          :placeholder="t('nativePlacePlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item label="头像">
-        <upload-image v-model="formData.head_img" />
-      </el-form-item>
-
-      <el-form-item :label="t('education')">
-        <el-select
-          class="input-width"
-          v-model="formData.education"
-          clearable
-          :placeholder="t('educationPlaceholder')"
-        >
-          <el-option label="请选择" value=""></el-option>
-          <el-option
-            v-for="(item, index) in educationList"
-            :key="index"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-
-      <el-form-item :label="t('profile')">
-        <el-input
-          v-model="formData.profile"
-          type="textarea"
-          rows="4"
-          clearable
-          :placeholder="t('profilePlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-      <el-form-item :label="t('emergencyContactPhone')">
-        <el-input
-          v-model="formData.emergency_contact_phone"
-          clearable
-          :placeholder="t('emergencyContactPhonePlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('idCardFront')">
-        <upload-image v-model="formData.id_card_front" />
-      </el-form-item>
-
-      <el-form-item :label="t('idCardBack')">
-        <upload-image v-model="formData.id_card_back" />
-      </el-form-item>
-
-      <el-form-item :label="t('status')" prop="status">
-        <el-select
-          class="input-width"
-          v-model="formData.status"
-          clearable
-          :placeholder="t('statusPlaceholder')"
-        >
-          <el-option label="请选择" value=""></el-option>
-          <el-option
-            v-for="(item, index) in statusList"
-            :key="index"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-
-      <el-form-item :label="t('isSysUser')" prop="is_sys_user">
-        <el-radio-group
-          v-model="formData.is_sys_user"
-          :placeholder="t('isSysUserPlaceholder')"
-        >
-          <el-radio
-            v-for="(item, index) in is_sys_userList"
-            :key="index"
-            :label="item.value"
-          >
-            {{ item.name }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
+	<el-dialog v-model="showDialog" :title="formData.id ? t('updatePersonnel') : t('addPersonnel')" width="50%"
+		class="diy-dialog-wrap" :destroy-on-close="true">
+
+		<el-tabs v-model="activeTab" class="tab-pane-half">
+			<!-- Tab 1: 基本信息 -->
+			<el-tab-pane label="基本信息" name="base">
+
+				<el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form">
+
+					<el-form-item :label="t('name')" prop="name">
+						<el-input v-model="formData.name" clearable :placeholder="t('namePlaceholder')"
+							class="input-width" />
+					</el-form-item>
+
+					<el-form-item :label="t('gender')">
+						<el-radio-group v-model="formData.gender" :placeholder="t('genderPlaceholder')">
+							<el-radio v-for="(item, index) in genderList" :key="index" :label="item.value">
+								{{ item.name }}
+							</el-radio>
+						</el-radio-group>
+					</el-form-item>
+
+					<el-form-item :label="t('phone')" prop="phone">
+						<el-input v-model="formData.phone" clearable :placeholder="t('phonePlaceholder')"
+							class="input-width" />
+					</el-form-item>
+
+					<el-form-item :label="t('address')">
+						<el-input v-model="formData.address" clearable :placeholder="t('addressPlaceholder')"
+							class="input-width" />
+					</el-form-item>
+
+					<el-form-item :label="t('nativePlace')">
+						<el-input v-model="formData.native_place" clearable :placeholder="t('nativePlacePlaceholder')"
+							class="input-width" />
+					</el-form-item>
+
+					<el-form-item label="头像">
+						<upload-image v-model="formData.head_img" />
+					</el-form-item>
+
+					<el-form-item :label="t('education')">
+						<el-select class="input-width" v-model="formData.education" clearable
+							:placeholder="t('educationPlaceholder')">
+							<el-option label="请选择" value=""></el-option>
+							<el-option v-for="(item, index) in educationList" :key="index" :label="item.name"
+								:value="item.value" />
+						</el-select>
+					</el-form-item>
+
+					<el-form-item :label="t('profile')">
+						<el-input v-model="formData.profile" type="textarea" rows="4" clearable
+							:placeholder="t('profilePlaceholder')" class="input-width" />
+					</el-form-item>
+					<el-form-item :label="t('emergencyContactPhone')">
+						<el-input v-model="formData.emergency_contact_phone" clearable
+							:placeholder="t('emergencyContactPhonePlaceholder')" class="input-width" />
+					</el-form-item>
+
+					<el-form-item :label="t('idCardFront')">
+						<upload-image v-model="formData.id_card_front" />
+					</el-form-item>
+
+					<el-form-item :label="t('idCardBack')">
+						<upload-image v-model="formData.id_card_back" />
+					</el-form-item>
+
+					<el-form-item :label="t('status')" prop="status">
+						<el-select class="input-width" v-model="formData.status" clearable
+							:placeholder="t('statusPlaceholder')">
+							<el-option label="请选择" value=""></el-option>
+							<el-option v-for="(item, index) in statusList" :key="index" :label="item.name"
+								:value="item.value" />
+						</el-select>
+					</el-form-item>
+
+					<el-form-item :label="t('isSysUser')" prop="is_sys_user">
+						<el-radio-group v-model="formData.is_sys_user" :placeholder="t('isSysUserPlaceholder')">
+							<el-radio v-for="(item, index) in is_sys_userList" :key="index" :label="item.value">
+								{{ item.name }}
+							</el-radio>
+						</el-radio-group>
+					</el-form-item>
+				</el-form>
+			
+			</el-tab-pane>
+			
+			<el-tab-pane label="详情信息" name="info">
+				<el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form">
+				
+					<el-row :gutter="20">
+						<el-col :span="12">
+							<el-form-item label="花名" prop="info.name">
+								<el-input v-model="formData.info.name" placeholder="请填写花名" class="input-width" />
+							</el-form-item>
+						</el-col>
+						
+						<el-col :span="12">
+							<el-form-item label="门店" prop="info.store">
+								<el-input v-model="formData.info.store" 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.ethnicity">
+								<el-input v-model="formData.info.ethnicity" placeholder="请填写民族" class="input-width" />
+							</el-form-item>
+						</el-col>
+						
+						<el-form-item label="生日日期" prop="info.birthday">
+						  <el-date-picker
+							v-model="formData.info.birthday"
+							type="date"
+							placeholder="请选择生日日期"
+							class="input-width"
+							value-format="YYYY-MM-DD"
+						  />
+						</el-form-item>
+
+						
+					</el-row>
+					
+					
+					<el-row :gutter="20">
+						<el-col :span="12">
+							<el-form-item label="年龄" prop="info.age">
+								<el-input v-model="formData.info.age" placeholder="请填写年龄" class="input-width" />
+							</el-form-item>
+						</el-col>
+						
+						<el-col :span="12">
+							<el-form-item label="司龄" prop="info.tenure">
+								<el-input v-model="formData.info.tenure" 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.regular_date">
+							  <el-date-picker
+								v-model="formData.info.regular_date"
+								type="date"
+								placeholder="请选择转正时间"
+								class="input-width"
+								value-format="YYYY-MM-DD"
+							  />
+							</el-form-item>
+							
+							
+						</el-col>
+						
+						<el-col :span="12">
+							<el-form-item label="是否转正" prop="info.is_regular">
+							  <el-select
+							    v-model="formData.info.is_regular"
+							    placeholder="请选择是否转正"
+							    class="input-width"
+							    clearable
+							  >
+							    <el-option label="是" value="是" />
+							    <el-option label="否" value="否" />
+							  </el-select>
+							</el-form-item>
+
+						</el-col>
+						
+					</el-row>
+					
+					
+					<el-row :gutter="20">
+						<el-col :span="12">
+							<el-form-item label="政治面貌" prop="info.politics">
+								<el-input v-model="formData.info.politics" placeholder="请填写政治面貌" class="input-width" />
+							</el-form-item>
+						</el-col>
+						
+						<el-col :span="12">
+							<el-form-item label="毕业院校" prop="info.university">
+								<el-input v-model="formData.info.university" 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.education">
+								<el-input v-model="formData.info.education" placeholder="请填写学历" class="input-width" />
+							</el-form-item>
+						</el-col>
+						
+						<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-row>
+					
+					<el-row :gutter="20">
+						<el-col :span="12">
+							<el-form-item label="毕业时间" prop="info.graduation_date">
+							  <el-date-picker
+								v-model="formData.info.graduation_date"
+								type="date"
+								placeholder="请选择毕业时间"
+								class="input-width"
+								value-format="YYYY-MM-DD"
+							  />
+							</el-form-item>
+							
+						</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" />
+							</el-form-item>
+						</el-col>
+						
+						<el-col :span="12">
+							<el-form-item label="户籍类型" prop="info.household_type">
+								<el-input v-model="formData.info.household_type" 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_address">
+								<el-input v-model="formData.info.household_address" placeholder="请填写户籍地址" class="input-width" />
+							</el-form-item>
+						</el-col>
+						
+						<el-col :span="12">
+							<el-form-item label="现居地址" prop="info.current_address">
+								<el-input v-model="formData.info.current_address" 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.emergency_contact">
+								<el-input v-model="formData.info.emergency_contact" placeholder="请填写紧急联系人" class="input-width" />
+							</el-form-item>
+						</el-col>
+						
+						<el-col :span="12">
+							<el-form-item label="紧急联系人联系电话" prop="info.emergency_phone">
+								<el-input v-model="formData.info.emergency_phone" 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.marital_status">
+							  <el-select
+							    v-model="formData.info.marital_status"
+							    placeholder="请选择婚否"
+							    class="input-width"
+							    clearable
+							  >
+							    <el-option label="已婚" value="已婚" />
+							    <el-option label="未婚" value="未婚" />
+							  </el-select>
+							</el-form-item>
+							
+						</el-col>
+						
+						<el-col :span="12">
+							<el-form-item label="银行卡号" prop="info.bank_card">
+								<el-input v-model="formData.info.bank_card" 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.bank_name">
+								<el-input v-model="formData.info.bank_name" placeholder="请填写开户行" class="input-width" />
+							</el-form-item>
+						</el-col>
+						
+						<el-col :span="12">
+							
+							<el-form-item label="合同到期时间" prop="info.contract_expire">
+							  <el-date-picker
+								v-model="formData.info.contract_expire"
+								type="date"
+								placeholder="请选择合同到期时间"
+								class="input-width"
+								value-format="YYYY-MM-DD"
+							  />
+							</el-form-item>
+							
+						</el-col>
+						
+					</el-row>
+					
+					
+					<el-row :gutter="20">
+						<el-col :span="12">
+							
+							<el-form-item label="是否复聘" prop="info.is_rehired">
+							  <el-select
+							    v-model="formData.info.is_rehired"
+							    placeholder="请选择是否复聘"
+							    class="input-width"
+							    clearable
+							  >
+							    <el-option label="是" value="是" />
+							    <el-option label="否" value="否" />
+							  </el-select>
+							</el-form-item>
+							
+							
+						</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>
+						</el-col>
+						
+					</el-row>
+					
+					
+					
+				</el-form>
+			</el-tab-pane>
+			
+		</el-tabs>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+					<el-button type="primary" :loading="loading"
+						@click="confirm(formRef)">{{ t('confirm') }}</el-button>
+				</span>
+			</template>
+	</el-dialog>
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, computed, watch } from 'vue'
-import { useDictionary } from '@/app/api/dict'
-import { t } from '@/lang'
-import type { FormInstance } from 'element-plus'
-import {
-  addPersonnel,
-  editPersonnel,
-  getPersonnelInfo,
-} from '@/app/api/personnel'
-
-let showDialog = ref(false)
-const loading = ref(false)
-
-/**
- * 表单数据
- */
-const initialFormData = {
-  id: '',
-  name: '',
-  gender: '',
-  head_img: '',
-  phone: '',
-  address: '',
-  native_place: '',
-  education: '',
-  profile: '',
-  emergency_contact_phone: '',
-  id_card_front: '',
-  id_card_back: '',
-  status: '',
-  is_sys_user: '',
-}
-const formData: Record<string, any> = reactive({ ...initialFormData })
-
-const formRef = ref<FormInstance>()
-
-// 表单验证规则
-const formRules = computed(() => {
-  return {
-    name: [{ required: true, message: t('namePlaceholder'), trigger: 'blur' }],
-    gender: [
-      { required: true, message: t('genderPlaceholder'), trigger: 'blur' },
-    ],
-    phone: [
-      { required: true, message: t('phonePlaceholder'), trigger: 'blur' },
-    ],
-    address: [
-      { required: true, message: t('addressPlaceholder'), trigger: 'blur' },
-    ],
-    native_place: [
-      { required: true, message: t('nativePlacePlaceholder'), trigger: 'blur' },
-    ],
-    education: [
-      { required: true, message: t('educationPlaceholder'), trigger: 'blur' },
-    ],
-    profile: [
-      { required: true, message: t('profilePlaceholder'), trigger: 'blur' },
-    ],
-    emergency_contact_phone: [
-      {
-        required: true,
-        message: t('emergencyContactPhonePlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    id_card_front: [
-      { required: true, message: t('idCardFrontPlaceholder'), trigger: 'blur' },
-    ],
-    id_card_back: [
-      { required: true, message: t('idCardBackPlaceholder'), trigger: 'blur' },
-    ],
-    status: [
-      { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
-    ],
-    is_sys_user: [
-      { required: true, message: t('isSysUserPlaceholder'), trigger: 'blur' },
-    ],
-  }
-})
-
-const emit = defineEmits(['complete'])
-
-/**
- * 确认
- * @param formEl
- */
-const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  let save = formData.id ? editPersonnel : addPersonnel
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      let data = formData
-
-      save(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch((err) => {
-          loading.value = false
-        })
-    }
-  })
-}
-
-// 获取字典数据
-let genderList = ref([])
-const genderDictList = async () => {
-  genderList.value = await (await useDictionary('gender')).data.dictionary
-}
-genderDictList()
-watch(
-  () => genderList.value,
-  () => {
-    formData.gender = genderList.value[0].value
-  }
-)
-let educationList = ref([])
-const educationDictList = async () => {
-  educationList.value = await (await useDictionary('education')).data.dictionary
-}
-educationDictList()
-watch(
-  () => educationList.value,
-  () => {
-    formData.education = educationList.value[0].value
-  }
-)
-let statusList = ref([])
-const statusDictList = async () => {
-  statusList.value = await (
-    await useDictionary('personnel_status')
-  ).data.dictionary
-}
-statusDictList()
-watch(
-  () => statusList.value,
-  () => {
-    formData.status = statusList.value[0].value
-  }
-)
-let is_sys_userList = ref([])
-const is_sys_userDictList = async () => {
-  is_sys_userList.value = await (
-    await useDictionary('global_true_or_false')
-  ).data.dictionary
-}
-is_sys_userDictList()
-watch(
-  () => is_sys_userList.value,
-  () => {
-    formData.is_sys_user = is_sys_userList.value[0].value
-  }
-)
-
-const setFormData = async (row: any = null) => {
-  Object.assign(formData, initialFormData)
-  loading.value = true
-  if (row) {
-    const data = await (await getPersonnelInfo(row.id)).data
-    if (data)
-      Object.keys(formData).forEach((key: string) => {
-        if (data[key] != undefined) formData[key] = data[key]
-      })
-  }
-  loading.value = false
-}
-
-// 验证手机号格式
-const mobileVerify = (rule: any, value: any, callback: any) => {
-  if (value && !/^1[3-9]\d{9}$/.test(value)) {
-    callback(new Error(t('generateMobile')))
-  } else {
-    callback()
-  }
-}
-
-// 验证身份证号
-const idCardVerify = (rule: any, value: any, callback: any) => {
-  if (
-    value &&
-    !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(
-      value
-    )
-  ) {
-    callback(new Error(t('generateIdCard')))
-  } else {
-    callback()
-  }
-}
-
-// 验证邮箱号
-const emailVerify = (rule: any, value: any, callback: any) => {
-  if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
-    callback(new Error(t('generateEmail')))
-  } else {
-    callback()
-  }
-}
-
-// 验证请输入整数
-const numberVerify = (rule: any, value: any, callback: any) => {
-  if (!Number.isInteger(value)) {
-    callback(new Error(t('generateNumber')))
-  } else {
-    callback()
-  }
-}
-
-defineExpose({
-  showDialog,
-  setFormData,
-})
+	import { ref, reactive, computed, watch } from 'vue'
+	import { useDictionary } from '@/app/api/dict'
+	import { t } from '@/lang'
+	import type { FormInstance } from 'element-plus'
+	import {
+		addPersonnel,
+		editPersonnel,
+		getPersonnelInfo,
+	} from '@/app/api/personnel'
+
+	let showDialog = ref(false)
+	const loading = ref(false)
+	const activeTab = ref('base')
+	/**
+	 * 表单数据
+	 */
+	const initialFormData = {
+		id: '',
+		name: '',
+		gender: '',
+		head_img: '',
+		phone: '',
+		address: '',
+		native_place: '',
+		education: '',
+		profile: '',
+		emergency_contact_phone: '',
+		id_card_front: '',
+		id_card_back: '',
+		status: '',
+		is_sys_user: '',
+		info:{
+			name:'',
+			store:'',
+			ethnicity:'',
+			birthday:'',
+			age:'',
+			tenure:'',
+			regular_date:'',
+			is_regular:'',
+			politics:'',
+			university:'',
+			education:'',
+			major:'',
+			graduation_date:'',
+			native_place:'',
+			household_place:'',
+			household_type:'',
+			household_address:'',
+			current_address:'',
+			emergency_contact:'',
+			emergency_phone:'',
+			marital_status:'',
+			bank_card:'',
+			bank_name:'',
+			contract_expire:'',
+			is_rehired:'',
+			remark:''
+
+		}
+	}
+	const formData : Record<string, any> = reactive({ ...initialFormData })
+
+	const formRef = ref<FormInstance>()
+
+	// 表单验证规则
+	const formRules = computed(() => {
+		return {
+			name: [{ required: true, message: t('namePlaceholder'), trigger: 'blur' }],
+			gender: [
+				{ required: true, message: t('genderPlaceholder'), trigger: 'blur' },
+			],
+			phone: [
+				{ required: true, message: t('phonePlaceholder'), trigger: 'blur' },
+			],
+			address: [
+				{ required: true, message: t('addressPlaceholder'), trigger: 'blur' },
+			],
+			native_place: [
+				{ required: true, message: t('nativePlacePlaceholder'), trigger: 'blur' },
+			],
+			education: [
+				{ required: true, message: t('educationPlaceholder'), trigger: 'blur' },
+			],
+			profile: [
+				{ required: true, message: t('profilePlaceholder'), trigger: 'blur' },
+			],
+			emergency_contact_phone: [
+				{
+					required: true,
+					message: t('emergencyContactPhonePlaceholder'),
+					trigger: 'blur',
+				},
+			],
+			id_card_front: [
+				{ required: true, message: t('idCardFrontPlaceholder'), trigger: 'blur' },
+			],
+			id_card_back: [
+				{ required: true, message: t('idCardBackPlaceholder'), trigger: 'blur' },
+			],
+			status: [
+				{ required: true, message: t('statusPlaceholder'), trigger: 'blur' },
+			],
+			is_sys_user: [
+				{ required: true, message: t('isSysUserPlaceholder'), trigger: 'blur' },
+			],
+		}
+	})
+
+	const emit = defineEmits(['complete'])
+
+	/**
+	 * 确认
+	 * @param formEl
+	 */
+	const confirm = async (formEl : FormInstance | undefined) => {
+		if (loading.value || !formEl) return
+		let save = formData.id ? editPersonnel : addPersonnel
+
+		await formEl.validate(async (valid) => {
+			if (valid) {
+				loading.value = true
+
+				let data = formData
+
+				save(data)
+					.then((res) => {
+						loading.value = false
+						showDialog.value = false
+						emit('complete')
+					})
+					.catch((err) => {
+						loading.value = false
+					})
+			}
+		})
+	}
+
+	// 获取字典数据
+	let genderList = ref([])
+	const genderDictList = async () => {
+		genderList.value = await (await useDictionary('gender')).data.dictionary
+	}
+	genderDictList()
+	watch(
+		() => genderList.value,
+		() => {
+			formData.gender = genderList.value[0].value
+		}
+	)
+	let educationList = ref([])
+	const educationDictList = async () => {
+		educationList.value = await (await useDictionary('education')).data.dictionary
+	}
+	educationDictList()
+	watch(
+		() => educationList.value,
+		() => {
+			formData.education = educationList.value[0].value
+		}
+	)
+	let statusList = ref([])
+	const statusDictList = async () => {
+		statusList.value = await (
+			await useDictionary('personnel_status')
+		).data.dictionary
+	}
+	statusDictList()
+	watch(
+		() => statusList.value,
+		() => {
+			formData.status = statusList.value[0].value
+		}
+	)
+	let is_sys_userList = ref([])
+	const is_sys_userDictList = async () => {
+		is_sys_userList.value = await (
+			await useDictionary('global_true_or_false')
+		).data.dictionary
+	}
+	is_sys_userDictList()
+	watch(
+		() => is_sys_userList.value,
+		() => {
+			formData.is_sys_user = is_sys_userList.value[0].value
+		}
+	)
+
+	const setFormData = async (row : any = null) => {
+		Object.assign(formData, initialFormData)
+		loading.value = true
+		if (row) {
+			const data = await (await getPersonnelInfo(row.id)).data
+			if (data)
+				Object.keys(formData).forEach((key : string) => {
+					if (data[key] != undefined) formData[key] = data[key]
+				})
+		}
+		loading.value = false
+	}
+
+	// 验证手机号格式
+	const mobileVerify = (rule : any, value : any, callback : any) => {
+		if (value && !/^1[3-9]\d{9}$/.test(value)) {
+			callback(new Error(t('generateMobile')))
+		} else {
+			callback()
+		}
+	}
+
+	// 验证身份证号
+	const idCardVerify = (rule : any, value : any, callback : any) => {
+		if (
+			value &&
+			!/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(
+				value
+			)
+		) {
+			callback(new Error(t('generateIdCard')))
+		} else {
+			callback()
+		}
+	}
+
+	// 验证邮箱号
+	const emailVerify = (rule : any, value : any, callback : any) => {
+		if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+			callback(new Error(t('generateEmail')))
+		} else {
+			callback()
+		}
+	}
+
+	// 验证请输入整数
+	const numberVerify = (rule : any, value : any, callback : any) => {
+		if (!Number.isInteger(value)) {
+			callback(new Error(t('generateNumber')))
+		} else {
+			callback()
+		}
+	}
+
+	defineExpose({
+		showDialog,
+		setFormData,
+	})
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
-.diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
-}
-</style>
+	.diy-dialog-wrap .el-form-item__label {
+		height: auto !important;
+	}
+</style>
\ No newline at end of file
diff --git a/admin/src/app/views/six_speed_modification_log/six_speed_modification_log.vue b/admin/src/app/views/six_speed_modification_log/six_speed_modification_log.vue
index 4d8fd7b5..ff8b130d 100644
--- a/admin/src/app/views/six_speed_modification_log/six_speed_modification_log.vue
+++ b/admin/src/app/views/six_speed_modification_log/six_speed_modification_log.vue
@@ -3,6 +3,7 @@
     <el-card class="box-card !border-none" shadow="never">
       <div class="flex justify-between items-center">
         <span class="text-lg">六要素修改记录</span>
+		<el-button type="default" @click="goBack">返回</el-button>
       </div>
 
       <!--      <el-card
@@ -111,9 +112,13 @@ import {
 import { img } from '@/utils/common'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import Edit from '@/app/views/six_speed_modification_log/components/six-speed-modification-log-edit.vue'
-import { useRoute } from 'vue-router'
+import { useRoute,useRouter  } from 'vue-router'
 const route = useRoute()
 const pageName = route.meta.title
+const router = useRouter()
+const goBack = () => {
+  router.go(-1)// 或 router.go(-1)
+}
 
 let sixSpeedModificationLogTable = reactive({
   page: 1,
diff --git a/niucloud/app/adminapi/controller/communication_records/CommunicationRecords.php b/niucloud/app/adminapi/controller/communication_records/CommunicationRecords.php
index 3a0c554c..c8bf5a89 100644
--- a/niucloud/app/adminapi/controller/communication_records/CommunicationRecords.php
+++ b/niucloud/app/adminapi/controller/communication_records/CommunicationRecords.php
@@ -31,7 +31,8 @@ class CommunicationRecords extends BaseAdminController
              ["name",""],
              ["phone_number",""],
              ["campus",""],
-             ["communication_type",""]
+             ["communication_type",""],
+            ["customer_resource_id",""]
         ]);
         return success((new CommunicationRecordsService())->getPage($data));
     }
diff --git a/niucloud/app/adminapi/controller/lesson_course_teaching/LessonCourseTeaching.php b/niucloud/app/adminapi/controller/lesson_course_teaching/LessonCourseTeaching.php
index 3c39a2d8..6021677b 100644
--- a/niucloud/app/adminapi/controller/lesson_course_teaching/LessonCourseTeaching.php
+++ b/niucloud/app/adminapi/controller/lesson_course_teaching/LessonCourseTeaching.php
@@ -754,7 +754,9 @@ class LessonCourseTeaching extends BaseAdminController
     public function getPersonnelDataAll(){
         $data = $this->request->params([
             ["name",""],
-            ["phone",""]
+            ["phone",""],
+            ["role_id",""],
+            ["dept_id",""]
         ]);
         return success((new LessonCourseTeachingService())->getPersonnelDataAll($data));
     }
diff --git a/niucloud/app/adminapi/controller/personnel/Personnel.php b/niucloud/app/adminapi/controller/personnel/Personnel.php
index 9b1f9fc9..14553558 100644
--- a/niucloud/app/adminapi/controller/personnel/Personnel.php
+++ b/niucloud/app/adminapi/controller/personnel/Personnel.php
@@ -68,7 +68,7 @@ class Personnel extends BaseAdminController
              ["id_card_back",""],
              ["status",0],
              ["is_sys_user",0],
-
+            ["info",[]],
         ]);
         $this->validate($data, 'app\validate\personnel\Personnel.add');
         $id = (new PersonnelService())->add($data);
@@ -95,6 +95,7 @@ class Personnel extends BaseAdminController
              ["id_card_back",""],
              ["status",0],
              ["is_sys_user",0],
+             ["info",[]],
 
         ]);
         $this->validate($data, 'app\validate\personnel\Personnel.edit');
@@ -112,5 +113,5 @@ class Personnel extends BaseAdminController
         return success('DELETE_SUCCESS');
     }
 
-    
+
 }
diff --git a/niucloud/app/common.php b/niucloud/app/common.php
index dbf1b4f6..9050de97 100644
--- a/niucloud/app/common.php
+++ b/niucloud/app/common.php
@@ -1037,8 +1037,11 @@ function get_campus_where($user_id,$field="campus_id")
     if($user_id > 1){
         $person_id = $person->where(['sys_user_id' => $user_id])->value("id");
         $role_info = $campusPersonRole->where(['person_id' => $person_id])->find();
+
         if (!in_array($role_info['role_id'], [1,7,8])) {
-            $where[] = [$field,'=',$role_info['campus_id']];
+            if($role_info['campus_id']){
+                $where[] = [$field,'=',$role_info['campus_id']];
+            }
         }
     }
     return $where;
diff --git a/niucloud/app/model/personnel/PersonnelInfo.php b/niucloud/app/model/personnel/PersonnelInfo.php
new file mode 100644
index 00000000..b898fb51
--- /dev/null
+++ b/niucloud/app/model/personnel/PersonnelInfo.php
@@ -0,0 +1,41 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\model\personnel;
+
+use core\base\BaseModel;
+use think\model\concern\SoftDelete;
+use think\model\relation\HasMany;
+use think\model\relation\HasOne;
+
+/**
+ * 人力资源-人员模型
+ * Class Personnel
+ * @package app\model\personnel
+ */
+class PersonnelInfo extends BaseModel
+{
+
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'personnel_info';
+
+
+
+}
diff --git a/niucloud/app/service/admin/communication_records/CommunicationRecordsService.php b/niucloud/app/service/admin/communication_records/CommunicationRecordsService.php
index ad90503e..c57f5f6e 100644
--- a/niucloud/app/service/admin/communication_records/CommunicationRecordsService.php
+++ b/niucloud/app/service/admin/communication_records/CommunicationRecordsService.php
@@ -57,6 +57,11 @@ class CommunicationRecordsService extends BaseAdminService
             $where[] = ['a.communication_type','=',$data['communication_type']];
         }
 
+        if($data['customer_resource_id']){
+            $where[] = ['b.id','=',$data['customer_resource_id']];
+        }
+
+
         $search_model = $this->model
             ->alias("a")
             ->join(['school_customer_resources' => 'b'],'a.resource_id = b.id','left')
diff --git a/niucloud/app/service/admin/lesson_course_teaching/LessonCourseTeachingService.php b/niucloud/app/service/admin/lesson_course_teaching/LessonCourseTeachingService.php
index 5e47c5c3..46587e22 100644
--- a/niucloud/app/service/admin/lesson_course_teaching/LessonCourseTeachingService.php
+++ b/niucloud/app/service/admin/lesson_course_teaching/LessonCourseTeachingService.php
@@ -38,7 +38,7 @@ class LessonCourseTeachingService extends BaseAdminService
      */
     public function getPage(array $where = [])
     {
-        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
+        $field = 'id,title,image,type,url,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
         $order = 'id desc';
 
         $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
@@ -85,7 +85,7 @@ class LessonCourseTeachingService extends BaseAdminService
      */
     public function jumpPetPage(array $where = [])
     {
-        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
+        $field = 'id,title,image,type,url,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
         $order = 'id desc';
         $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
         $list = $this->pageQuery($search_model);
@@ -129,7 +129,7 @@ class LessonCourseTeachingService extends BaseAdminService
      */
     public function enPetPage(array $where = [])
     {
-        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
+        $field = 'id,title,image,type,url,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
         $order = 'id desc';
         $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
         $list = $this->pageQuery($search_model);
@@ -174,7 +174,7 @@ class LessonCourseTeachingService extends BaseAdminService
      */
     public function basketballPetPage(array $where = [])
     {
-        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
+        $field = 'id,title,image,type,url,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
         $order = 'id desc';
         $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
         $list = $this->pageQuery($search_model);
@@ -218,7 +218,7 @@ class LessonCourseTeachingService extends BaseAdminService
      */
     public function strengPetPage(array $where = [])
     {
-        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
+        $field = 'id,title,image,type,url,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
         $order = 'id desc';
         $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
         $list = $this->pageQuery($search_model);
@@ -262,7 +262,7 @@ class LessonCourseTeachingService extends BaseAdminService
      */
     public function ninjaPetPage(array $where = [])
     {
-        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
+        $field = 'id,title,image,type,url,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
         $order = 'id desc';
         $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
         $list = $this->pageQuery($search_model);
@@ -306,7 +306,7 @@ class LessonCourseTeachingService extends BaseAdminService
      */
     public function securityPetPage(array $where = [])
     {
-        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
+        $field = 'id,title,image,type,url,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
         $order = 'id desc';
         $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
         $list = $this->pageQuery($search_model);
@@ -350,7 +350,7 @@ class LessonCourseTeachingService extends BaseAdminService
      */
     public function physicalPetPage(array $where = [])
     {
-        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
+        $field = 'id,title,image,type,url,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
         $order = 'id desc';
         $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
         $list = $this->pageQuery($search_model);
@@ -398,7 +398,7 @@ class LessonCourseTeachingService extends BaseAdminService
      */
     public function actionPetPage(array $where = [])
     {
-        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
+        $field = 'id,title,image,type,url,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
         $order = 'id desc';
         $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
         $list = $this->pageQuery($search_model);
@@ -443,7 +443,7 @@ class LessonCourseTeachingService extends BaseAdminService
      */
     public function gamesPetPage(array $where = [])
     {
-        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
+        $field = 'id,title,image,type,url,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
         $order = 'id desc';
         $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
         $list = $this->pageQuery($search_model);
@@ -489,7 +489,7 @@ class LessonCourseTeachingService extends BaseAdminService
      */
     public function fitnessPetPage(array $where = [])
     {
-        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
+        $field = 'id,title,image,type,url,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
         $order = 'id desc';
         $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
         $list = $this->pageQuery($search_model);
@@ -534,7 +534,7 @@ class LessonCourseTeachingService extends BaseAdminService
      */
     public function relaxationPetPage(array $where = [])
     {
-        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
+        $field = 'id,title,image,type,url,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
         $order = 'id desc';
         $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
         $list = $this->pageQuery($search_model);
@@ -574,7 +574,7 @@ class LessonCourseTeachingService extends BaseAdminService
 
     public function publicPetPage(array $where = [])
     {
-        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
+        $field = 'id,title,image,type,url,content,status,create_time,update_time,delete_time,table_type,user_permission,exam_papers_id';
         $order = 'id desc';
         $search_model = $this->model->withSearch(["title","status","create_time","update_time","table_type"], $where)->with(['personnelData'])->field($field)->order($order);
         $list = $this->pageQuery($search_model);
@@ -611,7 +611,7 @@ class LessonCourseTeachingService extends BaseAdminService
      */
     public function getInfo(int $id)
     {
-        $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission,url,exam_papers_id';
+        $field = 'id,title,image,type,url,content,status,create_time,update_time,delete_time,table_type,user_permission,url,exam_papers_id';
         $info = $this->model->field($field)->where([['id', "=", $id]])->with(['personnelData'])->findOrEmpty()->toArray();
         $info['status'] = strval($info['status']);
         $info['type'] = strval($info['type']);
@@ -633,16 +633,29 @@ class LessonCourseTeachingService extends BaseAdminService
 
     public function getPersonnelDataAll(array $where = []){
        $personnelDataModel = new PersonnelData();
-        $field = 'id,name,gender,phone,status,status,sys_user_id,create_time,update_time';
-        $order = 'id desc';
+//        $field = 'id,name,gender,phone,status,status,sys_user_id,create_time,update_time';
+        $order = 'a.id desc';
         $whereArr = [];
         if (!empty($where['name'])) {
-            $whereArr[] = ['name','like',"'%'".$where['name']."'%'"];
+            $whereArr[] = ['a.name','like',"'%'".$where['name']."'%'"];
         }
         if (!empty($where['phone'])) {
-            $whereArr[] = ['phone','like',"'%'".$where['phone']."'%'"];
+            $whereArr[] = ['a.phone','like',"'%'".$where['phone']."'%'"];
+        }
+
+        if (!empty($where['role_id'])) {
+            $whereArr[] = ['b.role_id','=',$where['role_id']];
         }
-        $search_model = $personnelDataModel->where('is_sys_user', 1)->where($whereArr)->field($field)->order($order);
+        if (!empty($where['dept_id'])) {
+            $whereArr[] = ['b.dept_id','=',$where['dept_id']];
+        }
+
+        $search_model = $personnelDataModel
+            ->alias("a")
+            ->join(['school_campus_person_role' => 'b'],'a.id = b.person_id','left')
+            ->where('a.is_sys_user', 1)
+            ->field("a.*,b.role_id,b.dept_id")
+            ->where($whereArr)->order($order);
         $list = $this->pageQuery($search_model);
         return $list;
     }
@@ -660,6 +673,7 @@ class LessonCourseTeachingService extends BaseAdminService
         }
         $search_model = $ExamPapersModel->where($whereArr)->field($field)->order($order);
         $list = $this->pageQuery($search_model);
+
         return $list;
     }
 
diff --git a/niucloud/app/service/admin/personnel/PersonnelService.php b/niucloud/app/service/admin/personnel/PersonnelService.php
index 97c9ea94..95ec8468 100644
--- a/niucloud/app/service/admin/personnel/PersonnelService.php
+++ b/niucloud/app/service/admin/personnel/PersonnelService.php
@@ -15,6 +15,7 @@ use app\dict\sys\UserDict;
 use app\model\campus_person_role\CampusPersonRole;
 use app\model\personnel\Personnel;
 
+use app\model\personnel\PersonnelInfo;
 use app\model\sys\SysUser;
 use app\service\admin\user\UserService;
 use core\base\BaseAdminService;
@@ -85,6 +86,8 @@ class PersonnelService extends BaseAdminService
         $info['gender'] = strval($info['gender']);
         $info['status'] = strval($info['status']);
         $info['is_sys_user'] = strval($info['is_sys_user']);
+
+        $info['info'] = (new PersonnelInfo())->where(['person_id' => $id])->findOrEmpty()->toArray();
         return $info;
     }
 
@@ -95,6 +98,9 @@ class PersonnelService extends BaseAdminService
      */
     public function add(array $data)
     {
+        $info = $data['info'];
+
+        unset($data['info']);
         $status = $this->model->where('phone', $data['phone'])->value('id');
         if ($status) {
             throw new \Exception('手机号已存在');
@@ -115,6 +121,9 @@ class PersonnelService extends BaseAdminService
 //            员工编号
             $data['employee_number'] = getEmployeeNumber();
             $res = $this->model->create($data);
+
+            $info['person_id'] = $res->id;
+            (new PersonnelInfo())->insert($info);
             Db::commit();
             return $res->id;
         } catch (\Exception $e) {
@@ -131,7 +140,9 @@ class PersonnelService extends BaseAdminService
      */
     public function edit(int $id, array $data)
     {
+        $info = $data['info'];
 
+        unset($data['info']);
         $status = $this->model->where('phone', $data['phone'])->value('id');
         if ($status && $status != $id) {
             throw new \Exception('手机号已存在');
@@ -153,6 +164,9 @@ class PersonnelService extends BaseAdminService
                 }
             }
             $this->model->where([['id', '=', $id]])->update($data);
+
+            (new PersonnelInfo())->where(['person_id' => $id])->update($info);
+
             Db::commit();
         } catch (\Exception $e) {
             Db::rollback();