From 431ed3ee2b41629e09247428348bf140d5339f18 Mon Sep 17 00:00:00 2001
From: zhoutianchi <1305666981@qq.com>
Date: Wed, 7 Jan 2026 18:34:21 +0800
Subject: [PATCH 1/2] 1

---
 src/views/professional/teacherbase/index.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/professional/teacherbase/index.vue b/src/views/professional/teacherbase/index.vue
index 217fb19..61dee92 100644
--- a/src/views/professional/teacherbase/index.vue
+++ b/src/views/professional/teacherbase/index.vue
@@ -120,7 +120,7 @@
                 placeholder="请选择职务等级"
               >
                 <el-option
-                  v-for="item in searchStationDutyLevelList"
+                  v-for="item in baseInfoAbout.stationDutyLevelList"
                   :key="item.id"
                   :label="item.stationDutyLevelName"
                   :value="item.id">
@@ -306,11 +306,11 @@
           
           <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="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 />
           
@@ -1786,7 +1786,7 @@
   
   // 搜索条件字典数据
   const searchProfessionalTitleList = ref([])
-  const searchStationDutyLevelList = ref([])
+  // const searchStationDutyLevelList = ref([])
   const searchPoliticsStatusList = ref([])
   const searchTeacherCateList = ref([])
   const inoutFlagOptions = ref([
@@ -1898,10 +1898,10 @@
       }
       
       // 加载职务等级列表
-      const dutyRes: any = await getStationDutyLevelList()
-      if (dutyRes && dutyRes.data) {
-        searchStationDutyLevelList.value = dutyRes.data
-      }
+      // const dutyRes: any = await getStationDutyLevelList()
+      // if (dutyRes && dutyRes.data) {
+      //   searchStationDutyLevelList.value = dutyRes.data
+      // }
       
       // 加载政治面貌列表
       const politicsRes: any = await getPoliticsStatusList()

From c3a42a5e0e86e3496f93821122b58f45a203ed7a Mon Sep 17 00:00:00 2001
From: zhoutianchi <1305666981@qq.com>
Date: Wed, 7 Jan 2026 18:44:51 +0800
Subject: [PATCH 2/2] 1

---
 src/views/professional/teacherbase/index.vue | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/views/professional/teacherbase/index.vue b/src/views/professional/teacherbase/index.vue
index 85dbbe9..c0bfb22 100644
--- a/src/views/professional/teacherbase/index.vue
+++ b/src/views/professional/teacherbase/index.vue
@@ -103,7 +103,7 @@
                 placeholder="请选择职称等级"
               >
                 <el-option
-                  v-for="item in searchProfessionalTitleList"
+                  v-for="item in baseInfoAbout.proTitleList"
                   :key="item.id"
                   :label="item.professionalTitle"
                   :value="item.id">
@@ -314,7 +314,7 @@
           
           <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" />
           
@@ -1892,10 +1892,10 @@
   const loadSearchDictData = async () => {
     try {
       // 加载职称等级列表
-      const titleRes: any = await getProfessionalTitleList()
-      if (titleRes && titleRes.data && titleRes.data) {
-        searchProfessionalTitleList.value = titleRes.data
-      }
+      // const titleRes: any = await getProfessionalTitleList()
+      // if (titleRes && titleRes.data && titleRes.data) {
+      //   searchProfessionalTitleList.value = titleRes.data
+      // }
       
       // 加载职务等级列表
       // const dutyRes: any = await getStationDutyLevelList()
@@ -2721,9 +2721,9 @@
         deptTreeList.value = response.data;
       }),
       // 锁定状态列表
-      getAllList().then((response: any) => {
-        Object.assign(statusForm, response.data)
-      }),
+      // getAllList().then((response: any) => {
+      //   Object.assign(statusForm, response.data)
+      // }),
       getAllInfoAboutList().then((response: any) => {
         const map = response.data
         baseInfoAbout.stationTypeList = map['stationTypeList']
@@ -2737,6 +2737,7 @@
         baseInfoAbout.majorStationList = map['majorStationList']
         baseInfoAbout.qualificationList = map['qualificationList']
         baseInfoAbout.partBranchList = map['partBranchList']
+        Object.assign(statusForm, map['allStatusList'])
       })
     ])
   }