mom-pro2-before.git

			@@ -3,12 +3,14 @@
			import type { MesProFeedbackApi } from '#/api/mes/pro/feedback';

			import { nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue';
			import { useRouter } from 'vue-router';

			import {
			DICT_TYPE,
			MesProFeedbackStatusEnum,
			} from '@vben/constants';
			import { useVbenModal } from '@vben/common-ui';
			import { useAccess } from '@vben/access';

			import { Button, message, Popconfirm, Space } from 'ant-design-vue';

			@@ -16,6 +18,7 @@
			import {
			approveFeedback,
			deleteFeedback,
			getBatchRequirements,
			getFeedbackPage,
			rejectFeedback,
			submitFeedback,
			@@ -23,6 +26,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 +43,22 @@
			destroyOnClose: true,
			});

			const { hasAccessByCodes } = useAccess();
			const router = useRouter();

			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 +66,7 @@

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

			/** 删除（仅草稿） */
			@@ -59,7 +79,7 @@

			/** 提交（仅草稿） */
			async function handleSubmit(row: MesProFeedbackApi.Feedback) {
			await submitFeedback(row.id!);
			await submitFeedback({ id: row.id! });
			message.success('报工单已提交');
			refreshGrid();
			emit('reported');
			@@ -67,12 +87,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);
			}
			}

			/** 驳回（仅审批中） */
			@@ -81,6 +113,15 @@
			message.success('报工单已驳回');
			refreshGrid();
			emit('reported');
			}

			/** 查看审批详情 */
			function handleViewProcess(row: MesProFeedbackApi.Feedback) {
			if (!row.processInstanceId) {
			message.warning('该报工尚未提交审批');
			return;
			}
			router.push({ path: '/bpm/process-instance/detail', query: { id: row.processInstanceId } });
			}

			/** 状态常量供模板使用 */
			@@ -100,7 +141,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 +243,7 @@
			<template>
			<div class="feedback-history-tab">
			<FormModal @success="refreshGrid" />
			<BatchInputDialog ref="batchDialogRef" @confirm="handleBatchConfirm" />

			<div v-if="!taskId" class="feedback-history-tab__empty">
			请从左侧工单列表选择一条任务查看报工记录
			@@ -246,9 +288,18 @@
			删除
			</Button>
			</Popconfirm>
			<!-- 审批中：审批通过、驳回 -->
			<Popconfirm
			<!-- 审批中：查看审批 -->
			<Button
			v-if="row.status === STATUS_APPROVING"
			type="link"
			size="small"
			@click="handleViewProcess(row)"
			>
			查看审批
			</Button>
			<!--
			<Popconfirm
			v-if="row.status === STATUS_APPROVING && hasAccessByCodes(['mes:pro-feedback:approve'])"
			title="确认审批通过该报工单？"
			@confirm="handleApprove(row)"
			>
			@@ -257,7 +308,7 @@
			</Button>
			</Popconfirm>
			<Popconfirm
			v-if="row.status === STATUS_APPROVING"
			v-if="row.status === STATUS_APPROVING && hasAccessByCodes(['mes:pro-feedback:approve'])"
			title="确认驳回该报工单？"
			@confirm="handleReject(row)"
			>
			@@ -265,6 +316,7 @@
			驳回
			</Button>
			</Popconfirm>
			-->
			</Space>
			</template>
			</Grid>