From 3ee472f690457001948c8e06dc933bf7bb6168e8 Mon Sep 17 00:00:00 2001
From: Net <svip6688@gmail.com>
Date: Wed, 11 Jun 2025 23:35:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A41?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicPicker/TimePicker/DatetimePicker.vue |   2 +-
 src/pages.json                                |   2 +-
 .../view/hr/teacherProfile/ExperienceInfo.vue |  22 ++--
 .../view/hr/teacherProfile/FamilyInfo.vue     |   3 +-
 .../view/hr/teacherProfile/PositionInfo.vue   |  30 ++++--
 .../view/hr/teacherProfile/TitleInfo.vue      |   8 ++
 .../view/hr/teacherProfile/education.vue      |  14 +--
 src/pages/view/hr/teacherProfile/index.vue    |  17 ++-
 src/pages/view/hr/teacherProfile/position.vue | 100 +++++++++---------
 9 files changed, 112 insertions(+), 86 deletions(-)

diff --git a/src/components/BasicPicker/TimePicker/DatetimePicker.vue b/src/components/BasicPicker/TimePicker/DatetimePicker.vue
index 946ee9b..ceed04f 100644
--- a/src/components/BasicPicker/TimePicker/DatetimePicker.vue
+++ b/src/components/BasicPicker/TimePicker/DatetimePicker.vue
@@ -79,7 +79,7 @@ export default {
     minDate: {
       type: Number,
       // 最小默认值为前10年
-      default: new Date(new Date().getFullYear() - 10, 0, 1).getTime()
+      default: new Date(new Date().getFullYear() - 80, 0, 1).getTime()
     },
     // 可选的最小小时，仅mode=time有效
     minHour: {
diff --git a/src/pages.json b/src/pages.json
index 2629017..5d20d17 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -261,7 +261,7 @@
     {
       "path": "pages/view/hr/teacherProfile/position",
       "style": {
-        "navigationBarTitleText": "任教任职",
+        "navigationBarTitleText": "任职情况",
         "enablePullDownRefresh": false
       }
     },
diff --git a/src/pages/view/hr/teacherProfile/ExperienceInfo.vue b/src/pages/view/hr/teacherProfile/ExperienceInfo.vue
index fbf7fbe..f304b6a 100644
--- a/src/pages/view/hr/teacherProfile/ExperienceInfo.vue
+++ b/src/pages/view/hr/teacherProfile/ExperienceInfo.vue
@@ -48,17 +48,25 @@
 </template>
 
 <script lang="ts" setup>
-import { useForm } from "@/components/BasicForm/hooks/useForm";
-import { useDataStore } from "@/store/modules/data";
-import { navigateTo, navigateBack } from "@/utils/uniapp";
-import { cloneDeep, map } from "lodash";
+import {useDataStore} from "@/store/modules/data";
+import {navigateBack, navigateTo} from "@/utils/uniapp";
+import {cloneDeep, map} from "lodash";
 
 const schema = reactive<FormsSchema[]>([
   {
     field: "gztime",
-    label: "起止时间",
-    component: "BasicDateTimes",
-    componentProps: {},
+    label: "开始时间",
+    component: "BasicDateTime",
+    componentProps: {
+      mode: "year-month",
+    },
+  }, {
+    field: "jssj",
+    label: "结束时间",
+    component: "BasicDateTime",
+    componentProps: {
+      mode: "year-month",
+    },
   },
   {
     field: "gzdw",
diff --git a/src/pages/view/hr/teacherProfile/FamilyInfo.vue b/src/pages/view/hr/teacherProfile/FamilyInfo.vue
index 9e2e746..5e39c3f 100644
--- a/src/pages/view/hr/teacherProfile/FamilyInfo.vue
+++ b/src/pages/view/hr/teacherProfile/FamilyInfo.vue
@@ -123,7 +123,8 @@ function submit() {
       return item.value;
     }),
   });
-  navigateTo("/pages/view/hr/teacherProfile/PersonalHonor");
+  // navigateTo("/pages/view/hr/teacherProfile/PersonalHonor");
+  navigateTo("/pages/view/hr/teacherProfile/RecordMaterials");
 }
 </script>
 <style>
diff --git a/src/pages/view/hr/teacherProfile/PositionInfo.vue b/src/pages/view/hr/teacherProfile/PositionInfo.vue
index 632aaef..543073b 100644
--- a/src/pages/view/hr/teacherProfile/PositionInfo.vue
+++ b/src/pages/view/hr/teacherProfile/PositionInfo.vue
@@ -47,16 +47,10 @@
 </template>
 
 <script lang="ts" setup>
-import {
-  findAllNjBjTreeApi,
-  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";
+import {dicApi} from "@/api/system/dic";
+import {useDataStore} from "@/store/modules/data";
+import {navigateBack, navigateTo} from "@/utils/uniapp";
+import {cloneDeep, map} from "lodash";
 
 const schema = reactive<FormsSchema[]>([
   // {
@@ -83,7 +77,21 @@ const schema = reactive<FormsSchema[]>([
   },
   {
     field: "gwrztime",
-    label: "岗位任职时间",
+    label: "岗位聘用开始时间",
+    component: "BasicDateTime",
+    componentProps: {
+      mode: "year-month",
+    },
+  }, {
+    field: "gwpyjssj",
+    label: "岗位聘用结束时间",
+    component: "BasicDateTime",
+    componentProps: {
+      mode: "year-month",
+    },
+  }, {
+    field: "gwpyjssj",
+    label: "当时时间-岗位聘用开始时间",
     component: "BasicDateTimes",
     componentProps: {},
   },
diff --git a/src/pages/view/hr/teacherProfile/TitleInfo.vue b/src/pages/view/hr/teacherProfile/TitleInfo.vue
index a0f899d..9ff92bc 100644
--- a/src/pages/view/hr/teacherProfile/TitleInfo.vue
+++ b/src/pages/view/hr/teacherProfile/TitleInfo.vue
@@ -131,6 +131,14 @@ const schema = reactive<FormsSchema[]>([
     componentProps: {},
   },
   {
+    field: "sczczs",
+    label: "上传职称证书",
+    component: "BasicUpload",
+    itemProps: {
+      labelPosition: "top",
+    },
+    componentProps: {},
+  }, {
     field: "pywjh",
     label: "上传任职文件",
     component: "BasicUpload",
diff --git a/src/pages/view/hr/teacherProfile/education.vue b/src/pages/view/hr/teacherProfile/education.vue
index a35d6d1..c210489 100644
--- a/src/pages/view/hr/teacherProfile/education.vue
+++ b/src/pages/view/hr/teacherProfile/education.vue
@@ -23,10 +23,10 @@
 </template>
 
 <script setup lang="ts">
-import { navigateBack, navigateTo } from "@/utils/uniapp";
-import { useForm } from "@/components/BasicForm/hooks/useForm";
-import { dicApi } from "@/api/system/dic";
-import { useDataStore } from "@/store/modules/data";
+import {navigateBack, navigateTo} from "@/utils/uniapp";
+import {useForm} from "@/components/BasicForm/hooks/useForm";
+import {dicApi} from "@/api/system/dic";
+import {useDataStore} from "@/store/modules/data";
 
 const { getFile, setFile } = useDataStore();
 
@@ -81,8 +81,10 @@ const [register, { getValue, setValue }] = useForm({
     {
       field: "zhbynytime",
       label: "最后学历毕业年月",
-      component: "BasicDateTimes",
-      componentProps: {},
+      component: "BasicDateTime",
+      componentProps: {
+        mode: "year-month",
+      },
     },
     {
       field: "xw",
diff --git a/src/pages/view/hr/teacherProfile/index.vue b/src/pages/view/hr/teacherProfile/index.vue
index 6f812fd..ad36e8b 100644
--- a/src/pages/view/hr/teacherProfile/index.vue
+++ b/src/pages/view/hr/teacherProfile/index.vue
@@ -17,14 +17,13 @@
 </template>
 
 <script setup lang="ts">
-import { navigateBack, navigateTo } from "@/utils/uniapp";
+import {navigateTo} from "@/utils/uniapp";
 
-import { useForm } from "@/components/BasicForm/hooks/useForm";
-import { dicApi, findDicTreeByPidApi } from "@/api/system/dic";
-import { useDataStore } from "@/store/modules/data";
-import { map } from "lodash";
+import {useForm} from "@/components/BasicForm/hooks/useForm";
+import {dicApi, findDicTreeByPidApi} from "@/api/system/dic";
+import {useDataStore} from "@/store/modules/data";
+import {map} from "lodash";
 import dayjs from "dayjs";
-import { ok } from "assert";
 
 const { getFile, setFile } = useDataStore();
 const jsjg = ref("");
@@ -151,7 +150,6 @@ const [register, { getValue, setValue, setSchema }] = useForm({
       componentProps: {
         mode: "year-month",
         ok: (e: any) => {
-          console.log(e);
           const yearDiff = calculateYearDiff(e.value);
           setValue({ jsgl: yearDiff });
         },
@@ -168,9 +166,10 @@ const [register, { getValue, setValue, setSchema }] = useForm({
     {
       field: "jsTime",
       label: "任教开始时间",
-      component: "BasicDateTimes",
+      component: "BasicDateTime",
       componentProps: {
-        change: (e: any) => {
+        mode: "year-month",
+        ok: (e: any) => {
           const yearDiff = calculateYearDiff(e);
           setValue({ jl: yearDiff });
         },
diff --git a/src/pages/view/hr/teacherProfile/position.vue b/src/pages/view/hr/teacherProfile/position.vue
index 27ee955..ffde16f 100644
--- a/src/pages/view/hr/teacherProfile/position.vue
+++ b/src/pages/view/hr/teacherProfile/position.vue
@@ -67,46 +67,46 @@ const [register, { getValue, setValue }] = useForm({
         savaKey: "dictionaryCode",
       },
     },
-    {
-      field: "zrxk",
-      label: "主任学科",
-      component: "BasicPicker",
-      componentProps: {
-        api: kmFindAllApi,
-        rangeKey: "kmmc",
-        savaKey: "id",
-      },
-    },
-    {
-      field: "zrbj",
-      label: "主任班级",
-      component: "BasicPicker",
-      componentProps: {
-        api: findAllNjBjTree,
-        rangeKey: "title",
-        savaKey: "key",
-      },
-    },
-    {
-      field: "jrxk",
-      label: "兼任学科",
-      component: "BasicPicker",
-      componentProps: {
-        api: kmFindAllApi,
-        rangeKey: "kmmc",
-        savaKey: "id",
-      },
-    },
-    {
-      field: "jrbj",
-      label: "兼任班级",
-      component: "BasicPicker",
-      componentProps: {
-        api: findAllNjBjTree,
-        rangeKey: "title",
-        savaKey: "key",
-      },
-    },
+    // {
+    //   field: "zrxk",
+    //   label: "主任学科",
+    //   component: "BasicPicker",
+    //   componentProps: {
+    //     api: kmFindAllApi,
+    //     rangeKey: "kmmc",
+    //     savaKey: "id",
+    //   },
+    // },
+    // {
+    //   field: "zrbj",
+    //   label: "主任班级",
+    //   component: "BasicPicker",
+    //   componentProps: {
+    //     api: findAllNjBjTree,
+    //     rangeKey: "title",
+    //     savaKey: "key",
+    //   },
+    // },
+    // {
+    //   field: "jrxk",
+    //   label: "兼任学科",
+    //   component: "BasicPicker",
+    //   componentProps: {
+    //     api: kmFindAllApi,
+    //     rangeKey: "kmmc",
+    //     savaKey: "id",
+    //   },
+    // },
+    // {
+    //   field: "jrbj",
+    //   label: "兼任班级",
+    //   component: "BasicPicker",
+    //   componentProps: {
+    //     api: findAllNjBjTree,
+    //     rangeKey: "title",
+    //     savaKey: "key",
+    //   },
+    // },
     {
       field: "njId",
       label: "所属年级",
@@ -117,16 +117,16 @@ const [register, { getValue, setValue }] = useForm({
         savaKey: "key",
       },
     },
-    {
-      field: "bzrBjId",
-      label: "班主任班级",
-      component: "BasicTree",
-      componentProps: {
-        api: findAllNjBjTree,
-        rangeKey: "title",
-        savaKey: "key",
-      },
-    },
+    // {
+    //   field: "bzrBjId",
+    //   label: "班主任班级",
+    //   component: "BasicTree",
+    //   componentProps: {
+    //     api: findAllNjBjTree,
+    //     rangeKey: "title",
+    //     savaKey: "key",
+    //   },
+    // },
   ],
 });