Merge branch 'perf/device-customer-06-03' into 'v1.4.0_dev'

perf: 设备列表 注释与客户相关的代码

See merge request yunteng/thingskit-front!1362

@@ -139,11 +139,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'organizationDTO.name',
     dataIndex: 'organizationDTO.name',
     width: 100,
     width: 100,
   },
   },
-  {
-    title: '客户',
-    dataIndex: 'customerName',
-    width: 100,
-  },
+  // {
+  //   title: '客户',
+  //   dataIndex: 'customerName',
+  //   width: 100,
+  // },
   {
   {
     title: '公开',
     title: '公开',
     dataIndex: 'public',
     dataIndex: 'public',

@@ -36,14 +36,14 @@
                     onConfirm: () => handleDelete(),
                     onConfirm: () => handleDelete(),
                   },
                   },
                 },
                 },
-                {
-                  text: '分配客户',
-                  auth: DeviceListAuthEnum.ASSIGN,
-                  icon: 'mdi:account-arrow-left',
-                  event: '',
-                  disabled: !batchPrivateFlag,
-                  onClick: handleBatchAssign.bind(null),
-                },
+                // {
+                //   text: '分配客户',
+                //   auth: DeviceListAuthEnum.ASSIGN,
+                //   icon: 'mdi:account-arrow-left',
+                //   event: '',
+                //   disabled: !batchPrivateFlag,
+                //   onClick: handleBatchAssign.bind(null),
+                // },
                 {
                 {
                   text: '更新产品',
                   text: '更新产品',
                   auth: DeviceListAuthEnum.UPDATE_PRODUCT,
                   auth: DeviceListAuthEnum.UPDATE_PRODUCT,
@@ -178,24 +178,24 @@
               },
               },
             ]"
             ]"
             :dropDownActions="[
             :dropDownActions="[
-              record.customerId
-                ? {
-                    label: '取消分配',
-                    icon: 'mdi:account-arrow-left',
-                    ifShow: authBtn(role) && !record?.customerAdditionalInfo?.isPublic,
-                    auth: DeviceListAuthEnum.ASSIGN,
-                    popConfirm: {
-                      title: '是否取消分配客户',
-                      confirm: handleCancelDispatchCustomer.bind(null, record),
-                    },
-                  }
-                : {
-                    label: '分配客户',
-                    icon: 'mdi:account-arrow-right',
-                    ifShow: authBtn(role),
-                    auth: DeviceListAuthEnum.ASSIGN,
-                    onClick: handleDispatchCustomer.bind(null, record),
-                  },
+              // record.customerId
+              //   ? {
+              //       label: '取消分配',
+              //       icon: 'mdi:account-arrow-left',
+              //       ifShow: authBtn(role) && !record?.customerAdditionalInfo?.isPublic,
+              //       auth: DeviceListAuthEnum.ASSIGN,
+              //       popConfirm: {
+              //         title: '是否取消分配客户',
+              //         confirm: handleCancelDispatchCustomer.bind(null, record),
+              //       },
+              //     }
+              //   : {
+              //       label: '分配客户',
+              //       icon: 'mdi:account-arrow-right',
+              //       ifShow: authBtn(role),
+              //       auth: DeviceListAuthEnum.ASSIGN,
+              //       onClick: handleDispatchCustomer.bind(null, record),
+              //     },
               {
               {
                 label: record?.customerAdditionalInfo?.isPublic ? '私有' : '公开',
                 label: record?.customerAdditionalInfo?.isPublic ? '私有' : '公开',
                 auth: DeviceListAuthEnum.PUBLIC,
                 auth: DeviceListAuthEnum.PUBLIC,
@@ -249,7 +249,7 @@
       <DeviceDetailDrawer @register="registerGatewayDetailDrawer" />
       <DeviceDetailDrawer @register="registerGatewayDetailDrawer" />
 
 
       <DeviceModal @register="registerModal" @success="handleSuccess" @reload="handleSuccess" />
       <DeviceModal @register="registerModal" @success="handleSuccess" @reload="handleSuccess" />
-      <CustomerModal @register="registerCustomerModal" @reload="handleReload" />
+      <!-- <CustomerModal @register="registerCustomerModal" @reload="handleReload" /> -->
       <OrgModal @register="registerOrgModal" @reload="handleReload" />
       <OrgModal @register="registerOrgModal" @reload="handleReload" />
 
 
       <BatchImportModal @register="registerImportModal" @import-finally="handleImportFinally" />
       <BatchImportModal @register="registerImportModal" @import-finally="handleImportFinally" />
@@ -276,7 +276,7 @@
     deleteDevice,
     deleteDevice,
     devicePage,
     devicePage,
     deviceCollect,
     deviceCollect,
-    cancelDispatchCustomer,
+    // cancelDispatchCustomer,
     getGATEWAY,
     getGATEWAY,
     privateDevice,
     privateDevice,
     publicDevice,
     publicDevice,
@@ -291,7 +291,7 @@
   import DeviceModal from './cpns/modal/DeviceModal.vue';
   import DeviceModal from './cpns/modal/DeviceModal.vue';
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';
   import DeviceDetailDrawer from './cpns/modal/DeviceDetailDrawer.vue';
   import DeviceDetailDrawer from './cpns/modal/DeviceDetailDrawer.vue';
-  import CustomerModal from './cpns/modal/CustomerModal.vue';
+  // import CustomerModal from './cpns/modal/CustomerModal.vue';
   import OrgModal from './cpns/modal/OrgModal.vue';
   import OrgModal from './cpns/modal/OrgModal.vue';
   import BatchImportModal from './cpns/modal/BatchImportModal/index.vue';
   import BatchImportModal from './cpns/modal/BatchImportModal/index.vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
@@ -320,7 +320,7 @@
   const searchInfo = reactive<Recordable>({});
   const searchInfo = reactive<Recordable>({});
   const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
   const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
   const [registerModal, { openModal }] = useModal();
   const [registerModal, { openModal }] = useModal();
-  const [registerCustomerModal, { openModal: openCustomerModal }] = useModal();
+  // const [registerCustomerModal, { openModal: openCustomerModal }] = useModal();
   const [registerOrgModal, { openModal: openOrgodal }] = useModal();
   const [registerOrgModal, { openModal: openOrgodal }] = useModal();
   const [registerDetailDrawer, { openDrawer }] = useDrawer();
   const [registerDetailDrawer, { openDrawer }] = useDrawer();
   const [registerTbDetailDrawer, { openDrawer: openTbDeviceDrawer }] = useDrawer();
   const [registerTbDetailDrawer, { openDrawer: openTbDeviceDrawer }] = useDrawer();
@@ -470,21 +470,21 @@
     });
     });
   }
   }
   // 分配客户
   // 分配客户
