From 06247101361a1a0830dcc570f7dd4c699d300ff0 Mon Sep 17 00:00:00 2001
From: fuenmao <980740792@qq.com>
Date: Mon, 14 Sep 2026 15:59:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=B8=E5=85=B3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/OnboardingTemplatePanel.vue    | 18 +++-
 src/views/onboarding/fill/index.vue           | 98 +++++++++++++++----
 2 files changed, 96 insertions(+), 20 deletions(-)

diff --git a/src/views/biz/onboarding/entry-config/components/OnboardingTemplatePanel.vue b/src/views/biz/onboarding/entry-config/components/OnboardingTemplatePanel.vue
index 47a744f..dc7a6fa 100644
--- a/src/views/biz/onboarding/entry-config/components/OnboardingTemplatePanel.vue
+++ b/src/views/biz/onboarding/entry-config/components/OnboardingTemplatePanel.vue
@@ -256,7 +256,7 @@
               <span class="block-subtitle">勾选入职时要求候选人必须或可选上传的证件材料（如身份证、毕业证、体检表等）</span>
             </div>
 
-            <el-table :data="materialTypes" border stripe height="240px" class="mt-2">
+            <el-table :data="enabledMaterialTypes" border stripe height="240px" class="mt-2">
               <el-table-column label="选择要求" width="85" align="center">
                 <template #default="scope">
                   <el-checkbox :model-value="hasMaterial(scope.row.id)"
@@ -293,7 +293,7 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, reactive, ref } from "vue";
+import { computed, onMounted, reactive, ref } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import {
   OnboardingCompany,
@@ -324,6 +324,9 @@ const departments = ref<OnboardingDepartmentOption[]>([]);
 const positions = ref<OnboardingPosition[]>([]);
 const contractTemplates = ref<OnboardingContractTemplate[]>([]);
 const materialTypes = ref<OnboardingMaterialType[]>([]);
+const enabledMaterialTypes = computed(() =>
+  materialTypes.value.filter(item => item.status === "enable")
+);
 const versionOptions = reactive<Record<number, OnboardingContractVersion[]>>({});
 
 const query = reactive({
@@ -597,6 +600,17 @@ async function openEdit(row: OnboardingTemplate) {
     }))
   });
 
