From 234096451465663939bd62306039c2a6136e6e0f Mon Sep 17 00:00:00 2001
From: easy <1358086367@qq.com>
Date: Mon, 13 Mar 2023 14:11:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/AddDeviceOrProductDialog.vue   | 41 +++++++++++++++----
 src/views/system/Department/device/index.vue  |  5 +--
 src/views/system/Department/product/index.vue |  1 +
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/src/views/system/Department/components/AddDeviceOrProductDialog.vue b/src/views/system/Department/components/AddDeviceOrProductDialog.vue
index fa78840a..f96d7fd7 100644
--- a/src/views/system/Department/components/AddDeviceOrProductDialog.vue
+++ b/src/views/system/Department/components/AddDeviceOrProductDialog.vue
@@ -32,13 +32,13 @@
             ref="tableRef"
             :request="table.requestFun"
             :gridColumn="2"
-            model="CARD"
             :params="query.params.value"
             :rowSelection="{
                 selectedRowKeys: table._selectedRowKeys.value,
-                onChange: pageChange
+                onChange: selectRow,
             }"
             @cancelSelect="table.cancelSelect"
+            :columns="columns"
         >
             <template #card="slotProps">
                 <CardBox
@@ -100,6 +100,30 @@
                     </template>
                 </CardBox>
             </template>
+
+            <template #permission="slotProps">
+                <div
+                    style="cursor: pointer"
+                    class="card-item-content-value"
+                    @click="(e) => e.stopPropagation()"
+                >
+                    <a-checkbox-group
+                        v-model:value="slotProps.selectPermissions"
+                        :options="slotProps.permissionList"
+                    />
+                </div>
+            </template>
+            <template #state="slotProps">
+                <BadgeStatus
+                    :status="slotProps.state.value"
+                    :text="slotProps.state.text"
+                    :statusNames="{
+                        online: 'success',
+                        offline: 'error',
+                        notActive: 'warning',
+                    }"
+                ></BadgeStatus>
+            </template>
         </j-pro-table>
     </a-modal>
 </template>
@@ -162,6 +186,9 @@ const options = computed(() =>
     })),
 );
 
+const columns = props.queryColumns.filter(
+    (item) => item.dataIndex !== 'action',
+);
 const query = {
     columns: [
         {
@@ -369,8 +396,6 @@ const table: any = {
         }),
     // 整理参数并获取数据
     requestFun: async (oParams: any) => {
-        table._selectedRowKeys.value = [];
-        table.selectedRows = [];
         if (props.parentId) {
             const terms = [
                 {
@@ -421,9 +446,11 @@ const table: any = {
     },
 };
 table.init();
-const pageChange = ()=>{
-    console.log(1111,table._selectedRowKeys.value);
-}
+const selectRow = (keys:string[], rows:any[]) => {
+    const okRows = rows.filter(item=>!!item.permissionList.find((permiss:any)=>permiss.value === 'share'));
+    table.selectedRows = okRows;
+    table._selectedRowKeys.value = okRows.map(item=>item.id)
+};
 </script>
 
 <style lang="less" scoped>
diff --git a/src/views/system/Department/device/index.vue b/src/views/system/Department/device/index.vue
index 5b90ce26..abe8bb6d 100644
--- a/src/views/system/Department/device/index.vue
+++ b/src/views/system/Department/device/index.vue
@@ -11,8 +11,9 @@
             :params="queryParams"
             :rowSelection="{
                 selectedRowKeys: table._selectedRowKeys.value,
+                onChange:(keys:string[])=>table._selectedRowKeys.value = [...keys],
+                onSelectNone: table.cancelSelect
             }"
-            @cancelSelect="table.cancelSelect"
             :columns="columns"
         >
             <template #headerTitle>
@@ -425,8 +426,6 @@ const table = {
         }),
     // 整理参数并获取数据
     requestFun: async (oParams: any) => {
-        table._selectedRowKeys.value = [];
-        table.selectedRows = [];
         if (props.parentId) {
             const params = {
                 ...oParams,
diff --git a/src/views/system/Department/product/index.vue b/src/views/system/Department/product/index.vue
index cc4255c0..3aeeda59 100644
--- a/src/views/system/Department/product/index.vue
+++ b/src/views/system/Department/product/index.vue
@@ -286,6 +286,7 @@ const columns = [
         dataIndex: 'state',
         key: 'state',
         ellipsis: true,
+        width: '80px',
         search: {
             type: 'select',
             options: [