From 78809560f4315777e770acec0e24cb42e2ca97a7 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 10 七月 2024 08:06:48 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
index 7bd50c0..f6ee0e2 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
@@ -424,13 +424,18 @@
size="small">
{{ $t('basicData.edit') }}
</el-button>
- <el-button @click="getTableRow(row,'delete')"
- v-if="userStore.user.permissions.indexOf('basicData.delete') > -1"
- link
- type="primary"
- size="small">
- {{ $t('basicData.delete') }}
- </el-button>
+<!-- <el-button @click="getTableRow(row,'delete')"-->
+<!-- v-if="userStore.user.permissions.indexOf('basicData.delete') > -1"-->
+<!-- link-->
+<!-- type="primary"-->
+<!-- size="small">-->
+<!-- {{ $t('basicData.delete') }}-->
+<!-- </el-button>-->
+ <el-popconfirm :title="$t('searchOrder.deleteConfirm')" @confirm="getTableRow(row,'delete')">
+ <template #reference>
+ <el-button link size="small" type="primary">{{ $t('basicData.delete') }}</el-button>
+ </template>
+ </el-popconfirm>
<!-- <el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">-->
<!-- <template #reference>-->
<!-- <el-button link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>-->
--
Gitblit v1.8.0