1

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'])
       })
     ])
   }