From df6b3c1440805b0adb1a0772929de560f83fdfcc 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: Mon, 28 Jun 2021 16:03:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/organization.js                       | 12 ------
 src/components/FormMixin/index.js             | 34 +++++++++++++++
 src/components/table/index.vue                | 20 +++++++--
 .../jobmanagement/JobManagement.vue           | 16 +++----
 .../view/organization/jobmanagement/form.vue  | 43 +++++++------------
 5 files changed, 73 insertions(+), 52 deletions(-)
 create mode 100644 src/components/FormMixin/index.js

diff --git a/src/api/organization.js b/src/api/organization.js
index db07227..a7ba9d7 100644
--- a/src/api/organization.js
+++ b/src/api/organization.js
@@ -1,17 +1,5 @@
 import { delReq, getReq, postReq, putReq } from '@/utils';
 
-// export function delMenuApi(id) {
-//     return delReq(`/api/v1/menus/${id}`);
-// }
-
-// export function getMenuDataApi() {
-//     return getReq('/api/v1/menus');
-// }
-
-// export function addMenuApi(data) {
-//     return postReq('/api/v1/menus', data);
-// }
-
 function addJobsApi(data) {
     return postReq('/api/v1/jobs', data);
 }
diff --git a/src/components/FormMixin/index.js b/src/components/FormMixin/index.js
new file mode 100644
index 0000000..cb43e98
--- /dev/null
+++ b/src/components/FormMixin/index.js
@@ -0,0 +1,34 @@
+export default {
+    data() {
+        return {
+            type: 0,
+            form: {},
+        };
+    },
+    computed: {
+        isAdd() {
+            return this.type === 0;
+        },
+        isEdit() {
+            return this.type === 1;
+        },
+        isView() {
+            return this.type === 2;
+        },
+    },
+    methods: {
+        async submit() {
+            await this.$refs.DrawerForm.validate();
+            if (this.isAdd) {
+                return this?.add();
+            }
+            if (this.isEdit) {
+                return this?.edit();
+            }
+        },
+        setData(data, type) {
+            this.form = data;
+            this.type = type;
+        },
+    },
+};
diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index 3092465..5ad8709 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -30,13 +30,12 @@
 
         <!-- 新增 -->
         <a-drawer
-            :title="addBtn.title || '新建'"
+            :title="title"
             placement="right"
             :visible="addVisible"
             @close="addDrawerClose"
             v-if="addBtn"
             :maskClosable="!!addBtn.maskClosable"
-            :closable="false"
             :drawerStyle="drawerStyle"
             :bodyStyle="bodyStyle"
             :width="addBtn.width || 600"
@@ -44,7 +43,7 @@
         >
             <div class="tw-overflow-y-hidden">
                 <div class="tw-overflow-y-auto tw-h-full">
-                    <slot name="add" />
+                    <slot name="drawer" />
                 </div>
             </div>
             <a-divider />
@@ -78,6 +77,7 @@ export default {
             pageSize: 10,
         };
         return {
+            title: '新增',
             data: [],
             queryForm: {
                 ...this.initQuery,
@@ -147,7 +147,19 @@ export default {
             }
             this.submitLoading = false;
         },
-        showAdd() {
+        show({ type, title } = {}) {
+            if (type === 0) {
+                this.title = '新增';
+            }
+            if (type === 1) {
+                this.title = '编辑';
+            }
+            if (type === 2) {
+                this.title = '查看';
+            }
+            if (title) {
+                this.title = title;
+            }
             this.addVisible = true;
         },
     },
diff --git a/src/pages/system/view/organization/jobmanagement/JobManagement.vue b/src/pages/system/view/organization/jobmanagement/JobManagement.vue
index 55c4e51..4bd4e93 100644
--- a/src/pages/system/view/organization/jobmanagement/JobManagement.vue
+++ b/src/pages/system/view/organization/jobmanagement/JobManagement.vue
@@ -1,21 +1,21 @@
 <template>
-    <my-table url="/api/v1/jobs" rowKey="jobId" :addBtn="addBtn" ref="table">
-        <template #add>
+    <my-table url="/api/v1/jobs" rowKey="jobId" :addBtn="addBtn" ref="table" noPage>
+        <template #drawer>
             <Form ref="form" />
         </template>
-        <template #search="{ query }">
+        <!-- <template #search="{ query }">
             <a-form-model-item label="名称">
                 <a-input v-model="query.jobName" />
             </a-form-model-item>
-        </template>
+        </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)">编辑</a>
+                <a @click="() => view(row, 1)">编辑</a>
                 <a-divider type="vertical" />
-                <PopconfirmDelete :url="`/api/v1/roles/${row.roleId}`" :cb="refreshTable" />
+                <PopconfirmDelete :url="`/api/v1/jobs/${row.jobId}`" :cb="refreshTable" />
             </template>
         </a-table-column>
     </my-table>
@@ -35,9 +35,9 @@ export default {
             this.$refs['table']?.getData();
         },
         view(data, type) {
-            this.$refs['table']?.showAdd();
+            this.$refs['table']?.show({ type });
             this.$nextTick(() => {
-                this.$refs['form'].setData(data, type);
+                this.$refs['form'].setData({ ...data }, type);
             });
         },
     },
diff --git a/src/pages/system/view/organization/jobmanagement/form.vue b/src/pages/system/view/organization/jobmanagement/form.vue
index 98fab55..fb91fd5 100644
--- a/src/pages/system/view/organization/jobmanagement/form.vue
+++ b/src/pages/system/view/organization/jobmanagement/form.vue
@@ -1,9 +1,9 @@
 <template>
-    <a-form-model layout="vertical" :model="form" :rules="rules">
-        <a-form-model-item label="名称">
+    <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="描述">
+        <a-form-model-item label="描述" prop="jobDescription">
             <a-textarea v-model="form.jobDescription" :disabled="isView" :rows="4" />
         </a-form-model-item>
     </a-form-model>
@@ -11,38 +11,25 @@
 
 <script>
 import JobsApi from '@/api/organization';
+import FormMixin from '@/components/FormMixin';
 export default {
+    mixins: [FormMixin],
     data() {
         return {
-            type: 0,
-            form: {},
-            rules: {},
-            checkedKeys: [],
+            rules: {
+                jobName: [{ required: true, message: 'Please select Activity zone', trigger: 'change' }],
+                jobDescription: [
+                    { required: true, message: 'Please select Activity zone', trigger: 'change' },
+                ],
+            },
         };
     },
-    computed: {
-        isAdd() {
-            return this.type === 0;
-        },
-        isEdit() {
-            return this.type === 1;
-        },
-        isView() {
-            return this.type === 2;
-        },
-    },
     methods: {
-        submit() {
-            if (this.isEdit) {
-                return JobsApi.add({ ...this.form });
-            }
-            if (this.isAdd) {
-                return JobsApi.update({ ...this.form });
-            }
+        add() {
+            return JobsApi.add({ ...this.form });
         },
-        setData(data, type) {
-            this.form = data;
-            this.type = type;
+        edit() {
+            return JobsApi.update({ ...this.form });
         },
     },
 };
-- 
GitLab