From 4531e7fd103f59ead9258f149a836c9b2fd5ff50 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Mon, 27 Feb 2023 18:05:32 +0800
Subject: [PATCH] =?UTF-8?q?:rocket:=20=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/common/push/pushBlacklist/index.vue | 19 ++---
 .../push/pushBlacklist/passList.data.ts       | 26 +++----
 .../common/push/pushThirdParty/index.vue      | 78 ++++++++++++++++++-
 .../common/push/pushTodoThirdParty/index.vue  | 28 -------
 src/views/common/push/pushWhitelist/index.vue | 19 ++---
 .../push/pushWhitelist/passList.data.ts       | 25 +++---
 src/views/system/user/index.vue               | 49 +++++++++++-
 7 files changed, 163 insertions(+), 81 deletions(-)

diff --git a/src/views/common/push/pushBlacklist/index.vue b/src/views/common/push/pushBlacklist/index.vue
index 22801e3..a7d0c6e 100644
--- a/src/views/common/push/pushBlacklist/index.vue
+++ b/src/views/common/push/pushBlacklist/index.vue
@@ -4,27 +4,22 @@
                 @selection-change="handleSelectionChange"
     >
       <template #toolbar>
-        <a-button type="primary"
+        <!--<a-button type="primary"
                   @click="handleAdd()"
         >新增黑名单</a-button>
         <a-button type="primary"
                   :disabled="state.single"
                   @click="handleEdit()"
-        >修改黑名单</a-button>
+        >修改黑名单</a-button>-->
         <a-button type="primary"
                   :disabled="state.multiple"
                   @click="handleDel()"
-        >删除黑名单</a-button>
+        >移除黑名单</a-button>
       </template>
       <template #action="{ record }">
         <TableAction :actions="[
           {
-            label: '编辑',
-            icon: 'fa6-regular:pen-to-square',
-            onClick: handleEdit.bind(null, record)
-          },
-          {
-            label: '删除',
+            label: '移除',
             icon: 'ant-design:delete-outlined',
             color: 'error',
             onClick: handleDel.bind(null, record)
@@ -93,7 +88,7 @@
       fixed: false
     },
     searchInfo: {
-      type: "0"
+      type: '0'
     },
     handleSearchInfoFn: () => clearSelectedRowKeys()
   });
@@ -122,10 +117,10 @@
     createConfirm({
       iconType: 'warning',
       title: '警告',
-      content: `是否确认删除编号为${ids}的数据?`,
+      content: `是否确认移除编号为${ids}的数据?`,
       onOk: async () => {
         await delPushPassList(ids);
-        createMessage.success('删除成功!');
+        createMessage.success('移除成功!');
         handleRefreshTable();
       }
     });
