From 7763f23f3224a0f609c4c483351edd656b0dfb26 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 16:49:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/pro/route/modules/product-list.vue | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/views/mes/pro/route/modules/product-list.vue b/src/views/mes/pro/route/modules/product-list.vue
index ea34d58..056d6db 100644
--- a/src/views/mes/pro/route/modules/product-list.vue
+++ b/src/views/mes/pro/route/modules/product-list.vue
@@ -4,7 +4,7 @@
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { MesProRouteProductApi } from '#/api/mes/pro/route/product';
-import { ref, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { DICT_TYPE } from '@vben/constants';
@@ -27,7 +27,11 @@
routeId: number;
}>();
-const isEditable = ref(props.formType !== 'detail'); // 鏄惁鍙紪杈�
+const emit = defineEmits<{
+ change: [list: MesProRouteProductApi.RouteProduct[]];
+}>();
+
+const isEditable = computed(() => props.formType !== 'detail'); // 鏄惁鍙紪杈�
const list = ref<MesProRouteProductApi.RouteProduct[]>([]); // 宸ヨ壓璺嚎浜у搧鍒楄〃
const [ProductFormModal, productFormModalApi] = useVbenModal({
@@ -55,6 +59,7 @@
try {
list.value = await getRouteProductListByRoute(props.routeId);
gridApi.setGridOptions({ data: list.value });
+ emit('change', list.value);
} finally {
gridApi.setLoading(false);
}
@@ -94,14 +99,14 @@
<TableAction
:actions="[
{
- label: $t('ui.actionTitle.create', ['鍏宠仈浜у搧']),
+ label: $t('ui.actionTitle.create', ['浜у嚭浜у搧']),
type: 'primary',
onClick: handleCreate,
},
]"
/>
</div>
- <Grid class="w-full" table-title="鍏宠仈浜у搧">
+ <Grid class="w-full" table-title="浜у嚭浜у搧鍙婃姤宸ュ叆搴撲綅缃�">
<template #productionTime="{ row }">
<span v-if="row.productionTime">
{{ row.productionTime }}
--
Gitblit v1.9.3