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/workorder/index.vue | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index 05d1c44..6c3ef86 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/mes/pro/workorder/index.vue
@@ -32,7 +32,8 @@
destroyOnClose: true,
});
- const archiveDetailRef = ref<InstanceType<typeof ArchiveDetail>>();
+ const archiveVisible = ref(false);
+ const archiveProductCode = ref('');
// const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 鏉＄爜璇︽儏寮圭獥
/** 鍒锋柊琛ㄦ牸 */
@@ -100,6 +101,12 @@
await cancelWorkOrder(row.id!);
message.success("璁㈠崟宸插彇娑�");
handleRefresh();
+ }
+
+ /** 鎵撳紑褰掓。璇︽儏 */
+ function handleArchive(row: MesProWorkOrderApi.WorkOrder) {
+ archiveProductCode.value = row.productCode || '';
+ archiveVisible.value = true;
}
/** 鏌ョ湅璁㈠崟鏉＄爜 */
@@ -237,7 +244,7 @@
},
},
{
- label: $t('common.create'),
+ label: '鏂板瀛愯鍗�',
type: 'link',
auth: ['mes:pro-work-order:create'],
ifShow:
@@ -274,13 +281,13 @@
{
label: '褰掓。',
type: 'link',
- onClick: () => archiveDetailRef.value?.open(row.productCode),
+ onClick: handleArchive.bind(null, row),
},
]" />
</template>
</Grid>
<!-- <BarcodeDetail ref="barcodeDetailRef" /> -->
- <ArchiveDetail ref="archiveDetailRef" />
+ <ArchiveDetail :visible="archiveVisible" :product-code="archiveProductCode" @update:visible="archiveVisible = $event" />
</Page>
</template>
--
Gitblit v1.9.3