-  function handleDispatchCustomer(record: Recordable) {
-    openCustomerModal(true, record);
-  }
+  // function handleDispatchCustomer(record: Recordable) {
+  //   openCustomerModal(true, record);
+  // }
   function handleReload() {
   function handleReload() {
     setSelectedRowKeys([]);
     setSelectedRowKeys([]);
     handleSuccess();
     handleSuccess();
   }
   }
   // 取消分配客户
   // 取消分配客户
-  async function handleCancelDispatchCustomer(record: Recordable) {
-    try {
-      // 该设备是否正在被场景联动使用中？
-      await cancelDispatchCustomer(record);
-      handleReload();
-    } catch {}
-  }
+  // async function handleCancelDispatchCustomer(record: Recordable) {
+  //   try {
+  //     // 该设备是否正在被场景联动使用中？
+  //     await cancelDispatchCustomer(record);
+  //     handleReload();
+  //   } catch {}
+  // }
 
 
   function handleDetail(record: Recordable) {
   function handleDetail(record: Recordable) {
     const { id, tbDeviceId, deviceProfile, deviceType } = record;
     const { id, tbDeviceId, deviceProfile, deviceType } = record;
@@ -533,28 +533,28 @@
     });
     });
   };
   };
 
 
-  const handleCheckHasDiffenterOrg = (options: DeviceModel[]) => {
-    let orgId: string | undefined;
-    let flag = false;
-    for (const item of options) {
-      const _orgId = item.organizationId;
-      if (!orgId) orgId = _orgId;
-      if (orgId !== _orgId) {
-        flag = true;
-        break;
-      }
-    }
-    return flag;
-  };
-
-  const handleBatchAssign = () => {
-    const options = getSelectRows();
-    if (handleCheckHasDiffenterOrg(options as DeviceModel[])) {
-      createMessage.error('当前选中项中存在不同所属组织的设备！');
-      return;
-    }
-    openCustomerModal(true, options);
-  };
+  // const handleCheckHasDiffenterOrg = (options: DeviceModel[]) => {
+  //   let orgId: string | undefined;
+  //   let flag = false;
+  //   for (const item of options) {
+  //     const _orgId = item.organizationId;
+  //     if (!orgId) orgId = _orgId;
+  //     if (orgId !== _orgId) {
+  //       flag = true;
+  //       break;
+  //     }
+  //   }
+  //   return flag;
+  // };
+
+  // const handleBatchAssign = () => {
+  //   const options = getSelectRows();
+  //   if (handleCheckHasDiffenterOrg(options as DeviceModel[])) {
+  //     createMessage.error('当前选中项中存在不同所属组织的设备！');
+  //     return;
+  //   }
+  //   openCustomerModal(true, options);
+  // };
 
 
   const handleBatchOrg = () => {
   const handleBatchOrg = () => {
     const options = getSelectRows();
     const options = getSelectRows();