mom-pro2-before.git

			@@ -16,6 +16,7 @@
			import {
			approveFeedback,
			deleteFeedback,
			getBatchRequirements,
			getFeedbackPage,
			rejectFeedback,
			submitFeedback,
			@@ -23,6 +24,7 @@
			import { $t } from '#/locales';

			import FeedbackForm from '../../../pro/feedback/modules/form.vue';
			import BatchInputDialog from '../../../pro/feedback/modules/batch-input-dialog.vue';

			defineOptions({ name: 'WorkbenchFeedbackHistoryTab' });

			@@ -39,6 +41,19 @@
			destroyOnClose: true,
			});

			const batchDialogRef = ref<InstanceType<typeof BatchInputDialog>>();
			const approvingRow = ref<MesProFeedbackApi.Feedback>();

			/** 执行审批（含批次属性） */
			async function doApprove(row: MesProFeedbackApi.Feedback, batchFields?: Record<string, unknown>) {
			const finished = await approveFeedback({ id: row.id!, ...batchFields });
			message.success(
			finished ? '报工单已审批完成' : '报工成功，请等待质量检验完成！',
			);
			refreshGrid();
			emit('reported');
			}

			/** 查看详情 */
			function handleDetail(row: MesProFeedbackApi.Feedback) {
			formModalApi.setData({ formType: 'detail', id: row.id }).open();
			@@ -46,7 +61,7 @@

			/** 编辑（仅草稿） */
			function handleEdit(row: MesProFeedbackApi.Feedback) {
			formModalApi.setData({ formType: 'update', id: row.id }).open();
			formModalApi.setData({ formType: 'update', id: row.id, showSubmitButton: false }).open();
			}

			/** 删除（仅草稿） */
			@@ -67,12 +82,24 @@

			/** 审批通过（仅审批中） */
			async function handleApprove(row: MesProFeedbackApi.Feedback) {
			const finished = await approveFeedback(row.id!);
			message.success(
			finished ? '报工单已审批完成' : '报工成功，请等待质量检验完成！',
			);
			refreshGrid();
			emit('reported');
			try {
			const checkResult = await getBatchRequirements(row.id!);
			if (checkResult?.needBatchInput) {
			approvingRow.value = row;
			batchDialogRef.value?.open({ checkResult });
			} else {
			await doApprove(row);
			}
			} catch {
			await doApprove(row);
			}
			}

			/** 批次弹窗确认回调 */
			function handleBatchConfirm(batchData: Record<string, unknown>) {
			if (approvingRow.value) {
			doApprove(approvingRow.value, batchData);
			}
			}

			/** 驳回（仅审批中） */
			@@ -100,7 +127,7 @@
			width: 160,
			slots: { default: 'code' },
			},
			{ field: 'workOrderCode', title: '工单编码', width: 140 },
			{ field: 'taskCode', title: '任务编码', width: 140 },
			{ field: 'processName', title: '工序', width: 100 },
			{ field: 'itemName', title: '产品', minWidth: 120 },
			{ field: 'feedbackQuantity', title: '报工数量', width: 100 },
			@@ -202,6 +229,7 @@
			<template>
			<div class="feedback-history-tab">
			<FormModal @success="refreshGrid" />
			<BatchInputDialog ref="batchDialogRef" @confirm="handleBatchConfirm" />

			<div v-if="!taskId" class="feedback-history-tab__empty">
			请从左侧工单列表选择一条任务查看报工记录