From 88a464464a16c4f4572dadf86bf85eddc91916d0 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Wed, 17 Jun 2020 10:17:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E8=B0=83=E8=AF=95=E5=AD=98?=
 =?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workbench/yygl/yyglList.vue | 98 ++++++++-------------------
 src/store/index.js                    |  2 +-
 2 files changed, 29 insertions(+), 71 deletions(-)

diff --git a/src/pages/workbench/yygl/yyglList.vue b/src/pages/workbench/yygl/yyglList.vue
index f07e477..53721f4 100644
--- a/src/pages/workbench/yygl/yyglList.vue
+++ b/src/pages/workbench/yygl/yyglList.vue
@@ -154,7 +154,7 @@ export default {
           },
         ];
       }
-      // 普通用户 --- 我部署的应用
+      // 普通用户 --- 我部署的应用 card列表形式
       else if (level === 0 && type === 1) {
         this.listType = "card";
         this.cardType = 1;
@@ -205,7 +205,7 @@ export default {
           },
         ];
       }
-      // 普通用户 --- 申请的应用 card列表形式
+      // 普通用户 --- 申请的应用
       else if (level === 0 && type === 2) {
         this.listType = "table";
         this.listHeader = [
@@ -320,45 +320,6 @@ export default {
           },
         ];
       }
-      /* // 普通用户 --- 审批的应用
-      else if (level === 0 && type === 3) {
-        this.listType = "table";
-        this.listHeader = [
-          {
-            label: "应用名称", prop: "name", type: "href", align: "left" },
-          {
-            label: "应用版本", prop: "date", align: "center" },
-          {
-            label: "应用类型", prop: "address", align: "center" },
-          {
-            label: "业务领域", prop: "address", align: "center" },
-          {
-            label: "在线区域", prop: "address", align: "center" },
-          {
-            label: "申请类型", prop: "address", align: "center" },
-          {
-            label: "审批时间", prop: "address", align: "center" },
-          {
-            label: "审批状态", prop: "address", align: "center" },
-          {
-            label: "操作",
-            type: "Button",
-            align: "center",
-            width: 160,
-            btnList: [
-              {
-                type: "action-approval",
-                label: "审批",
-                line: "|",
-              },
-              {
-                type: "action-delete",
-                label: "删除",
-              },
-            ],
-          },
-        ];
-      } */
 
       // 组织管理员 --- 应用仓库管理
       else if (level === 1 && type === 0) {
@@ -524,14 +485,6 @@ export default {
                 },
                 callback: this.detailItem,
               },
-              {
-                label: "删除",
-                class: "warn",
-                disabledRule(item) {
-                  return item.apply_status === "待审批";
-                },
-                callback: this.deleteItem,
-              },
             ],
           },
         ];
@@ -569,7 +522,7 @@ export default {
           },
           {
             label: "所属组织",
-            prop: "address",
+            prop: "org_name",
             align: "center",
           },
           {
@@ -583,11 +536,25 @@ export default {
                 callback: _self.editItem,
               },
               {
-                label: "下线",
-                callback: _self.offLine,
+                getLabel(item) {
+                  return item.online_state == 0 ? "上线" : "下线";
+                },
+                callback(item) {
+                  item.online_state == 0
+                    ? _self.onLine(item)
+                    : _self.offLine(item);
+                },
+                disabledRule(item) {
+                  if (item.online_state == 0) {
+                    return item.up_platform_status != 0;
+                  } else {
+                    return item.up_platform_status != 2;
+                  }
+                },
               },
               {
                 label: "删除",
+                class: "warn",
                 callback: _self.deleteItem,
               },
             ],
@@ -600,7 +567,7 @@ export default {
         this.listHeader = [
           {
             label: "应用名称",
-            prop: "app_name",
+            prop: "deploy_name",
             type: "button",
             callback: this.detailItem,
           },
@@ -697,14 +664,6 @@ export default {
                 },
                 callback: this.detailItem,
               },
-              {
-                label: "删除",
-                class: "warn",
-                disabledRule(item) {
-                  return item.apply_status === "待审批";
-                },
-                callback: this.deleteItem,
-              },
             ],
           },
         ];
@@ -955,10 +914,6 @@ export default {
     changeCurrentPage(value) {
       this.currentPage = value;
     },
-    deleteItem(item) {
-      // console.log("delete --- " + item.id);
-      console.log("删除审批记录功能设计中");
-    }, // TODO: 删除审批记录功能设计中
     detailItem(item) {
       this.$router.push(
         `${this.detailsUrl + (this.type === 1 ? item.deploy_id : item.app_id)}`
@@ -1025,12 +980,15 @@ export default {
     editItem(item) {
       this.$router.push(`/yygl/${this.level}/${this.type}/edit/${item.id}`);
     },
+    onLine(item) {
+      console.log("on line --- " + item.app_id);
+    }, // TODO: 存档
     offLine(item) {
-      console.log("off line --- " + item.id);
-    },
-    goodsShelf(item) {
-      console.log("goods shelf", item.state);
-    },
+      console.log("off line --- " + item.app_id);
+    }, // TODO: 存档
+    deleteItem(item) {
+      console.log("delete --- " + item.app_id);
+    }, // TODO: 存档
   },
   created() {
     this.level = parseInt(this.$route.params.level);
diff --git a/src/store/index.js b/src/store/index.js
index f0544ea..5a21a20 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -13,7 +13,7 @@ const store = new Vuex.Store({
       ["平台服务管理", "服务审批管理" /* , "云资源管理" */], // 超级管理员
     ], // 服务管理列表，onlyRead
     yyglNav: [
-      ["应用仓库", "我部署的应用", "申请的应用" /* "审批的应用" */], // 普通用户
+      ["应用仓库", "我部署的应用", "申请的应用"], // 普通用户
       ["应用仓库管理", "部署的应用", "应用审批管理"], // 组织管理员
       ["平台应用管理", "应用部署管理", "应用审批管理"], // 超级管理员
     ], // 应用管理列表，onlyRead
-- 
2.26.0