From be8822686bf6c0d29eae0d494865311836acb608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B0=B4=E8=90=BD=28YangLei=29?= <lzi.love@icloud.com>
Date: Wed, 14 Jul 2021 10:40:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ranger.js                             |  8 ++
 .../equipment/Left/OrganizationTree.vue       |  3 +-
 src/pages/ranger/basic/major/add_member.vue   | 80 +++++++++++++++++++
 src/pages/ranger/basic/major/index.vue        | 11 ++-
 src/pages/ranger/basic/major/member.vue       | 63 +++++++++++++++
 5 files changed, 161 insertions(+), 4 deletions(-)
 create mode 100644 src/pages/ranger/basic/major/add_member.vue
 create mode 100644 src/pages/ranger/basic/major/member.vue

diff --git a/src/api/ranger.js b/src/api/ranger.js
index 514670a..2ef4ddf 100644
--- a/src/api/ranger.js
+++ b/src/api/ranger.js
@@ -70,3 +70,11 @@ export function updateMajorApi(data) {
 export function getMajorInfoApi(id) {
     return getReq(`/ranger/inspection/api/v1/specialities/${id}`);
 }
+
+export function getOrganizationUserApi(id) {
+    return getReq(`/api/v1/users/organizations/${id}`);
+}
+
+export function addSpecialitiesStaffsApi(data) {
+    return postReq(`/ranger/inspection/api/v1/specialities/staffs`, data);
+}
diff --git a/src/pages/oceanus/equipment/Left/OrganizationTree.vue b/src/pages/oceanus/equipment/Left/OrganizationTree.vue
index da83e55..96dc167 100644
--- a/src/pages/oceanus/equipment/Left/OrganizationTree.vue
+++ b/src/pages/oceanus/equipment/Left/OrganizationTree.vue
@@ -12,10 +12,11 @@
         @change="onChange"
     />
 </template>
-  <!-- v-on="$listeners" -->
+
 <script>
 import api from '@/api/organization';
 import { arrayToTree } from '@/utils';
+
 export default {
     model: {
         prop: 'value',
diff --git a/src/pages/ranger/basic/major/add_member.vue b/src/pages/ranger/basic/major/add_member.vue
new file mode 100644
index 0000000..5915e56
--- /dev/null
+++ b/src/pages/ranger/basic/major/add_member.vue
@@ -0,0 +1,80 @@
+<template>
+    <Wraper :hidden="hidden" :onOk="submit" :refresh="refresh">
+        <OrganizationTree v-model="value" style="margin-bottom: 10px" @change="organizationChange" />
+
+        <a-table
+            :data-source="data"
+            :row-selection="rowSelection"
+            :pagination="false"
+            rowKey="userId"
+            :loading="loading"
+        >
+            <a-table-column title="姓名" data-index="userName" />
+        </a-table>
+    </Wraper>
+</template>
+
+<script>
+import Wraper from '@/components/table/wraper.vue';
+import OrganizationTree from '@/pages/oceanus/equipment/Left/OrganizationTree.vue';
+import { getOrganizationUserApi, addSpecialitiesStaffsApi } from '@/api';
+
+export default {
+    components: { Wraper, OrganizationTree },
+    props: {
+        hidden: Function,
+        row: Object,
+        specialityId: Number,
+        refresh: Function,
+    },
+    data() {
+        return {
+            value: undefined,
+
+            loading: false,
+
+            data: [],
+
+            form: {
+                specialityId: this.specialityId,
+                staffOrgCommands: [],
+            },
+            selectedRowKeys: [],
+        };
+    },
+
+    computed: {
+        rowSelection() {
+            const { selectedRowKeys, onSelectChange } = this;
+            return {
+                selectedRowKeys,
+                onChange: onSelectChange,
+            };
+        },
+    },
+    methods: {
+        submit() {
+            this.form.staffOrgCommands = this.selectedRowKeys.map((staffId) => ({
+                orgId: this.value,
+                staffId,
+            }));
+
+            return addSpecialitiesStaffsApi(this.form);
+        },
+
+        onSelectChange(selectedRowKeys) {
+            this.selectedRowKeys = selectedRowKeys;
+        },
+
+        async organizationChange(val) {
+            this.loading = true;
+            this.data = await this.getTableData(val);
+            this.loading = false;
+        },
+
+        getTableData(id) {
+            return getOrganizationUserApi(id);
+        },
+    },
+};
+</script>
diff --git a/src/pages/ranger/basic/major/index.vue b/src/pages/ranger/basic/major/index.vue
index d6a809f..26eac08 100644
--- a/src/pages/ranger/basic/major/index.vue
+++ b/src/pages/ranger/basic/major/index.vue
@@ -21,7 +21,8 @@
         </template>
 
         <template #drawer="drawer">
-            <AddAndEdit v-bind="drawer" />
+            <Member v-if="drawer.type === 'member'" v-bind="drawer" />
+            <AddAndEdit v-bind="drawer" v-else />
         </template>
 
         <a-table-column title="专业名称" data-index="specialityName" />
@@ -36,15 +37,16 @@ import Table from '@/components/table/table.vue';
 import UrlSelect from '@/components/MySelect/url_select.vue';
 import MoreItem from '@/components/table/more_item.vue';
 import AddAndEdit from './add_edit.vue';
+import Member from './member.vue';
 
 export default {
-    components: { Table, UrlSelect, MoreItem, AddAndEdit },
+    components: { Table, UrlSelect, MoreItem, AddAndEdit, Member },
     data() {
         return {
             buttons: [
                 { label: '编辑', click: this.edit },
                 { label: '详情', click: this.view },
-                { label: '人员', click: this.view },
+                { label: '人员', click: this.showMember },
                 {
                     type: 'confirm',
                     url: (row) => `/ranger/inspection/api/v1/specialities/${row.specialityId}`,
@@ -63,6 +65,9 @@ export default {
         view(row) {
             this.$refs.table.show({ row, title: '详情', type: 'view' });
         },
+        showMember(row) {
+            this.$refs.table.show({ row, title: '人员', type: 'member' });
+        },
     },
 };
 </script>
diff --git a/src/pages/ranger/basic/major/member.vue b/src/pages/ranger/basic/major/member.vue
new file mode 100644
index 0000000..841702b
--- /dev/null
+++ b/src/pages/ranger/basic/major/member.vue
@@ -0,0 +1,63 @@
+<template>
+    <Wraper :hidden="hidden" noFooter>
+        <Table
+            :url="tableUrl"
+            rowKey="staffId"
+            noPadding
+            :addBtn="addBtn"
+            :buttons="buttons"
+            :width="400"
+            ref="table"
+        >
+            <template #drawer="drawer">
+                <AddMember v-bind="drawer" :specialityId="row.specialityId" />
+            </template>
+
+            <a-table-column title="部门" data-index="orgName" />
+            <a-table-column title="用户姓名" data-index="staffName" />
+        </Table>
+    </Wraper>
+</template>
+
+<script>
+import Wraper from '@/components/table/wraper.vue';
+import Table from '@/components/table/table.vue';
+import AddMember from './add_member.vue';
+
+export default {
+    components: { Wraper, Table, AddMember },
+    props: {
+        hidden: Function,
+        row: Object,
+    },
+    data() {
+        return {
+            addBtn: {
+                text: '添加',
+                title: '添加',
+            },
+            buttons: [
+                {
+                    type: 'confirm',
+                    url: (row) => ({
+                        url: `/ranger/inspection/api/v1/specialities/staffs`,
+                        method: 'del',
+                        data: { staffBindIds: [row.staffBindId] },
+                    }),
+                    after: this.refreshTable,
+                },
+            ],
+        };
+    },
+    computed: {
+        tableUrl() {
+            return `/ranger/inspection/api/v1/specialities/staffs?specialityId=${this.row.specialityId}`;
+        },
+    },
+    methods: {
+        refreshTable() {
+            this.$refs['table'].getData();
+        },
+    },
+};
+</script>
-- 
GitLab