教师档案调整

src/pages/view/hr/teacherProfile/PositionInfo.vue

@@ -5,25 +5,25 @@
         <template v-for="(item, index) in education.xl" :key="index">
           <view class="po-re mb-15">
             <BasicForm
-              :index="index"
-              v-model="item.value"
-              :schema="schema"
-              :key="`form-${index}-${forceUpdateKey}`"
-              :formsProps="{ labelWidth: 100 }"
+                :index="index"
+                v-model="item.value"
+                :schema="schema"
+                :key="`form-${index}-${forceUpdateKey}`"
+                :formsProps="{ labelWidth: 100 }"
             />
             <view
-              @click="deleteMemberFamily(index, item.value)"
-              class="delete-icon"
+                @click="deleteMemberFamily(index, item.value)"
+                class="delete-icon"
             >
-              <BasicIcon type="clear" size="30" />
+              <BasicIcon type="clear" size="30"/>
             </view>
           </view>
         </template>
       </view>
       <view
-        class="flex-row items-center justify-center pb-10 pt-5"
-        style="border: 1px solid #e8e8e8"
-        @click="addEducation"
+          class="flex-row items-center justify-center pb-10 pt-5"
+          style="border: 1px solid #e8e8e8"
+          @click="addEducation"
       >
         <uni-icons type="plus" size="16" color="#447ADE"></uni-icons>
         <view class="ml-5 cor-447ADE">新增</view>
@@ -32,22 +32,22 @@
     <template #bottom>
       <view class="flex-row items-center pb-10 pt-5">
         <u-button
-          text="测试计算"
-          class="ml-15 mr-7"
-          :plain="true"
-          @click="calculateAllPositionYears"
+            text="测试计算"
+            class="ml-15 mr-7"
+            :plain="true"
+            @click="calculateAllPositionYears"
         />
         <u-button
-          text="上一步"
-          class="ml-15 mr-7"
-          :plain="true"
-          @click="navigateBack"
+            text="上一步"
+            class="ml-15 mr-7"
+            :plain="true"
+            @click="navigateBack"
         />
         <u-button
-          text="下一步"
-          class="mr-15 mr-7"
-          type="primary"
-          @click="submit"
+            text="下一步"
+            class="mr-15 mr-7"
+            type="primary"
+            @click="submit"
         />
       </view>
     </template>
@@ -55,10 +55,10 @@
 </template>
 
 <script lang="ts" setup>
-import { dicApi } from "@/api/system/dic";
-import { useDataStore } from "@/store/modules/data";
-import { navigateBack, navigateTo } 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";
 import dayjs from "dayjs";
 
 // 计算任岗年限
@@ -67,7 +67,7 @@ const calculatePositionYears = (startDate: string, endDate?: string) => {
   const start = dayjs(startDate);
   const end = endDate ? dayjs(endDate) : dayjs();
   const years = end.diff(start, "year");
-  console.log("计算任岗年限:", { startDate, endDate, years });
+  console.log("计算任岗年限:", {startDate, endDate, years});
   // 确保0值也能显示，转换为字符串
   return years.toString();
 };
