Merge branch 'main' into sqy_dev1

@@ -18,6 +18,8 @@ enum NotifyManagerApi {
   NOTICE_GET_MYDETAIL_URL = '/noticeUser',
   NOTICE_GET_PAGE_URL = '/noticeUser/page',
   NOTICE_GET_READ_URL = '/noticeUser/read',
+  NOTICE_GET_DICT_URL = '/dictItem',
+  NOTICE_GET_DEPT_URL = '/organization/me/organizations',
 }
 
 // /**
@@ -105,3 +107,23 @@ export const notifyMyGetrReadApi = (params?: NoticeQueryParam) => {
     params,
   });
 };
+
+/**
+ * 获取字典----id
+ * @param 无参数
+ */
+export const notifyDictGetApi = () => {
+  return defHttp.get({
+    url: `${NotifyManagerApi.NOTICE_GET_DICT_URL}?page=1&pageSize=10&dictId=74a3878d-1bb9-4a59-bd2d-d5e4646c7239&_t=1638928298910`,
+  });
+};
+
+/**
+ * 获取部门
+ * @param 无参数
+ */
+export const notifyOrganizationGetApi = () => {
+  return defHttp.get({
+    url: NotifyManagerApi.NOTICE_GET_DEPT_URL,
+  });
+};

 export enum RoleEnum {
-  ROLE_SYS_ADMIN = 'ROLE_SYS_ADMIN',
-  ROLE_TENANT_ADMIN = 'ROLE_TENANT_ADMIN',
-  ROLE_NORMAL_USER = 'ROLE_NORMAL_USER',
-  ROLE_PLATFORM_ADMIN = 'ROLE_PLATFORM_ADMIN',
+  ROLE_SYS_ADMIN = 'SYS_ADMIN',
+  ROLE_TENANT_ADMIN = 'TENANT_ADMIN',
+  ROLE_NORMAL_USER = 'CUSTOMER_USER',
+  ROLE_PLATFORM_ADMIN = 'PLATFORM_ADMIN',
 }

