From 56d8182e01c24ccca9a7e73df877593941f5d1dd Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Tue, 28 Apr 2020 11:38:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/OrganizationMember.vue | 5 +---- .../organization/OrganizationWorkspace.vue | 7 ++----- .../settings/system/Organization.vue | 18 +++++++++--------- .../settings/system/SystemWorkspace.vue | 5 +---- .../components/settings/system/User.vue | 8 ++++---- .../settings/workspace/WorkspaceMember.vue | 5 +---- 6 files changed, 18 insertions(+), 30 deletions(-) diff --git a/frontend/src/business/components/settings/organization/OrganizationMember.vue b/frontend/src/business/components/settings/organization/OrganizationMember.vue index 7adee98ff6..22fe460ff9 100644 --- a/frontend/src/business/components/settings/organization/OrganizationMember.vue +++ b/frontend/src/business/components/settings/organization/OrganizationMember.vue @@ -2,7 +2,7 @@
@@ -162,9 +162,6 @@ buildPagePath(path) { return path + "/" + this.currentPage + "/" + this.pageSize; }, - search() { - this.initTableData(); - }, closeFunc() { this.form = {}; this.initTableData(); diff --git a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue index 469e27bbd5..027c90d6de 100644 --- a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue +++ b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue @@ -2,7 +2,7 @@
@@ -202,16 +202,13 @@ type: 'warning' }).then(() => { this.$get('/workspace/delete/' + row.id, () => { - Message.success(this.$t('commons.delete_success')); + this.$success(this.$t('commons.delete_success')); this.list(); }); }).catch(() => { }); }, - search() { - this.list(); - }, list() { let url = '/workspace/list/' + this.currentPage + '/' + this.pageSize; let lastOrganizationId = this.currentUser.lastOrganizationId; diff --git a/frontend/src/business/components/settings/system/Organization.vue b/frontend/src/business/components/settings/system/Organization.vue index a51d3a5152..6df8ccbebd 100644 --- a/frontend/src/business/components/settings/system/Organization.vue +++ b/frontend/src/business/components/settings/system/Organization.vue @@ -220,7 +220,7 @@ rule: { name: [ {required: true, message: this.$t('organization.input_name'), trigger: 'blur'}, - {min: 2, max: 10, message: this.$t('commons.input_limit', [2, 50]), trigger: 'blur'}, + {min: 2, max: 50, message: this.$t('commons.input_limit', [2, 50]), trigger: 'blur'}, { required: true, pattern: /^[\u4e00-\u9fa5_a-zA-Z0-9.ยท-]+$/, @@ -322,7 +322,7 @@ }).then(() => { this.result = this.$get(this.deletePath + row.id, () => { this.$success(this.$t('commons.delete_success')); - this.initTableData() + this.initTableData(); }); }).catch(() => { this.$info(this.$t('commons.delete_cancel')); @@ -343,8 +343,8 @@ }); }, createOrganization(createOrganizationForm) { - this.$refs[createOrganizationForm].validate(valide => { - if (valide) { + this.$refs[createOrganizationForm].validate(valid => { + if (valid) { this.result = this.$post(this.createPath, this.form, () => { this.$success(this.$t('commons.save_success')); this.initTableData(); @@ -355,11 +355,11 @@ } }) }, - updateOrganization(udpateOrganizationForm) { - this.$refs[udpateOrganizationForm].validate(valide => { - if (valide) { + updateOrganization(updateOrganizationForm) { + this.$refs[updateOrganizationForm].validate(valid => { + if (valid) { this.result = this.$post(this.updatePath, this.form, () => { - this.$success(this.$t('commons.modify_success')) + this.$success(this.$t('commons.modify_success')); this.dialogOrgUpdateVisible = false; this.initTableData(); }); @@ -423,7 +423,7 @@ organizationId: this.currentRow.id } this.result = this.$post("/organization/member/update", param, () => { - this.$success(this.$t('commons.modify_success')) + this.$success(this.$t('commons.modify_success')); this.dialogOrgMemberUpdateVisible = false; this.cellClick(this.currentRow); }); diff --git a/frontend/src/business/components/settings/system/SystemWorkspace.vue b/frontend/src/business/components/settings/system/SystemWorkspace.vue index 222c2e00f2..42b247a3ff 100644 --- a/frontend/src/business/components/settings/system/SystemWorkspace.vue +++ b/frontend/src/business/components/settings/system/SystemWorkspace.vue @@ -2,7 +2,7 @@
@@ -324,9 +324,6 @@ this.memberLineData = []; this.list(); }, - search() { - this.list(); - }, list() { let url = '/workspace/list/all/' + this.currentPage + '/' + this.pageSize; this.result = this.$post(url, this.condition, response => { diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue index f428580b78..44bffab1f6 100644 --- a/frontend/src/business/components/settings/system/User.vue +++ b/frontend/src/business/components/settings/system/User.vue @@ -178,8 +178,8 @@ }); }, createUser(createUserForm) { - this.$refs[createUserForm].validate(valide => { - if (valide) { + this.$refs[createUserForm].validate(valid => { + if (valid) { this.result = this.$post(this.createPath, this.form, () => { this.$success(this.$t('commons.save_success')); this.search(); @@ -191,8 +191,8 @@ }) }, updateUser(updateUserForm) { - this.$refs[updateUserForm].validate(valide => { - if (valide) { + this.$refs[updateUserForm].validate(valid => { + if (valid) { this.result = this.$post(this.updatePath, this.form, () => { this.$success(this.$t('commons.modify_success')); this.updateVisible = false; diff --git a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue index 4f43bfa397..0cb53f56bd 100644 --- a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue +++ b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue @@ -2,7 +2,7 @@
@@ -167,9 +167,6 @@ buildPagePath(path) { return path + "/" + this.currentPage + "/" + this.pageSize; }, - search() { - this.initTableData(); - }, closeFunc() { this.form = {}; this.initTableData();