From 726b359e53c1ee75bd756212c9b6e2a02c23b6b3 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 27 八月 2026 09:23:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/pro/task/modules/task-list.vue | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/src/views/mes/pro/task/modules/task-list.vue b/src/views/mes/pro/task/modules/task-list.vue
index 60bd097..12053cb 100644
--- a/src/views/mes/pro/task/modules/task-list.vue
+++ b/src/views/mes/pro/task/modules/task-list.vue
@@ -4,7 +4,7 @@
import { computed, watch } from 'vue';
-import { useVbenModal } from '../../../../../packages/effects/common-ui/src';
+import { useVbenModal } from '@vben/common-ui';
import { message } from 'ant-design-vue';
@@ -14,6 +14,7 @@
import { useTaskGridColumns } from '../data';
import TaskForm from './task-form.vue';
+// import QuickFeedbackForm from '../../workorder-center/modules/quick-feedback.vue'; // 鎶ュ伐鎿嶄綔鏆傞殣钘�
const props = defineProps<{
colorCode?: string;
@@ -22,6 +23,7 @@
processId: number;
routeId: number;
workOrderId: number;
+ workOrderQuantity?: number;
}>();
const editable = computed(() => !props.disabled); // 鏄惁鍙淮鎶や换鍔�
@@ -30,6 +32,11 @@
connectedComponent: TaskForm,
destroyOnClose: true,
});
+
+// const [QuickFeedbackModal, quickFeedbackModalApi] = useVbenModal({
+// connectedComponent: QuickFeedbackForm,
+// destroyOnClose: true,
+// });
/** 鍒锋柊琛ㄦ牸 */
function handleRefresh() {
@@ -43,6 +50,7 @@
colorCode: props.colorCode,
itemId: props.itemId,
processId: props.processId,
+ quantity: props.workOrderQuantity,
routeId: props.routeId,
workOrderId: props.workOrderId,
})
@@ -53,6 +61,18 @@
function handleEdit(row: MesProTaskApi.Task) {
taskFormModalApi.setData({ id: row.id }).open();
}
+
+// /** 蹇�熸姤宸� */
+// function handleQuickFeedback(row: MesProTaskApi.Task) {
+// quickFeedbackModalApi
+// .setData({
+// taskId: row.id,
+// taskCode: row.code,
+// taskQuantity: row.quantity,
+// taskProducedQuantity: row.producedQuantity,
+// })
+// .open();
+// }
/** 鍒犻櫎浠诲姟 */
async function handleDelete(row: MesProTaskApi.Task) {
@@ -105,14 +125,17 @@
// 宸ュ簭姝ラ鍒囨崲鏃堕噸鏂板姞杞藉綋鍓嶅伐搴忕殑浠诲姟
watch(
- () => props.processId,
+ () => [props.workOrderId, props.routeId, props.processId],
() => handleRefresh(),
);
+
+
</script>
<template>
<div>
<TaskFormModal @success="handleRefresh" />
+ <!-- <QuickFeedbackModal @success="handleRefresh" /> -->
<Grid table-title="鐢熶骇浠诲姟">
<template v-if="editable" #toolbar-tools>
<TableAction
@@ -136,6 +159,13 @@
<template #actions="{ row }">
<TableAction
:actions="[
+ // {
+ // label: '鎶ュ伐',
+ // type: 'link',
+ // auth: ['mes:pro-feedback:create'],
+ // ifShow: (row.quantity ?? 0) > (row.producedQuantity ?? 0),
+ // onClick: handleQuickFeedback.bind(null, row),
+ // },
{
label: $t('common.edit'),
type: 'link',
--
Gitblit v1.9.3