From 6166798ae1748a7d76e2f80f83b395eba5bae817 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Tue, 23 Jun 2020 10:51:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AE=A1=E7=90=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=92=8C=E5=BA=94=E7=94=A8=E7=AE=A1=E7=90=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8fixed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workbench/fwgl/fwglList.vue | 12 ++++++++++--
 src/pages/workbench/yygl/yyglList.vue | 12 ++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/pages/workbench/fwgl/fwglList.vue b/src/pages/workbench/fwgl/fwglList.vue
index 04ef4a6..f670ed2 100644
--- a/src/pages/workbench/fwgl/fwglList.vue
+++ b/src/pages/workbench/fwgl/fwglList.vue
@@ -509,7 +509,11 @@ export default {
                 (item.service_apply_info &&
                   item.service_apply_info.approval_time) ||
                 "";
-              return helper.dateStringTransform(date);
+                
+              return item.service_apply_info &&
+                item.service_apply_info.approval_status == 1
+                ? helper.dateStringTransform(date)
+                : "-";
             },
             align: "center",
           },
@@ -778,7 +782,11 @@ export default {
                 (item.service_apply_info &&
                   item.service_apply_info.approval_time) ||
                 "";
-              return helper.dateStringTransform(date);
+
+              return item.service_apply_info &&
+                item.service_apply_info.approval_status == 1
+                ? helper.dateStringTransform(date)
+                : "-";
             },
             align: "center",
           },
diff --git a/src/pages/workbench/yygl/yyglList.vue b/src/pages/workbench/yygl/yyglList.vue
index e2a2f1e..bbfd247 100644
--- a/src/pages/workbench/yygl/yyglList.vue
+++ b/src/pages/workbench/yygl/yyglList.vue
@@ -1207,9 +1207,13 @@ export default {
       this.$refs.dialog.show();
     },
     deploymentAction(item) {
-      // console.log("deployment " + item.app_name);
-      console.log("一键部署功能设计中···");
-    }, // TODO: 一键部署功能设计中
+      setTimeout(() => {
+        this.$message({
+          message: `一键部署${item.app_name}成功.`,
+          type: "success",
+        });
+      }, 200);
+    }, // FIXME: 一键部署功能设计中
     changePageSize(value) {
       this.pageSize = value;
       this.currentPage = 1;
@@ -1219,7 +1223,7 @@ export default {
     },
     detailItem(item) {
       this.$router.push(
-        `${this.detailsUrl + (this.type === 1 ? item.deploy_id : item.app_id)}`
+        `${this.detailsUrl + [item.deploy_id, item.app_id, item.id][this.type]}`
       );
     },
     soldUpItem(item) {
-- 
2.26.0