diff --git a/src/views/hr/archives/basicinformation/educationalexperience.vue b/src/views/hr/archives/basicinformation/educationalexperience.vue
index afd86e4..4eb88de 100644
--- a/src/views/hr/archives/basicinformation/educationalexperience.vue
+++ b/src/views/hr/archives/basicinformation/educationalexperience.vue
@@ -129,19 +129,19 @@ function editXueLiBox(cont:jiaoyujingli){
学历类型
- {{ item.educationtype }}
+ {{ item.xueLiLeixing }}
所属院系
- {{ item.faculty }}
+ {{ item.collegeFaction }}
院校类型
- {{ item.schooltype }}
+ {{ item.yuanXiaoLeiXing }}
diff --git a/src/views/hr/archives/basicinformation/talentinventory.vue b/src/views/hr/archives/basicinformation/talentinventory.vue
index 1ce61ef..5f5a3ad 100644
--- a/src/views/hr/archives/basicinformation/talentinventory.vue
+++ b/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()
const editrcpdBox = (cont: rencaipandian) => {
+ console.log("编辑人才盘点",cont)
rcpdInfo.value = cont;
editrcpdBoxPage.value = true;
};
diff --git a/src/views/hr/archives/basicinformation/talentinventoryedit.vue b/src/views/hr/archives/basicinformation/talentinventoryedit.vue
index ee7e540..27daeeb 100644
--- a/src/views/hr/archives/basicinformation/talentinventoryedit.vue
+++ b/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
}
}
);
diff --git a/src/views/hr/archives/index.vue b/src/views/hr/archives/index.vue
index 2ef67f8..4fbef0c 100644
--- a/src/views/hr/archives/index.vue
+++ b/src/views/hr/archives/index.vue
@@ -27,7 +27,7 @@ const scrollbarRef = ref>()
const handleClick = () => {
nextTick(() => {
- console.log("滚动条长度",innerRef.value!.clientHeight)
+ // console.log("滚动条长度",innerRef.value!.clientHeight)
if (innerRef.value!.clientHeight > 300) {
scrollbarRef.value!.setScrollTop(innerRef.value!.clientHeight)
}