From 5dbc69b4e792dcce998038822b92402366bec47f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 18 八月 2026 10:45:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fix/hsy/20260812' into dev_pro2.0

---
 src/views/mes/pro/feedback/data.ts |   46 +++++++++++++++++++++++++++++++---------------
 1 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/src/views/mes/pro/feedback/data.ts b/src/views/mes/pro/feedback/data.ts
index c7aadb8..29b244a 100644
--- a/src/views/mes/pro/feedback/data.ts
+++ b/src/views/mes/pro/feedback/data.ts
@@ -10,8 +10,8 @@
   MesAutoCodeRuleCode,
   MesProTaskStatusEnum,
   MesProWorkOrderStatusEnum,
-} from '..\..\..\..\packages\constants\src';
-import { getDictOptions } from '..\..\..\..\packages\effects\hooks\src';
+} from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
 
@@ -32,11 +32,11 @@
   return [
     {
       fieldName: 'code',
-      label: '鎶ュ伐鍗曞彿',
+      label: '鎶ヨ鍗曞彿',
       component: 'Input',
       componentProps: {
         allowClear: true,
-        placeholder: '璇疯緭鍏ユ姤宸ュ崟鍙�',
+        placeholder: '璇疯緭鍏ユ姤璁㈠崟鍙�',
       },
     },
     {
@@ -51,11 +51,11 @@
     },
     {
       fieldName: 'workOrderId',
-      label: '鐢熶骇宸ュ崟',
+      label: '鐢熶骇璁㈠崟',
       component: markRaw(ProWorkOrderSelect),
       componentProps: {
         allowClear: true,
-        placeholder: '璇烽�夋嫨宸ュ崟',
+        placeholder: '璇烽�夋嫨璁㈠崟',
       },
     },
     {
@@ -118,7 +118,7 @@
   return [
     {
       field: 'code',
-      title: '鎶ュ伐鍗曞彿',
+      title: '鎶ヨ鍗曞彿',
       width: 160,
       slots: { default: 'code' },
     },
@@ -133,7 +133,7 @@
     },
     { field: 'workstationName', title: '宸ヤ綔绔�', width: 120 },
     { field: 'processName', title: '宸ュ簭', width: 100 },
-    { field: 'workOrderCode', title: '鐢熶骇宸ュ崟缂栫爜', width: 160 },
+    { field: 'workOrderCode', title: '鐢熶骇璁㈠崟缂栫爜', width: 160 },
     { field: 'itemCode', title: '浜у搧鐗╂枡缂栫爜', width: 120 },
     { field: 'itemName', title: '浜у搧鐗╂枡鍚嶇О', minWidth: 140 },
     { field: 'itemSpecification', title: '瑙勬牸鍨嬪彿', width: 120 },
@@ -209,11 +209,11 @@
     },
     {
       fieldName: 'code',
-      label: '鎶ュ伐鍗曞彿',
+      label: '鎶ヨ鍗曞彿',
       component: 'Input',
       componentProps: {
         disabled: isHeaderReadonly,
-        placeholder: '璇疯緭鍏ユ姤宸ュ崟鍙�',
+        placeholder: '璇疯緭鍏ユ姤璁㈠崟鍙�',
       },
       rules: 'required',
       suffix: () =>
@@ -245,13 +245,13 @@
     },
     {
       fieldName: 'workOrderId',
-      label: '鐢熶骇宸ュ崟',
+      label: '鐢熶骇璁㈠崟',
       component: markRaw(ProWorkOrderSelect),
       componentProps: {
         disabled: isHeaderReadonly,
-        placeholder: '璇烽�夋嫨宸ュ崟',
+        placeholder: '璇烽�夋嫨璁㈠崟',
         status: MesProWorkOrderStatusEnum.CONFIRMED,
-        // 宸ュ崟鍙樻洿锛氭竻绌轰换鍔″強浠诲姟甯﹀嚭鐨勪骇鍝佷俊鎭�佹暟閲忓尯鍩熸帶鍒朵綅
+        // 璁㈠崟鍙樻洿锛氭竻绌轰换鍔″強浠诲姟甯﹀嚭鐨勪骇鍝佷俊鎭�佹暟閲忓尯鍩熸帶鍒朵綅
         onChange: async () => {
           await formApi?.setValues({
             checkFlag: true,
@@ -264,6 +264,7 @@
             taskId: undefined,
             unitMeasureName: undefined,
             workstationId: undefined,
+            reportableQuantity: undefined,
           });
         },
       },
@@ -277,7 +278,7 @@
         triggerFields: ['workOrderId', 'workstationId'],
         componentProps: (values) => ({
           disabled: isHeaderReadonly || !values.workOrderId,
-          placeholder: values.workOrderId ? '璇烽�夋嫨浠诲姟' : '璇峰厛閫夋嫨宸ュ崟',
+          placeholder: values.workOrderId ? '璇烽�夋嫨浠诲姟' : '璇峰厛閫夋嫨璁㈠崟',
           statuses: [MesProTaskStatusEnum.PREPARE],
           workOrderId: values.workOrderId,
           workstationId: values.workstationId,
@@ -298,6 +299,7 @@
             routeId: task.routeId,
             unitMeasureName: task.unitMeasureName,
             workstationId: task.workstationId,
+            reportableQuantity: task.reportableQuantity,
           });
           // 宸ヨ壓璺嚎宸ュ簭鐨� checkFlag 鍐冲畾鏁伴噺鍖哄煙灞曠ず
           if (task.routeId && task.processId) {
@@ -374,6 +376,20 @@
       dependencies: {
         triggerFields: ['itemCode'],
         show: (values) => !!values.itemCode,
+      },
+    },
+    {
+      fieldName: 'reportableQuantity',
+      label: '鍙姤宸ユ暟閲�',
+      component: 'InputNumber',
+      componentProps: {
+        class: 'w-full',
+        disabled: true,
+        precision: 2,
+      },
+      dependencies: {
+        triggerFields: ['taskId'],
+        show: (values) => !!values.taskId && ['create', 'update'].includes(formType),
       },
     },
     {
@@ -554,7 +570,7 @@
         format: 'YYYY-MM-DD HH:mm:ss',
         placeholder: '璇烽�夋嫨鎶ュ伐鏃堕棿',
         showTime: true,
-        valueFormat: 'x',
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
       },
       rules: 'required',
     },

--
Gitblit v1.9.3