From 0c33c7cd59cef4b1453bae043c3fd982fe2f687f Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Thu, 21 May 2020 11:59:33 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E5=88=9D=E6=AD=A5=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86Page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.json                        |  2 +-
 src/views/xpack/Organization.vue              | 13 -------
 .../xpack/org/OrganizationDetail/index.vue    | 38 +++++++++++++++++++
 src/views/xpack/router.js                     | 27 +++++++++++++
 4 files changed, 66 insertions(+), 14 deletions(-)
 delete mode 100644 src/views/xpack/Organization.vue
 create mode 100644 src/views/xpack/org/OrganizationDetail/index.vue

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 11b2932dc..0356fbd80 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -426,7 +426,7 @@
     "options": "选项",
     "taskName": "任务名称",
     "dateStart": "开始日期",
-    "versionDetail": ""
+    "versionDetail": "版本详情"
   },
   "perms": {
     "assetPermissions": "资产授权",
diff --git a/src/views/xpack/Organization.vue b/src/views/xpack/Organization.vue
deleted file mode 100644
index 79d434ce4..000000000
--- a/src/views/xpack/Organization.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<template>
-  <h1>hello</h1>
-</template>
-
-<script>
-export default {
-  name: 'Organization'
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/xpack/org/OrganizationDetail/index.vue b/src/views/xpack/org/OrganizationDetail/index.vue
new file mode 100644
index 000000000..c30243272
--- /dev/null
+++ b/src/views/xpack/org/OrganizationDetail/index.vue
@@ -0,0 +1,38 @@
+<template>
+  <GenericDetailPage :object.sync="Organization" :active-menu.sync="config.activeMenu" v-bind="config" v-on="$listeners" @tab-click="TabClick">
+    <keep-alive>
+      <component :is="config.activeMenu" :object="Organization" />
+    </keep-alive>
+  </GenericDetailPage>
+</template>
+
+<script>
+import { GenericDetailPage, TabPage } from '@/layout/components'
+import OrganizationDetail from './OrganizationDetail'
+
+export default {
+  components: {
+    GenericDetailPage,
+    OrganizationDetail,
+    TabPage
+  },
+  data() {
+    return {
+      Organization: {},
+      config: {
+        activeMenu: 'OrganizationDetail',
+        submenu: [
+          {
+            title: this.$t('org.OrganizationDetail'),
+            name: 'OrganizationDetail'
+          }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/xpack/router.js b/src/views/xpack/router.js
index 70a305604..0744f8b18 100644
--- a/src/views/xpack/router.js
+++ b/src/views/xpack/router.js
@@ -24,6 +24,33 @@ export default {
       component: () => import('@/views/xpack/GatherUser'),
       name: 'GatherUser',
       meta: { title: 'GatherUser' }
+    },
+    {
+      path: 'orgs',
+      component: () => import('@/views/xpack/org/OrganizationList'),
+      name: 'OrganizationList',
+      meta: { title: 'OrganizationList' }
+    },
+    {
+      path: 'orgs/create',
+      component: () => import('@/views/xpack/org/OrganizationCreateUpdate'),
+      name: 'OrganizationCreate',
+      hidden: true,
+      meta: { title: 'OrganizationCreate', activeMenu: '/xpack/orgs', action: 'create' }
+    },
+    {
+      path: 'orgs/:id/update',
+      component: () => import('@/views/xpack/org/OrganizationCreateUpdate'),
+      name: 'OrganizationUpdate',
+      hidden: true,
+      meta: { title: 'OrganizationUpdate', activeMenu: '/xpack/orgs', action: 'update' }
+    },
+    {
+      path: 'orgs/:id',
+      component: () => import('@/views/xpack/org/OrganizationDetail/index'),
+      name: 'OrganizationDetail',
+      hidden: true,
+      meta: { title: 'OrganizationDetail', activeMenu: '/xpack/orgs', action: 'detail' }
     }
   ]
 }