From 38a398bbf9925dd5e57ca61003286af8b24ba5f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B5=A9=E7=8E=AE?= <chen.haowei@iwhalecloud.com>
Date: Tue, 29 Jun 2021 09:28:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/index.vue                | 14 +++--
 src/components/table/my_item.vue              | 21 +++++++
 .../components/OrganizationTree.vue           | 52 +++++++++++++++++
 .../view/organization/jobsmanagement/Jobs.vue | 45 +++++++++++++++
 .../view/organization/jobsmanagement/form.vue | 36 ++++++++++++
 .../view/organization/jobsmanagement/index.js |  3 +
 .../view/organization/usermanagement/User.vue | 56 +++++++++++++++++++
 .../view/organization/usermanagement/form.vue | 36 ++++++++++++
 .../view/organization/usermanagement/index.js |  3 +
 9 files changed, 261 insertions(+), 5 deletions(-)
 create mode 100644 src/components/table/my_item.vue
 create mode 100644 src/pages/system/view/organization/components/OrganizationTree.vue
 create mode 100644 src/pages/system/view/organization/jobsmanagement/Jobs.vue
 create mode 100644 src/pages/system/view/organization/jobsmanagement/form.vue
 create mode 100644 src/pages/system/view/organization/jobsmanagement/index.js
 create mode 100644 src/pages/system/view/organization/usermanagement/User.vue
 create mode 100644 src/pages/system/view/organization/usermanagement/form.vue
 create mode 100644 src/pages/system/view/organization/usermanagement/index.js

diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index 892ab92..3628ae5 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -1,8 +1,10 @@
 <template>
     <div>
         <div :class="$style.card" v-if="$scopedSlots.search">
-            <a-form-model layout="inline" :model="queryForm">
-                <slot name="search" :query="queryForm" />
+            <a-form-model :model="queryForm" layout="horizontal">
+                <a-row :gutter="24">
+                    <slot name="search" :query="queryForm" />
+                </a-row>
             </a-form-model>
 
             <div class="tw-text-right tw-mt-2">
@@ -50,9 +52,7 @@
                 <a-divider />
                 <a-space>
                     <a-button @click="addVisible = false">取消</a-button>
-                    <a-button type="primary" @click="submit" :loading="submitLoading">
-                        确认
-                    </a-button>
+                    <a-button type="primary" @click="submit" :loading="submitLoading"> 确认 </a-button>
                 </a-space>
             </template>
         </a-drawer>
@@ -99,6 +99,10 @@ export default {
                 flexDirection: 'column',
             },
             noFooter: false,
