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

src/views/demo/workflow/revocation/index.vue

@@ -12,12 +12,7 @@
               {
                 label: '撤回',
                 color: 'error',
-                popConfirm: {
-                  title: '确认撤回到' + record.UnitName + '吗？',
-                  confirm: () => {
-                    revokeBtnClick(record);
-                  },
-                },
+                onClick: revokeBtnClick.bind(null, record),
               },
             ]"
           />
@@ -55,7 +50,7 @@
   import { useMessage } from '@/hooks/web/useMessage';
   import { Look } from '@/views/demo/workflow/task/process/page';
 
-  const { createMessage } = useMessage();
+  const { createConfirm, createMessage } = useMessage();
   const props = defineProps({
     componentCode: String,
   });
@@ -164,16 +159,23 @@
   // 撤回
   //   FN371326202408117735
   async function revokeBtnClick(record) {
-    const data = await retract(record.Id, {
-      code: 'retract',
-      name: '撤回',
-      des: '',
+    createConfirm({
+      iconType: 'info',
+      title: '撤回',
+      content: '确定要撤回到' + record.UnitName + '吗？',
+      onOk: async () => {
+        const data = await retract(record.Id, {
+          code: 'retract',
+          name: '撤回',
+          des: '',
+        });
+        if (data) {
+          return createMessage.success('成功');
+        } else {
+          return createMessage.error('失败');
+        }
+      },
     });
-    if (data) {
-      return createMessage.success('成功');
-    } else {
-      return createMessage.error('失败');
-    }
   }
 </script>
 <style lang="less">

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

@@ -228,9 +228,7 @@
         nodeArr.push(element.unitId);
       }
     });
-    console.log(nodeArr);
     const auditNode = wfData.find((t) => t.id == nodeArr[nodeArr.length - 1]);
-    console.log(auditNode);
     // const auditNode = wfData.find((t) => t.id == data.flowViewer.unfinishedTaskSet[0]);
     // 流程已结束
     // if (data.process.isFinished == 1) {