Merge branch 'xym' into dev

src/pages/workbench/fwgl/fwglList.vue

@@ -1116,7 +1116,8 @@ export default {
       this.showDialog();
     }, // 删除服务
     detailItem(item) {
-      this.$router.push(`${this.detailsUrl + item.id}`);
+      let id = this.type == 1 ? item.service_apply_info.id : item.id;
+      this.$router.push(`${this.detailsUrl + id}`);
     }, // 查看服务
     editItem(item) {
       this.$router.push(