@@ -77,7 +77,7 @@ const forceUpdateKey = ref(0);
 
 // 更新指定项的任岗年限
 const updatePositionYears = (itemValue: any) => {
-  const { gwrztime, gwpyjssj } = itemValue;
+  const {gwrztime, gwpyjssj} = itemValue;
   if (gwrztime) {
     const years = calculatePositionYears(gwrztime, gwpyjssj);
     itemValue.gwrznx = years;
@@ -85,24 +85,24 @@ const updatePositionYears = (itemValue: any) => {
 };
 
 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: dicApi,
-      param: { pid: 260783972 },
+      param: {pid: 260783972},
+      rangeKey: "dictionaryValue",
+      savaKey: "dictionaryCode",
+    },
+  },
+  {
+    field: "xj",
+    label: "岗位级别",
+    component: "BasicPicker",
+    componentProps: {
+      api: dicApi,
+      param: {pid: 434953981},
       rangeKey: "dictionaryValue",
       savaKey: "dictionaryCode",
     },
@@ -188,7 +188,7 @@ const schema = reactive<FormsSchema[]>([
   //     savaKey: "key",
   //   },
   // },
-  {
+  /*{
     field: "dzzw",
     label: "职务",
     component: "BasicPicker",
@@ -198,17 +198,17 @@ const schema = reactive<FormsSchema[]>([
       rangeKey: "dictionaryValue",
       savaKey: "dictionaryCode",
     },
-  },
+  },*/
 ]);
 
 const education = reactive<any>({
-  xl: [{ value: {} }],
+  xl: [{value: {}}],
 });
 
-const { getFile, setFile } = useDataStore();
+const {getFile, setFile} = useDataStore();
 if (getFile.rgqkList && getFile.rgqkList.length > 0) {
   education.xl = map(getFile.rgqkList, (item) => {
-    return { value: item };
+    return {value: item};
   });
 
   // 回显数据后，重新计算所有任岗年限
@@ -216,8 +216,8 @@ if (getFile.rgqkList && getFile.rgqkList.length > 0) {
     education.xl.forEach((item: any, index: number) => {
       if (item.value.gwrztime) {
         const years = calculatePositionYears(
-          item.value.gwrztime,
-          item.value.gwpyjssj
+            item.value.gwrztime,
+            item.value.gwpyjssj
         );
         item.value.gwrznx = years;
         console.log(`回显数据-表单项${index}计算结果:`, {
@@ -241,8 +241,8 @@ const calculateAllPositionYears = () => {
   education.xl.forEach((item: any, index: number) => {
     if (item.value.gwrztime) {
       const years = calculatePositionYears(
-        item.value.gwrztime,
-        item.value.gwpyjssj
+          item.value.gwrztime,
+          item.value.gwpyjssj
       );
       item.value.gwrznx = years;
       console.log(`表单项${index}计算结果:`, {
@@ -260,7 +260,7 @@ const calculateAllPositionYears = () => {
 };
 
 function addEducation() {
-  education.xl.push({ value: {} });
+  education.xl.push({value: {}});
   // 强制重新渲染
   forceUpdateKey.value++;
 }

src/pages/view/hr/teacherProfile/index.vue

@@ -19,10 +19,27 @@ import { dicApi, findDicTreeByPidApi } from "@/api/system/dic";
 import { useDataStore } from "@/store/modules/data";
 import { map } from "lodash";
 import dayjs from "dayjs";
+import chinaCitys from "@/api/base/ChinaCitys.json";
 
 const { getFile, setFile } = useDataStore();
 const jsjg = ref("");
 
+// 转换省市区数据为树形结构
+const cityTreeData = computed(() => {
+  return chinaCitys.map(province => ({
+    text: province.province,
+    value: province.code,
+    children: province.citys.map(city => ({
+      text: city.city,
+      value: city.code,
+      children: city.areas.map(area => ({
+        text: area.area,
+        value: area.code
+      }))
+    }))
+  }));
+});
+
 // 计算日期与当前日期相差的年数
 const calculateYearDiff = (startDate: string) => {
   if (!startDate) return "";
@@ -41,9 +58,7 @@ const [register, { getValue, setValue, setSchema }] = useForm({
       field: "jsdah",
       label: "档案号",
       component: "BasicInput",
-      componentProps: {
-        disabled: true,
-      },
+      componentProps: {},
     },
     {
       field: "jsxm",
@@ -67,15 +82,15 @@ const [register, { getValue, setValue, setSchema }] = useForm({
       label: "籍贯",
       component: "BasicDataPicker",
       componentProps: {
-        api: findDicTreeByPidApi,
-        param: { pid: 3701 },
-        rangeKey: "dictionaryValue",
-        savaKey: "dictionaryCode",
+        range: cityTreeData.value,
+        rangeKey: "text",
+        savaKey: "value",
         onChange: (e: any) => {
-          jsjg.value = map(e.detail.value, (item) => {
-            return item.text;
-          }).join("");
-        },
+          const selectedNodes = e.detail.data;
+          if (selectedNodes && selectedNodes.length > 0) {
+            jsjg.value = selectedNodes.map((node: any) => node.text).join("");
+          }
+        }
       },
     },
     {
@@ -251,7 +266,7 @@ const [register, { getValue, setValue, setSchema }] = useForm({
       component: "BasicInput",
       componentProps: {},
     },
-    {
+    /*{
       field: "gwjbId",
       label: "岗位级别",
       component: "BasicPicker",
@@ -272,7 +287,7 @@ const [register, { getValue, setValue, setSchema }] = useForm({
         rangeKey: "dictionaryValue",
         savaKey: "dictionaryCode",
       },
-    },
+    },*/
     {
       field: "sbkh",
       label: "社保卡号",