From 858df78951d5c29e8d4217cffcf81d2cc4fabcd4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 03 八月 2026 14:58:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/wls/arrivalnotice/modules/line-list.vue | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/views/wls/arrivalnotice/modules/line-list.vue b/src/views/wls/arrivalnotice/modules/line-list.vue
index 29a152a..be40c57 100644
--- a/src/views/wls/arrivalnotice/modules/line-list.vue
+++ b/src/views/wls/arrivalnotice/modules/line-list.vue
@@ -10,7 +10,7 @@
import { useVbenModal } from '@vben/common-ui';
-import { Button, message } from 'ant-design-vue';
+import { Button, message, Tag } from 'ant-design-vue';
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import {
@@ -72,7 +72,7 @@
/** 璺宠浆 IQC 妫�楠屽崟璇︽儏 */
function handleOpenIqc(row: MesWmArrivalNoticeLineApi.ArrivalNoticeLine) {
if (row.iqcId) {
- router.push({ path: '/mes/qc/iqc', query: { id: row.iqcId } });
+ router.push({ name: 'MesQcIqc', query: { id: row.iqcId } });
}
}
@@ -133,6 +133,13 @@
</Button>
<span v-else>-</span>
</template>
+ <template #iqcCheckResult="{ row }">
+ <Tag v-if="row.iqcCheckResult === 1" color="success">鍚堟牸</Tag>
+ <Tag v-else-if="row.iqcCheckResult === 2" color="warning">鐗归噰</Tag>
+ <Tag v-else-if="row.iqcCheckResult === 3" color="error">涓嶅悎鏍奸��璐�</Tag>
+ <Tag v-else-if="row.iqcCheckResult === 4" color="error">涓嶅悎鏍兼姤搴�</Tag>
+ <span v-else>-</span>
+ </template>
<template #actions="{ row }">
<TableAction
:actions="[
--
Gitblit v1.9.3