Merge branch 'qin_v4'

src/views/hr/archives/basicinformation/educationalexperience.vue

@@ -129,19 +129,19 @@ function editXueLiBox(cont:jiaoyujingli){
 						<template #label>
                             <el-text><svg-icon icon-class="xueli" class="svg_box"></svg-icon> 学历类型</el-text>
                         </template>
-                        {{ item.educationtype }}
+                        {{ item.xueLiLeixing }}
                 </el-descriptions-item>
 				<el-descriptions-item>
 						<template #label>
                             <el-text><el-icon><School /></el-icon> 所属院系</el-text>
                         </template>
-                        {{ item.faculty }}
+                        {{ item.collegeFaction }}
                 </el-descriptions-item>
 				<el-descriptions-item>
 						<template #label>
                             <el-text><svg-icon icon-class="school" class="svg_box"></svg-icon> 院校类型</el-text>
                         </template>
-                        {{ item.schooltype }}
+                        {{ item.yuanXiaoLeiXing }}
                 </el-descriptions-item>
 				<el-descriptions-item>
 						<template #label>

src/views/hr/archives/basicinformation/talentinventory.vue

@@ -25,10 +25,11 @@ const props = defineProps({
   },
 });
 const peopd = reactive([{
-	zy:props.usercont.careerPlanning,
-	bz:props.usercont.helpObtained
+	id:props.usercont.id,
+	zy:props.usercont.career_planning,
+	bz:props.usercont.help_obtained
 }])
-// const editrcpdBoxPage = ref(false); 
+const editrcpdBoxPage = ref(false); 
 // const addrcpdBoxPage = ref(false);
 
 // const tableLoading = ref(false);
@@ -53,8 +54,8 @@ watch(
     if (props.tabsid == "12") {
       // getrcpdList();
 			// console.log("人员全部西悉尼",props.usercont)
-			peopd.zy=props.usercont.careerPlanning
-			peopd.bz=props.usercont.helpObtained
+			peopd.zy=props.usercont.career_planning
+			peopd.bz=props.usercont.help_obtained
     }
   }
 );
@@ -64,8 +65,8 @@ watch(
 @ 功能: 首页页面渲染加载
 */
 onMounted(()=>{
-	peopd.zy=props.usercont.careerPlanning
-	peopd.bz=props.usercont.helpObtained
+	peopd.zy=props.usercont.career_planning
+	peopd.bz=props.usercont.help_obtained
 })
 /**
  * 添加数据
@@ -76,7 +77,9 @@ const addrcpdBox = (key: string) => {
 /**
  * 编辑人才盘点
  */
+const rcpdInfo = ref<any>()
 const editrcpdBox = (cont: rencaipandian) => {
+	console.log("编辑人才盘点",cont)
   rcpdInfo.value = cont;
   editrcpdBoxPage.value = true;
 };

src/views/hr/archives/basicinformation/talentinventoryedit.vue

@@ -79,7 +79,9 @@ watch(
   () => props.editisshow,
   () => {
     if (props.editisshow) {
-      rcpdFormData.id = props.datacont.id.toString();
+      rcpdFormData.id = props.datacont.id
+			rcpdFormData.career = props.datacont.zy
+			rcpdFormData.expecthelp = props.datacont.bz
     }
   }
 );

src/views/hr/archives/index.vue

@@ -27,7 +27,7 @@ const scrollbarRef = ref<InstanceType<typeof ElScrollbarType>>()
 
 const handleClick = () => {
   nextTick(() => {
-	console.log("滚动条长度",innerRef.value!.clientHeight)
+	// console.log("滚动条长度",innerRef.value!.clientHeight)
     if (innerRef.value!.clientHeight > 300) {
       scrollbarRef.value!.setScrollTop(innerRef.value!.clientHeight)
     }