From 616181992e5d0f046261e793aa7a241ae897f548 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Wed, 27 May 2020 18:21:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/authority/organization.vue | 34 ++++++++--------------------
 src/router/index.js                  |  2 +-
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/src/pages/authority/organization.vue b/src/pages/authority/organization.vue
index 5c7b884..6ffed0b 100644
--- a/src/pages/authority/organization.vue
+++ b/src/pages/authority/organization.vue
@@ -27,7 +27,7 @@
       </div>
       <organization-list
         :data="organizationList"
-        details-url="/authority/organization/"
+        details-url="/authority/organizationdetail/"
         @delete-action="deleteAction"
       ></organization-list>
       <div class="flex_grow"></div>
@@ -165,34 +165,20 @@ export default {
   }),
   methods: {
     addOrganization() {
-      console.log("add organization");
+      this.$router.push("/authority/organizationedit");
     },
     searchAction() {
       console.log(this.searchFilter);
     },
     deleteAction(item) {
-      if (this.cardType === 0) {
-        this.confirmOptions.title = "删除提示";
-        this.confirmOptions.message =
-          "您需要先进行应用商店下架申请，应用处于下架状态时才能进行删除操作。";
-        this.confirmOptions.btnCancelText = "";
-        this.confirmOptions.btnSubmitText = "";
-        this.confirmOptions.confirmSubmit = () => {
-          console.log("deleteItem - " + item.name);
-          this.$refs.myConfirm.hideModel();
-        };
-      } else if (this.cardType === 1) {
-        this.confirmOptions.title = "是否删除部署的应用";
-        this.confirmOptions.message =
-          "该操作会导致正在调用该应用的用户被迫终止对应用的调用，删除前需向正在调用该应用的用户发送通知，自通知发送之日起，2日后应用将被删除。";
-        this.confirmOptions.btnCancelText = "";
-        this.confirmOptions.btnSubmitText = "发送通知";
-        this.confirmOptions.confirmSubmit = () => {
-          console.log("deleteItem - " + item.name);
-          this.$refs.myConfirm.hideModel();
-        };
-      }
-
+      this.confirmOptions.title = "删除提示";
+      this.confirmOptions.message = `确认删除${item.name}吗？`;
+      this.confirmOptions.btnCancelText = "";
+      this.confirmOptions.btnSubmitText = "";
+      this.confirmOptions.confirmSubmit = () => {
+        console.log("deleteItem - " + item.name);
+        this.$refs.myConfirm.hideModel();
+      };
       this.$refs.myConfirm.showModel();
     },
     changePageSize(value) {
diff --git a/src/router/index.js b/src/router/index.js
index 88ee2d3..c2df22f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -229,7 +229,7 @@ export default new Router({
               component: () => import("@/pages/authority/organization"),
             },
             {
-              path: "/authority/organizationdetail", // 组织管理详情
+              path: "/authority/organizationdetail/:id", // 组织管理详情
               name: "organizationdetail",
               component: () => import("@/pages/authority/organizationdetail"),
             },
-- 
2.26.0