diff --git a/src/components/BasicForm/components/BasicDateTime.vue b/src/components/BasicForm/components/BasicDateTime.vue
index 71296a2..a55af85 100644
--- a/src/components/BasicForm/components/BasicDateTime.vue
+++ b/src/components/BasicForm/components/BasicDateTime.vue
@@ -1,18 +1,25 @@
 <template>
   <view class="py-7">
     <view @click="open" class="wh-full flex-row items-center justify-between">
-      <view class="font-14 color-9" v-if="!newValue">请选择{{ attrs.label }}</view>
+      <view class="font-14 color-9" v-if="!newValue"
+        >请选择{{ attrs.label }}</view
+      >
       <view class="font-14 text-ellipsis-1 color-3" v-else>{{ newValue }}</view>
-      <uni-icons type="right" size="18" color="#999999" v-if="!attrs.componentProps.disabled"/>
+      <uni-icons
+        type="right"
+        size="18"
+        color="#999999"
+        v-if="!attrs.componentProps.disabled"
+      />
     </view>
     <TimePicker
-        ref="popup"
-        :minDate="attrs.componentProps.minDate"
-        :maxDate="attrs.componentProps.maxDate"
-        :mode="attrs.componentProps.mode"
-        :title="attrs.label"
-        :value=" newValue?newValue:undefined"
-        @confirm="confirm"
+      ref="popup"
+      :minDate="attrs.componentProps.minDate"
+      :maxDate="attrs.componentProps.maxDate"
+      :mode="attrs.componentProps.mode"
+      :title="attrs.label"
+      :value="newValue ? newValue : undefined"
+      @confirm="confirm"
     />
   </view>
 </template>
@@ -25,63 +32,66 @@
  * @property  minDate   开始时间
  * @property  maxDate     结束时间
  */
-import TimePicker from '@/components/BasicPicker/TimePicker/DatetimePicker.vue'
-import dayjs from 'dayjs'
+import TimePicker from "@/components/BasicPicker/TimePicker/DatetimePicker.vue";
+import dayjs from "dayjs";
 
-const popup = ref<any>(null)
+const popup = ref<any>(null);
 
