Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

@@ -46,3 +46,14 @@ export function logoutReg (data) {
         data
     })
 }
+// 流程图
+export function getWorkFlowImage (bsmSlsq) {
+    return request({
+        url: '/business/workFlow/getWorkFlowImage',
+        method: 'get',
+        responseType: 'blob',
+        params: {
+            bsmSlsq: bsmSlsq
+        }
+    })
+}
\ No newline at end of file

@@ -2,7 +2,7 @@
 
 @mixin colorBtn($color) {
   background: $color;
-  color:#fff;
+  color: #fff;
 
   &:hover {
     color: #fff;
@@ -99,15 +99,9 @@
   font-size: 14px;
   border-radius: 4px;
 }
+
 // 搜索框按钮的位置
-.btnCol{
+.btnCol {
   box-sizing: border-box;
   text-align: right;
 }
\ No newline at end of file
-
-// 默认白色按钮样式
-.el-button--default{
-  background: #FBFCFD;
-  border: 1px solid #E4EBF4;
-  border-radius: 4px;
-}

@@ -99,20 +99,9 @@ class data extends filter {
             </div>
           )
         }
-      },
-      {
-        label: '操作',
-        width: '80',
-        align: 'center',
-        fixed: 'right',
-        render: (h, scope) => {
-          return <el-button type="text" icon="el-icon-delete" onClick={() => { vm.del(scope.row) }}>删除</el-button>
-        }
       }
     ]
   }
-
-
 }
 let datas = new data()
 export {

@@ -123,6 +123,7 @@
   left: 0%;
 }
 
+
 .topButton {
   @include flex;
   width: 100%;

@@ -56,6 +56,9 @@
         </div>
       </div>
     </div>
+    <dialogBox title="流程图" width="70%" isMain v-model="myValue" :isFullscreen="false" :isButton="false">
+      <img :src="imgSrc" style="margin: 20px 0" />
+    </dialogBox>
   </div>
 </template>
 
@@ -72,10 +75,14 @@ import {
   getNextLinkInfo,
   completeTask,
 } from "@/api/fqsq.js";
+import { getWorkFlowImage } from "@/api/jsydsyqFlow.js"
 import { getForm } from "./flowform.js";
 export default {
   data () {
     return {
+      // 流程图
+      imgSrc: '',
+      myValue: false,
       // 折叠
       isShowdrawer: true,
       // 默认选中
@@ -144,6 +151,12 @@ export default {
     operation (index, item) {
       let that = this;
       switch (item.value) {
+        case "B1":
+          getWorkFlowImage(this.bsmSlsq).then(res => {
+            this.imgSrc = URL.createObjectURL(res)
+            this.myValue = true
+          })
+          break;
         case "zsyl":
           this.zsylFlag = true;
           break;
@@ -173,7 +186,6 @@ export default {
             }
           });
           //  this.$alert(res.result);
-
           break;
         case "tc":
           window.close();
@@ -239,8 +251,6 @@ export default {
           h("i", { style: "color: teal" }, obj.usernames.join("，")),
         ]),
         showCancelButton: true,
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
         beforeClose: (action, instance, done) => {
           if (action === "confirm") {
             instance.confirmButtonLoading = true;
@@ -267,10 +277,10 @@ export default {
       }).then((action) => {
         this.$message({
           type: "info",
-          message: "action: " + action,
-        });
-      });
-    },
-  },
-};
+          message: "action: " + action
+        })
+      })
+    }
+  }
+}
 </script>
\ No newline at end of file

@@ -75,15 +75,6 @@ class data extends filter {
             </div>
           )
         }
-      },
-      {
-        label: '操作',
-        width: '80',
-        align: 'center',
-        fixed: 'right',
-        render: (h, scope) => {
-          return <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openDialog(scope) }}>编辑</el-button>
-        }
       }
     ]
   }