fix: 19361、19656
This commit is contained in:
parent
0ffb6a92c9
commit
ce1260d561
|
@ -175,11 +175,11 @@ watch(updateCount, () => getList());
|
||||||
|
|
||||||
const tabs = ref<any>([]);
|
const tabs = ref<any>([]);
|
||||||
|
|
||||||
const queryTypeList = async () => {
|
const queryTypeList = async (_tab: any[]) => {
|
||||||
const resp: any = await getAllNotice();
|
const resp: any = await getAllNotice();
|
||||||
if (resp.status === 200) {
|
if (resp.status === 200) {
|
||||||
const provider = resp.result.map((i: any) => i.provider) || [];
|
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))
|
return item.type.some((i: any) => provider.includes(i))
|
||||||
});
|
});
|
||||||
tabs.value = arr;
|
tabs.value = arr;
|
||||||
|
@ -191,7 +191,15 @@ const queryTypeList = async () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
onMounted(() => {
|
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>
|
</script>
|
||||||
|
|
||||||
|
|
|
@ -64,12 +64,13 @@ import NoticeTab from './NoticeTab.vue';
|
||||||
|
|
||||||
const emits = defineEmits(['action']);
|
const emits = defineEmits(['action']);
|
||||||
|
|
||||||
type DataType = 'alarm' | 'system-monitor' | 'system-business';
|
type DataType = 'alarm' | 'system-monitor' | 'system-business' | 'workflow-notification';
|
||||||
|
|
||||||
const refreshObj = ref({
|
const refreshObj = ref({
|
||||||
'alarm': true,
|
'alarm': true,
|
||||||
'system-monitor': true,
|
'system-monitor': true,
|
||||||
'system-business': true,
|
'system-business': true,
|
||||||
|
'workflow-notification': true
|
||||||
});
|
});
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
|
|
|
@ -108,7 +108,7 @@ const getType = computed(() => {
|
||||||
} else if (props.type === 'system-monitor') {
|
} else if (props.type === 'system-monitor') {
|
||||||
return ['system-event'];
|
return ['system-event'];
|
||||||
} else if(props.type === 'workflow-notification'){
|
} 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 {
|
else {
|
||||||
return [
|
return [
|
||||||
|
|
|
@ -107,7 +107,7 @@ const handleSearch = () => {
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
const keys = ['alarm', 'system-monitor', 'system-business']
|
const keys = ['alarm', 'system-monitor', 'system-business']
|
||||||
if (menuStore.hasMenu('workflow')) {
|
if (menuStore.hasMenu('process')) {
|
||||||
keys.push('workflow-notification')
|
keys.push('workflow-notification')
|
||||||
}
|
}
|
||||||
activeKey.value = keys
|
activeKey.value = keys
|
||||||
|
|
|
@ -57,20 +57,29 @@ const workflowNotice = [
|
||||||
provider: 'workflow-notification',
|
provider: 'workflow-notification',
|
||||||
name: '工作流通知',
|
name: '工作流通知',
|
||||||
children: [
|
children: [
|
||||||
|
{
|
||||||
|
provider: 'workflow-task-todo',
|
||||||
|
name: '待办通知',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
provider: 'workflow-task-reject',
|
||||||
|
name: '驳回通知',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
provider: 'workflow-task-cc',
|
provider: 'workflow-task-cc',
|
||||||
name: '抄送通知',
|
name: '抄送通知',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
provider: 'workflow-task-todo',
|
provider: 'workflow-process-finish',
|
||||||
name: '待办通知'
|
name: '办结通知',
|
||||||
},{
|
},
|
||||||
provider: 'workflow-task-completed',
|
{
|
||||||
name: '完成通知'
|
provider: 'workflow-process-repealed',
|
||||||
}
|
name: '关闭通知',
|
||||||
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
export const getInitData = () =>{
|
export const getInitData = () =>{
|
||||||
return menuStore.hasMenu('workflow') ? [...systemNotice,...workflowNotice] : [...systemNotice]
|
return menuStore.hasMenu('process') ? [...systemNotice,...workflowNotice] : [...systemNotice]
|
||||||
}
|
}
|
||||||
|
|
|
@ -106,17 +106,26 @@ const lowCodeNotice = [
|
||||||
provider: 'workflow-notification',
|
provider: 'workflow-notification',
|
||||||
name: '工作流通知',
|
name: '工作流通知',
|
||||||
children: [
|
children: [
|
||||||
|
{
|
||||||
|
provider: 'workflow-task-todo',
|
||||||
|
name: '待办通知',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
provider: 'workflow-task-reject',
|
||||||
|
name: '驳回通知',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
provider: 'workflow-task-cc',
|
provider: 'workflow-task-cc',
|
||||||
name: '抄送通知',
|
name: '抄送通知',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
provider: 'workflow-task-todo',
|
provider: 'workflow-process-finish',
|
||||||
name: '待办通知'
|
name: '办结通知',
|
||||||
},{
|
},
|
||||||
provider: 'workflow-task-completed',
|
{
|
||||||
name: '完成通知'
|
provider: 'workflow-process-repealed',
|
||||||
}
|
name: '关闭通知',
|
||||||
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
@ -181,7 +190,7 @@ onMounted(() => {
|
||||||
// data.value = Array.from(dataMap).map((item) => {
|
// data.value = Array.from(dataMap).map((item) => {
|
||||||
// return item?.[1];
|
// return item?.[1];
|
||||||
// });
|
// });
|
||||||
if(menuStore.hasMenu('code')){
|
if(menuStore.hasMenu('process')){
|
||||||
dataSource = [...systemNotice,...lowCodeNotice]
|
dataSource = [...systemNotice,...lowCodeNotice]
|
||||||
activeKey.value = ['alarm', 'system-monitor', 'system-business','workflow-notification']
|
activeKey.value = ['alarm', 'system-monitor', 'system-business','workflow-notification']
|
||||||
}else{
|
}else{
|
||||||
|
|
Loading…
Reference in New Issue