fix: 调配增加岗位

apps/web-antd/src/api/hr/employeeModel.d.ts

@@ -542,6 +542,14 @@ export namespace EmployeeInfoApi {
      * 原先部门
      */
     oldDeptName?: string;
+    /**
+     * 主岗位
+     */
+    position?: string;
+    /**
+     * 调配时间
+     */
+    transferDate?: Date;
     /**
      * 编制所在地
      */

apps/web-antd/src/api/request.ts

@@ -122,8 +122,10 @@ function createRequestClient(baseURL: string, options?: RequestClientOptions) {
       const responseData = error?.response?.data ?? {};
       const errorMessage = responseData?.errMessage ?? '';
       console.error('[666]', msg);
-      // 如果没有错误信息，则会根据状态码进行提示
-      message.error(errorMessage || msg);
+      if (!responseData.errCode || responseData.errCode !== '401') {
+        // 如果没有错误信息，则会根据状态码进行提示
+        message.error(errorMessage || msg);
+      }
     }),
   );
 

apps/web-antd/src/views/hr/contractExpirationReminder/apply-renewal-contract-model.vue

@@ -222,7 +222,7 @@ const [BasicModal, modalApi] = useVbenModal({
       data = await apiDetail(data.id);
       updateDataInfo(data);
     } else {
-      data = await initByEmployeeId('3', data.employeeId!);
+      data = await initByEmployeeId('5', data.employeeId!);
     }
     await formApi.setValues(data);
     await markInitialized();

apps/web-antd/src/views/hr/employeeInfo/apply-transfer-model.vue

@@ -143,6 +143,12 @@ const formSchema: VbenFormSchema[] = [
     label: '新的部门',
     rules: 'selectRequired',
   },
+  {
+    component: 'Input',
+    fieldName: 'position',
+    label: '岗位',
+    rules: 'required',
+  },
   {
     component: 'DatePicker',
     componentProps: {
@@ -252,11 +258,11 @@ const [BasicModal, modalApi] = useVbenModal({
     if (isUpdate.value && data.id) {
       updateForm(isUpdate.value);
       data = await apiDetail(data.id);
-      data.oldDeptName = data.deptName;
       updateDataInfo(data);
     } else {
-      data = await initByEmployeeId('5', data.employeeId!);
+      data = await initByEmployeeId('3', data.employeeId!);
     }
+    data.oldDeptName = data.deptName;
     await formApi.setValues(data);
     await markInitialized();
 

apps/web-antd/src/views/hr/employeeInfo/data.ts

@@ -308,7 +308,7 @@ export function useColumns(): VxeTableGridOptions<EmployeeInfoApi.Employee>['col
     },
     {
       title: '主岗位',
-      field: 'positionName',
+      field: 'position',
       width: 100,
     },
     {

apps/web-antd/src/views/hr/staffingPlanData/data.ts

@@ -338,19 +338,17 @@ export function useColumns(
       title: staffingPlanRecords.lastYearTitle || '上一年编制',
       field: 'lastYearStaffing',
       width: 100,
-      editRender: { name: 'input' },
     },
     {
       title: staffingPlanRecords.currentYearTitle || '今年编制',
       field: 'thisYearStaffing',
       width: 100,
-      editRender: { name: 'input' },
     },
     {
       title: staffingPlanRecords.nextYearTitle || '下一年编制',
       field: 'nextYearStaffing',
       width: 100,
-      editRender: { name: 'input' },
+      editRender: { name: 'input', attrs: { type: 'number' } },
     },
     {
       title: staffingPlanRecords.nextYearTitle || '下一年编制',
@@ -360,7 +358,7 @@ export function useColumns(
           title: '1月正式工计划',
           field: 'm1FormalPlan',
           width: 120,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '1月正式工实际',
@@ -371,7 +369,7 @@ export function useColumns(
           title: '1月兼职计划',
           field: 'm1PartPlan',
           width: 120,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '1月兼职实际',
@@ -382,7 +380,7 @@ export function useColumns(
           title: '2月正式工计划',
           field: 'm2FormalPlan',
           width: 120,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '2月正式工实际',
@@ -393,7 +391,7 @@ export function useColumns(
           title: '2月兼职计划',
           field: 'm2PartPlan',
           width: 120,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '2月兼职实际',
@@ -404,7 +402,7 @@ export function useColumns(
           title: '3月正式工计划',
           field: 'm3FormalPlan',
           width: 120,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '3月正式工实际',
@@ -415,7 +413,7 @@ export function useColumns(
           title: '3月兼职计划',
           field: 'm3PartPlan',
           width: 120,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '3月兼职实际',
@@ -426,7 +424,7 @@ export function useColumns(
           title: '4月正式工计划',
           field: 'm4FormalPlan',
           width: 120,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '4月正式工实际',
@@ -437,7 +435,7 @@ export function useColumns(
           title: '4月兼职计划',
           field: 'm4PartPlan',
           width: 120,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '4月兼职实际',
@@ -448,7 +446,7 @@ export function useColumns(
           title: '5月正式工计划',
           field: 'm5FormalPlan',
           width: 120,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '5月正式工实际',
@@ -459,7 +457,7 @@ export function useColumns(
           title: '5月兼职计划',
           field: 'm5PartPlan',
           width: 120,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '5月兼职实际',
@@ -470,7 +468,7 @@ export function useColumns(
           title: '6月正式工计划',
           field: 'm6FormalPlan',
           width: 120,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '6月正式工实际',
@@ -481,7 +479,7 @@ export function useColumns(
           title: '6月兼职计划',
           field: 'm6PartPlan',
           width: 120,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '6月兼职实际',
@@ -492,7 +490,7 @@ export function useColumns(
           title: '7月正式工计划',
           field: 'm7FormalPlan',
           width: 120,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '7月正式工实际',
@@ -503,7 +501,7 @@ export function useColumns(
           title: '7月兼职计划',
           field: 'm7PartPlan',
           width: 120,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '7月兼职实际',
@@ -514,7 +512,7 @@ export function useColumns(
           title: '8月正式工计划',
           field: 'm8FormalPlan',
           width: 120,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '8月正式工实际',
@@ -525,7 +523,7 @@ export function useColumns(
           title: '8月兼职计划',
           field: 'm8PartPlan',
           width: 120,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '8月兼职实际',
@@ -536,7 +534,7 @@ export function useColumns(
           title: '9月正式工计划',
           field: 'm9FormalPlan',
           width: 120,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '9月正式工实际',
@@ -547,7 +545,7 @@ export function useColumns(
           title: '9月兼职计划',
           field: 'm9PartPlan',
           width: 120,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '9月兼职实际',
@@ -558,7 +556,7 @@ export function useColumns(
           title: '10月正式工计划',
           field: 'm10FormalPlan',
           width: 130,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '10月正式工实际',
@@ -569,7 +567,7 @@ export function useColumns(
           title: '10月兼职计划',
           field: 'm10PartPlan',
           width: 120,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '10月兼职实际',
@@ -580,7 +578,7 @@ export function useColumns(
           title: '11月正式工计划',
           field: 'm11FormalPlan',
           width: 130,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '11月正式工实际',
@@ -591,7 +589,7 @@ export function useColumns(
           title: '11月兼职计划',
           field: 'm11PartPlan',
           width: 120,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '11月兼职实际',
@@ -602,7 +600,7 @@ export function useColumns(
           title: '12月正式工计划',
           field: 'm12FormalPlan',
           width: 130,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '12月正式工实际',
@@ -613,7 +611,7 @@ export function useColumns(
           title: '12月兼职计划',
           field: 'm12PartPlan',
           width: 120,
-          editRender: { name: 'input' },
+          editRender: { name: 'input', attrs: { type: 'number' } },
         },
         {
           title: '12月兼职实际',