From c694bf822233a5483c3218cafbb0de5f9fdb309e Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Thu, 30 Mar 2023 16:19:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug=20=E8=AE=BE=E5=A4=87=E6=8E=A5?=
 =?UTF-8?q?=E5=85=A5=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Product/Detail/DeviceAccess/index.vue     | 41 ++++---------------
 1 file changed, 8 insertions(+), 33 deletions(-)

diff --git a/src/views/device/Product/Detail/DeviceAccess/index.vue b/src/views/device/Product/Detail/DeviceAccess/index.vue
index 7410cbd0..22d10f64 100644
--- a/src/views/device/Product/Detail/DeviceAccess/index.vue
+++ b/src/views/device/Product/Detail/DeviceAccess/index.vue
@@ -8,12 +8,6 @@
                         v-if="
                             permissionStore.hasPermission(
                                 'device/Product:update',
-                            ) &&
-                            permissionStore.hasPermission(
-                                'link/AccessConfig:add',
-                            ) &&
-                            permissionStore.hasPermission(
-                                'link/AccessConfig:update',
                             )
                         "
                     >
@@ -60,35 +54,15 @@
                                         productStore.current?.count &&
                                         productStore.current?.count > 0
                                             ? '产品下有设备实例时不能更换接入方式'
-                                            : !(permissionStore.hasPermission(
-                                                  'device/Product:update',
-                                              ) &&
-                                              permissionStore.hasPermission(
-                                                  'link/AccessConfig:add',
-                                              ) &&
-                                              permissionStore.hasPermission(
-                                                  'link/AccessConfig:update',
-                                              ))
-                                            ? '暂无权限，请联系管理员'
                                             : '',
                                 }"
                                 :disabled="
-                                    (productStore.current?.count &&
-                                        productStore.current?.count > 0) ||
-                                    !(
-                                        permissionStore.hasPermission(
-                                            'device/Product:update',
-                                        ) &&
-                                        permissionStore.hasPermission(
-                                            'link/AccessConfig:add',
-                                        ) &&
-                                        permissionStore.hasPermission(
-                                            'link/AccessConfig:update',
-                                        )
-                                    )
+                                    productStore.current?.count &&
+                                    productStore.current?.count > 0
                                 "
                                 ghost
                                 @click="showDevice"
+                                hasPermission="device/Product:update"
                             >
                                 更换
                             </PermissionButton>
@@ -349,8 +323,11 @@
             :gridColumns="[2]"
         >
             <template #headerTitle>
-                <j-button type="primary" @click="add"
-                    ><plus-outlined />新增</j-button
+                <PermissionButton
+                    type="primary"
+                    @click="add"
+                    hasPermission="link/AccessConfig:add"
+                    >新增</PermissionButton
                 >
             </template>
             <template #deviceType="slotProps">
@@ -1010,7 +987,6 @@ const submitDevice = async () => {
     const result: any = {};
     flatObj(values, result);
     const { storePolicy, ...extra } = result;
-    console.log({ ...extra });
     const id = productStore.current?.id;
     const resp = await modify(id || '', {
         id: id,
@@ -1046,7 +1022,6 @@ const add = () => {
     if (url) {
         const tab: any = window.open(`${origin}/#${url}?view=false`);
         tab.onTabSaveSuccess = (value: any) => {
-            console.log(value);
             if (value.status === 200) {
                 tableRef.value.reload();
                 handleClick(value.result);