From cee2e6cf027ac448e4e7fcaf90f14144eca967f4 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Wed, 29 Mar 2023 14:43:56 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/controller/pushEnterprise.ts       |  12 +-
 .../platform/common/entity/pushEnterprise.ts  |   2 +-
 ...hirdPartyModal.vue => EnterpriseModal.vue} |  24 ++--
 ...{thirdParty.data.ts => enterprise.data.ts} |  78 ++++++++++---
 .../common/push/pushEnterprise/index.vue      | 104 +++---------------
 5 files changed, 95 insertions(+), 125 deletions(-)
 rename src/views/common/push/pushEnterprise/{ThirdPartyModal.vue => EnterpriseModal.vue} (73%)
 rename src/views/common/push/pushEnterprise/{thirdParty.data.ts => enterprise.data.ts} (62%)

diff --git a/src/api/platform/common/controller/pushEnterprise.ts b/src/api/platform/common/controller/pushEnterprise.ts
index 9f55b8a..ca66586 100644
--- a/src/api/platform/common/controller/pushEnterprise.ts
+++ b/src/api/platform/common/controller/pushEnterprise.ts
@@ -1,4 +1,4 @@
-import type { PushChatMessage, PushChatMessageParams, PushChatMessageResult } from '/@/api/platform/common/entity/pushChatMessage';
+import type { PushEnterprise, PushEnterpriseParams, PushEnterpriseResult } from '/@/api/platform/common/entity/pushEnterprise';
 import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
@@ -11,15 +11,15 @@ enum Api {
   revokeAuth = '/common_proxy/common/pushEnterprise/revokeAuth'
 }
 
-export const listPushEnterprise = (params?: Partial<PushChatMessageParams>) => defHttp.get<PushChatMessageResult>({ url: Api.list, params }, { isReturnResultResponse: true });
+export const listPushEnterprise = (params?: Partial<PushEnterpriseParams>) => defHttp.get<PushEnterpriseResult>({ url: Api.list, params }, { isReturnResultResponse: true });
 
-export const addPushEnterprise = (params: Partial<PushChatMessage>) => defHttp.post({ url: Api.add, data: params });
+export const addPushEnterprise = (params: Partial<PushEnterprise>) => defHttp.post({ url: Api.add, data: params });
 
-export const editPushEnterprise = (params: Partial<PushChatMessage>) => defHttp.put({ url: Api.edit, data: params });
+export const editPushEnterprise = (params: Partial<PushEnterprise>) => defHttp.put({ url: Api.edit, data: params });
 
-export const getPushEnterprise = (id: string) => defHttp.get<PushChatMessage>({ url: `${Api.get}/${id}` });
+export const getPushEnterprise = (id: string) => defHttp.get<PushEnterprise>({ url: `${Api.get}/${id}` });
 
-export const getPushEnterpriseByUserId = (id: string) => defHttp.get<PushChatMessage>({ url: `${Api.getByUserId}/${id}` });
+export const getPushEnterpriseByUserId = (id: string) => defHttp.get<PushEnterprise>({ url: `${Api.getByUserId}/${id}` });
 
 export const revokeAuthPushEnterprise = () => defHttp.delete({ url: Api.revokeAuth });
 
