From 91c82965b2d987452ca276e3a03b48c8dcda2ae9 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 19 八月 2026 11:47:26 +0800
Subject: [PATCH] config(env): 更新生产环境配置和公司名称
---
src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue | 66 ++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 17 deletions(-)
diff --git a/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue b/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
index 578eaf9..8620c70 100644
--- a/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
+++ b/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
@@ -16,13 +16,15 @@
import {
approveFeedback,
deleteFeedback,
- getFeedbackListByTask,
+ getBatchRequirements,
+ getFeedbackPage,
rejectFeedback,
submitFeedback,
} from '#/api/mes/pro/feedback';
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 },
@@ -134,11 +161,15 @@
keepSource: true,
proxyConfig: {
ajax: {
- query: async () => {
+ query: async ({ page }) => {
if (!props.taskId) {
- return [];
+ return { list: [], total: 0 };
}
- return await getFeedbackListByTask(props.taskId);
+ return await getFeedbackPage({
+ taskId: props.taskId,
+ pageNo: page.currentPage,
+ pageSize: page.pageSize,
+ });
},
},
},
@@ -198,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">
璇蜂粠宸︿晶宸ュ崟鍒楄〃閫夋嫨涓�鏉′换鍔℃煡鐪嬫姤宸ヨ褰�
@@ -213,7 +245,7 @@
<template #actions="{ row }">
<Space :size="4" wrap>
<Button type="link" size="small" @click="handleDetail(row)">
- {{ $t('common.view') }}
+ 鏌ョ湅
</Button>
<!-- 鑽夌锛氱紪杈戙�佸垹闄ゃ�佹彁浜� -->
<Button
@@ -222,7 +254,7 @@
size="small"
@click="handleEdit(row)"
>
- {{ $t('common.edit') }}
+ 缂栬緫
</Button>
<Popconfirm
v-if="row.status === STATUS_PREPARE"
@@ -230,7 +262,7 @@
@confirm="handleSubmit(row)"
>
<Button type="link" size="small">
- {{ $t('common.submit') }}
+ 鎻愪氦
</Button>
</Popconfirm>
<Popconfirm
@@ -239,7 +271,7 @@
@confirm="handleDelete(row)"
>
<Button type="link" size="small" danger>
- {{ $t('common.delete') }}
+ 鍒犻櫎
</Button>
</Popconfirm>
<!-- 瀹℃壒涓細瀹℃壒閫氳繃銆侀┏鍥� -->
@@ -249,7 +281,7 @@
@confirm="handleApprove(row)"
>
<Button type="link" size="small">
- {{ $t('common.approve') }}
+ 瀹℃壒閫氳繃
</Button>
</Popconfirm>
<Popconfirm
--
Gitblit v1.9.3