Merge branch 'xym' into dev

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",
           },

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) {