Merge remote-tracking branch 'origin/dev-dictionary' into dev-dictionary

src/components/Layout/components/Notice.vue

@@ -175,11 +175,11 @@ watch(updateCount, () => getList());
 
 const tabs = ref<any>([]);
 
-const queryTypeList = async () => {
+const queryTypeList = async (_tab: any[]) => {
     const resp: any = await getAllNotice();
     if (resp.status === 200) {
         const provider = resp.result.map((i: any) => i.provider) || [];
-        const arr = tab.filter((item: any) => {
+        const arr = _tab.filter((item: any) => {
             return item.type.some((i: any) => provider.includes(i))
         });
         tabs.value = arr;
@@ -191,7 +191,15 @@ const queryTypeList = async () => {
 };
 
 onMounted(() => {
-    queryTypeList()
+    const _list: any[] = [...tab]
+    if(menuStory.hasMenu('process')){
+        _list.push({
+            key: 'workflow-notification',
+            tab: '工作流通知',
+            type: ['workflow-task-todo', 'workflow-task-reject', 'workflow-task-cc', 'workflow-process-finish', 'workflow-process-repealed'],
+        })
+    }
+    queryTypeList(_list)
 })
 </script>
 

src/components/Layout/components/NoticeInfo.vue

@@ -64,12 +64,13 @@ import NoticeTab from './NoticeTab.vue';
 
 const emits = defineEmits(['action']);
 
-type DataType = 'alarm' | 'system-monitor' | 'system-business';
+type DataType = 'alarm' | 'system-monitor' | 'system-business' | 'workflow-notification';
 
 const refreshObj = ref({
     'alarm': true,
     'system-monitor': true,
     'system-business': true,
+    'workflow-notification': true
 });
 
 const props = defineProps({

src/views/account/Center/components/StationMessage/components/NotificationRecord/index.vue

@@ -108,7 +108,7 @@ const getType = computed(() => {
     } else if (props.type === 'system-monitor') {
         return ['system-event'];
     } else if(props.type === 'workflow-notification'){
-        return ['workflow-task-cc','workflow-task-todo','workflow-task-completed']
+        return ['workflow-task-cc','workflow-task-todo','workflow-task-reject', 'workflow-process-finish', 'workflow-process-repealed']
     } 
     else {
         return [

src/views/account/Center/components/Subscribe/index.vue

@@ -107,7 +107,7 @@ const handleSearch = () => {
 
 onMounted(() => {
   const keys = ['alarm', 'system-monitor', 'system-business']
-  if (menuStore.hasMenu('workflow')) {
+  if (menuStore.hasMenu('process')) {
     keys.push('workflow-notification')
   }
     activeKey.value = keys

src/views/account/Center/components/data.ts

@@ -57,20 +57,29 @@ const workflowNotice = [
         provider: 'workflow-notification',
         name: '工作流通知',
         children: [
+            {
+                provider: 'workflow-task-todo',
+                name: '待办通知',
+            },
+            {
+                provider: 'workflow-task-reject',
+                name: '驳回通知',
+            },
             {
                 provider: 'workflow-task-cc',
                 name: '抄送通知',
             },
             {
-                provider: 'workflow-task-todo',
-                name: '待办通知'
-            },{
-                provider: 'workflow-task-completed',
-                name: '完成通知'
-            }
+                provider: 'workflow-process-finish',
+                name: '办结通知',
+            },
+            {
+                provider: 'workflow-process-repealed',
+                name: '关闭通知',
+            },
         ],
     },
 ]
 export const getInitData = () =>{
-   return menuStore.hasMenu('workflow') ? [...systemNotice,...workflowNotice] : [...systemNotice]
+   return menuStore.hasMenu('process') ? [...systemNotice,...workflowNotice] : [...systemNotice]
 }

src/views/system/NoticeRule/index.vue

@@ -106,17 +106,26 @@ const lowCodeNotice = [
         provider: 'workflow-notification',
         name: '工作流通知',
         children: [
+            {
+                provider: 'workflow-task-todo',
+                name: '待办通知',
+            },
+            {
+                provider: 'workflow-task-reject',
+                name: '驳回通知',
+            },
             {
                 provider: 'workflow-task-cc',
                 name: '抄送通知',
             },
             {
-                provider: 'workflow-task-todo',
-                name: '待办通知'
-            },{
-                provider: 'workflow-task-completed',
-                name: '完成通知'
-            }
+                provider: 'workflow-process-finish',
+                name: '办结通知',
+            },
+            {
+                provider: 'workflow-process-repealed',
+                name: '关闭通知',
+            },
         ],
     },
 ]
@@ -181,7 +190,7 @@ onMounted(() => {
     // data.value = Array.from(dataMap).map((item) => {
     //     return item?.[1];
     // });
-    if(menuStore.hasMenu('code')){
+    if(menuStore.hasMenu('process')){
         dataSource = [...systemNotice,...lowCodeNotice]
         activeKey.value = ['alarm', 'system-monitor', 'system-business','workflow-notification']
     }else{