From 73d1e840eb910f8b75e32c52e70e2798fee6dbeb Mon Sep 17 00:00:00 2001
From: Net <svip6688@gmail.com>
Date: Wed, 4 Jun 2025 20:52:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/server.ts                        |   9 +
 .../view/hr/teacherProfile/ExperienceInfo.vue |   2 +-
 .../view/hr/teacherProfile/FamilyInfo.vue     |   2 +-
 .../view/hr/teacherProfile/PersonalHonor.vue  |  12 +
 .../view/hr/teacherProfile/PositionInfo.vue   |  87 +++----
 .../hr/teacherProfile/RecordMaterials.vue     |  16 +-
 .../view/hr/teacherProfile/TitleInfo.vue      |  45 +++-
 src/pages/view/hr/teacherProfile/index.vue    | 215 +++++++++++++-----
 8 files changed, 271 insertions(+), 117 deletions(-)

diff --git a/src/api/base/server.ts b/src/api/base/server.ts
index dfdd8b8..699c271 100644
--- a/src/api/base/server.ts
+++ b/src/api/base/server.ts
@@ -15,6 +15,15 @@ export const xqxjFindAllApi = async () => {
 export const findAllNjBjTreeApi = async () => {
   return await get("/api/nj/findAllNjBjTree");
 };
+export const kmFindAllApi = async () => {
+  return await get("/api/km/findAll");
+};
+export const findAllXxXqNjTree = async () => {
+  return await get("/api/nj/findAllXxXqNjTree");
+};
+export const findAllNjBjTree = async () => {
+  return await get("/api/nj/findAllNjBjTree");
+};
 export const jsConfirmJsDataApi = async (params: any) => {
   return await post("/api/js/confirmJsData", params);
 };
diff --git a/src/pages/view/hr/teacherProfile/ExperienceInfo.vue b/src/pages/view/hr/teacherProfile/ExperienceInfo.vue
index 48e750d..b4b60a4 100644
--- a/src/pages/view/hr/teacherProfile/ExperienceInfo.vue
+++ b/src/pages/view/hr/teacherProfile/ExperienceInfo.vue
@@ -113,7 +113,7 @@ function submit() {
       return item.value;
     }),
   });
-  navigateTo("/pages/view/hr/teacherProfile/EmergencyContact");
+  navigateTo("/pages/view/hr/teacherProfile/FamilyInfo");
 }
 </script>
 <style>
diff --git a/src/pages/view/hr/teacherProfile/FamilyInfo.vue b/src/pages/view/hr/teacherProfile/FamilyInfo.vue
index c9cc694..839a7b1 100644
--- a/src/pages/view/hr/teacherProfile/FamilyInfo.vue
+++ b/src/pages/view/hr/teacherProfile/FamilyInfo.vue
@@ -123,7 +123,7 @@ function submit() {
       return item.value;
     }),
   });
-  navigateTo("/pages/view/hr/teacherProfile/ExperienceInfo");
+  navigateTo("/pages/view/hr/teacherProfile/PersonalHonor");
 }
 </script>
 <style>
