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

@@ -150,7 +150,7 @@ export default {
       });
       });
     },
     },
     ywhClick (item) {
     ywhClick (item) {
-      const { href } = this.$router.resolve('/fqsq?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid)
+      const { href } = this.$router.resolve('/fqsq?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&viewtype=1')
       window.open(href, '_blank');
       window.open(href, '_blank');
     },
     },
   },
   },

@@ -109,6 +109,7 @@ export default {
       queryForm: {
       queryForm: {
         bsmSlsq: "",
         bsmSlsq: "",
         bestepid: "",
         bestepid: "",
+        bsmBusiness: ""
       },
       },
       isShowdrawer: true,
       isShowdrawer: true,
       key: 0,
       key: 0,
@@ -123,7 +124,6 @@ export default {
       unitData: [],
       unitData: [],
       taskId: "",
       taskId: "",
       bsmBusiness: "",
       bsmBusiness: "",
-      id: "",
     };
     };
   },
   },
   watch: {
   watch: {
@@ -141,18 +141,20 @@ export default {
   mounted() {
   mounted() {
     if (this.$route.query.bsmSlsq) {
     if (this.$route.query.bsmSlsq) {
       this.expandInfo(this.$route.query.bsmSlsq, this.$route.query.bestepid);
       this.expandInfo(this.$route.query.bsmSlsq, this.$route.query.bestepid);
-      this.list(this.$route.query.bsmSlsq);
       this.queryForm.bsmSlsq = this.$route.query.bsmSlsq;
       this.queryForm.bsmSlsq = this.$route.query.bsmSlsq;
       this.queryForm.bestepid = this.$route.query.bestepid;
       this.queryForm.bestepid = this.$route.query.bestepid;
+      this.queryForm.bsmBusiness = this.$route.query.bsmBusiness;
+      this.list();
     }
     }
   },
   },
   methods: {
   methods: {
     // 获取左侧列表
     // 获取左侧列表
-    list(id) {
+    list() {
       let that = this;
       let that = this;
-      that.id = id;
       var formdata = new FormData();
       var formdata = new FormData();
-      formdata.append("bsmSlsq", id);
+      formdata.append("bsmSlsq", that.queryForm.bsmSlsq);
+      formdata.append("bestepid", that.queryForm.bestepid);
+      formdata.append("bsmBusiness", that.queryForm.bsmBusiness);
       leftMenu(formdata).then((res) => {
       leftMenu(formdata).then((res) => {
         if (res.code === 200) {
         if (res.code === 200) {
           this.unitData = res.result ? res.result : [];
           this.unitData = res.result ? res.result : [];
@@ -181,7 +183,7 @@ export default {
     },
     },
     activeClick(tab, event) {
     activeClick(tab, event) {
       if (tab.name == "slxx") {
       if (tab.name == "slxx") {
-        this.list(this.id);
+        this.list();
       }
       }
     },
     },
     //  左侧列表点击调用接口
     //  左侧列表点击调用接口

@@ -108,8 +108,9 @@ export default {
     handleSort (name, sort) {
     handleSort (name, sort) {
       console.log(name, sort);
       console.log(name, sort);
     },
     },
-    openDialog () {
-      console.log(999999999999999);
+    openDialog (item) {
+      const { href } = this.$router.resolve('/fqsq?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&viewtype=2')
+      window.open(href, '_blank');
     },
     },
   },
   },
 };
 };

@@ -33,8 +33,14 @@ class data extends filter {
         }
         }
       },
       },
       {
       {
-        prop: "ywh",
         label: "业务号",
         label: "业务号",
+        render: (h, scope) => {
+          return (
+            <div>
+              <el-link type="primary" onClick={() => { vm.openDialog(scope.row) }}>{scope.row.ywh}</el-link>
+            </div>
+          )
+        }
       },
       },
       {
       {
         prop: "sqywmc",
         prop: "sqywmc",

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

@@ -47,7 +47,7 @@ class data extends filter {
         render: (h, scope) => {
         render: (h, scope) => {
           return (
           return (
             <div>
             <div>
-              <el-link type="primary" onClick={() => { vm.openDialog(scope) }}>{scope.row.ywh}</el-link>
+              <el-link type="primary" onClick={() => { vm.openDialog(scope.row) }}>{scope.row.ywh}</el-link>
             </div>
             </div>
           )
           )
         }
         }