diff --git a/src/views/common/push/pushBlacklist/passList.data.ts b/src/views/common/push/pushBlacklist/passList.data.ts
index f1deebf..21f0f0a 100644
--- a/src/views/common/push/pushBlacklist/passList.data.ts
+++ b/src/views/common/push/pushBlacklist/passList.data.ts
@@ -4,12 +4,12 @@ import { FormSchema } from '/@/components/Table';
 /** 表格列配置 */
 export const columns: BasicColumn[] = [
   {
-    title: '推送名称',
-    dataIndex: 'name'
+    title: '发送方用户id',
+    dataIndex: 'fromPushId'
   },
   {
-    title: '推送ID',
-    dataIndex: 'pushManageId'
+    title: '对方用户id',
+    dataIndex: 'toPushId'
   },
   {
     title: '创建人',
@@ -25,11 +25,11 @@ export const columns: BasicColumn[] = [
 /** 搜索表单配置 */
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'name',
-    label: '推送名称',
+    field: 'fromPushId',
+    label: '发送方用户id',
     component: 'Input',
     componentProps: {
-      placeholder: '请输入推送名称',
+      placeholder: '请输入发送方用户id',
     },
     colProps: { span: 6 }
   }
@@ -45,14 +45,14 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'type',
-    label: '名单类型',
+    label: '白名单类型',
     component: 'Input',
-    defaultValue: "0",
+    defaultValue: '0',
     show: false
   },
   {
-    field: 'name',
-    label: '推送名称',
+    field: 'fromPushId',
+    label: '发送方用户id',
     component: 'Input',
     required: true,
     colProps: {
@@ -60,8 +60,8 @@ export const formSchema: FormSchema[] = [
     }
   },
   {
-    field: 'pushManageId',
-    label: '推送ID',
+    field: 'toPushId',
+    label: '对方用户id',
     component: 'Input',
     required: true,
     colProps: {
diff --git a/src/views/common/push/pushThirdParty/index.vue b/src/views/common/push/pushThirdParty/index.vue
index 1d2eda8..ddab040 100644
--- a/src/views/common/push/pushThirdParty/index.vue
+++ b/src/views/common/push/pushThirdParty/index.vue
@@ -10,14 +10,29 @@
         <a-button type="primary"
                   :disabled="state.single"
                   @click="handleEdit()"
-        >修改第三方</a-button>
+        >修改企业</a-button>
         <a-button type="primary"
                   :disabled="state.multiple"
                   @click="handleDel()"
-        >删除第三方</a-button>
+        >删除企业</a-button>
       </template>
       <template #action="{ record }">
         <TableAction :actions="[
+          {
+            label: '加入黑名单',
+            icon: 'fa6-regular:pen-to-square',
+            onClick: handleBlacklist.bind(null, record)
+          },
+          {
+            label: '加入白名单',
+            icon: 'fa6-regular:pen-to-square',
+            onClick: handleWhitelist.bind(null, record)
+          },
+          {
+            label: '推送申请',
+            icon: 'fa6-regular:pen-to-square',
+            onClick: handlePushAdd.bind(null, record)
+          },
           {
             label: '编辑',
             icon: 'fa6-regular:pen-to-square',
@@ -51,7 +66,12 @@
   import ThirdPartyModal from './ThirdPartyModal.vue';
   import { columns, searchFormSchema } from './thirdParty.data';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { addPushPassList } from '/@/api/platform/common/controller/pushPassList';
+  import { addPushUserManage } from '/@/api/platform/common/controller/pushUserManage';
+  import {useUserStore} from '/@/store/modules/user';
 
+  const userStore = useUserStore();
+  const userInfoStore = userStore.getUserInfo;
   /** 类型规范统一声明定义区域 */
   interface TableState {
     single: boolean;
@@ -84,7 +104,7 @@
     clickToRowSelect: false,
     showIndexColumn: false,
     actionColumn: {
-      width: 220,
+      width: 450,
       title: '操作',
       dataIndex: 'action',
       slots: { customRender: 'action' },
@@ -114,6 +134,58 @@
     openModal(true, { _tag: 'edit', record });
   }
 
+  function handleWhitelist(record?: Recordable) {
+    createConfirm({
+      iconType: 'warning',
+      title: '警告',
+      content: `是否添加白名单编号为${record?.userId}的数据?`,
+      onOk: async () => {
+        await addPushPassList({
+          fromPushId: record?.userId,
+          toPushId: userInfoStore.id,
+          type: '1'
+        });
+        createMessage.success('添加成功!');
+        handleRefreshTable();
+      }
+    });
+  }
+
+  function handleBlacklist(record?: Recordable) {
+    createConfirm({
+      iconType: 'warning',
+      title: '警告',
+      content: `是否添加黑名单编号为${record?.userId}的数据?`,
+      onOk: async () => {
+        await addPushPassList({
+          fromPushId: record?.userId,
+          toPushId: userInfoStore.id,
+          type: '0'
+        });
+        createMessage.success('添加成功!');
+        handleRefreshTable();
+      }
+    });
+  }
+
+  function handlePushAdd(record?: Recordable) {
+    createConfirm({
+      iconType: 'warning',
+      title: '警告',
+      content: `是否添加推送申请编号为${record?.userId}的数据?`,
+      onOk: async () => {
+        await addPushUserManage({
+          fromUserId: record?.userId,
+          toUserId: userInfoStore.id,
+          userName: record?.entName,
+          type: '1'
+        });
+        createMessage.success('申请成功!');
+        handleRefreshTable();
+      }
+    });
+  }
+
   /** 删除按钮操作,行内删除 */
   async function handleDel(record?: Recordable) {
     const ids = record?.id || getSelectRowKeys();
diff --git a/src/views/common/push/pushTodoThirdParty/index.vue b/src/views/common/push/pushTodoThirdParty/index.vue
index 4da1b0c..619cdfd 100644
--- a/src/views/common/push/pushTodoThirdParty/index.vue
+++ b/src/views/common/push/pushTodoThirdParty/index.vue
@@ -16,11 +16,6 @@
             icon: 'fa6-regular:pen-to-square',
             onClick: handleEdit.bind(null, record)
           },
-          {
-            label: '推送申请',
-            icon: 'fa6-regular:pen-to-square',
-            onClick: handlePushAdd.bind(null, record)
-          },
           {
             label: '删除',
             icon: 'ant-design:delete-outlined',
@@ -45,15 +40,10 @@
   import { reactive, toRaw } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { listPushThirdParty, delPushThirdParty } from '/@/api/platform/common/controller/pushThirdParty';
-  import { addPushUserManage } from '/@/api/platform/common/controller/pushUserManage';
   import { useModal } from '/@/components/Modal';
   import ThirdPartyModal from './ThirdPartyModal.vue';
   import { columns, searchFormSchema } from './thirdParty.data';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import {useUserStore} from '/@/store/modules/user';
-
-  const userStore = useUserStore();
-  const userInfoStore = userStore.getUserInfo;
 
   /** 类型规范统一声明定义区域 */
   interface TableState {
@@ -117,24 +107,6 @@
     openModal(true, { _tag: 'edit', record });
   }
 
-  function handlePushAdd(record?: Recordable) {
-    createConfirm({
-      iconType: 'warning',
-      title: '警告',
-      content: `是否添加推送申请编号为${record?.userId}的数据?`,
-      onOk: async () => {
-        await addPushUserManage({
-          fromUserId: record?.userId,
-          toUserId: userInfoStore.id,
-          userName: record?.entName,
-          type: '1'
-        });
-        createMessage.success('申请成功!');
-        handleRefreshTable();
-      }
-    });
-  }
-
   /** 删除按钮操作,行内删除 */
   async function handleDel(record?: Recordable) {
     const ids = record?.id || getSelectRowKeys();
diff --git a/src/views/common/push/pushWhitelist/index.vue b/src/views/common/push/pushWhitelist/index.vue
index 25b4126..315cf4f 100644
--- a/src/views/common/push/pushWhitelist/index.vue
+++ b/src/views/common/push/pushWhitelist/index.vue
@@ -4,27 +4,22 @@
                 @selection-change="handleSelectionChange"
     >
       <template #toolbar>
-        <a-button type="primary"
+        <!--<a-button type="primary"
                   @click="handleAdd()"
         >新增白名单</a-button>
         <a-button type="primary"
                   :disabled="state.single"
                   @click="handleEdit()"
-        >修改白名单</a-button>
+        >修改白名单</a-button>-->
         <a-button type="primary"
                   :disabled="state.multiple"
                   @click="handleDel()"
-        >删除白名单</a-button>
+        >移除白名单</a-button>
       </template>
       <template #action="{ record }">
         <TableAction :actions="[
           {
-            label: '编辑',
-            icon: 'fa6-regular:pen-to-square',
-            onClick: handleEdit.bind(null, record)
-          },
-          {
-            label: '删除',
+            label: '移除',
             icon: 'ant-design:delete-outlined',
             color: 'error',
             onClick: handleDel.bind(null, record)
@@ -91,7 +86,7 @@
       fixed: false
     },
     searchInfo: {
-      type: "1"
+      type: '1'
     },
     handleSearchInfoFn: () => clearSelectedRowKeys()
   });
@@ -120,10 +115,10 @@
     createConfirm({
       iconType: 'warning',
       title: '警告',
-      content: `是否确认删除编号为${ids}的数据?`,
+      content: `是否确认移除编号为${ids}的数据?`,
       onOk: async () => {
         await delPushPassList(ids);
-        createMessage.success('删除成功!');
+        createMessage.success('移除成功!');
         handleRefreshTable();
       }
     });
diff --git a/src/views/common/push/pushWhitelist/passList.data.ts b/src/views/common/push/pushWhitelist/passList.data.ts
index 55d7319..151ff9f 100644
--- a/src/views/common/push/pushWhitelist/passList.data.ts
+++ b/src/views/common/push/pushWhitelist/passList.data.ts
@@ -4,12 +4,12 @@ import { FormSchema } from '/@/components/Table';
 /** 表格列配置 */
 export const columns: BasicColumn[] = [
   {
-    title: '推送名称',
-    dataIndex: 'name'
+    title: '发送方用户id',
+    dataIndex: 'fromPushId'
   },
   {
-    title: '推送ID',
-    dataIndex: 'pushManageId'
+    title: '对方用户id',
+    dataIndex: 'toPushId'
   },
   {
     title: '创建人',
@@ -25,11 +25,11 @@ export const columns: BasicColumn[] = [
 /** 搜索表单配置 */
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'name',
-    label: '推送名称',
+    field: 'fromPushId',
+    label: '发送方用户id',
     component: 'Input',
     componentProps: {
-      placeholder: '请输入推送名称',
+      placeholder: '请输入发送方用户id',
     },
     colProps: { span: 6 }
   }
@@ -47,11 +47,12 @@ export const formSchema: FormSchema[] = [
     field: 'type',
     label: '白名单类型',
     component: 'Input',
-    defaultValue: '1'
+    defaultValue: '1',
+    show: false
   },
   {
-    field: 'name',
-    label: '推送名称',
+    field: 'fromPushId',
+    label: '发送方用户id',
     component: 'Input',
     required: true,
     colProps: {
@@ -59,8 +60,8 @@ export const formSchema: FormSchema[] = [
     }
   },
   {
-    field: 'pushManageId',
-    label: '推送ID',
+    field: 'toPushId',
+    label: '对方用户id',
     component: 'Input',
     required: true,
     colProps: {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 8ccd5fa..ce8935b 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -27,6 +27,16 @@
       </template>
       <template #action="{ record }">
         <TableAction :actions="[
+          {
+            label: '加入黑名单',
+            icon: 'fa6-regular:pen-to-square',
+            onClick: handleBlacklist.bind(null, record)
+          },
+          {
+            label: '加入白名单',
+            icon: 'fa6-regular:pen-to-square',
+            onClick: handleWhitelist.bind(null, record)
+          },
           {
             label: '推送申请',
             icon: 'fa6-regular:pen-to-square',
@@ -79,6 +89,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import {addPushUserManage} from '/@/api/platform/common/controller/pushUserManage';
   import {useUserStore} from '/@/store/modules/user';
+  import {addPushPassList} from '/@/api/platform/common/controller/pushPassList';
 
   const userStore = useUserStore();
   const userInfoStore = userStore.getUserInfo;
@@ -136,7 +147,7 @@
         showIndexColumn: false,
         searchInfo: state.searchInfo,
         actionColumn: {
-          width: 350,
+          width: 550,
           title: '操作',
           dataIndex: 'action',
           slots: { customRender: 'action' },
@@ -163,6 +174,40 @@
         });
       }
 
+      function handleWhitelist(record?: Recordable) {
+        createConfirm({
+          iconType: 'warning',
+          title: '警告',
+          content: `是否添加白名单编号为${record?.userId}的数据?`,
+          onOk: async () => {
+            await addPushPassList({
+              fromPushId: record?.userId,
+              toPushId: userInfoStore.id,
+              type: '1'
+            });
+            createMessage.success('添加成功!');
+            handleRefreshTable();
+          }
+        });
+      }
+
+      function handleBlacklist(record?: Recordable) {
+        createConfirm({
+          iconType: 'warning',
+          title: '警告',
+          content: `是否添加黑名单编号为${record?.userId}的数据?`,
+          onOk: async () => {
+            await addPushPassList({
+              fromPushId: record?.userId,
+              toPushId: userInfoStore.id,
+              type: '0'
+            });
+            createMessage.success('添加成功!');
+            handleRefreshTable();
+          }
+        });
+      }
+
       /** 处理多选框选中数据 */
       function handleSelectionChange(selection?: Recordable) {
         const rowSelection = toRaw(selection?.keys) || [];
@@ -216,6 +261,8 @@
       }
 
       return {
+        handleBlacklist,
+        handleWhitelist,
         handlePushAdd,
         state,
         registerTable,