+            layout: {
+                labelCol: { span: 4 },
+                wrapperCol: { span: 20 },
+            },
         };
     },
     watch: {
diff --git a/src/components/table/my_item.vue b/src/components/table/my_item.vue
new file mode 100644
index 0000000..398a178
--- /dev/null
+++ b/src/components/table/my_item.vue
@@ -0,0 +1,21 @@
+<template>
+    <a-col v-bind="span">
+        <a-form-model-item v-bind="layout">
+            <slot />
+        </a-form-model-item>
+    </a-col>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            span: { xs: 24, sm: 24, lg: 12, xl: 6 },
+            layout: { labelCol: { span: 5 }, wrapperCol: { span: 19 }, ...this.$attrs },
+        };
+    },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/pages/system/view/organization/components/OrganizationTree.vue b/src/pages/system/view/organization/components/OrganizationTree.vue
new file mode 100644
index 0000000..cf0d023
--- /dev/null
+++ b/src/pages/system/view/organization/components/OrganizationTree.vue
@@ -0,0 +1,52 @@
+<template>
+    <div>
+        <a-tree-select
+            :value="value"
+            show-search
+            style="width: 100%"
+            :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+            placeholder="Please select"
+            :tree-data="treeData"
+            allow-clear
+            tree-default-expand-all
+            :replaceFields="replaceFields"
+            v-on="$listeners"
+        >
+        </a-tree-select>
+    </div>
+</template>
+
+<script>
+import api from '@/api/organization';
+import { arrayToTree } from '@/utils';
+export default {
+    model: {
+        prop: 'value',
+        event: 'change',
+    },
+    props: {
+        value: [Object, Array],
+        showMenu: Boolean,
+    },
+    data() {
+        return {
+            treeData: [],
+            replaceFields: {
+                title: 'orgName',
+                key: 'orgId',
+                value: 'orgId',
+            },
+        };
+    },
+    async mounted() {
+        this.rawData = await api.getOrganizationList();
+        const newArr = new arrayToTree({
+            data: this.rawData,
+            rootValue: 0,
+            parentKey: 'parentOrgId',
+            key: 'orgId',
+        }).treeData;
+        this.treeData = [...newArr];
+    },
+};
+</script>
diff --git a/src/pages/system/view/organization/jobsmanagement/Jobs.vue b/src/pages/system/view/organization/jobsmanagement/Jobs.vue
new file mode 100644
index 0000000..4bd4e93
--- /dev/null
+++ b/src/pages/system/view/organization/jobsmanagement/Jobs.vue
@@ -0,0 +1,45 @@
+<template>
+    <my-table url="/api/v1/jobs" rowKey="jobId" :addBtn="addBtn" ref="table" noPage>
+        <template #drawer>
+            <Form ref="form" />
+        </template>
+        <!-- <template #search="{ query }">
+            <a-form-model-item label="名称">
+                <a-input v-model="query.jobName" />
+            </a-form-model-item>
+        </template> -->
+
+        <a-table-column title="名称" data-index="jobName" />
+        <a-table-column title="描述" data-index="jobDescription" />
+        <a-table-column title="操作">
+            <template #default="row">
+                <a @click="() => view(row, 1)">编辑</a>
+                <a-divider type="vertical" />
+                <PopconfirmDelete :url="`/api/v1/jobs/${row.jobId}`" :cb="refreshTable" />
+            </template>
+        </a-table-column>
+    </my-table>
+</template>
+<script>
+import Form from './form.vue';
+import PopconfirmDelete from '@/components/popconfirm_delete/index.vue';
+export default {
+    components: { Form, PopconfirmDelete },
+    data() {
+        return {
+            addBtn: { width: 600, onOk: () => this.$refs['form']?.submit() },
+        };
+    },
+    methods: {
+        refreshTable() {
+            this.$refs['table']?.getData();
+        },
+        view(data, type) {
+            this.$refs['table']?.show({ type });
+            this.$nextTick(() => {
+                this.$refs['form'].setData({ ...data }, type);
+            });
+        },
+    },
+};
+</script>
\ No newline at end of file
diff --git a/src/pages/system/view/organization/jobsmanagement/form.vue b/src/pages/system/view/organization/jobsmanagement/form.vue
new file mode 100644
index 0000000..7b8a493
--- /dev/null
+++ b/src/pages/system/view/organization/jobsmanagement/form.vue
@@ -0,0 +1,36 @@
+<template>
+    <a-form-model layout="vertical" :model="form" :rules="rules" ref="DrawerForm">
+        <a-form-model-item label="名称" prop="jobName">
+            <a-input v-model="form.jobName" :disabled="isView" />
+        </a-form-model-item>
+        <a-form-model-item label="描述" prop="jobDescription">
+            <a-textarea v-model="form.jobDescription" :disabled="isView" :rows="4" />
+        </a-form-model-item>
+    </a-form-model>
+</template>
+
+<script>
+import JobsApi from '@/api/organization';
+import FormMixin from '@/components/FormMixin';
+export default {
+    mixins: [FormMixin],
+    data() {
+        return {
+            rules: {
+                jobName: [{ required: true, message: 'Please select Activity zone', trigger: 'change' }],
+                jobDescription: [
+                    { required: true, message: 'Please select Activity zone', trigger: 'change' },
+                ],
+            },
+        };
+    },
+    methods: {
+        add() {
+            return JobsApi.addJobs({ ...this.form });
+        },
+        edit() {
+            return JobsApi.updateJobs({ ...this.form });
+        },
+    },
+};
+</script>
diff --git a/src/pages/system/view/organization/jobsmanagement/index.js b/src/pages/system/view/organization/jobsmanagement/index.js
new file mode 100644
index 0000000..64f0518
--- /dev/null
+++ b/src/pages/system/view/organization/jobsmanagement/index.js
@@ -0,0 +1,3 @@
+import Jobs from './Jobs';
+
+export default Jobs;
diff --git a/src/pages/system/view/organization/usermanagement/User.vue b/src/pages/system/view/organization/usermanagement/User.vue
new file mode 100644
index 0000000..2c2a29a
--- /dev/null
+++ b/src/pages/system/view/organization/usermanagement/User.vue
@@ -0,0 +1,56 @@
+<template>
+    <my-table url="/api/v1/users" rowKey="userId" :addBtn="addBtn" ref="table">
+        <template #drawer>
+            <Form ref="form" />
+        </template>
+        <template #search="{ query }">
+            <MyFormModelItem label="归属部门">
+                <OrganizationTree v-model="query.orgId" />
+            </MyFormModelItem>
+            <MyFormModelItem label="账号">
+                <a-input placeholder="Basic usage" v-model="query.loginId" />
+            </MyFormModelItem>
+        </template>
+
+        <a-table-column title="账号" data-index="loginId" />
+        <a-table-column title="姓名" data-index="userName" />
+        <a-table-column title="职称" data-index="userTitleName" />
+        <a-table-column title="移动电话" data-index="mobilePhone" />
+        <a-table-column title="固定电话" data-index="fixedPhone" />
+        <a-table-column title="电子邮箱" data-index="userEmail" />
+        <a-table-column title="是否锁定" data-index="isLockedName" />
+        <a-table-column title="操作">
+            <template #default="row">
+                <a @click="() => view(row, 1)">编辑</a>
+                <a-divider type="vertical" />
+                <PopconfirmDelete :url="`/api/v1/jobs/${row.jobId}`" :cb="refreshTable" />
+            </template>
+        </a-table-column>
+    </my-table>
+</template>
+<script>
+import Form from './form.vue';
+import PopconfirmDelete from '@/components/popconfirm_delete/index.vue';
+import MyFormModelItem from '@/components/table/my_item.vue';
+import OrganizationTree from '../components/OrganizationTree.vue';
+export default {
+    components: { Form, PopconfirmDelete, OrganizationTree, MyFormModelItem },
+    data() {
+        return {
+            addBtn: { width: 600, onOk: () => this.$refs['form']?.submit() },
+            span: { xs: 12, md: 8, lg: 6 },
+        };
+    },
+    methods: {
+        refreshTable() {
+            this.$refs['table']?.getData();
+        },
+        view(data, type) {
+            this.$refs['table']?.show({ type });
+            this.$nextTick(() => {
+                this.$refs['form'].setData({ ...data }, type);
+            });
+        },
+    },
+};
+</script>
\ No newline at end of file
diff --git a/src/pages/system/view/organization/usermanagement/form.vue b/src/pages/system/view/organization/usermanagement/form.vue
new file mode 100644
index 0000000..7b8a493
--- /dev/null
+++ b/src/pages/system/view/organization/usermanagement/form.vue
@@ -0,0 +1,36 @@
+<template>
+    <a-form-model layout="vertical" :model="form" :rules="rules" ref="DrawerForm">
+        <a-form-model-item label="名称" prop="jobName">
+            <a-input v-model="form.jobName" :disabled="isView" />
+        </a-form-model-item>
+        <a-form-model-item label="描述" prop="jobDescription">
+            <a-textarea v-model="form.jobDescription" :disabled="isView" :rows="4" />
+        </a-form-model-item>
+    </a-form-model>
+</template>
+
+<script>
+import JobsApi from '@/api/organization';
+import FormMixin from '@/components/FormMixin';
+export default {
+    mixins: [FormMixin],
+    data() {
+        return {
+            rules: {
+                jobName: [{ required: true, message: 'Please select Activity zone', trigger: 'change' }],
+                jobDescription: [
+                    { required: true, message: 'Please select Activity zone', trigger: 'change' },
+                ],
+            },
+        };
+    },
+    methods: {
+        add() {
+            return JobsApi.addJobs({ ...this.form });
+        },
+        edit() {
+            return JobsApi.updateJobs({ ...this.form });
+        },
+    },
+};
+</script>
diff --git a/src/pages/system/view/organization/usermanagement/index.js b/src/pages/system/view/organization/usermanagement/index.js
new file mode 100644
index 0000000..b6916d8
--- /dev/null
+++ b/src/pages/system/view/organization/usermanagement/index.js
@@ -0,0 +1,3 @@
+import User from './User';
+
+export default User;
-- 
GitLab