style:流程图

@@ -109,8 +109,6 @@ class data extends filter {
       ]
       ]
     }
     }
   }
   }
-
-
 }
 }
 let datas = new data()
 let datas = new data()
 export {
 export {

 import { getWorkFlowImage } from "@/api/jsydsyqFlow.js";
 import { getWorkFlowImage } from "@/api/jsydsyqFlow.js";
 import { popupDialog } from "@/utils/popup.js";
 import { popupDialog } from "@/utils/popup.js";
-
 import {
 import {
   leftMenu,
   leftMenu,
   stepExpandInfo,
   stepExpandInfo,
@@ -139,7 +138,7 @@ export default {
           popupDialog("退回", "workflow/components/th", {
           popupDialog("退回", "workflow/components/th", {
             bsmSlsq: this.bsmSlsq,
             bsmSlsq: this.bsmSlsq,
             bestepid: this.bestepid
             bestepid: this.bestepid
-          }, '30%', "200px", true,)
+          }, '30%', "200px", true)
           break;
           break;
         case "transfer": //转件按钮
         case "transfer": //转件按钮
           getNextLinkInfo({
           getNextLinkInfo({
@@ -277,9 +276,9 @@ export default {
       }).then((action) => {
       }).then((action) => {
         this.$message({
         this.$message({
           type: "info",
           type: "info",
-          message: "action: " + action,
-        });
-      });
+          message: "action: " + action
+        })
+      })
     }
     }
   }
   }
 }
 }

@@ -72,6 +72,7 @@ import {
   getStepFormInfo
   getStepFormInfo
 } from "@/api/fqsq.js"
 } from "@/api/fqsq.js"
 import publicFlow from "./mixin/public.js"
 import publicFlow from "./mixin/public.js"
+import { popupDialog } from "@/utils/popup.js";
 import NoticeBar from '@/components/NoticeBar/index'
 import NoticeBar from '@/components/NoticeBar/index'
 import { getWorkFlowImage } from "@/api/jsydsyqFlow.js"
 import { getWorkFlowImage } from "@/api/jsydsyqFlow.js"
 export default {
 export default {
@@ -139,15 +140,19 @@ export default {
     operation (item) {
     operation (item) {
       //按钮 B1:流程图 B2:材料分屏 B3:材料导入 B4:登记簿 B5:证书预览 B6：打印申请书
       //按钮 B1:流程图 B2:材料分屏 B3:材料导入 B4:登记簿 B5:证书预览 B6：打印申请书
       //操作按钮 登簿：record  转件：transfer  退回：back  退出：signout
       //操作按钮 登簿：record  转件：transfer  退回：back  退出：signout
-      let that = this;
       switch (item.value) {
       switch (item.value) {
         case "B1":
         case "B1":
-          getWorkFlowImage(this.bsmSlsq).then(res => {
-            this.imgSrc = URL.createObjectURL(res)
-            this.$popup({
-              title: '流程图',
-              editItem: 'workflow/components/flowChart',
-              formData: this.imgSrc
+          getWorkFlowImage(this.bsmSlsq, this.$route.query.bestepid).then(res => {
+            let { result } = res
+            popupDialog("流程图", "workflow/components/processViewer", {
+              xml: result.xml,
+              finishedInfo: {
+                finishedTaskSet: result.finishedTaskSet,
+                unfinishedTaskSet: result.unfinishedTaskSet,
+                rejectedTaskSet: result.rejectedTaskSet,
+                finishedSequenceFlowSet: result.finishedSequenceFlowSet
+              },
+              allCommentList: result.historyTaskList
             })
             })
           })
           })
           break;
           break;
@@ -198,7 +203,7 @@ export default {
           //默认加载第一个表单信息
           //默认加载第一个表单信息
           this.tabName = res.result[0].value;
           this.tabName = res.result[0].value;
         }
         }
-      });
+      })
     }
     }
   }
   }
 }
 }

@@ -121,7 +121,7 @@ export default {
       console.log(name, sort);
       console.log(name, sort);
     },
     },
     openDialog (item) {
     openDialog (item) {
-      const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + item.bsmBusiness + '&viewtype=3')
+      const { href } = this.$router.resolve('/workFrameViewcs?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + item.bsmBusiness + '&viewtype=3')
       window.open(href, '_blank');
       window.open(href, '_blank');
     }
     }
   }
   }