@@ -18,11 +18,11 @@
       label: '内容',
     },
     {
-      field: 'creator',
+      field: 'senderName',
       label: '发送者',
     },
     {
-      field: 'readDate',
+      field: 'createTime',
       label: '发送时间',
     },
     {

@@ -5,6 +5,9 @@ export const columns: BasicColumn[] = [
     title: '标题',
     dataIndex: 'title',
     width: 200,
+    format: (text: string, record: Recordable) => {
+      return record.title ? record.title : '无';
+    },
   },
   {
     title: '类型',
@@ -22,12 +25,15 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '发送者',
-    dataIndex: 'receiverId',
+    dataIndex: 'senderName',
     width: 200,
+    format: (text: string, record: Recordable) => {
+      return record.senderName ? record.senderName : '无';
+    },
   },
   {
     title: '发送时间',
-    dataIndex: 'readDate',
+    dataIndex: 'createTime',
     width: 200,
   },
   {
@@ -51,13 +57,22 @@ export const searchFormSchema: FormSchema[] = [
     field: 'orderField',
     label: '',
     colProps: { span: 8 },
-    component: 'ApiTreeSelect',
+    component: 'Select',
     componentProps: {
-      // api: async () => {
-      //   const data = await screenLinkOrganizationGetApi();
-      //   copyTransFun(data as any as any[]);
-      //   return data;
-      // },
+      options: [
+        {
+          label: '公告',
+          value: 'NOTICE',
+        },
+        {
+          label: '会议',
+          value: 'MEETING',
+        },
+        {
+          label: '其他',
+          value: 'OTHER',
+        },
+      ],
     },
   },
 ];

 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { Tinymce } from '/@/components/Tinymce/index';
-import { h } from 'vue';
+import { h, ref } from 'vue';
+import { findDictItemByCode } from '/@/api/system/dict';
+import { getOrganizationList } from '/@/api/system/system';
+import { copyTransFun } from '/@/utils/fnUtils';
+
+export const selectAll = ref(null);
+export const selectOrg = ref(null);
+export const selectDep = ref(null);
+export const selectPer = ref(null);
+export const isDeptId = ref(null);
 
 export const columns: BasicColumn[] = [
   {
     title: '类型',
     dataIndex: 'type',
     width: 200,
-    format: (text: string, record: Recordable) => {
-      return record.type === 'MEETING'
+    format: (_text: string, record: Recordable) => {
+      return record.type === 'NOTICE'
         ? '公告'
-        : record.type === 'MEETING1'
+        : record.type === 'MEETING'
         ? '会议'
-        : record.type === 'MEETING2'
+        : record.type === 'OTHER'
         ? '其他'
         : '';
     },
@@ -26,24 +35,24 @@ export const columns: BasicColumn[] = [
     title: '内容',
     dataIndex: 'content',
     width: 120,
+    format: (text: string, record: Recordable) => {
+      return !record.content ? '' : record.content.slice(3, record.content.length - 4);
+    },
   },
   {
     title: '发送者',
     dataIndex: 'senderName',
     width: 200,
+    format: (text: string, record: Recordable) => {
+      return record.senderName ? record.senderName : '无';
+    },
   },
   {
     title: '状态',
     dataIndex: 'status',
     width: 200,
-    format: (text: string, record: Recordable) => {
-      return record.status == 0
-        ? '草稿'
-        : record.type == 1
-        ? '已发'
-        : record.type == 2
-        ? '其他'
-        : '其他';
+    format: (_text: string, record: Recordable) => {
+      return record.status;
     },
   },
 ];
@@ -59,15 +68,15 @@ export const formSchema: FormSchema[] = [
       options: [
         {
           label: '公告',
-          value: '1',
+          value: 'NOTICE',
         },
         {
           label: '会议',
-          value: '2',
+          value: 'MEETING',
         },
         {
           label: '其他',
-          value: '3',
+          value: 'OTHER',
         },
       ],
     },
@@ -87,7 +96,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     colProps: { span: 24 },
     label: '内容',
-    defaultValue: '请输入内容',
+    defaultValue: '',
     rules: [{ required: true }],
     render: ({ model, field }) => {
       return h(Tinymce, {
@@ -99,21 +108,46 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'receiverTypeIds',
+    field: 'organizationId',
+    label: '所属组织',
+    colProps: { span: 12 },
+    component: 'ApiTreeSelect',
+    componentProps: {
+      api: async () => {
+        const data = await getOrganizationList();
+        copyTransFun(data as any as any[]);
+        return data;
+      },
+      onChange: (v) => {
+        isDeptId.value = v;
+        console.log(isDeptId.value);
+      },
+    },
+  },
+  {
+    field: 'receiverType',
+    required: true,
     label: '接收者',
     colProps: { span: 24 },
-    component: 'RadioGroup',
+    component: 'ApiSelect',
     componentProps: {
-      options: [
-        {
-          label: '全部',
-          value: '1',
-        },
-        {
-          label: '部门',
-          value: '2',
-        },
-      ],
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'receiver_type',
+      },
+      labelField: 'itemText',
+      valueField: 'itemValue',
+      onChange: (v) => {
+        if (v == 0) {
+          selectAll.value = 0;
+        } else if (v == 1) {
+          selectOrg.value = 1;
+        } else if (v == 2) {
+          selectDep.value = 2;
+        } else if (v == 3) {
+          selectPer.value = 3;
+        }
+      },
     },
   },
   {
@@ -132,13 +166,22 @@ export const searchFormSchema: FormSchema[] = [
     field: 'orderField',
     label: '',
     colProps: { span: 8 },
-    component: 'ApiSelect',
+    component: 'Select',
     componentProps: {
-      // api: async () => {
-      //   const data = await screenLinkOrganizationGetApi();
-      //   copyTransFun(data as any as any[]);
-      //   return data;
-      // },
+      options: [
+        {
+          label: '公告',
+          value: 'NOTICE',
+        },
+        {
+          label: '会议',
+          value: 'MEETING',
+        },
+        {
+          label: '其他',
+          value: 'OTHER',
+        },
+      ],
     },
   },
 ];

@@ -13,9 +13,20 @@
         <TableAction
           :actions="[
             {
+              label: '查看',
+              icon: 'clarity:note-edit-line',
+              onClick: handleView.bind(null, record),
+              // ifShow: (_action) => {
+              //   return record.status == '已发布';
+              // },
+            },
+            {
               label: '编辑',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
+              // ifShow: (_action) => {
+              //   return record.status == '草稿';
+              // },
             },
             {
               label: '删除',
@@ -31,25 +42,29 @@
       </template>
     </BasicTable>
     <NotifyManagerDrawer
+      v-if="isJudgeStatus"
       :getChildrenData="echoEditData"
       @register="registerDrawer"
       @success="handleSuccess"
     />
+    <tableViewChild v-if="!isJudgeStatus" @register="registerDrawer" />
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, reactive } from 'vue';
+  import { defineComponent, reactive, ref } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useDrawer } from '/@/components/Drawer';
   import NotifyManagerDrawer from './useDrawer.vue';
+  import tableViewChild from './viewDetailDrawer.vue';
   import { columns, searchFormSchema } from './config.d';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { notifyGetTableApi, notifyDeleteApi } from '/@/api/stationnotification/stationnotifyApi';
 
   export default defineComponent({
     name: 'index',
-    components: { BasicTable, NotifyManagerDrawer, TableAction },
+    components: { BasicTable, NotifyManagerDrawer, TableAction, tableViewChild },
     setup() {
+      let isJudgeStatus = ref(true);
       let selectedRowKeys: Array<string> = [];
       let echoEditData = reactive({});
       const [registerDrawer, { openDrawer }] = useDrawer();
@@ -81,6 +96,7 @@
         openDrawer(true, {
           isUpdate: false,
         });
+        isJudgeStatus.value = true;
       }
 
       const useSelectionChange = () => {
@@ -93,16 +109,22 @@
         createMessage.success('删除成功');
         reload();
       }
-
+      const handleView = (record: Recordable) => {
+        openDrawer(true, {
+          record,
+          isUpdate: true,
+        });
+        isJudgeStatus.value = false;
+      };
       function handleEdit(record: Recordable) {
         openDrawer(true, {
           record,
           isUpdate: true,
         });
+        isJudgeStatus.value = true;
       }
       async function handleDelete(record: Recordable) {
-        console.log(record.id);
-        let ids = '1';
+        let ids = record.id;
         await notifyDeleteApi(ids);
         createMessage.success('删除成功');
         reload();
@@ -111,6 +133,8 @@
         reload();
       }
       return {
+        isJudgeStatus,
+        handleView,
         useSelectionChange,
         echoEditData,
         registerTable,

@@ -18,24 +18,29 @@
   </BasicDrawer>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, computed, unref } from 'vue';
+  import { defineComponent, ref, computed, unref, reactive, watch, onMounted } from 'vue';
   import { Button } from '/@/components/Button';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { formSchema } from './config.d';
+  import { formSchema, selectAll, selectOrg, selectDep, selectPer, isDeptId } from './config.d';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import {
     notifyAddDraftApi,
     notifyAddLeaseApi,
   } from '/@/api/stationnotification/stationnotifyApi';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { getOrganizationList } from '/@/api/system/system';
 
   export default defineComponent({
     name: 'ConfigDrawer',
     components: { BasicDrawer, BasicForm, Button },
     emits: ['success', 'register'],
-    setup() {
+    setup(_, { emit }) {
       const { createMessage } = useMessage();
       const isUpdate = ref(true);
+      const pointArray = ref([]);
+      const isJudgeWherePoint = ref([]);
+      const newArray = ref([]);
+      let getAllData: any = reactive({});
       const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
         labelWidth: 120,
         schemas: formSchema,
@@ -59,32 +64,103 @@
         closeDrawer();
       };
 
+      watch([selectAll, selectOrg, selectDep, selectPer, isDeptId], (newV) => {
+        isJudgeWherePoint.value = newV;
+      });
+
+      onMounted(() => {
+        getOrganizationList().then((res) => {
+          res.map((m) => {
+            if (m.children) {
+              m.children.map((m1) => {
+                newArray.value.push(m1.id);
+              });
+            }
+          });
+        });
+      });
+
       async function handleSend() {
         if (!unref(isUpdate)) {
           const values = await validate();
-          // saveForm = getFieldsValue();
-          await notifyAddLeaseApi(values);
+          Object.assign(getAllData, values);
+          isJudgeWherePoint.value.forEach((f) => {
+            if (f == 0) {
+              pointArray.value = [];
+            } else if (f == 1) {
+              //组织
+              pointArray.value.push(getAllData.organizationId);
+            } else if (f == 2) {
+              //部门
+              let findDeptId = newArray.value.find((f) => {
+                return f == isJudgeWherePoint.value[4];
+              });
+              console.log(findDeptId);
+              pointArray.value.push(findDeptId);
+            } else if (f == 3) {
+              //个人
+              pointArray.value = [3];
+            }
+          });
+          getAllData.pointId = pointArray.value;
+          await notifyAddLeaseApi(getAllData);
           createMessage.success('新增成功');
+          closeDrawer();
+          emit('success');
+          resetFields();
+          setTimeout(() => {
+            pointArray.value = [];
+            isJudgeWherePoint.value = [];
+          }, 1000);
         }
         if (unref(isUpdate)) {
           const values = await validate();
           // saveForm = getFieldsValue();
           await notifyAddLeaseApi(values);
           createMessage.success('编辑成功');
+          closeDrawer();
+          emit('success');
         }
       }
       async function handleSubmit() {
         if (!unref(isUpdate)) {
           const values = await validate();
-          // saveForm = getFieldsValue();
-          await notifyAddDraftApi(values);
+          Object.assign(getAllData, values);
+          isJudgeWherePoint.value.forEach((f) => {
+            if (f == 0) {
+              pointArray.value = [];
+            } else if (f == 1) {
+              //组织
+              pointArray.value.push(getAllData.organizationId);
+            } else if (f == 2) {
+              //部门
+              let findDeptId = newArray.value.find((f) => {
+                return f == isJudgeWherePoint.value[4];
+              });
+              pointArray.value.push(findDeptId);
+            } else if (f == 3) {
+              //个人
+              pointArray.value = [3];
+            }
+          });
+          getAllData.pointId = pointArray.value;
+          await notifyAddDraftApi(getAllData);
           createMessage.success('新增成功');
+          closeDrawer();
+          emit('success');
+          resetFields();
+          setTimeout(() => {
+            pointArray.value = [];
+            isJudgeWherePoint.value = [];
+          }, 1000);
         }
         if (unref(isUpdate)) {
           const values = await validate();
           // saveForm = getFieldsValue();
           await notifyAddDraftApi(values);
           createMessage.success('编辑成功');
+          closeDrawer();
+          emit('success');
         }
       }
       return {

+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    @register="registerDrawer"
+    :showFooter="false"
+    :title="getTitle"
+    width="800px"
+  >
+    <PageWrapper title="我的通知详情">
+      <Description @register="register1" class="mt-4" />
+    </PageWrapper>
+    <BasicTable :columns="columns" :dataSource="tableData">
+      <span></span>
+    </BasicTable>
+  </BasicDrawer>
+</template>
+<script lang="ts">
+  import { defineComponent, ref, computed, unref } from 'vue';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { BasicTable } from '/@/components/Table';
+  import { Description, DescItem, useDescription } from '/@/components/Description/index';
+  import { PageWrapper } from '/@/components/Page';
+
+  const schema: DescItem[] = [
+    {
+      field: 'title',
+      label: '标题',
+    },
+    {
+      field: 'content',
+      label: '内容',
+    },
+    {
+      field: 'senderName',
+      label: '发送者',
+    },
+    {
+      field: 'senderDate',
+      label: '发送时间',
+    },
+    {
+      field: 'type',
+      label: '类型',
+      render: (_, data) => {
+        return data.type === 'MEETING'
+          ? '公告'
+          : data.type === 'MEETING1'
+          ? '会议'
+          : data.type === 'MEETING2'
+          ? '其他'
+          : '';
+      },
+    },
+  ];
+
+  export default defineComponent({
+    name: 'ConfigDrawer',
+    components: { BasicDrawer, BasicTable, Description, PageWrapper },
+    emits: ['success', 'register'],
+    setup() {
+      let tableData: [] = ref([]);
+      const columns: BasicColumn[] = [
+        {
+          title: '接收者',
+          dataIndex: 'senderName',
+        },
+        {
+          title: '阅读状态',
+          dataIndex: 'status',
+        },
+        {
+          title: '阅读时间',
+          dataIndex: 'createTime',
+        },
+      ];
+      const isUpdate = ref(true);
+      const [registerDrawer, { setDrawerProps }] = useDrawerInner(async (data) => {
+        setDrawerProps({ confirmLoading: false });
+        isUpdate.value = !!data?.isUpdate;
+        tableData.value.push(data.record);
+      });
+      const getTitle = computed(() => (!unref(isUpdate) ? '查看通知' : '查看通知'));
+      const [register1] = useDescription({
+        title: '详情',
+        bordered: false,
+        data: tableData,
+        schema: schema,
+      });
+      return {
+        register1,
+        tableData,
+        getTitle,
+        columns,
+        registerDrawer,
+      };
+    },
+  });
+</script>