From 173855b299e89930b5ea2ff9a9295fde9d0f55b5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 08:51:43 +0800
Subject: [PATCH] feat: 同步质检、生产、销售、财务与人事前端功能

---
 src/views/mes/pro/feedback/data.ts |  369 ++++++++++++++++++++++++++++++++--------------------
 1 files changed, 225 insertions(+), 144 deletions(-)

diff --git a/src/views/mes/pro/feedback/data.ts b/src/views/mes/pro/feedback/data.ts
index 573f29c..05c692a 100644
--- a/src/views/mes/pro/feedback/data.ts
+++ b/src/views/mes/pro/feedback/data.ts
@@ -10,16 +10,19 @@
   DICT_TYPE,
   MesAutoCodeRuleCode,
   MesProTaskStatusEnum,
-  MesProWorkOrderStatusEnum,
 } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
+import { formatDate } from '@vben/utils';
 
 import { Button } from 'ant-design-vue';
 
+import { z } from '#/adapter/form';
+import { getMachinerySimpleList } from '#/api/mes/dv/machinery';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { getRouteProcessByRouteAndProcess } from '#/api/mes/pro/route/process';
+import { getProcess } from '#/api/mes/pro/process';
 import { getSimpleUserList } from '#/api/system/user';
 import { loadParamDetails } from './param-state';
+
 import { getRangePickerDefaultProps } from '#/utils';
 import { MdItemSelect } from '#/views/mes/md/item/components';
 import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
@@ -29,6 +32,17 @@
 
 /** 鐢熶骇鎶ュ伐琛ㄥ崟绫诲瀷 */
 export type FormType = 'approve' | 'create' | 'detail' | 'submit' | 'update';
