diff --git a/src/api/ranger.js b/src/api/ranger.js index 514670ae43e180a59abe4d8560f2b412a755128e..2ef4ddfe0e509afe25677bb7b5088ea2adcf3333 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 da83e55f94b32ad13c499ecac675ae830caf0497..96dc167c563b8d3707bed3e4402a0ddd3af291f1 100644 --- a/src/pages/oceanus/equipment/Left/OrganizationTree.vue +++ b/src/pages/oceanus/equipment/Left/OrganizationTree.vue @@ -12,10 +12,11 @@ @change="onChange" /> - + diff --git a/src/pages/ranger/basic/major/index.vue b/src/pages/ranger/basic/major/index.vue index d6a809fa0be3c0e2fb4b1354f6b7cae6664831cc..26eac089c647c5764b4572f4c7deb30eac6e2b79 100644 --- a/src/pages/ranger/basic/major/index.vue +++ b/src/pages/ranger/basic/major/index.vue @@ -21,7 +21,8 @@ @@ -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' }); + }, }, }; diff --git a/src/pages/ranger/basic/major/member.vue b/src/pages/ranger/basic/major/member.vue new file mode 100644 index 0000000000000000000000000000000000000000..841702b8db3b676c4938dd589b8315114f6b746b --- /dev/null +++ b/src/pages/ranger/basic/major/member.vue @@ -0,0 +1,63 @@ + + +