From f2bfa5c7421afe7e495c0657a3bf739cc91d476b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=AE=BF=E6=98=95?= <liudianxin@bd-apaas.com>
Date: Thu, 7 Jan 2021 15:10:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workbench/fwgl/fwglList.vue | 54 +++++++++++++--------------
 src/pages/workbench/workPlace.vue     |  4 ++
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/pages/workbench/fwgl/fwglList.vue b/src/pages/workbench/fwgl/fwglList.vue
index bf99754..cdbc519 100644
--- a/src/pages/workbench/fwgl/fwglList.vue
+++ b/src/pages/workbench/fwgl/fwglList.vue
@@ -221,13 +221,13 @@ export default {
         this.deleteUrl = "/apaas/service/v3/service/manager";
         this.listHeader = [
           {
-            label: "服务名称",
+            label: "名称",
             prop: "name",
             type: "button",
             callback: this.detailItem,
           },
           {
-            label: "服务领域",
+            label: "所属领域",
             prop: "sectors_name",
             align: "center",
           },
@@ -237,7 +237,7 @@ export default {
             align: "center",
           },
           {
-            label: "服务描述",
+            label: "简介描述",
             prop: "descript",
           },
           {
@@ -251,7 +251,7 @@ export default {
             align: "center",
           },
           {
-            label: "服务类型",
+            label: "所属类型",
             prop: "data_service_type1_name",
             align: "center",
           },
@@ -316,7 +316,7 @@ export default {
             ],
           },
           {
-            name: "服务状态",
+            name: "状态",
             prop: "state",
             data: [
               {
@@ -345,13 +345,13 @@ export default {
         this.deleteUrl = "/apaas/service/v3/service/apply/service";
         this.listHeader = [
           {
-            label: "服务名称",
+            label: "名称",
             prop: "name",
             type: "button",
             callback: this.detailItem,
           },
           {
-            label: "服务领域",
+            label: "所属领域",
             prop: "sectors_name",
             align: "center",
           },
@@ -361,7 +361,7 @@ export default {
             align: "center",
           },
           {
-            label: "服务描述",
+            label: "简介描述",
             prop: "descript",
           },
           {
@@ -378,7 +378,7 @@ export default {
             align: "center",
           },
           {
-            label: "服务类型",
+            label: "所属类型",
             prop: "data_service_type1_name",
             align: "center",
           },
@@ -610,13 +610,13 @@ export default {
         this.listUrl = "/apaas/service/v3/service/manager/list";
         this.listHeader = [
           {
-            label: "服务名称",
+            label: "名称",
             prop: "name",
             type: "button",
             callback: this.detailItem,
           },
           {
-            label: "服务领域",
+            label: "所属领域",
             prop: "sectors_name",
             align: "center",
           },
@@ -634,7 +634,7 @@ export default {
             align: "center",
           },
           {
-            label: "服务描述",
+            label: "简介描述",
             prop: "descript",
           },
           {
@@ -648,12 +648,12 @@ export default {
             align: "center",
           },
           {
-            label: "服务类型",
+            label: "所属类型",
             prop: "data_service_type1_name",
             align: "center",
           },
           {
-            label: "服务状态",
+            label: "状态",
             prop: "state",
             getText(item) {
               return ["已下架", "已上架", "上架审核中", "下架审核中"][
@@ -683,7 +683,7 @@ export default {
             ],
           },
           {
-            name: "服务状态",
+            name: "状态",
             prop: "state",
             data: [
               {
@@ -712,11 +712,11 @@ export default {
         this.deleteUrl = "/apaas/service/v3/service/approval/applied";
         this.listHeader = [
           {
-            label: "服务名称",
+            label: "名称",
             prop: "name",
           },
           {
-            label: "服务领域",
+            label: "所属领域",
             prop: "sectors_name",
             align: "center",
           },
@@ -734,7 +734,7 @@ export default {
             align: "center",
           },
           {
-            label: "服务描述",
+            label: "简介描述",
             prop: "descript",
           },
           {
@@ -755,7 +755,7 @@ export default {
             align: "center",
           },
           {
-            label: "服务类型",
+            label: "所属类型",
             prop: "data_service_type1_name",
             align: "center",
           },
@@ -1013,13 +1013,13 @@ export default {
         this.deleteUrl = "/apaas/service/v3/service/manager";
         this.listHeader = [
           {
-            label: "服务名称",
+            label: "名称",
             prop: "name",
             type: "button",
             callback: this.detailItem,
           },
           {
-            label: "服务领域",
+            label: "所属领域",
             prop: "sectors_name",
             align: "center",
           },
@@ -1037,7 +1037,7 @@ export default {
             align: "center",
           },
           {
-            label: "服务描述",
+            label: "简介描述",
             prop: "descript",
           },
           {
@@ -1051,7 +1051,7 @@ export default {
             align: "center",
           },
           {
-            label: "服务类型",
+            label: "所属类型",
             prop: "data_service_type1_name",
             align: "center",
           },
@@ -1127,11 +1127,11 @@ export default {
         this.deleteUrl = "/apaas/service/v3/service/approval/applied";
         this.listHeader = [
           {
-            label: "服务名称",
+            label: "名称",
             prop: "name",
           },
           {
-            label: "服务领域",
+            label: "所属领域",
             prop: "sectors_name",
             align: "center",
           },
@@ -1149,7 +1149,7 @@ export default {
             align: "center",
           },
           {
-            label: "服务描述",
+            label: "简介描述",
             prop: "descript",
           },
           {
@@ -1170,7 +1170,7 @@ export default {
             align: "center",
           },
           {
-            label: "服务类型",
+            label: "所属类型",
             prop: "data_service_type1_name",
             align: "center",
           },
diff --git a/src/pages/workbench/workPlace.vue b/src/pages/workbench/workPlace.vue
index 6982693..a40bb9a 100644
--- a/src/pages/workbench/workPlace.vue
+++ b/src/pages/workbench/workPlace.vue
@@ -1225,6 +1225,10 @@ export default {
               } else {
                 e.approval_status = "";
               }
+
+              if (e.service_apply_info && e.service_apply_info.id != "") {
+                e.id = e.service_apply_info.id;
+              }
             });
             this.listTotal = data.total;
           }
-- 
2.26.0