diff --git a/src/pages/view/hr/teacherProfile/PersonalHonor.vue b/src/pages/view/hr/teacherProfile/PersonalHonor.vue
index 12e5fbf..abb4e51 100644
--- a/src/pages/view/hr/teacherProfile/PersonalHonor.vue
+++ b/src/pages/view/hr/teacherProfile/PersonalHonor.vue
@@ -71,6 +71,18 @@ const schema = reactive<FormsSchema[]>([
     component: "BasicInput",
     componentProps: {},
   },
+  // {
+  //   field: "bjdw",
+  //   label: "获奖内容",
+  //   component: "BasicInput",
+  //   itemProps: { 
+  //     labelPosition: "top",
+  //   },
+  //   componentProps: {
+  //     type: "textarea",
+  //     rows: 3,
+  //   },
+  // },
   {
     field: "hjtime",
     label: "获奖时间",
diff --git a/src/pages/view/hr/teacherProfile/PositionInfo.vue b/src/pages/view/hr/teacherProfile/PositionInfo.vue
index 25ca08c..d540919 100644
--- a/src/pages/view/hr/teacherProfile/PositionInfo.vue
+++ b/src/pages/view/hr/teacherProfile/PositionInfo.vue
@@ -52,20 +52,33 @@ import {
   xqgwFindAllApi,
   xqxjFindAllApi,
 } from "@/api/base/server";
+import { dicApi } from "@/api/system/dic";
 import { useForm } from "@/components/BasicForm/hooks/useForm";
 import { useDataStore } from "@/store/modules/data";
 import { navigateTo, navigateBack } from "@/utils/uniapp";
 import { cloneDeep, map } from "lodash";
 
 const schema = reactive<FormsSchema[]>([
+  {
+    field: "xj",
+    label: "薪级",
+    component: "BasicPicker",
+    componentProps: {
+      api: dicApi,
+      param: { pid: 434953981 },
+      rangeKey: "dictionaryValue",
+      savaKey: "dictionaryCode",
+    },
+  },
   {
     field: "gwjbId",
     label: "岗位级别",
     component: "BasicPicker",
     componentProps: {
-      api: xqgwFindAllApi,
-      rangeKey: "gwmc",
-      savaKey: "id",
+      api: dicApi,
+      param: { pid: 260783972 },
+      rangeKey: "dictionaryValue",
+      savaKey: "dictionaryCode",
     },
   },
   {
@@ -80,43 +93,38 @@ const schema = reactive<FormsSchema[]>([
     component: "BasicInput",
     componentProps: {},
   },
-  {
-    field: "xj",
-    label: "薪级",
-    component: "BasicPicker",
-    componentProps: {
-      api: xqxjFindAllApi,
-      rangeKey: "xjmc",
-      savaKey: "id",
-    },
-  },
-  {
-    field: "zrxk",
-    label: "主任学科",
-    component: "BasicInput",
-    componentProps: {},
-  },
-  {
-    field: "jrxk",
-    label: "兼任学科",
-    component: "BasicInput",
-    componentProps: {},
-  },
-  {
-    field: "bzrBjId",
-    label: "班主任班级",
-    component: "BasicDataPicker",
-    componentProps: {
-      api: findAllNjBjTreeApi,
-      rangeKey: "title",
-      savaKey: "key",
-    },
-  },
+  // {
+  //   field: "zrxk",
+  //   label: "主任学科",
+  //   component: "BasicInput",
+  //   componentProps: {},
+  // },
+  // {
+  //   field: "jrxk",
+  //   label: "兼任学科",
+  //   component: "BasicInput",
+  //   componentProps: {},
+  // },
+  // {
+  //   field: "bzrBjId",
+  //   label: "班主任班级",
+  //   component: "BasicDataPicker",
+  //   componentProps: {
+  //     api: findAllNjBjTreeApi,
+  //     rangeKey: "title",
+  //     savaKey: "key",
+  //   },
+  // },
   {
     field: "dzzw",
-    label: "党政职务",
-    component: "BasicInput",
-    componentProps: {},
+    label: "职务",
+    component: "BasicPicker",
+    componentProps: {
+      api: dicApi,
+      param: { pid: 1063530116 },
+      rangeKey: "dictionaryValue",
+      savaKey: "dictionaryCode",
+    },
   },
 ]);
 
@@ -148,7 +156,8 @@ function submit() {
       return item.value;
     }),
   });
-  navigateTo("/pages/view/hr/teacherProfile/FamilyInfo");
+  navigateTo("/pages/view/hr/teacherProfile/ExperienceInfo");
+ 
 }
 </script>
 <style>
diff --git a/src/pages/view/hr/teacherProfile/RecordMaterials.vue b/src/pages/view/hr/teacherProfile/RecordMaterials.vue
index 19435fb..ee2fcd7 100644
--- a/src/pages/view/hr/teacherProfile/RecordMaterials.vue
+++ b/src/pages/view/hr/teacherProfile/RecordMaterials.vue
@@ -26,7 +26,12 @@
 <script setup lang="ts">
 import { ref } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
-import { hideLoading, navigateBack, navigateTo, showLoading } from "@/utils/uniapp";
+import {
+  hideLoading,
+  navigateBack,
+  navigateTo,
+  showLoading,
+} from "@/utils/uniapp";
 import { cloneDeep } from "lodash";
 const leaveId = ref<string | null>(null);
 const signCompRef = ref<any>(null);
