Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

src/layouts/default/header/components/notify/index.vue

@@ -1,6 +1,11 @@
 <template>
   <div :class="prefixCls">
-    <Popover title="" trigger="click" :overlayClassName="`${prefixCls}__overlay`">
+    <Popover
+      v-model:visible="visible"
+      title=""
+      trigger="click"
+      :overlayClassName="`${prefixCls}__overlay`"
+    >
       <Badge :count="count" dot :numberStyle="numberStyle">
         <BellOutlined />
       </Badge>
@@ -54,7 +59,7 @@
   const [registerModal, { openModal: openLookModal }] = useModal();
   const userStore = useUserStore();
   const userInfo: any = userStore.getUserInfo;
-
+  const visible = ref(false);
   const { prefixCls } = useDesign('header-notify');
   const { createMessage, notification } = useMessage();
   const listData = ref(tabListData);
@@ -74,6 +79,7 @@
 
   async function onNoticeClick(record) {
     console.log(record);
+    visible.value = false;
     const index = listData.value[0].list.findIndex((item: any) => item.id === record.id);
     if (index !== -1) {
       listData.value[0].list.splice(index, 1);

src/views/demo/workflow/task/process/look.vue

@@ -273,7 +273,7 @@
       });
       mapConfig.value = currentNode.mapConfig;
     } else {
-      if (auditNode.isInherit) {
+      if (auditNode && auditNode.isInherit) {
         currentNode = wfData.find((t) => t.type == 'bpmn:StartEvent');
         mapConfig.value = currentNode.mapConfig;
         footerStyle.value.width = mapConfig.value?.isShowMap ? '60%' : '100%';
@@ -284,7 +284,7 @@
         footerStyle.value.width = mapConfig.value?.isShowMap ? '60%' : '100%';
       }
     }
-    if (currentNode.authFields.length > 0) {
+    if (currentNode && currentNode.authFields.length > 0) {
       formVisble.value = true;
     } else {
       activeName.value = 'flow';