diff --git a/src/locales/en.ts b/src/locales/en.ts
index bb23aba4..d6b09e73 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -3414,6 +3414,7 @@ export default {
detailTableTaskCodeColumn: 'Task Order',
detailTableProductCodeColumn: 'Product Code',
detailTableProductNameColumn: 'Product Name',
+ detailTableDeviceNameColumn: 'Device Name',
detailTableTotalNumberColumn: 'Total Quantity',
detailTablePlanNumberColumn: 'Planned',
detailTableUnplanNumberColumn: 'Unplanned',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 801f61d3..3bc3ad71 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -3260,6 +3260,7 @@ export default {
detailTableTaskCodeColumn: '任务单',
detailTableProductCodeColumn: '产品编码',
detailTableProductNameColumn: '产品名称',
+ detailTableDeviceNameColumn: '设备名称',
detailTableTotalNumberColumn: '任务总数',
detailTablePlanNumberColumn: '已计划',
detailTableUnplanNumberColumn: '未计划',
diff --git a/src/views/mes/tasksummary/components/TaskScheduleDialog.vue b/src/views/mes/tasksummary/components/TaskScheduleDialog.vue
index 8cf74312..3a4864e6 100644
--- a/src/views/mes/tasksummary/components/TaskScheduleDialog.vue
+++ b/src/views/mes/tasksummary/components/TaskScheduleDialog.vue
@@ -131,13 +131,13 @@
@select-all="handleDetailSelectAll"
>
-
+
-
-
-
-
+
+
+
+
{{ scope.row.number - scope.row.planNumber > 0 ? scope.row.number - scope.row.planNumber : 0 }}
@@ -617,6 +617,14 @@ const handleDeviceSelectConfirm = (payload: { ids: (number | string)[]; rows: an
.filter((item): item is { id: number; name: string } => Boolean(item))
selectedDeviceRows.value = payload.rows
}
+const refreshDetailListAfterDeviceSaved = async () => {
+ const taskId = Number(currentDeviceRelationRow.value?.taskId)
+ if (!Number.isFinite(taskId)) return
+ delete allDetailsMap.value[taskId]
+ if (Number(currentTask.value?.id) === taskId && currentTask.value) {
+ await handleCurrentTaskChange(currentTask.value)
+ }
+}
const submitDeviceRelation = async () => {
if (!currentProductData.value || !deviceRelationForm.productId) return
deviceRelationSaving.value = true
@@ -636,21 +644,7 @@ const submitDeviceRelation = async () => {
delete payload.devices
delete payload.molds
await ProductApi.updateProduct(payload)
- const displayText = deviceRelationForm.devices.map((item) => item.name).join('、')
- const rowId = currentDeviceRelationRow.value?.id
- if (rowId !== undefined) {
- Object.values(allDetailsMap.value).forEach((rows) => {
- rows.forEach((item: any) => {
- if (item.id === rowId) {
- item.deviceDisplayName = displayText
- }
- })
- })
- const target = detailList.value.find((item: any) => item.id === rowId)
- if (target) {
- target.deviceDisplayName = displayText
- }
- }
+ await refreshDetailListAfterDeviceSaved()
message.success('关联设备已保存')
deviceRelationDialogVisible.value = false
} finally {