yangg 1 өдөр өмнө
parent
commit
4a8db2c728

+ 23 - 14
src/views/position/detail/index.vue

@@ -6006,7 +6006,7 @@ const defaultConfig = {
   // 基本信息
   name: { visible: true, label: '姓名', required: true },
   gender: { visible: true, label: '性别', required: true },
-  three_period: { visible: true, label: '是否为三期', required: true },
+  // three_period: { visible: true, label: '是否为三期', required: true },
   phone: { visible: true, label: '手机号', required: true },
   id_card: { visible: true, label: '身份证号', required: true },
   ethnicity: { visible: true, label: '民族', required: true },
@@ -6016,6 +6016,7 @@ const defaultConfig = {
   household_location: { visible: true, label: '户口所在地', required: false },
   marital_status: { visible: true, label: '婚育状况', required: false },
   expected_salary: { visible: true, label: '期望薪资(元/月)', required: false },
+  political_status:{visible:true,label:'政治面貌',required:false},
 
   // 家庭成员信息
   family_member: {
@@ -6024,10 +6025,10 @@ const defaultConfig = {
     fields: {
       relation: { visible: true, label: '称谓', required: true },
       name: { visible: true, label: '姓名', required: true },
-      workplace_address: { visible: true, label: '工作单位/家庭地址', required: false },
+      workplace: { visible: true, label: '工作单位/家庭地址', required: false },//workplace_address
       position: { visible: true, label: '职务', required: false },
       phone: { visible: true, label: '联系电话', required: true },
-      is_emergency_contact: { visible: true, label: '是否为紧急联系人', required: false }
+      family_contact_person: { visible: true, label: '是否为紧急联系人', required: false }//is_emergency_contact
     }
   },
 
@@ -6056,11 +6057,11 @@ const defaultConfig = {
       start_time: { visible: true, label: '开始时间', required: true },
       end_time: { visible: true, label: '结束时间', required: true },
       company_name: { visible: true, label: '单位名称', required: true },
-      employee_count: { visible: true, label: '单位人数', required: true },
+      company_size: { visible: true, label: '单位人数', required: true },
       department: { visible: true, label: '任职部门', required: true },
       position: { visible: true, label: '担任职务', required: true },
-      monthly_salary: { visible: true, label: '月总收入', required: true },
-      supervisor: { visible: true, label: '直接领导', required: true },
+      monthly_income: { visible: true, label: '月总收入', required: true },
+      direct_supervisor: { visible: true, label: '直接领导', required: true },
       supervisor_phone: { visible: true, label: '领导电话', required: true }
     }
   },
@@ -6110,11 +6111,13 @@ const saveFieldConfig = async () => {
         id_card: { required: fieldConfig.id_card.required, visible: fieldConfig.id_card.visible },
         gender: { required: fieldConfig.gender.required, visible: fieldConfig.gender.visible },
         birth_date: { required: false, visible: true },
-        political_status: { required: false, visible: true },
+        political_status: { required: fieldConfig.political_status.required, visible: fieldConfig.political_status.visible },
         ethnicity: { required: fieldConfig.ethnicity.required, visible: fieldConfig.ethnicity.visible },
         height: { required: fieldConfig.height.required, visible: fieldConfig.height.visible },
         weight: { required: fieldConfig.weight.required, visible: fieldConfig.weight.visible },
-        marital_status: { required: fieldConfig.marital_status.required, visible: fieldConfig.marital_status.visible }
+        marital_status: { required: fieldConfig.marital_status.required, visible: fieldConfig.marital_status.visible },
+        expected_salary: { required: fieldConfig.expected_salary.required, visible: fieldConfig.expected_salary.visible },
+        household_location:{required: fieldConfig.household_location.required, visible: fieldConfig.household_location.visible }
       },
       
       // 教育信息配置
@@ -6137,7 +6140,10 @@ const saveFieldConfig = async () => {
         end_date: { required: fieldConfig.work_experience.fields.end_time.required, visible: fieldConfig.work_experience.fields.end_time.visible },
         job_description: { required: true, visible: true },
         achievements: { required: false, visible: true },
-        resignation_reason: { required: false, visible: true }
+        resignation_reason: { required: false, visible: true },
+        company_size:{required: fieldConfig.work_experience.fields.company_size.required, visible: fieldConfig.work_experience.fields.company_size.visible},
+        monthly_income:{required: fieldConfig.work_experience.fields.monthly_income.required, visible: fieldConfig.work_experience.fields.monthly_income.visible},
+        supervisor_phone:{required: fieldConfig.work_experience.fields.supervisor_phone.required, visible: fieldConfig.work_experience.fields.supervisor_phone.visible}
       },
       
       // 家庭信息配置
@@ -6145,9 +6151,10 @@ const saveFieldConfig = async () => {
       family_fields_config: {
         relation: { required: fieldConfig.family_member.fields.relation.required, visible: fieldConfig.family_member.fields.relation.visible },
         name: { required: fieldConfig.family_member.fields.name.required, visible: fieldConfig.family_member.fields.name.visible },
-        workplace: { required: fieldConfig.family_member.fields.workplace_address.required, visible: fieldConfig.family_member.fields.workplace_address.visible },
+        workplace: { required: fieldConfig.family_member.fields.workplace.required, visible: fieldConfig.family_member.fields.workplace.visible },
         position: { required: fieldConfig.family_member.fields.position.required, visible: fieldConfig.family_member.fields.position.visible },
-        phone: { required: fieldConfig.family_member.fields.phone.required, visible: fieldConfig.family_member.fields.phone.visible }
+        phone: { required: fieldConfig.family_member.fields.phone.required, visible: fieldConfig.family_member.fields.phone.visible },
+        family_contact_person:{required: fieldConfig.family_member.fields.family_contact_person.required, visible: fieldConfig.family_member.fields.family_contact_person.visible}
       },
       
       // 培训经历配置
@@ -6229,22 +6236,24 @@ const saveFieldConfig = async () => {
   }
 };
 
-// 获取基本信息字段
+// 获取基本信息字段three_period: fieldConfig.three_period,
 const getBasicFields = () => {
   const basicFields = {
     name: fieldConfig.name,
     id_card: fieldConfig.id_card,
     phone: fieldConfig.phone,
     gender: fieldConfig.gender,
-    three_period: fieldConfig.three_period,
+    
     ethnicity: fieldConfig.ethnicity,
     height: fieldConfig.height,
     weight: fieldConfig.weight,
     current_address: fieldConfig.current_address,
     household_location: fieldConfig.household_location,
     marital_status: fieldConfig.marital_status,
-    expected_salary: fieldConfig.expected_salary
+    expected_salary: fieldConfig.expected_salary,
+    political_status:fieldConfig.political_status
   };
+  console.log(fieldConfig);
   return basicFields;
 };
 

+ 2 - 0
src/views/position/detail/types.ts

@@ -24,6 +24,7 @@ interface ProfileFieldsConfig {
   ethnicity: FieldConfig;
   height: FieldConfig;
   weight: FieldConfig;
+  political_status:FieldConfig;
   current_address: FieldConfig;
   household_location: FieldConfig;
   marital_status: FieldConfig;
@@ -31,6 +32,7 @@ interface ProfileFieldsConfig {
   family_member: NestedFieldConfig;
   education: NestedFieldConfig;
   work_experience: NestedFieldConfig;
+ 
 }
 
 export type { FieldConfig, NestedFieldConfig, ProfileFieldsConfig }; 

+ 3 - 2
src/views/position/detail/utils.ts

@@ -6,15 +6,16 @@ import type { ProfileFieldsConfig } from './types';
  * @param responseData - 接口返回的配置数据
  */
 export function updateFieldConfig(fieldConfig: any, responseData: ProfileFieldsConfig) {
-  // 基础字段更新
+  // 基础字段更新'three_period',
   const basicFields = [
     'name', 'gender', 'phone', 'id_card', 'ethnicity', 
     'height', 'weight', 'current_address', 'household_location', 
-    'marital_status', 'expected_salary', 'three_period'
+    'marital_status', 'expected_salary', 'political_status'
   ];
   
   basicFields.forEach(field => {
     if (responseData[field]) {
+      console.log(fieldConfig,responseData);
       fieldConfig[field].visible = responseData[field].visible;
       fieldConfig[field].required = responseData[field].required;
     }