RISE/school-developer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'developer' of ssh://code.cyweb.top:30033/scj/zhxy/v3/cloud-ui into developer

Browse Source
This commit is contained in:
guochunsi
2026-01-07 18:51:27 +08:00
parent aa4e502eaf c3a42a5e0e
commit 8a1faabd70
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/views/professional/teacherbase/index.vue
View File

@@ -103,7 +103,7 @@
placeholder="请选择职称等级" placeholder="请选择职称等级"
> >
<el-option <el-option
v-for="item in searchProfessionalTitleList" v-for="item in baseInfoAbout.proTitleList"
:key="item.id" :key="item.id"
:label="item.professionalTitle" :label="item.professionalTitle"
:value="item.id"> :value="item.id">
@@ -120,7 +120,7 @@
placeholder="请选择职务等级" placeholder="请选择职务等级"
> >
<el-option <el-option
v-for="item in searchStationDutyLevelList" v-for="item in baseInfoAbout.stationDutyLevelList"
:key="item.id" :key="item.id"
:label="item.stationDutyLevelName" :label="item.stationDutyLevelName"
:value="item.id"> :value="item.id">
@@ -306,15 +306,15 @@
<TableColumn prop="dgreeName" label="学历学位" width="120" align="center" show-overflow-tooltip /> <TableColumn prop="dgreeName" label="学历学位" width="120" align="center" show-overflow-tooltip />
<TableColumn prop="professionalTitle" label="职称等级" width="120" align="center" show-overflow-tooltip /> <TableColumn prop="titleName" label="职称等级" width="120" align="center" show-overflow-tooltip />
<TableColumn prop="stationLevelName" label="岗位级别" width="120" align="center" show-overflow-tooltip /> <TableColumn prop="stationLevelName" label="岗位级别" width="120" align="center" show-overflow-tooltip />
<TableColumn prop="levelName" label="职业资格等级" width="120" align="center" show-overflow-tooltip /> <TableColumn prop="workLevelName" label="职业资格等级" width="120" align="center" show-overflow-tooltip />
<TableColumn prop="workName" label="职业资格工种" width="150" align="center" show-overflow-tooltip /> <TableColumn prop="workName" label="职业资格工种" width="150" align="center" show-overflow-tooltip />
<TableColumn prop="employmentNatureName" label="用工性质" width="120" align="center" show-overflow-tooltip /> <TableColumn prop="employmentNature" label="用工性质" width="120" align="center" show-overflow-tooltip />
<TableColumn prop="telPhone" label="手机" width="120" align="center" /> <TableColumn prop="telPhone" label="手机" width="120" align="center" />
@@ -1786,7 +1786,7 @@
// 搜索条件字典数据 // 搜索条件字典数据
const searchProfessionalTitleList = ref([]) const searchProfessionalTitleList = ref([])
const searchStationDutyLevelList = ref([]) // const searchStationDutyLevelList = ref([])
const searchPoliticsStatusList = ref([]) const searchPoliticsStatusList = ref([])
const searchTeacherCateList = ref([]) const searchTeacherCateList = ref([])
const inoutFlagOptions = ref([ const inoutFlagOptions = ref([
@@ -1892,16 +1892,16 @@
const loadSearchDictData = async () => { const loadSearchDictData = async () => {
try { try {
// 加载职称等级列表 // 加载职称等级列表
const titleRes: any = await getProfessionalTitleList() // const titleRes: any = await getProfessionalTitleList()
if (titleRes && titleRes.data && titleRes.data) { // if (titleRes && titleRes.data && titleRes.data) {
searchProfessionalTitleList.value = titleRes.data // searchProfessionalTitleList.value = titleRes.data
} // }
// 加载职务等级列表 // 加载职务等级列表
const dutyRes: any = await getStationDutyLevelList() // const dutyRes: any = await getStationDutyLevelList()
if (dutyRes && dutyRes.data) { // if (dutyRes && dutyRes.data) {
searchStationDutyLevelList.value = dutyRes.data // searchStationDutyLevelList.value = dutyRes.data
} // }
// 加载政治面貌列表 // 加载政治面貌列表
const politicsRes: any = await getPoliticsStatusList() const politicsRes: any = await getPoliticsStatusList()
@@ -2721,9 +2721,9 @@
deptTreeList.value = response.data; deptTreeList.value = response.data;
}), }),
// 锁定状态列表 // 锁定状态列表
getAllList().then((response: any) => { // getAllList().then((response: any) => {
Object.assign(statusForm, response.data) // Object.assign(statusForm, response.data)
}), // }),
getAllInfoAboutList().then((response: any) => { getAllInfoAboutList().then((response: any) => {
const map = response.data const map = response.data
baseInfoAbout.stationTypeList = map['stationTypeList'] baseInfoAbout.stationTypeList = map['stationTypeList']
@@ -2737,6 +2737,7 @@
baseInfoAbout.majorStationList = map['majorStationList'] baseInfoAbout.majorStationList = map['majorStationList']
baseInfoAbout.qualificationList = map['qualificationList'] baseInfoAbout.qualificationList = map['qualificationList']
baseInfoAbout.partBranchList = map['partBranchList'] baseInfoAbout.partBranchList = map['partBranchList']
Object.assign(statusForm, map['allStatusList'])
}) })
]) ])
} }