+
+/** 宸ュ簭璁¤垂绫诲瀷锛�1-璁℃椂 2-璁′欢 */
+const FEEDBACK_BILLING_TYPE_OPTIONS = [
+  { label: '璁℃椂锛堟寜宸ユ椂锛�', value: 1 },
+  { label: '璁′欢锛堟寜鏁伴噺锛�', value: 2 },
+];
+
+/** 宸ヨ祫瀹氶鍗曚綅 */
+function getWageRateUnit(billingType?: number) {
+  return billingType === 1 ? '鍏�/灏忔椂' : '鍏�/浠�';
+}
 
 /** 鍒楄〃鐨勬悳绱㈣〃鍗� */
 export function useGridFormSchema(): VbenFormSchema[] {
@@ -137,17 +151,55 @@
     { field: 'workstationName', title: '宸ヤ綔绔�', width: 120 },
     { field: 'processName', title: '宸ュ簭', width: 100 },
     { field: 'workOrderCode', title: '鐢熶骇璁㈠崟缂栫爜', width: 160 },
+    { field: 'reelNo', title: '鐩樺彿', minWidth: 120 },
     { field: 'itemCode', title: '浜у搧鐗╂枡缂栫爜', width: 120 },
     { field: 'itemName', title: '浜у搧鐗╂枡鍚嶇О', minWidth: 140 },
     { field: 'itemSpecification', title: '瑙勬牸鍨嬪彿', width: 120 },
     { field: 'unitMeasureName', title: '鍗曚綅', width: 80 },
     { field: 'feedbackQuantity', title: '鎶ュ伐鏁伴噺', width: 100 },
+    {
+      field: 'billingType',
+      title: '璁¤垂绫诲瀷',
+      width: 100,
+      formatter: ({ cellValue }) =>
+        FEEDBACK_BILLING_TYPE_OPTIONS.find((item) => item.value === cellValue)
+          ?.label ?? '-',
+    },
+    { field: 'workHours', title: '鎶ュ伐宸ユ椂(h)', width: 110 },
+    { field: 'productionLength', title: '鐢熶骇闀垮害(m)', width: 120 },
+    { field: 'standardWorkHours', title: '鏍囧噯宸ユ椂(h)', width: 110 },
+    {
+      field: 'workHoursDiff',
+      title: '宸ユ椂宸紓(h)',
+      width: 110,
+      formatter: ({ cellValue }) =>
+        cellValue == null
+          ? '-'
+          : `${Number(cellValue) > 0 ? '+' : ''}${cellValue}`,
+    },
+    {
+      field: 'workHoursDiffRate',
+      title: '宸紓鐜�',
+      width: 100,
+      formatter: ({ cellValue, row }) =>
+        cellValue == null
+          ? '-'
+          : `${Number(cellValue) > 0 ? '+' : ''}${cellValue}%`,
+    },
+    {
+      field: 'wageAmount',
+      title: '鎶ュ伐宸ヨ祫',
+      width: 110,
+      formatter: 'formatAmount2',
+    },
+    { field: 'qualifiedQuantity', title: '璐ㄦ鍚堟牸鏁伴噺', width: 120 },
+    { field: 'unqualifiedQuantity', title: '璐ㄦ涓嶅悎鏍兼暟閲�', width: 130 },
     { field: 'feedbackUserNickname', title: '鎶ュ伐浜�', width: 100 },
     {
       field: 'feedbackTime',
       title: '鎶ュ伐鏃堕棿',
       width: 180,
-      formatter: 'formatDateTime',
+      formatter: 'formatDate',
     },
     { field: 'approveUserNickname', title: '瀹℃牳浜�', width: 100 },
     {
@@ -174,26 +226,53 @@
  * - create / update锛氬綍鍏ユ姤宸ヤ富浣撲俊鎭拰鏁伴噺
  * - submit / approve / detail锛氫富浣撳瓧娈靛彧璇�
  *
- * 鏁伴噺鍖哄煙鏍规嵁 `checkFlag` 鍜� `unqualifiedQuantity` 鍔ㄦ�佹樉绀猴細
- * - 闈炶川妫�宸ュ簭锛氭姤宸ユ暟閲� = 鍚堟牸 + 涓嶈壇锛涗笉鑹� > 0 鏃跺啀灞曞紑宸ュ簾/鏂欏簾/鍏朵粬搴熷搧
- * - 璐ㄦ宸ュ簭锛氬彧濉姤宸ユ暟閲忥紙瑙嗕负寰呮鏁伴噺锛�
+ * 鎶ュ伐鍙~鍐�"鎶ュ伐鏁伴噺"锛涘悎鏍煎搧/涓嶈壇鍝佹暟閲忕敱璐ㄦ纭畾锛屾姤宸ョ幆鑺備笉閲囬泦銆�
+ * 鎶ュ伐瀹℃壒鍚庝骇鍑哄潎寰呮楠岋紝鍚堟牸鍝佺粡妫�楠屽悗鍏ュ簱銆�
  */
+/** 鎶ュ伐琛ㄥ崟涓庡伐鏃惰瘯绠楃粍浠剁殑鑱斿姩鍥炶皟 */
+export interface FeedbackFormHooks {
+  /** 浠诲姟閫夋嫨鍙樺寲锛氭妸浠诲姟淇℃伅鍚屾缁欒緟鍔╁伐鏃跺綍鍏ョ粍浠� */
+  onTaskChange?: (task?: MesProTaskApi.Task) => void;
+  /** 鐢熶骇闀垮害鍙樺寲锛氱敤浜庤緟鍔╁伐鏃惰瘯绠� */
+  onProductionLengthChange?: (value?: number) => void;
+  /** 瀹為檯宸ユ椂鍙樺寲锛氱敤浜庡疄鏃跺睍绀哄伐鏃跺樊寮� */
+  onWorkHoursChange?: (value?: number) => void;
+  /** 琛ㄥ崟鍏抽敭瀛楁鍙樺寲锛氳Е鍙戝悗绔伐璧勮瘯绠楋紙鍚緟鍔╁伐璧勪笌璐ㄩ噺璋冩暣锛� */
+  onPreviewWage?: () => void;
+}
+
 export function useFormSchema(
   formType: FormType,
   formApi?: VbenFormApi,
+  hooks?: FeedbackFormHooks,
 ): VbenFormSchema[] {
   const isHeaderReadonly = ['approve', 'detail', 'submit'].includes(formType);
+
+  /**
+   * 鍓嶇鎸夊伐搴忓揩鐓ч瑙堟姤宸ュ伐璧勶細璁℃椂=宸ユ椂脳瀹氶锛岃浠�=鎶ュ伐鏁伴噺脳瀹氶銆�
+   * 浠ュ悗绔繚瀛�/瀹℃壒鏃堕噸绠楃殑缁撴灉涓哄噯锛岃繖閲屽彧鐢ㄤ簬褰曞叆鏃跺嵆鏃跺睍绀恒��
+   */
+  const recalculateWagePreview = async () => {
+    if (!formApi) {
+      return;
+    }
+    const values = await formApi.getValues();
+    const wageRate = Number(values?.wageRate ?? 0);
+    const quantity = Number(values?.feedbackQuantity ?? 0);
+    const hours = Number(values?.workHours ?? 0);
+    const wage = values?.billingType === 1 ? hours * wageRate : quantity * wageRate;
+    await formApi.setFieldValue(
+      'wageAmount',
+      Number.isFinite(wage) ? Math.round(wage * 100) / 100 : 0,
+    );
+    hooks?.onPreviewWage?.();
+  };
+
   return [
     {
       fieldName: 'id',
       component: 'Input',
       dependencies: { triggerFields: [''], show: () => false },
-    },
-    {
-      fieldName: 'checkFlag',
-      component: 'Input',
-      dependencies: { triggerFields: [''], show: () => false },
-      defaultValue: true,
     },
     {
       fieldName: 'routeId',
@@ -253,11 +332,9 @@
       componentProps: {
         disabled: isHeaderReadonly,
         placeholder: '璇烽�夋嫨璁㈠崟',
-        status: MesProWorkOrderStatusEnum.CONFIRMED,
         // 璁㈠崟鍙樻洿锛氭竻绌轰换鍔″強浠诲姟甯﹀嚭鐨勪骇鍝佷俊鎭�佹暟閲忓尯鍩熸帶鍒朵綅
         onChange: async () => {
           await formApi?.setValues({
-            checkFlag: true,
             itemCode: undefined,
             itemId: undefined,
             itemName: undefined,
@@ -287,7 +364,7 @@
           workstationId: values.workstationId,
         }),
       },
-      // 浠诲姟鍙樻洿锛氳嚜鍔ㄥ~鍏呭叧鑱斿瓧娈点�佷骇鍝佷俊鎭�乧heckFlag锛屽苟鍔犺浇浠诲姟缁戝畾鐨勫伐鑹哄弬鏁�
+      // 浠诲姟鍙樻洿锛氳嚜鍔ㄥ~鍏呭叧鑱斿瓧娈点�佷骇鍝佷俊鎭紝骞跺姞杞戒换鍔$粦瀹氱殑宸ヨ壓鍙傛暟
       componentProps: {
         onChange: async (task?: MesProTaskApi.Task) => {
           await loadParamDetails(task?.id);
@@ -305,21 +382,15 @@
             workstationId: task.workstationId,
             reportableQuantity: task.reportableQuantity,
           });
-          // 宸ヨ壓璺嚎宸ュ簭鐨� checkFlag 鍐冲畾鏁伴噺鍖哄煙灞曠ず
-          if (task.routeId && task.processId) {
-            try {
-              const routeProcess = await getRouteProcessByRouteAndProcess(
-                task.routeId,
-                task.processId,
-              );
-              await formApi?.setFieldValue(
-                'checkFlag',
-                routeProcess?.checkFlag ?? false,
-              );
-            } catch {
-              await formApi?.setFieldValue('checkFlag', true);
-            }
+          // 甯﹀嚭宸ュ簭鐨勮璐圭被鍨嬩笌宸ヨ祫瀹氶锛岀敤浜庡睍绀哄拰鍗虫椂棰勮鎶ュ伐宸ヨ祫
+          if (task.processId) {
+            const process = await getProcess(task.processId);
+            const billingType = process?.billingType ?? 2;
+            const wageRate = process?.wageRate ?? 0;
+            await formApi?.setValues({ billingType, wageRate });
+            await recalculateWagePreview();
           }
+          hooks?.onTaskChange?.(task);
         },
       },
       rules: 'selectRequired',
@@ -333,6 +404,40 @@
         placeholder: '璇烽�夋嫨宸ヤ綔绔�',
       },
       rules: 'selectRequired',
+    },
+    {
+      fieldName: 'machineryId',
+      label: '浣跨敤璁惧',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getMachinerySimpleList,
+        disabled: isHeaderReadonly,
+        labelField: 'name',
+        placeholder: '鏈鎶ュ伐涓荤敤璁惧锛堝奖鍝嶅伐璧勫崟浠凤級',
+        showSearch: true,
+        filterOption: true,
+        valueField: 'id',
+        onChange: () => recalculateWagePreview(),
+      },
+      dependencies: {
+        triggerFields: ['taskId', 'workstationId'],
+        componentProps: (values) => ({
+          allowClear: true,
+          // 鍙垪鍑哄綋鍓嶄换鍔″伐浣滅珯宸茬粦瀹氱殑璁惧锛岄伩鍏嶈閫夊叾浠栧伐搴忕殑璁惧
+          api: () => getMachinerySimpleList(values.workstationId),
+          disabled: isHeaderReadonly,
+          labelField: 'name',
+          placeholder: values.workstationId
+            ? '鏈鎶ュ伐涓荤敤璁惧锛堜粎鏄剧ず璇ュ伐浣滅珯缁戝畾鐨勮澶囷級'
+            : '璇峰厛閫夋嫨宸ヤ綔绔�',
+          showSearch: true,
+          filterOption: true,
+          valueField: 'id',
+          onChange: () => recalculateWagePreview(),
+        }),
+        show: (values) => !!values.taskId,
+      },
     },
     {
       fieldName: 'itemCode',
@@ -404,150 +509,101 @@
         class: 'w-full',
         min: 0,
         precision: 2,
-      },
-      dependencies: {
-        triggerFields: ['checkFlag'],
-        // 闈炶川妫�宸ュ簭鏃讹紝鎶ュ伐鏁伴噺 = 鍚堟牸 + 涓嶈壇锛岀鐢ㄧ洿鎺ョ紪杈�
-        componentProps: (values) => ({
-          class: 'w-full',
-          disabled: !values.checkFlag,
-          min: 0,
-          placeholder: '璇疯緭鍏ユ姤宸ユ暟閲�',
-          precision: 2,
-        }),
+        placeholder: '璇疯緭鍏ユ姤宸ユ暟閲�',
+        onChange: () => recalculateWagePreview(),
       },
       rules: 'required',
     },
     {
-      fieldName: 'qualifiedQuantity',
-      label: '鍚堟牸鍝佹暟閲�',
+      fieldName: 'productionLength',
+      label: '鐢熶骇闀垮害(绫�)',
       component: 'InputNumber',
       componentProps: {
         class: 'w-full',
         min: 0,
         precision: 2,
-        // 鍚堟牸/涓嶈壇鍙樻洿锛岃嚜鍔ㄧ疮璁′负鎶ュ伐鏁伴噺
-        onChange: async () => {
-          const values = await formApi?.getValues();
-          await formApi?.setFieldValue(
-            'feedbackQuantity',
-            (values?.qualifiedQuantity || 0) +
-              (values?.unqualifiedQuantity || 0),
-          );
-        },
+        placeholder: '鐢ㄤ簬鏍囧噯宸ユ椂璁$畻锛涘崟浣嶄负绫虫椂榛樿绛変簬鎶ュ伐鏁伴噺',
+        onChange: (value?: number) =>
+          hooks?.onProductionLengthChange?.(value),
       },
-      defaultValue: 0,
       dependencies: {
-        triggerFields: ['checkFlag'],
-        show: (values) => !values.checkFlag,
-      },
-    },
-    {
-      fieldName: 'unqualifiedQuantity',
-      label: '涓嶈壇鍝佹暟閲�',
-      component: 'InputNumber',
-      componentProps: {
-        class: 'w-full',
-        min: 0,
-        precision: 2,
-        // 鍚堟牸/涓嶈壇鍙樻洿锛岃嚜鍔ㄧ疮璁′负鎶ュ伐鏁伴噺
-        onChange: async () => {
-          const values = await formApi?.getValues();
-          await formApi?.setFieldValue(
-            'feedbackQuantity',
-            (values?.qualifiedQuantity || 0) +
-              (values?.unqualifiedQuantity || 0),
-          );
-        },
-      },
-      defaultValue: 0,
-      dependencies: {
-        triggerFields: ['checkFlag'],
-        show: (values) => !values.checkFlag,
-      },
-    },
-    {
-      fieldName: 'laborScrapQuantity',
-      label: '宸ュ簾鏁伴噺',
-      component: 'InputNumber',
-      componentProps: {
-        class: 'w-full',
-        min: 0,
-        precision: 2,
-        // 搴熷搧鍒嗙被鍙樻洿锛岃嚜鍔ㄧ疮璁′负涓嶈壇鍝佹暟閲忓強鎶ュ伐鏁伴噺
-        onChange: async () => {
-          const values = await formApi?.getValues();
-          const unqualified =
-            (values?.laborScrapQuantity || 0) +
-            (values?.materialScrapQuantity || 0) +
-            (values?.otherScrapQuantity || 0);
-          await formApi?.setValues({
-            feedbackQuantity: (values?.qualifiedQuantity || 0) + unqualified,
-            unqualifiedQuantity: unqualified,
-          });
-        },
-      },
-      defaultValue: 0,
-      dependencies: {
-        triggerFields: ['checkFlag', 'unqualifiedQuantity'],
+        triggerFields: ['taskId'],
         show: (values) =>
-          !values.checkFlag && (values.unqualifiedQuantity || 0) > 0,
+          !!values.taskId && ['create', 'update'].includes(formType),
       },
     },
     {
-      fieldName: 'materialScrapQuantity',
-      label: '鏂欏簾鏁伴噺',
+      fieldName: 'billingType',
+      label: '璁¤垂绫诲瀷',
+      component: 'Select',
+      componentProps: {
+        disabled: true,
+        options: FEEDBACK_BILLING_TYPE_OPTIONS,
+      },
+      dependencies: {
+        triggerFields: ['taskId'],
+        show: (values) => !!values.taskId,
+      },
+    },
+    {
+      fieldName: 'wageRate',
+      label: '宸ヨ祫瀹氶',
+      component: 'InputNumber',
+      componentProps: {
+        class: 'w-full',
+        disabled: true,
+        precision: 2,
+      },
+      dependencies: {
+        triggerFields: ['taskId', 'billingType'],
+        show: (values) => !!values.taskId,
+        componentProps: (values) => ({
+          addonAfter: getWageRateUnit(values.billingType),
+        }),
+      },
+    },
+    {
+      fieldName: 'workHours',
+      label: '鎶ュ伐宸ユ椂(h)',
       component: 'InputNumber',
       componentProps: {
         class: 'w-full',
         min: 0,
         precision: 2,
-        // 搴熷搧鍒嗙被鍙樻洿锛岃嚜鍔ㄧ疮璁′负涓嶈壇鍝佹暟閲忓強鎶ュ伐鏁伴噺
-        onChange: async () => {
-          const values = await formApi?.getValues();
-          const unqualified =
-            (values?.laborScrapQuantity || 0) +
-            (values?.materialScrapQuantity || 0) +
-            (values?.otherScrapQuantity || 0);
-          await formApi?.setValues({
-            feedbackQuantity: (values?.qualifiedQuantity || 0) + unqualified,
-            unqualifiedQuantity: unqualified,
-          });
+        placeholder: '璇疯緭鍏ユ湰娆℃姤宸ュ伐鏃�',
+        onChange: (value?: number) => {
+          hooks?.onWorkHoursChange?.(value);
+          recalculateWagePreview();
         },
       },
-      defaultValue: 0,
       dependencies: {
-        triggerFields: ['checkFlag', 'unqualifiedQuantity'],
-        show: (values) =>
-          !values.checkFlag && (values.unqualifiedQuantity || 0) > 0,
+        triggerFields: ['taskId', 'billingType'],
+        show: (values) => !!values.taskId && values.billingType === 1,
+        rules: (values) =>
+          values.billingType === 1
+            ? z.number().min(0.01, '璁℃椂璁¤柂鐨勫伐搴忓繀椤诲~鍐欏ぇ浜� 0 鐨勬姤宸ュ伐鏃�')
+            : null,
       },
     },
     {
-      fieldName: 'otherScrapQuantity',
-      label: '鍏朵粬搴熷搧',
+      fieldName: 'wageAmount',
+      label: '鎶ュ伐宸ヨ祫',
       component: 'InputNumber',
       componentProps: {
         class: 'w-full',
-        min: 0,
+        disabled: true,
         precision: 2,
-        // 搴熷搧鍒嗙被鍙樻洿锛岃嚜鍔ㄧ疮璁′负涓嶈壇鍝佹暟閲忓強鎶ュ伐鏁伴噺
-        onChange: async () => {
-          const values = await formApi?.getValues();
-          const unqualified =
-            (values?.laborScrapQuantity || 0) +
-            (values?.materialScrapQuantity || 0) +
-            (values?.otherScrapQuantity || 0);
-          await formApi?.setValues({
-            feedbackQuantity: (values?.qualifiedQuantity || 0) + unqualified,
-            unqualifiedQuantity: unqualified,
-          });
-        },
       },
-      defaultValue: 0,
       dependencies: {
-        triggerFields: ['checkFlag', 'unqualifiedQuantity'],
-        show: (values) =>
-          !values.checkFlag && (values.unqualifiedQuantity || 0) > 0,
+        triggerFields: ['taskId', 'billingType'],
+        show: (values) => !!values.taskId,
+        componentProps: (values) => ({
+          addonAfter: '鍏�',
+          placeholder:
+            values.billingType === 1
+              ? '鎸夊伐鏃� 脳 宸ヨ祫瀹氶鑷姩璁$畻'
+              : '鎸夋姤宸ユ暟閲� 脳 宸ヨ祫瀹氶鑷姩璁$畻',
+        }),
       },
     },
     {
@@ -616,22 +672,47 @@
       render: (val) =>
         h(DictTag, { type: DICT_TYPE.MES_PRO_FEEDBACK_TYPE, value: val }),
     },
-    { field: 'workOrderId', label: '鐢熶骇璁㈠崟', render: (_val, data) => data.workOrderCode },
-    { field: 'taskId', label: '鐢熶骇浠诲姟', render: (_val, data) => data.taskCode },
+    { field: 'workOrderId', label: '鐢熶骇璁㈠崟', render: (_val, data) => data?.workOrderCode },
+    { field: 'taskId', label: '鐢熶骇浠诲姟', render: (_val, data) => data?.taskCode },
     { field: 'workstationName', label: '宸ヤ綔绔�' },
+    { field: 'machineryName', label: '浣跨敤璁惧' },
     { field: 'itemCode', label: '浜у搧缂栫爜' },
     { field: 'itemName', label: '浜у搧鍚嶇О' },
     { field: 'unitMeasureName', label: '鍗曚綅' },
     { field: 'itemSpecification', label: '瑙勬牸' },
     { field: 'reportableQuantity', label: '鍙姤宸ユ暟閲�' },
     { field: 'feedbackQuantity', label: '鎶ュ伐鏁伴噺' },
+    {
+      field: 'billingType',
+      label: '璁¤垂绫诲瀷',
+      render: (val) =>
+        FEEDBACK_BILLING_TYPE_OPTIONS.find((item) => item.value === val)
+          ?.label ?? '-',
+    },
+    { field: 'wageRate', label: '宸ヨ祫瀹氶' },
+    { field: 'workHours', label: '鎶ュ伐宸ユ椂(h)' },
+    { field: 'auxPaidHours', label: '杈呭姪璁¤柂宸ユ椂(h)' },
+    { field: 'wageAmount', label: '鎶ュ伐宸ヨ祫锛堝惈璐ㄩ噺璋冩暣锛�' },
+    { field: 'auxWageAmount', label: '杈呭姪宸ヨ祫' },
+    { field: 'qualityPassRate', label: '杩囩▼妫�楠屽悎鏍肩巼(%)' },
+    { field: 'productionLength', label: '鐢熶骇闀垮害(绫�)' },
+    { field: 'standardWorkHours', label: '鏍囧噯宸ユ椂(h)' },
+    { field: 'standardPrimaryHours', label: '鏍囧噯涓诲伐鏃�(h)' },
+    { field: 'standardAuxHours', label: '鏍囧噯杈呭姪宸ユ椂(h)' },
+    { field: 'workHoursDiff', label: '宸ユ椂宸紓(h)' },
+    { field: 'workHoursDiffRate', label: '宸ユ椂宸紓鐜�(%)' },
+    { field: 'stdCalcNote', label: '鏍囧噯宸ユ椂璁$畻渚濇嵁' },
     { field: 'qualifiedQuantity', label: '鍚堟牸鍝佹暟閲�' },
     { field: 'unqualifiedQuantity', label: '涓嶈壇鍝佹暟閲�' },
     { field: 'laborScrapQuantity', label: '宸ュ簾鏁伴噺' },
     { field: 'materialScrapQuantity', label: '鏂欏簾鏁伴噺' },
     { field: 'otherScrapQuantity', label: '鍏朵粬搴熷搧' },
     { field: 'feedbackUserNickname', label: '鎶ュ伐浜�' },
-    { field: 'feedbackTime', label: '鎶ュ伐鏃堕棿' },
+    {
+      field: 'feedbackTime',
+      label: '鎶ュ伐鏃堕棿',
+      render: (val) => formatDate(val) as string,
+    },
     { field: 'approveUserNickname', label: '瀹℃牳浜�' },
     { field: 'remark', label: '澶囨敞' },
   ];

--
Gitblit v1.9.3