From cb9cd49627b65a4c0e137e08063271a8cefe1826 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 23 七月 2026 17:48:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue b/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
index 578eaf9..4048770 100644
--- a/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
+++ b/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
@@ -16,7 +16,7 @@
import {
approveFeedback,
deleteFeedback,
- getFeedbackListByTask,
+ getFeedbackPage,
rejectFeedback,
submitFeedback,
} from '#/api/mes/pro/feedback';
@@ -46,7 +46,7 @@
/** 缂栬緫锛堜粎鑽夌锛� */
function handleEdit(row: MesProFeedbackApi.Feedback) {
- formModalApi.setData({ formType: 'update', id: row.id }).open();
+ formModalApi.setData({ formType: 'update', id: row.id, showSubmitButton: false }).open();
}
/** 鍒犻櫎锛堜粎鑽夌锛� */
@@ -100,7 +100,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 +134,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,
+ });
},
},
},
@@ -213,7 +217,7 @@
<template #actions="{ row }">
<Space :size="4" wrap>
<Button type="link" size="small" @click="handleDetail(row)">
- {{ $t('common.view') }}
+ 鏌ョ湅
</Button>
<!-- 鑽夌锛氱紪杈戙�佸垹闄ゃ�佹彁浜� -->
<Button
@@ -222,7 +226,7 @@
size="small"
@click="handleEdit(row)"
>
- {{ $t('common.edit') }}
+ 缂栬緫
</Button>
<Popconfirm
v-if="row.status === STATUS_PREPARE"
@@ -230,7 +234,7 @@
@confirm="handleSubmit(row)"
>
<Button type="link" size="small">
- {{ $t('common.submit') }}
+ 鎻愪氦
</Button>
</Popconfirm>
<Popconfirm
@@ -239,7 +243,7 @@
@confirm="handleDelete(row)"
>
<Button type="link" size="small" danger>
- {{ $t('common.delete') }}
+ 鍒犻櫎
</Button>
</Popconfirm>
<!-- 瀹℃壒涓細瀹℃壒閫氳繃銆侀┏鍥� -->
@@ -249,7 +253,7 @@
@confirm="handleApprove(row)"
>
<Button type="link" size="small">
- {{ $t('common.approve') }}
+ 瀹℃壒閫氳繃
</Button>
</Popconfirm>
<Popconfirm
--
Gitblit v1.9.3