From 1deae1d89a7039ef0b943be291f6c1b9aaa5ad2c Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 10:30:33 +0800
Subject: [PATCH] feat(mes): 生产报工新增「可报工数量」展示 - `src/api/mes/pro/task/index.ts`: `MesProTaskApi.Task` 接口新增 `reportableQuantity` (可报工数量) 字段定义 - `src/views/mes/pro/feedback/data.ts`:   - 生产报工弹框表单中新增「可报工数量」字段展示,设置为不可编辑,且仅在新建/编辑模式下显示   - 在生产任务选择弹框 (`ProTaskSelect`) 的 `onChange` 事件中,自动从选中的任务对象中提取并带入 `reportableQuantity`   - 完善了表单联动的重置逻辑,确保更换工单等操作时正确清空此字段

---
 src/views/hrm/employee/data.ts |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 46 insertions(+), 0 deletions(-)

diff --git a/src/views/hrm/employee/data.ts b/src/views/hrm/employee/data.ts
index b9e0233..9affcfa 100644
--- a/src/views/hrm/employee/data.ts
+++ b/src/views/hrm/employee/data.ts
@@ -177,6 +177,49 @@
       },
     },
     {
+      fieldName: 'nation',
+      label: '姘戞棌',
+      component: 'Input',
+      componentProps: {
+        placeholder: '璇疯緭鍏ユ皯鏃�',
+      },
+    },
+    {
+      fieldName: 'marriageStatus',
+      label: '濠氬Щ鐘舵��',
+      component: 'Input',
+      componentProps: {
+        placeholder: '璇疯緭鍏ュ濮荤姸鎬�',
+      },
+    },
+    {
+      fieldName: 'age',
+      label: '骞撮緞',
+      component: 'InputNumber',
+      componentProps: {
+        placeholder: '璇疯緭鍏ュ勾榫�',
+        min: 0,
+        max: 150,
+        style: { width: '100%' },
+      },
+    },
+    {
+      fieldName: 'education',
+      label: '瀛﹀巻',
+      component: 'Input',
+      componentProps: {
+        placeholder: '璇疯緭鍏ュ鍘�',
+      },
+    },
+    {
+      fieldName: 'politicalStatus',
+      label: '鏀挎不闈㈣矊',
+      component: 'Input',
+      componentProps: {
+        placeholder: '璇疯緭鍏ユ斂娌婚潰璨�',
+      },
+    },
+    {
       fieldName: 'annualLeaveBalance',
       label: '骞村亣浣欓',
       component: 'InputNumber',
@@ -311,6 +354,9 @@
     { field: 'phone', title: '鎵嬫満鍙风爜', minWidth: 120 },
     { field: 'deptName', title: '閮ㄩ棬', minWidth: 120 },
     { field: 'postName', title: '宀椾綅', minWidth: 120 },
+    { field: 'nation', title: '姘戞棌', width: 90 },
+    { field: 'age', title: '骞撮緞', width: 70 },
+    { field: 'education', title: '瀛﹀巻', width: 90 },
     {
       field: 'employeeStatus',
       title: '鍛樺伐鐘舵��',

--
Gitblit v1.9.3