@@ -137,13 +142,16 @@ async function submit() {
   const res = await jsConfirmJsDataApi(params);
   hideLoading();
   if (res.resultCode === 1) {
-    uni.switchTab({
-      url: "/pages/base/message/index",
-    });
     uni.showToast({
       title: "提交成功",
       icon: "success",
     });
+
+    setTimeout(() => {
+      uni.redirectTo({
+        url: "/pages/system/launchPage/launchPage",
+      });
+    }, 1500);
   } else {
     uni.showToast({
       title: "提交失败",
diff --git a/src/pages/view/hr/teacherProfile/TitleInfo.vue b/src/pages/view/hr/teacherProfile/TitleInfo.vue
index 6effeec..a1abac2 100644
--- a/src/pages/view/hr/teacherProfile/TitleInfo.vue
+++ b/src/pages/view/hr/teacherProfile/TitleInfo.vue
@@ -64,17 +64,17 @@ const schema = reactive<FormsSchema[]>([
       savaKey: "dictionaryCode",
     },
   },
-  // {
-  //   field: "zclbId",
-  //   label: "职称类别",
-  //   component: "BasicPicker",
-  //   componentProps: {
-  //     api: dicApi,
-  //     param: { pid: 385536488 },
-  //     rangeKey: "dictionaryValue",
-  //     savaKey: "dictionaryCode",
-  //   },
-  // },
+  {
+    field: "zclbId",
+    label: "职称类别",
+    component: "BasicPicker",
+    componentProps: {
+      api: dicApi,
+      param: { pid: 912140841 },
+      rangeKey: "dictionaryValue",
+      savaKey: "dictionaryCode",
+    },
+  },
   {
     field: "zczyId",
     label: "职称专业",
@@ -110,6 +110,29 @@ const schema = reactive<FormsSchema[]>([
     component: "BasicInput",
     componentProps: {},
   },
+  {
+    field: "pydj",
+    label: "聘用等级",
+    component: "BasicPicker",
+    componentProps: {
+      api: dicApi,
+      param: { pid: 1982857463 },
+      rangeKey: "dictionaryValue",
+      savaKey: "dictionaryCode",
+    },
+  },
+  {
+    field: "qqtime",
+    label: "起聘时间",
+    component: "BasicDateTimes",
+    componentProps: {},
+  },
+  {
+    field: "pywjh",
+    label: "聘用文件号",
+    component: "BasicInput",
+    componentProps: {},
+  },
 ]);
 const { getFile, setFile } = useDataStore();
 
diff --git a/src/pages/view/hr/teacherProfile/index.vue b/src/pages/view/hr/teacherProfile/index.vue
index 81d3036..c952fa9 100644
--- a/src/pages/view/hr/teacherProfile/index.vue
+++ b/src/pages/view/hr/teacherProfile/index.vue
@@ -30,6 +30,11 @@ import { dicApi, findDicTreeByPidApi } from "@/api/system/dic";
 import { useDataStore } from "@/store/modules/data";
 import { map } from "lodash";
 import dayjs from "dayjs";
+import {
+  findAllNjBjTree,
+  findAllXxXqNjTree,
+  kmFindAllApi,
+} from "@/api/base/server";
 
 const { getFile, setFile } = useDataStore();
 const jsjg = ref("");
@@ -147,7 +152,99 @@ const [register, { getValue, setValue }] = useForm({
       component: "BasicInput",
       componentProps: {},
     },
+    {
+      field: "cgtime",
+      label: "参加工作时间",
+      component: "BasicDateTimes",
+      componentProps: {
+        change: (e: any) => {
+          const yearDiff = calculateYearDiff(e);
+          setValue({ jsgl: yearDiff });
+        },
+      },
+    },
+    {
+      field: "jsgl",
+      label: "工龄",
+      component: "BasicInput",
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      field: "jsTime",
+      label: "任教开始时间",
+      component: "BasicDateTimes",
+      componentProps: {
+        change: (e: any) => {
+          const yearDiff = calculateYearDiff(e);
+          setValue({ jl: yearDiff });
+        },
+      },
+    },
+    {
+      field: "jl",
+      label: "教龄",
+      component: "BasicInput",
+      componentProps: {
+        disabled: true,
+        placeholder: "请选择教龄时间",
+      },
+    },
+    {
+      field: "jrdwtime",
+      label: "进入本单位时间",
+      component: "BasicDateTimes",
+      componentProps: {
+        change: (e: any) => {
+          const yearDiff = calculateYearDiff(e);
+          setValue({ jrdwnx: yearDiff });
+        },
+      },
+    },
+    {
+      field: "jrdwnx",
+      label: "进入本单位年限",
+      component: "BasicInput",
+      componentProps: {
+        placeholder: "请选择进入本单位时间",
+        disabled: true,
+      },
+    },
 
+    {
+      field: "jrly",
+      label: "进入来源",
+      component: "BasicPicker",
+      componentProps: {
+        api: dicApi,
+        param: { pid: 2026977361 },
+        rangeKey: "dictionaryValue",
+        savaKey: "dictionaryCode",
+      },
+    },
+    {
+      field: "bzqkId",
+      label: "编制情况",
+      component: "BasicPicker",
+      componentProps: {
+        api: dicApi,
+        param: { pid: 290357612 },
+        rangeKey: "dictionaryValue",
+        savaKey: "dictionaryCode",
+      },
+    },
+    {
+      field: "zdqkId",
+      label: "在岗情况",
+      component: "BasicPicker",
+      componentProps: {
+        api: dicApi,
+        param: { pid: 810984651 },
+        rangeKey: "dictionaryValue",
+        savaKey: "dictionaryCode",
+      },
+    },
     {
       field: "sbkh",
       label: "社保卡号",
@@ -276,95 +373,91 @@ const [register, { getValue, setValue }] = useForm({
       componentProps: {},
     },
     {
-      title: "任职情况",
+      title: "任教任职",
     },
     {
-      field: "cgtime",
-      label: "参公时间",
+      field: "gwjbId",
+      label: "岗位级别",
+      component: "BasicPicker",
+      componentProps: {
+        api: dicApi,
+        param: { pid: 260783972 },
+        rangeKey: "dictionaryValue",
+        savaKey: "dictionaryCode",
+      },
+    },
+    {
+      field: "gwrztime",
+      label: "岗位任职时间",
       component: "BasicDateTimes",
+      componentProps: {},
+    },
+    {
+      field: "xqxjId",
+      label: "薪级",
+      component: "BasicPicker",
       componentProps: {
-        change: (e: any) => {
-          const yearDiff = calculateYearDiff(e);
-          setValue({ jsgl: yearDiff });
-        },
+        api: dicApi,
+        param: { pid: 434953981 },
+        rangeKey: "dictionaryValue",
+        savaKey: "dictionaryCode",
       },
     },
     {
-      field: "jsgl",
-      label: "工龄",
-      component: "BasicInput",
+      field: "dzzw",
+      label: "职务",
+      component: "BasicPicker",
       componentProps: {
-        disabled: true,
-        placeholder: "请选择参公时间",
+        api: dicApi,
+        param: { pid: 434953981 },
+        rangeKey: "dictionaryValue",
+        savaKey: "dictionaryCode",
       },
     },
     {
-      field: "jrdwtime",
-      label: "进入本单位时间",
-      component: "BasicDateTimes",
+      field: "zrxk",
+      label: "主任学科",
+      component: "BasicPicker",
       componentProps: {
-        change: (e: any) => {
-          const yearDiff = calculateYearDiff(e);
-          setValue({ jrdwnx: yearDiff });
-        },
+        api: kmFindAllApi,
+        rangeKey: "kmmc",
+        savaKey: "id",
       },
     },
     {
-      field: "jrdwnx",
-      label: "进入本单位年限",
-      component: "BasicInput",
+      field: "jrxk",
+      label: "兼任学科",
+      component: "BasicPicker",
       componentProps: {
-        placeholder: "请选择进入本单位时间",
-        disabled: true,
+        api: kmFindAllApi,
+        rangeKey: "kmmc",
+        savaKey: "id",
       },
     },
     {
-      field: "jsTime",
-      label: "教龄时间",
-      component: "BasicDateTimes",
-      componentProps: {
-        change: (e: any) => {
-          const yearDiff = calculateYearDiff(e);
-          setValue({ jl: yearDiff });
-        },
-      },
-    },
-    {
-      field: "jl",
-      label: "教龄",
-      component: "BasicInput",
-      componentProps: {
-        disabled: true,
-        placeholder: "请选择教龄时间",
-      },
-    },
-
-    {
-      field: "jrly",
-      label: "进入来源",
+      field: "qtzw",
+      label: "其他职务",
       component: "BasicInput",
       componentProps: {},
     },
     {
-      field: "bzqkId",
-      label: "编制情况",
-      component: "BasicPicker",
+      field: "njId",
+      label: "年级",
+      component: "BasicTree",
       componentProps: {
-        api: dicApi,
-        param: { pid: 290357612 },
-        rangeKey: "dictionaryValue",
-        savaKey: "dictionaryCode",
+        api: findAllXxXqNjTree,
+        rangeKey: "title",
+        savaKey: "key",
       },
     },
     {
-      field: "zdqkId",
-      label: "在岗情况",
-      component: "BasicPicker",
+      field: "bzrBjId",
+      label: "班主任班级",
+      component: "BasicTree",
       componentProps: {
-        api: dicApi,
-        param: { pid: 810984651 },
-        rangeKey: "dictionaryValue",
-        savaKey: "dictionaryCode",
+        api: findAllNjBjTree,
+        rangeKey: "title",
+        savaKey: "key",
       },
     },
   ],