+  const enabledMaterialIds = new Set(enabledMaterialTypes.value.map(item => item.id));
+  const disabledMaterials = materialTypes.value.filter(item =>
+    item.status !== "enable" && form.materials.some(config => config.materialTypeId === item.id)
+  );
+  form.materials = form.materials.filter(item => enabledMaterialIds.has(item.materialTypeId));
+  if (disabledMaterials.length > 0) {
+    ElMessage.warning(
+      `该模板原来关联的停用资料“${disabledMaterials.map(item => item.materialName).join("、")}”已从本次配置中移除，保存后生效`
+    );
+  }
+
   if (form.companyId) {
     const departmentRes = await onboardingTaskApi.listDepartments(form.companyId);
     departments.value = departmentRes.data || [];
diff --git a/src/views/onboarding/fill/index.vue b/src/views/onboarding/fill/index.vue
index eea3a7c..a30409f 100644
--- a/src/views/onboarding/fill/index.vue
+++ b/src/views/onboarding/fill/index.vue
@@ -714,6 +714,7 @@ const contracts = ref<any[]>([]);
 const materialRequirements = ref<any[]>([]);
 const uploadedMaterials = ref<any[]>([]);
 const contractVariables = ref<any[]>([]);
+const formFieldRequirements = ref<any[]>([]);
 
 const regFormRef = ref<FormInstance>();
 
@@ -878,7 +879,7 @@ function validateBirthday(_rule: any, value: unknown, callback: (error?: Error)
 }
 
 function validateBankCardNumber(_rule: any, value: unknown, callback: (error?: Error) => void) {
-  if (!isBankCardNumber(value)) {
+  if (value && !isBankCardNumber(value)) {
     return callback(new Error("请输入12至19位银行卡号"));
   }
   callback();
@@ -912,23 +913,83 @@ function validateOptionalContactPhone(_rule: any, value: unknown, callback: (err
   callback();
 }
 
-// 固定登记表字段在前端即时校验；后端仍会执行相同的核心规则作为安全兜底。
-const regRules: FormRules = {
-  employeeName: [{ required: true, validator: validateEmployeeName, trigger: "blur" }],
-  gender: [{ required: true, message: "请选择性别", trigger: "change" }],
-  birthday: [{ validator: validateBirthday, trigger: "change" }],
-  height: [{ validator: validateOptionalHeight, trigger: "blur" }],
-  weight: [{ validator: validateOptionalWeight, trigger: "blur" }],
-  phone: [{ required: true, validator: validatePhone, trigger: "blur" }],
-  email: [{ validator: validateOptionalEmail, trigger: "blur" }],
-  idCardNumber: [{ required: true, validator: validateIdCardNumber, trigger: "blur" }],
-  bankCardNumber: [{ required: true, validator: validateBankCardNumber, trigger: "blur" }],
-  bankName: [
-    { required: true, message: "请输入开户银行名称", trigger: "blur" },
-    { max: 100, message: "开户银行名称不能超过100个字符", trigger: "blur" }
-  ],
-  emergencyPhone: [{ validator: validateOptionalContactPhone, trigger: "blur" }]
-};
+/** 将 employee.EmployeeName 转为登记表模型使用的 employeeName。 */
+function getRegistrationFieldKey(fieldCode: unknown) {
+  const code = String(fieldCode || "").trim();
+  if (!code.toLowerCase().startsWith("employee.")) {
+    return "";
+  }
+
+  const propertyName = code.substring(code.lastIndexOf(".") + 1);
+  return propertyName
+    ? propertyName.charAt(0).toLowerCase() + propertyName.slice(1)
+    : "";
+}
+
+const requiredRegistrationFields = computed(() => {
+  const result = new Map<string, any>();
+  formFieldRequirements.value.forEach(requirement => {
+    const fieldKey = getRegistrationFieldKey(requirement.fieldCode);
+    if (!fieldKey || !(fieldKey in form)) {
+      return;
+    }
+
+    const existing = result.get(fieldKey);
+    if (!existing || requirement.required) {
+      result.set(fieldKey, requirement);
+    }
+  });
+  return result;
+});
+
+function appendRegistrationRule(rules: FormRules, fieldKey: string, rule: any) {
+  const existingRules = rules[fieldKey];
+  const fieldRules = Array.isArray(existingRules)
+    ? existingRules
+    : existingRules
+      ? [existingRules]
+      : [];
+  rules[fieldKey] = [...fieldRules, rule];
+}
+
+// 固定登记表必填状态读取任务快照；姓名、身份证和手机号仍是电子签约的系统必填项。
+const regRules = computed<FormRules>(() => {
+  const rules: FormRules = {};
+  const changeTriggerFields = new Set(["gender", "birthday", "maritalStatus", "education"]);
+
+  requiredRegistrationFields.value.forEach((requirement, fieldKey) => {
+    if (!requirement.required) {
+      return;
+    }
+
+    const useChangeTrigger = changeTriggerFields.has(fieldKey);
+    rules[fieldKey] = [{
+      required: true,
+      message: `${useChangeTrigger ? "请选择" : "请填写"}${requirement.fieldName || fieldKey}`,
+      trigger: useChangeTrigger ? "change" : "blur"
+    }];
+  });
+
+  rules.employeeName = [{ required: true, validator: validateEmployeeName, trigger: "blur" }];
+  rules.phone = [{ required: true, validator: validatePhone, trigger: "blur" }];
+  rules.idCardNumber = [{ required: true, validator: validateIdCardNumber, trigger: "blur" }];
+  appendRegistrationRule(rules, "birthday", { validator: validateBirthday, trigger: "change" });
+  appendRegistrationRule(rules, "height", { validator: validateOptionalHeight, trigger: "blur" });
+  appendRegistrationRule(rules, "weight", { validator: validateOptionalWeight, trigger: "blur" });
+  appendRegistrationRule(rules, "email", { validator: validateOptionalEmail, trigger: "blur" });
+  appendRegistrationRule(rules, "bankCardNumber", { validator: validateBankCardNumber, trigger: "blur" });
+  appendRegistrationRule(rules, "bankName", {
+    max: 100,
+    message: "开户银行名称不能超过100个字符",
+    trigger: "blur"
+  });
+  appendRegistrationRule(rules, "emergencyPhone", {
+    validator: validateOptionalContactPhone,
+    trigger: "blur"
+  });
+
+  return rules;
+});
 
 /** 根据当前 Token 的实际有效期实时锁定已打开的填写页面。 */
 const isLinkExpired = computed(() => {
@@ -1286,6 +1347,7 @@ async function load(silent = false) {
     materialRequirements.value = data.materialRequirements || [];
     uploadedMaterials.value = data.materials || [];
     contractVariables.value = data.contractVariables || [];
+    formFieldRequirements.value = data.formFields || [];
     contractVariables.value.forEach((variable: any) => {
       if (!(variable.variableCode in customVariables) && variable.defaultValue != null) {
         customVariables[variable.variableCode] = String(variable.defaultValue);