diff --git a/src/api/platform/common/entity/pushEnterprise.ts b/src/api/platform/common/entity/pushEnterprise.ts
index 5b46a28..9661574 100644
--- a/src/api/platform/common/entity/pushEnterprise.ts
+++ b/src/api/platform/common/entity/pushEnterprise.ts
@@ -8,7 +8,7 @@ export interface PushEnterprise extends CommonEntity {
   name: string;
   repName: string;
   phone: string;
-  license: string;
+  license: string | string[];
   userId: string;
   creditCode: string;
   idCard: string;
diff --git a/src/views/common/push/pushEnterprise/ThirdPartyModal.vue b/src/views/common/push/pushEnterprise/EnterpriseModal.vue
similarity index 73%
rename from src/views/common/push/pushEnterprise/ThirdPartyModal.vue
rename to src/views/common/push/pushEnterprise/EnterpriseModal.vue
index 3862f1a..d3f60b3 100644
--- a/src/views/common/push/pushEnterprise/ThirdPartyModal.vue
+++ b/src/views/common/push/pushEnterprise/EnterpriseModal.vue
@@ -9,16 +9,10 @@
   </BasicModal>
 </template>
 <script lang="ts" setup>
-  /**
-   * 提供模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
-   * 采用vben-动态表格表单封装组件编写,采用 setup 写法
-   * Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
-   * author entfrm开发团队-王翔
-   */
   import { ref, unref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
-  import { formSchema } from './thirdParty.data';
-  import { addPushThirdParty, editPushThirdParty, getPushThirdParty, getPushThirdPartyByUserId } from '/@/api/platform/common/controller/pushThirdParty';
+  import { formSchema } from './enterprise.data';
+  import { addPushEnterprise, editPushEnterprise, getPushEnterprise, getPushEnterpriseByUserId } from '/@/api/platform/common/controller/pushEnterprise';
   import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal';
 
   /** 通用变量统一声明区域 */
@@ -46,11 +40,16 @@
         break;
       case 'edit':
         props.title = '编辑企业';
-        await setFieldsValue(await getPushThirdParty(refId));
+        let enterprise = await getPushEnterprise(refId);
+        enterprise.license = String(enterprise.license).split(',');
+        await setFieldsValue(enterprise);
         break;
       case 'view':
+        // 查看当前用户的所关联的企业
         props.title = '查看企业';
-        await setFieldsValue(await getPushThirdPartyByUserId(refId));
+        let enterpriseByUserId = await getPushEnterpriseByUserId(refId);
+        enterpriseByUserId.license = String(enterpriseByUserId.license).split(',');
+        await setFieldsValue(enterpriseByUserId);
         await setProps({ disabled: true });
         break;
     }
@@ -63,15 +62,16 @@
     try {
       // 提取验证数据
       const formData = await validate();
+      formData.license = Array(formData.license).join(',');
       // 处理提交之前逻辑
       setModalProps({ confirmLoading: true });
       // 采用tag标签区分操作
       switch (unref(tag)) {
         case 'add':
-          await addPushThirdParty(formData);
+          await addPushEnterprise(formData);
           break;
         case 'edit':
-          await editPushThirdParty(formData);
+          await editPushEnterprise(formData);
           break;
       }
       // 处理提交完成之后逻辑
diff --git a/src/views/common/push/pushEnterprise/thirdParty.data.ts b/src/views/common/push/pushEnterprise/enterprise.data.ts
similarity index 62%
rename from src/views/common/push/pushEnterprise/thirdParty.data.ts
rename to src/views/common/push/pushEnterprise/enterprise.data.ts
index 59a65d1..990debd 100644
--- a/src/views/common/push/pushEnterprise/thirdParty.data.ts
+++ b/src/views/common/push/pushEnterprise/enterprise.data.ts
@@ -1,15 +1,17 @@
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
+import { listUser } from '/@/api/platform/system/controller/user';
+import { commonUpload } from '/@/api/platform/core/controller/upload';
 
 /** 表格列配置 */
 export const columns: BasicColumn[] = [
   {
-    title: '法定代表人',
-    dataIndex: 'statutoryRepName',
+    title: '企业名称',
+    dataIndex: 'name'
   },
   {
-    title: '企业名称',
-    dataIndex: 'entName'
+    title: '法定代表人',
+    dataIndex: 'repName',
   },
   {
     title: '手机号',
@@ -32,7 +34,7 @@ export const columns: BasicColumn[] = [
 /** 搜索表单配置 */
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'entName',
+    field: 'name',
     label: '企业名称',
     component: 'Input',
     componentProps: {
@@ -51,28 +53,31 @@ export const formSchema: FormSchema[] = [
     show: false,
   },
   {
-    field: 'statutoryRepName',
-    label: '法定代表人',
-    component: 'Input',
-    required: true,
-  },
-  {
-    field: 'idCard',
-    label: '身份证',
+    field: 'name',
+    label: '企业名称',
     component: 'Input',
     required: true,
+    colProps: {
+      span: 12
+    },
   },
   {
-    field: 'entName',
-    label: '企业名称',
+    field: 'repName',
+    label: '法定代表人',
     component: 'Input',
     required: true,
+    colProps: {
+      span: 12
+    },
   },
   {
     field: 'phone',
     label: '手机号',
     component: 'Input',
     required: true,
+    colProps: {
+      span: 12
+    },
     rules: [
       {
         required: true,
@@ -85,11 +90,54 @@ export const formSchema: FormSchema[] = [
       }
     ]
   },
+  {
+    field: 'userId',
+    label: '关联用户',
+    component: 'ApiSelect',
+    required: true,
+    componentProps: {
+      api: listUser,
+      params: {
+        size: 99
+      },
+      labelField: 'nickName',
+      valueField: 'id',
+      resultField: 'data'
+    },
+  },
+  {
+    field: 'license',
+    label: '营业执照',
+    component: 'Upload',
+    required: true,
+    componentProps: {
+      multiple: true,
+      maxSize: 20,
+      maxNumber: 10,
+      showUploadSaveBtn: true,
+      showPreviewNumber: true,
+      emptyHidePreview: true,
+      api: commonUpload,
+      accept: ['image/*']
+    }
+  },
   {
     field: 'creditCode',
     label: '信用代码',
     component: 'Input',
     required: true,
+    colProps: {
+      span: 12
+    },
+  },
+  {
+    field: 'idCard',
+    label: '身份证',
+    component: 'Input',
+    required: true,
+    colProps: {
+      span: 12
+    },
   },
   {
     field: 'detailedAddress',
diff --git a/src/views/common/push/pushEnterprise/index.vue b/src/views/common/push/pushEnterprise/index.vue
index cbf2ebc..d0bcd60 100644
--- a/src/views/common/push/pushEnterprise/index.vue
+++ b/src/views/common/push/pushEnterprise/index.vue
@@ -5,9 +5,9 @@
       @selection-change="handleSelectionChange"
     >
       <template #toolbar>
-        <!--<a-button type="primary"
+        <a-button type="primary"
                   @click="handleAdd()"
-        >新增第三方</a-button>-->
+        >新增企业</a-button>
         <a-button
           type="primary"
           :disabled="state.single"
@@ -19,24 +19,9 @@
           @click="handleDel()"
         >删除企业</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)
-            },
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.key === 'action'">
+          <TableAction :actions="[
             {
               label: '编辑',
               icon: 'fa6-regular:pen-to-square',
@@ -48,34 +33,24 @@
               color: 'error',
               onClick: handleDel.bind(null, record)
             }]"
-        />
+          />
+        </template>
       </template>
     </BasicTable>
     <!--弹出窗体区域-->
-    <ThirdPartyModal @register="registerModal" @success="handleRefreshTable"/>
+    <EnterpriseModal @register="registerModal" @success="handleRefreshTable"/>
   </div>
 </template>
 
 <script lang="ts" setup>
-  /**
-   * 提供模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
-   * 采用vben-动态表格表单封装组件编写,采用 setup 写法
-   * Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
-   * author entfrm开发团队-王翔
-   */
   import { reactive, toRaw } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { listPushThirdParty, delPushThirdParty } from '/@/api/platform/common/controller/pushThirdParty';
+  import { listPushEnterprise, delPushEnterprise } from '/@/api/platform/common/controller/pushEnterprise';
   import { useModal } from '/@/components/Modal';
-  import ThirdPartyModal from './ThirdPartyModal.vue';
-  import { columns, searchFormSchema } from './thirdParty.data';
+  import EnterpriseModal from './EnterpriseModal.vue';
+  import { columns, searchFormSchema } from './enterprise.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;
@@ -93,7 +68,7 @@
   const [registerModal, { openModal }] = useModal();
   const [registerTable, { reload, clearSelectedRowKeys, getSelectRowKeys }] = useTable({
     title: '企业列表',
-    api: listPushThirdParty,
+    api: listPushEnterprise,
     rowKey: 'id',
     columns,
     formConfig: {
@@ -114,7 +89,6 @@
       width: 450,
       title: '操作',
       dataIndex: 'action',
-      slots: { customRender: 'action' },
       fixed: false
     },
     searchInfo: {
@@ -141,58 +115,6 @@
     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();
@@ -201,7 +123,7 @@
       title: '警告',
       content: `是否确认删除编号为${ids}的数据?`,
       onOk: async () => {
-        await delPushThirdParty(ids);
+        await delPushEnterprise(ids);
         createMessage.success('删除成功!');
         handleRefreshTable();
       }