-const props = defineProps(['modelValue'])
-const emit = defineEmits(['update:modelValue'])
+const props = defineProps(["modelValue"]);
+const emit = defineEmits(["update:modelValue"]);
 const newValue = computed({
   get() {
-    return props.modelValue
+    return props.modelValue;
   },
   set(value) {
-    emit('update:modelValue', value)
-  }
-})
-const attrs: any = useAttrs()
+    emit("update:modelValue", value);
+  },
+});
+const attrs: any = useAttrs();
 
 function open() {
   if (!attrs.componentProps.disabled) {
-    if (attrs.componentProps.open && typeof attrs.componentProps.open == 'function') {
-      attrs.componentProps.open()
+    if (
+      attrs.componentProps.open &&
+      typeof attrs.componentProps.open == "function"
+    ) {
+      attrs.componentProps.open();
     }
-    popup.value.open()
+    popup.value.open();
   }
 }
 
 if (attrs.componentProps && attrs.componentProps.today) {
   if (!attrs.componentProps.mode) {
-    attrs.componentProps.mode = 'datetime'
+    attrs.componentProps.mode = "datetime";
   }
-  if (attrs.componentProps.mode === 'date') {
-    newValue.value = dayjs().format('YYYY-MM-DD')
+  if (attrs.componentProps.mode === "date") {
+    newValue.value = dayjs().format("YYYY-MM-DD");
   }
-  if (attrs.componentProps.mode === 'time') {
-    newValue.value = dayjs().format('HH:mm')
+  if (attrs.componentProps.mode === "time") {
+    newValue.value = dayjs().format("HH:mm");
   }
-  if (attrs.componentProps.mode === 'datetime') {
-    newValue.value = dayjs().format('YYYY-MM-DD HH:mm')
+  if (attrs.componentProps.mode === "datetime") {
+    newValue.value = dayjs().format("YYYY-MM-DD HH:mm");
   }
 }
 
 function confirm(e: any) {
-  const {value, mode} = e
-  if (mode === 'date') {
-    newValue.value = dayjs(value).format('YYYY-MM-DD')
+  const { value, mode } = e;
+  if (mode === "date") {
+    newValue.value = dayjs(value).format("YYYY-MM-DD");
   }
-  if (mode === 'time') {
-    newValue.value = dayjs(value).format('HH:mm')
+  if (mode === "time") {
+    newValue.value = dayjs(value).format("HH:mm");
   }
-  if (mode === 'datetime') {
-    newValue.value = dayjs(value).format('YYYY-MM-DD HH:mm')
+  if (mode === "datetime") {
+    newValue.value = dayjs(value).format("YYYY-MM-DD HH:mm");
   }
-  if (attrs.componentProps.ok && typeof attrs.componentProps.ok == 'function') {
-    attrs.componentProps.ok(e)
+  if (mode === "year-month") {
+    newValue.value = dayjs(value).format("YYYY-MM");
+  }
+  if (attrs.componentProps.ok && typeof attrs.componentProps.ok == "function") {
+    attrs.componentProps.ok(e);
   }
 }
-
-
 </script>
-
diff --git a/src/pages.json b/src/pages.json
index 611c6cf..2629017 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -244,6 +244,27 @@
         "enablePullDownRefresh": false
       }
     },
+    {
+      "path": "pages/view/hr/teacherProfile/education",
+      "style": {
+        "navigationBarTitleText": "学历情况",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/view/hr/teacherProfile/qualification",
+      "style": {
+        "navigationBarTitleText": "教师资格",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/view/hr/teacherProfile/position",
+      "style": {
+        "navigationBarTitleText": "任教任职",
+        "enablePullDownRefresh": false
+      }
+    },
     {
       "path": "pages/view/hr/teacherProfile/TitleInfo",
       "style": {
@@ -254,7 +275,7 @@
     {
       "path": "pages/view/hr/teacherProfile/PositionInfo",
       "style": {
-        "navigationBarTitleText": "任岗情况",
+        "navigationBarTitleText": "岗位变动情况",
         "enablePullDownRefresh": false
       }
     },
@@ -399,13 +420,13 @@
         "pagePath": "pages/base/service/index",
         "iconPath": "static/tabBar/x2.png",
         "selectedIconPath": "static/tabBar/2.png"
-      },
-      {
-        "text": "我的",
-        "pagePath": "pages/base/mine/index",
-        "iconPath": "static/tabBar/x3.png",
-        "selectedIconPath": "static/tabBar/3.png"
       }
+      // {
+      //   "text": "我的",
+      //   "pagePath": "pages/base/mine/index",
+      //   "iconPath": "static/tabBar/x3.png",
+      //   "selectedIconPath": "static/tabBar/3.png"
+      // }
     ]
   }
 }
\ No newline at end of file
diff --git a/src/pages/base/service/index.vue b/src/pages/base/service/index.vue
index f8a1905..2174c6b 100644
--- a/src/pages/base/service/index.vue
+++ b/src/pages/base/service/index.vue
@@ -3,23 +3,61 @@
     <!-- 1. 顶部 Header -->
     <view class="header-section">
       <view class="header-gradient"></view>
-      <image
-        class="header-image"
-        src="@/static/base/home/120851x.png"
-        mode="aspectFit"
-      ></image>
-      <view class="header-overlay">
-        <text class="header-title">智慧校园</text>
-        <text class="header-subtitle">教师服务平台</text>
+
+      <!-- 退出按钮 -->
+      <view class="logout-btn" @click="handleLogout">
+        <text class="logout-text">退出</text>
+      </view>
+
+      <!-- 老师信息 -->
+      <view class="teacher-info">
+        <view class="teacher-avatar">
+          <image
+            class="avatar-image"
+            :src="teacherData.avatar || '/static/base/default-avatar.png'"
+            mode="aspectFill"
+          ></image>
+        </view>
+
+        <view class="teacher-details">
+          <view class="teacher-name">{{ teacherData.name }}</view>
+          <view class="teacher-position">{{ teacherData.position }}</view>
+          <view class="teacher-class">{{ teacherData.className }}</view>
+        </view>
+      </view>
+
+      <!-- 统计信息 -->
+      <view class="stats-info">
+        <view class="stat-item">
+          <text class="stat-label">积分：</text>
+          <text class="stat-value">{{ teacherData.score }}分</text>
+        </view>
+        <view class="stat-divider">|</view>
+        <view class="stat-item">
+          <text class="stat-label">工作量：</text>
+          <text class="stat-value">{{ teacherData.workload }}课时</text>
+        </view>
+      </view>
+
+      <!-- 介绍文字 -->
+      <view class="teacher-intro">
+        {{ teacherData.introduction }}
       </view>
     </view>
 
     <!-- 2. 主要内容区域 -->
     <view class="main-content">
       <!-- 循环渲染功能分区 -->
-      <view class="section-block" v-for="(section, index) in sections" :key="section.id">
+      <view
+        class="section-block"
+        v-for="(section, index) in sections"
+        :key="section.id"
+      >
         <view class="section-title">
-          <view class="title-decorator" :style="{backgroundColor: getSectionColor(index)}"></view>
+          <view
+            class="title-decorator"
+            :style="{ backgroundColor: getSectionColor(index) }"
+          ></view>
           <text>{{ section.title }}</text>
           <view class="title-line"></view>
         </view>
@@ -30,7 +68,10 @@
               class="grid-item"
               @click="handleGridItemClick(item)"
             >
-              <view class="grid-icon-container" :style="{backgroundColor: getIconBgColor(index)}">
+              <view
+                class="grid-icon-container"
+                :style="{ backgroundColor: getIconBgColor(index) }"
+              >
                 <image
                   class="grid-icon"
                   :src="`/static/base/home/${item.icon}.png`"
@@ -47,7 +88,9 @@
 </template>
 
 <script lang="ts" setup>
-import { reactive } from "vue";
+import { useUserStore } from "@/store/modules/user";
+import { imagUrl } from "@/utils";
+import { reactive, ref } from "vue";
 
 interface GridItem {
   id: number | string;
@@ -64,6 +107,46 @@ interface Section {
   items: GridItem[];
 }
 
+// 定义老师数据接口
+interface TeacherData {
+  name: string;
+  position: string;
+  className: string;
+  score: number;
+  workload: number;
+  introduction: string;
+  avatar?: string;
+}
+const { logout, getUser } = useUserStore();
+// 老师数据
+const teacherData = reactive<TeacherData>({
+  name: getUser.loginName,
+  position: "教研组长",
+  className: "2014级1班班主任",
+  score: 48,
+  workload: 20,
+  introduction: "北冥有鱼，其名为鲲。鲲之大，不知其几千里也。",
+  avatar: imagUrl(getUser.profilePhoto),
+});
+
+// 退出登录
+const handleLogout = () => {
+  uni.showModal({
+    title: "确认退出",
+    content: "确定要退出登录吗？",
+    success: (res) => {
+      if (res.confirm) {
+        // 清除用户数据
+        logout();
+        // 跳转到登录页面
+        uni.reLaunch({
+          url: "/pages/system/login/login",
+        });
+      }
+    },
+  });
+};
+
 // 定义功能分区数据
 const sections = reactive<Section[]>([
   {
@@ -186,13 +269,17 @@ const sections = reactive<Section[]>([
 
 // 获取分区颜色
 const getSectionColor = (index: number) => {
-  const colors = ['#4F46E5', '#059669', '#DC2626'];
+  const colors = ["#4F46E5", "#059669", "#DC2626"];
   return colors[index % colors.length];
 };
 
 // 获取图标背景颜色
 const getIconBgColor = (index: number) => {
-  const colors = ['rgba(79, 70, 229, 0.1)', 'rgba(5, 150, 105, 0.1)', 'rgba(220, 38, 38, 0.1)'];
+  const colors = [
+    "rgba(79, 70, 229, 0.1)",
+    "rgba(5, 150, 105, 0.1)",
+    "rgba(220, 38, 38, 0.1)",
+  ];
   return colors[index % colors.length];
 };
 
@@ -217,10 +304,12 @@ const handleGridItemClick = (item: GridItem) => {
 // 顶部 Header
 .header-section {
   position: relative;
-  background: linear-gradient(135deg, #4F46E5 0%, #7C3AED 50%, #EC4899 100%);
+  background: linear-gradient(135deg, #4f46e5 0%, #7c3aed 50%, #ec4899 100%);
   color: #ffffff;
   overflow: hidden;
-  height: 280rpx;
+  padding: 40rpx 30rpx 30rpx;
+  height: auto;
+  min-height: 320rpx;
 
   .header-gradient {
     position: absolute;
@@ -228,56 +317,136 @@ const handleGridItemClick = (item: GridItem) => {
     left: 0;
     right: 0;
     bottom: 0;
-    background: linear-gradient(45deg, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0.05) 100%);
+    background: linear-gradient(
+      45deg,
+      rgba(255, 255, 255, 0.1) 0%,
+      rgba(255, 255, 255, 0.05) 100%
+    );
     z-index: 1;
   }
 
-  .header-image {
-    width: 100%;
-    height: 100%;
-    display: block;
-    opacity: 0.3;
+  // 退出按钮
+  .logout-btn {
     position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 0;
-    object-fit: cover;
+    top: 40rpx;
+    right: 30rpx;
+    z-index: 3;
+    background: rgba(255, 255, 255, 0.2);
+    border-radius: 20rpx;
+    padding: 10rpx 20rpx;
+    border: 1px solid rgba(255, 255, 255, 0.3);
+    backdrop-filter: blur(10px);
+
+    .logout-text {
+      color: #ffffff;
+      font-size: 14px;
+      font-weight: 500;
+    }
   }
 
-  .header-overlay {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    text-align: center;
+  // 老师信息
+  .teacher-info {
+    display: flex;
+    align-items: center;
+    margin-top: 20rpx;
     z-index: 2;
+    position: relative;
 
-    .header-title {
-      font-size: 32px;
-      font-weight: bold;
-      color: #ffffff;
-      text-shadow: 0 2px 4px rgba(0,0,0,0.3);
-      display: block;
-      margin-bottom: 8px;
+    .teacher-avatar {
+      width: 120rpx;
+      height: 120rpx;
+      border-radius: 50%;
+      overflow: hidden;
+      border: 3px solid rgba(255, 255, 255, 0.3);
+      margin-right: 20rpx;
+
+      .avatar-image {
+        width: 100%;
+        height: 100%;
+      }
     }
 
-    .header-subtitle {
-      font-size: 16px;
-      color: rgba(255,255,255,0.9);
-      text-shadow: 0 1px 2px rgba(0,0,0,0.2);
+    .teacher-details {
+      flex: 1;
+
+      .teacher-name {
+        font-size: 20px;
+        font-weight: bold;
+        color: #ffffff;
+        margin-bottom: 5rpx;
+        text-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+      }
+
+      .teacher-position {
+        font-size: 14px;
+        color: rgba(255, 255, 255, 0.9);
+        margin-bottom: 5rpx;
+      }
+
+      .teacher-class {
+        font-size: 12px;
+        color: rgba(255, 255, 255, 0.8);
+      }
     }
   }
+
+  // 统计信息
+  .stats-info {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 20rpx;
+    z-index: 2;
+    position: relative;
+
+    .stat-item {
+      display: flex;
+      align-items: center;
+
+      .stat-label {
+        font-size: 14px;
+        color: rgba(255, 255, 255, 0.9);
+      }
+
+      .stat-value {
+        font-size: 14px;
+        color: #ffffff;
+        font-weight: 600;
+      }
+    }
+
+    .stat-divider {
+      margin: 0 30rpx;
+      color: rgba(255, 255, 255, 0.6);
+      font-size: 14px;
+    }
+  }
+
+  // 介绍文字
+  .teacher-intro {
+    text-align: center;
+    font-size: 12px;
+    color: rgba(255, 255, 255, 0.8);
+    margin-top: 20rpx;
+    line-height: 1.4;
+    z-index: 2;
+    position: relative;
+  }
 }
 
 // 主要内容区域
 .main-content {
   padding: 20px 15px 40px 15px;
   position: relative;
-  background: linear-gradient(to bottom, rgba(255,255,255,0.95) 0%, rgba(248,250,252,0.98) 100%);
+  background: linear-gradient(
+    to bottom,
+    rgba(255, 255, 255, 0.95) 0%,
+    rgba(248, 250, 252, 0.98) 100%
+  );
   border-radius: 20px 20px 0 0;
   margin-top: -20px;
   z-index: 3;
-  box-shadow: 0 -4px 20px rgba(0,0,0,0.1);
+  box-shadow: 0 -4px 20px rgba(0, 0, 0, 0.1);
 }
 
 // 功能分区块
@@ -285,9 +454,15 @@ const handleGridItemClick = (item: GridItem) => {
   margin-bottom: 25px;
   animation: fadeInUp 0.6s ease-out;
 
-  &:nth-child(1) { animation-delay: 0.1s; }
-  &:nth-child(2) { animation-delay: 0.2s; }
-  &:nth-child(3) { animation-delay: 0.3s; }
+  &:nth-child(1) {
+    animation-delay: 0.1s;
+  }
+  &:nth-child(2) {
+    animation-delay: 0.2s;
+  }
+  &:nth-child(3) {
+    animation-delay: 0.3s;
+  }
 
   .section-title {
     display: flex;
@@ -301,7 +476,7 @@ const handleGridItemClick = (item: GridItem) => {
       height: 8px;
       border-radius: 50%;
       margin-right: 12px;
-      box-shadow: 0 2px 8px rgba(0,0,0,0.2);
+      box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
     }
 
     text {
@@ -314,7 +489,11 @@ const handleGridItemClick = (item: GridItem) => {
     .title-line {
       flex: 1;
       height: 1px;
-      background: linear-gradient(to right, rgba(156, 163, 175, 0.3), transparent);
+      background: linear-gradient(
+        to right,
+        rgba(156, 163, 175, 0.3),
+        transparent
+      );
       margin-left: 15px;
     }
   }
@@ -324,7 +503,7 @@ const handleGridItemClick = (item: GridItem) => {
     border-radius: 16px;
     padding: 20px 15px;
     box-shadow: 0 4px 20px rgba(0, 0, 0, 0.08);
-    border: 1px solid rgba(255,255,255,0.8);
+    border: 1px solid rgba(255, 255, 255, 0.8);
     backdrop-filter: blur(10px);
     display: grid;
     grid-template-columns: repeat(3, 1fr);
@@ -369,7 +548,7 @@ const handleGridItemClick = (item: GridItem) => {
     justify-content: center;
     margin-bottom: 8px;
     transition: all 0.3s ease;
-    box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
 
     .grid-icon {
       width: 24px;
@@ -392,7 +571,7 @@ const handleGridItemClick = (item: GridItem) => {
 
   &:hover .grid-icon-container {
     transform: scale(1.1);
-    box-shadow: 0 4px 15px rgba(0,0,0,0.15);
+    box-shadow: 0 4px 15px rgba(0, 0, 0, 0.15);
   }
 }
 
@@ -414,15 +593,15 @@ const handleGridItemClick = (item: GridItem) => {
     gap: 15px 8px;
     padding: 15px 10px;
   }
-  
+
   .grid-item {
     padding: 8px 3px;
   }
-  
+
   .grid-icon-container {
     width: 42px;
     height: 42px;
-    
+
     .grid-icon {
       width: 20px;
       height: 20px;
diff --git a/src/pages/view/hr/teacherProfile/ExperienceInfo.vue b/src/pages/view/hr/teacherProfile/ExperienceInfo.vue
index b4b60a4..e1cf624 100644
--- a/src/pages/view/hr/teacherProfile/ExperienceInfo.vue
+++ b/src/pages/view/hr/teacherProfile/ExperienceInfo.vue
@@ -1,6 +1,7 @@
 <template>
   <BasicLayout>
     <view class="p-15">
+      <view class="mb-15 cor-ff0000 font-14 ml-15">注:从参加工作前最高学历开始填写 </view>
       <view v-if="education.xl.length > 0">
         <template v-for="(item, index) in education.xl" :key="index">
           <view class="po-re mb-15">
@@ -55,25 +56,13 @@ import { cloneDeep, map } from "lodash";
 const schema = reactive<FormsSchema[]>([
   {
     field: "gztime",
-    label: "时间",
+    label: "起止时间",
     component: "BasicDateTimes",
     componentProps: {},
   },
   {
     field: "gzdw",
-    label: "学校/单位",
-    component: "BasicInput",
-    componentProps: {},
-  },
-  {
-    field: "zmr",
-    label: "证明人",
-    component: "BasicInput",
-    componentProps: {},
-  },
-  {
-    field: "lxfs",
-    label: "联系方式",
+    label: "学习/工作单位",
     component: "BasicInput",
     componentProps: {},
   },
diff --git a/src/pages/view/hr/teacherProfile/PositionInfo.vue b/src/pages/view/hr/teacherProfile/PositionInfo.vue
index d540919..632aaef 100644
--- a/src/pages/view/hr/teacherProfile/PositionInfo.vue
+++ b/src/pages/view/hr/teacherProfile/PositionInfo.vue
@@ -30,7 +30,7 @@
     <template #bottom>
       <view class="flex-row items-center pb-10 pt-5">
         <u-button
-          text="返回"
+          text="上一步"
           class="ml-15 mr-7"
           :plain="true"
           @click="navigateBack"
@@ -59,20 +59,20 @@ 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: "xj",
+  //   label: "薪级",
+  //   component: "BasicPicker",
+  //   componentProps: {
+  //     api: dicApi,
+  //     param: { pid: 434953981 },
+  //     rangeKey: "dictionaryValue",
+  //     savaKey: "dictionaryCode",
+  //   },
+  // },
   {
     field: "gwjbId",
-    label: "岗位级别",
+    label: "岗位类别",
     component: "BasicPicker",
     componentProps: {
       api: dicApi,
diff --git a/src/pages/view/hr/teacherProfile/TitleInfo.vue b/src/pages/view/hr/teacherProfile/TitleInfo.vue
index a1abac2..e3263f6 100644
--- a/src/pages/view/hr/teacherProfile/TitleInfo.vue
+++ b/src/pages/view/hr/teacherProfile/TitleInfo.vue
@@ -30,7 +30,7 @@
     <template #bottom>
       <view class="flex-row items-center pb-10 pt-5">
         <u-button
-          text="返回"
+          text="上一步"
           class="ml-15 mr-7"
           :plain="true"
           @click="navigateBack"
@@ -78,13 +78,8 @@ const schema = reactive<FormsSchema[]>([
   {
     field: "zczyId",
     label: "职称专业",
-    component: "BasicPicker",
-    componentProps: {
-      api: dicApi,
-      param: { pid: 2130488509 },
-      rangeKey: "dictionaryValue",
-      savaKey: "dictionaryCode",
-    },
+    component: "BasicInput",
+    componentProps: {},
   },
   {
     field: "zcspjg",
@@ -133,6 +128,24 @@ const schema = reactive<FormsSchema[]>([
     component: "BasicInput",
     componentProps: {},
   },
+  {
+    field: "pywjh",
+    label: "上传任职文件",
+    component: "BasicUpload",
+    itemProps: {
+      labelPosition: "top",
+    },
+    componentProps: {},
+  },
+  {
+    field: "pywjh",
+    label: "上传聘用文件",
+    component: "BasicUpload",
+    itemProps: {
+      labelPosition: "top",
+    },
+    componentProps: {},
+  },
 ]);
 const { getFile, setFile } = useDataStore();
 
diff --git a/src/pages/view/hr/teacherProfile/education.vue b/src/pages/view/hr/teacherProfile/education.vue
new file mode 100644
index 0000000..a35d6d1
--- /dev/null
+++ b/src/pages/view/hr/teacherProfile/education.vue
@@ -0,0 +1,126 @@
+<template>
+  <BasicLayout>
+    <view class="px-15 pb-15">
+      <BasicForm @register="register"> </BasicForm>
+    </view>
+    <template #bottom>
+      <view class="flex-row items-center pb-10 pt-5">
+        <u-button
+          text="上一步"
+          class="ml-15 mr-7"
+          :plain="true"
+          @click="navigateBack"
+        />
+        <u-button
+          text="下一步"
+          class="mr-15 mr-7"
+          type="primary"
+          @click="submit"
+        />
+      </view>
+    </template>
+  </BasicLayout>
+</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";
+
+const { getFile, setFile } = useDataStore();
+
+const [register, { getValue, setValue }] = useForm({
+  schema: [
+    {
+      field: "dyxlId",
+      label: "初始学历",
+      component: "BasicPicker",
+      componentProps: {
+        api: dicApi,
+        param: { pid: 1914632204 },
+        rangeKey: "dictionaryValue",
+        savaKey: "dictionaryCode",
+      },
+    },
+    {
+      field: "dybyyx",
+      label: "全日制学历毕业院校",
+      component: "BasicInput",
+      componentProps: {},
+    },
+    {
+      field: "dybyzy",
+      label: "全日制学历专业",
+      component: "BasicInput",
+      componentProps: {},
+    },
+    {
+      field: "zhxlId",
+      label: "最后学历",
+      component: "BasicPicker",
+      componentProps: {
+        api: dicApi,
+        param: { pid: 1914632204 },
+        rangeKey: "dictionaryValue",
+        savaKey: "dictionaryCode",
+      },
+    },
+    {
+      field: "zhbyyx",
+      label: "最后学历毕业院校",
+      component: "BasicInput",
+      componentProps: {},
+    },
+    {
+      field: "zhbyzy",
+      label: "最后学历专业",
+      component: "BasicInput",
+      componentProps: {},
+    },
+    {
+      field: "zhbynytime",
+      label: "最后学历毕业年月",
+      component: "BasicDateTimes",
+      componentProps: {},
+    },
+    {
+      field: "xw",
+      label: "学位",
+      component: "BasicPicker",
+      defaultValue: "无",
+      componentProps: {
+        api: dicApi,
+        param: { pid: 1513282965 },
+        rangeKey: "dictionaryValue",
+        savaKey: "dictionaryCode",
+      },
+    },
+    {
+      field: "xwzy",
+      label: "学位专业",
+      component: "BasicInput",
+      componentProps: {},
+    },
+  ],
+});
+
+setValue(getFile);
+
+async function submit() {
+  try {
+    const value = await getValue();
+    setFile({ ...getFile, ...value });
+    navigateTo("/pages/view/hr/teacherProfile/qualification");
+  } catch (error) {}
+}
+</script>
+
+<style lang="scss" scoped>
+.delete-icon {
+  position: absolute;
+  right: 0;
+  top: 0;
+  z-index: 1;
+}
+</style>
diff --git a/src/pages/view/hr/teacherProfile/index.vue b/src/pages/view/hr/teacherProfile/index.vue
index c952fa9..6f812fd 100644
--- a/src/pages/view/hr/teacherProfile/index.vue
+++ b/src/pages/view/hr/teacherProfile/index.vue
@@ -5,15 +5,9 @@
     </view>
     <template #bottom>
       <view class="flex-row items-center pb-10 pt-5">
-        <u-button
-          text="返回"
-          class="ml-15 mr-7"
-          :plain="true"
-          @click="navigateBack"
-        />
         <u-button
           text="下一步"
-          class="mr-15 mr-7"
+          class="mx-15 "
           type="primary"
           @click="submit"
         />
@@ -30,11 +24,7 @@ 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";
+import { ok } from "assert";
 
 const { getFile, setFile } = useDataStore();
 const jsjg = ref("");
@@ -48,7 +38,7 @@ const calculateYearDiff = (startDate: string) => {
   return now.diff(start, "year");
 };
 
-const [register, { getValue, setValue }] = useForm({
+const [register, { getValue, setValue, setSchema }] = useForm({
   schema: [
     {
       title: "基础信息",
@@ -137,8 +127,10 @@ const [register, { getValue, setValue }] = useForm({
     {
       field: "rdtime",
       label: "入党时间",
-      component: "BasicDateTimes",
-      componentProps: {},
+      component: "BasicDateTime",
+      componentProps: {
+        mode: "year-month",
+      },
     },
     {
       field: "lxdh",
@@ -155,10 +147,12 @@ const [register, { getValue, setValue }] = useForm({
     {
       field: "cgtime",
       label: "参加工作时间",
-      component: "BasicDateTimes",
+      component: "BasicDateTime",
       componentProps: {
-        change: (e: any) => {
-          const yearDiff = calculateYearDiff(e);
+        mode: "year-month",
+        ok: (e: any) => {
+          console.log(e);
+          const yearDiff = calculateYearDiff(e.value);
           setValue({ jsgl: yearDiff });
         },
       },
@@ -194,10 +188,11 @@ const [register, { getValue, setValue }] = useForm({
     {
       field: "jrdwtime",
       label: "进入本单位时间",
-      component: "BasicDateTimes",
+      component: "BasicDateTime",
       componentProps: {
-        change: (e: any) => {
-          const yearDiff = calculateYearDiff(e);
+        mode: "year-month",
+        ok: (e: any) => {
+          const yearDiff = calculateYearDiff(e.value);
           setValue({ jrdwnx: yearDiff });
         },
       },
@@ -243,138 +238,25 @@ const [register, { getValue, setValue }] = useForm({
         param: { pid: 810984651 },
         rangeKey: "dictionaryValue",
         savaKey: "dictionaryCode",
+        ok: (e: any, form: any, attrs: any) => {
+          if (attrs[e].dictionaryValue == "调出") {
+            setSchema([
+              {
+                field: "dcyy",
+                ifShow: false,
+              },
+            ]);
+          }
+        },
       },
     },
     {
-      field: "sbkh",
-      label: "社保卡号",
+      field: "dcyy",
+      label: "调出原因",
+      ifShow: true,
       component: "BasicInput",
       componentProps: {},
     },
-    {
-      title: "学历情况",
-    },
-    {
-      field: "dyxlId",
-      label: "初始学历",
-      component: "BasicPicker",
-      componentProps: {
-        api: dicApi,
-        param: { pid: 1914632204 },
-        rangeKey: "dictionaryValue",
-        savaKey: "dictionaryCode",
-      },
-    },
-    {
-      field: "dybyyx",
-      label: "全日制学历毕业院校",
-      component: "BasicInput",
-      componentProps: {},
-    },
-    {
-      field: "dybyzy",
-      label: "全日制学历专业",
-      component: "BasicInput",
-      componentProps: {},
-    },
-    {
-      field: "zhxlId",
-      label: "最后学历",
-      component: "BasicPicker",
-      componentProps: {
-        api: dicApi,
-        param: { pid: 1914632204 },
-        rangeKey: "dictionaryValue",
-        savaKey: "dictionaryCode",
-      },
-    },
-    {
-      field: "zhbyyx",
-      label: "最后学历毕业院校",
-      component: "BasicInput",
-      componentProps: {},
-    },
-    {
-      field: "zhbyzy",
-      label: "最后学历专业",
-      component: "BasicInput",
-      componentProps: {},
-    },
-    {
-      field: "zhbynytime",
-      label: "最后学历毕业年月",
-      component: "BasicDateTimes",
-      componentProps: {},
-    },
-    {
-      field: "xwlbId",
-      label: "学位类别",
-      component: "BasicInput",
-      componentProps: {},
-    },
-    {
-      field: "xw",
-      label: "学位",
-      component: "BasicPicker",
-      componentProps: {
-        api: dicApi,
-        param: { pid: 1513282965 },
-        rangeKey: "dictionaryValue",
-        savaKey: "dictionaryCode",
-      },
-    },
-    {
-      field: "xwzy",
-      label: "学位专业",
-      component: "BasicInput",
-      componentProps: {},
-    },
-    {
-      title: "教师资格",
-    },
-    {
-      field: "zgxdId",
-      label: "教师资格学段",
-      component: "BasicPicker",
-      componentProps: {
-        api: dicApi,
-        param: { pid: 1680570189 },
-        rangeKey: "dictionaryValue",
-        savaKey: "dictionaryCode",
-      },
-    },
-    {
-      field: "zgxkId",
-      label: "教师资格学科",
-      component: "BasicPicker",
-      componentProps: {
-        api: dicApi,
-        param: { pid: 1029593616 },
-        rangeKey: "dictionaryValue",
-        savaKey: "dictionaryCode",
-      },
-    },
-    {
-      field: "zgzs",
-      label: "教师资格证书号",
-      component: "BasicInput",
-      componentProps: {},
-    },
-    {
-      field: "zgnytime",
-      label: "教师资格取得年月",
-      component: "BasicDateTimes",
-      componentProps: {},
-    },
-    {
-      field: "zgzctime",
-      label: "教师资格注册时间",
-      component: "BasicDateTimes",
-      componentProps: {},
-    },
-    {
-      title: "任教任职",
-    },
     {
       field: "gwjbId",
       label: "岗位级别",
@@ -386,12 +268,6 @@ const [register, { getValue, setValue }] = useForm({
         savaKey: "dictionaryCode",
       },
     },
-    {
-      field: "gwrztime",
-      label: "岗位任职时间",
-      component: "BasicDateTimes",
-      componentProps: {},
-    },
     {
       field: "xqxjId",
       label: "薪级",
@@ -404,62 +280,11 @@ const [register, { getValue, setValue }] = useForm({
       },
     },
     {
-      field: "dzzw",
-      label: "职务",
-      component: "BasicPicker",
-      componentProps: {
-        api: dicApi,
-        param: { pid: 434953981 },
-        rangeKey: "dictionaryValue",
-        savaKey: "dictionaryCode",
-      },
-    },
-    {
-      field: "zrxk",
-      label: "主任学科",
-      component: "BasicPicker",
-      componentProps: {
-        api: kmFindAllApi,
-        rangeKey: "kmmc",
-        savaKey: "id",
-      },
-    },
-    {
-      field: "jrxk",
-      label: "兼任学科",
-      component: "BasicPicker",
-      componentProps: {
-        api: kmFindAllApi,
-        rangeKey: "kmmc",
-        savaKey: "id",
-      },
-    },
-    {
-      field: "qtzw",
-      label: "其他职务",
+      field: "sbkh",
+      label: "社保卡号",
       component: "BasicInput",
       componentProps: {},
     },
-    {
-      field: "njId",
-      label: "年级",
-      component: "BasicTree",
-      componentProps: {
-        api: findAllXxXqNjTree,
-        rangeKey: "title",
-        savaKey: "key",
-      },
-    },
-    {
-      field: "bzrBjId",
-      label: "班主任班级",
-      component: "BasicTree",
-      componentProps: {
-        api: findAllNjBjTree,
-        rangeKey: "title",
-        savaKey: "key",
-      },
-    },
   ],
 });
 setValue(getFile);
@@ -468,7 +293,7 @@ async function submit() {
   try {
     const value = await getValue();
     setFile({ ...getFile, ...value, jsjg: jsjg.value });
-    navigateTo("/pages/view/hr/teacherProfile/TitleInfo");
+    navigateTo("/pages/view/hr/teacherProfile/education");
   } catch (error) {}
 }
 </script>
diff --git a/src/pages/view/hr/teacherProfile/position.vue b/src/pages/view/hr/teacherProfile/position.vue
new file mode 100644
index 0000000..8013a9f
--- /dev/null
+++ b/src/pages/view/hr/teacherProfile/position.vue
@@ -0,0 +1,142 @@
+<template>
+  <BasicLayout>
+    <view class="px-15 pb-15">
+      <BasicForm @register="register"> </BasicForm>
+    </view>
+    <template #bottom>
+      <view class="flex-row items-center pb-10 pt-5">
+        <u-button
+          text="上一步"
+          class="ml-15 mr-7"
+          :plain="true"
+          @click="navigateBack"
+        />
+        <u-button
+          text="下一步"
+          class="mr-15 mr-7"
+          type="primary"
+          @click="submit"
+        />
+      </view>
+    </template>
+  </BasicLayout>
+</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 {
+  findAllNjBjTree,
+  findAllXxXqNjTree,
+  kmFindAllApi,
+} from "@/api/base/server";
+
+const { getFile, setFile } = useDataStore();
+
+const [register, { getValue, setValue }] = useForm({
+  schema: [
+    {
+      field: "dzzw",
+      label: "党政职务:",
+      component: "BasicCheckbox",
+      itemProps: {
+        labelPosition: "top",
+      },
+      componentProps: {
+        api: dicApi,
+        multiple: true,
+        param: { pid: 1063530116 },
+        rangeKey: "dictionaryValue",
+        savaKey: "dictionaryCode",
+      },
+    },
+    {
+      field: "qtzw",
+      label: "其他职务",
+      component: "BasicInput",
+      componentProps: {},
+    },
+    {
+      field: "zrxk",
+      label: "主任学科",
+      component: "BasicPicker",
+      componentProps: {
+        api: kmFindAllApi,
+        rangeKey: "kmmc",
+        savaKey: "id",
+      },
+    },
+    {
+      field: "zrbj",
+      label: "主任班级",
+      component: "BasicPicker",
+      componentProps: {
+        api: kmFindAllApi,
+        rangeKey: "kmmc",
+        savaKey: "id",
+      },
+    },
+    {
+      field: "jrxk",
+      label: "兼任学科",
+      component: "BasicPicker",
+      componentProps: {
+        api: kmFindAllApi,
+        rangeKey: "kmmc",
+        savaKey: "id",
+      },
+    },
+    {
+      field: "jrbj",
+      label: "兼任班级",
+      component: "BasicPicker",
+      componentProps: {
+        api: kmFindAllApi,
+        rangeKey: "kmmc",
+        savaKey: "id",
+      },
+    },
+    {
+      field: "njId",
+      label: "所属年级",
+      component: "BasicTree",
+      componentProps: {
+        api: findAllXxXqNjTree,
+        rangeKey: "title",
+        savaKey: "key",
+      },
+    },
+    {
+      field: "bzrBjId",
+      label: "班主任班级",
+      component: "BasicTree",
+      componentProps: {
+        api: findAllNjBjTree,
+        rangeKey: "title",
+        savaKey: "key",
+      },
+    },
+  ],
+});
+
+setValue(getFile);
+
+async function submit() {
+  try {
+    const value = await getValue();
+    setFile({ ...getFile, ...value });
+    navigateTo("/pages/view/hr/teacherProfile/TitleInfo");
+  } catch (error) {}
+}
+</script>
+
+<style lang="scss" scoped>
+.delete-icon {
+  position: absolute;
+  right: 0;
+  top: 0;
+  z-index: 1;
+}
+</style>
diff --git a/src/pages/view/hr/teacherProfile/qualification.vue b/src/pages/view/hr/teacherProfile/qualification.vue
new file mode 100644
index 0000000..beb8bd3
--- /dev/null
+++ b/src/pages/view/hr/teacherProfile/qualification.vue
@@ -0,0 +1,111 @@
+<template>
+  <BasicLayout>
+    <view class="px-15 pb-15">
+      <BasicForm @register="register"> </BasicForm>
+    </view>
+    <template #bottom>
+      <view class="flex-row items-center pb-10 pt-5">
+        <u-button
+          text="上一步"
+          class="ml-15 mr-7"
+          :plain="true"
+          @click="navigateBack"
+        />
+        <u-button
+          text="下一步"
+          class="mr-15 mr-7"
+          type="primary"
+          @click="submit"
+        />
+      </view>
+    </template>
+  </BasicLayout>
+</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 dayjs from "dayjs";
+
+const { getFile, setFile } = useDataStore();
+
+const [register, { getValue, setValue }] = useForm({
+  schema: [
+    {
+      field: "zgxdId",
+      label: "教师资格学段",
+      component: "BasicPicker",
+      componentProps: {
+        api: dicApi,
+        param: { pid: 1680570189 },
+        rangeKey: "dictionaryValue",
+        savaKey: "dictionaryCode",
+      },
+    },
+    {
+      field: "zgxkId",
+      label: "教师资格学科",
+      component: "BasicPicker",
+      componentProps: {
+        api: dicApi,
+        param: { pid: 1029593616 },
+        rangeKey: "dictionaryValue",
+        savaKey: "dictionaryCode",
+      },
+    },
+    {
+      field: "zgzs",
+      label: "教师资格证书号",
+      component: "BasicInput",
+      componentProps: {},
+    },
+    {
+      field: "zgnytime",
+      label: "教师资格取得年月",
+      component: "BasicDateTimes",
+      componentProps: {},
+    },
+    {
+      field: "zgzctime",
+      label: "当前教师资格注册时间",
+      component: "BasicDateTimes",
+      componentProps: {
+        change: (e: any) => {
+          if (e) {
+            // 计算5年后的日期
+            const nextDate = dayjs(e).add(5, 'year').format('YYYY-MM-DD');
+            setValue({ xczgzctime: nextDate });
+          }
+        },
+      },
+    },
+    {
+      field: "xczgzctime",
+      label: "下次教师资格注册时间",
+      component: "BasicDateTimes",
+      componentProps: {},
+    },
+  ],
+});
+
+setValue(getFile);
+
+async function submit() {
+  try {
+    const value = await getValue();
+    setFile({ ...getFile, ...value });
+    navigateTo("/pages/view/hr/teacherProfile/position");
+  } catch (error) {}
+}
+</script>
+
+<style lang="scss" scoped>
+.delete-icon {
+  position: absolute;
+  right: 0;
+  top: 0;
+  z-index: 1;
+}
+</style>