From 03787d12c8b2d92f56a6016dbfda42d06d9d49ea Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 4 Jun 2020 15:27:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E5=91=98=E6=97=B6?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E9=A1=B9=E4=B8=BA=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/OrganizationMember.vue        | 18 +++++++++++-------
 .../organization/OrganizationWorkspace.vue     | 18 +++++++++++-------
 .../settings/system/Organization.vue           | 16 ++++++++++------
 .../settings/system/SystemWorkspace.vue        | 16 ++++++++++------
 .../settings/workspace/WorkspaceMember.vue     | 16 ++++++++++------
 5 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/frontend/src/business/components/settings/organization/OrganizationMember.vue b/frontend/src/business/components/settings/organization/OrganizationMember.vue
index 90477b4f43..e2578064d7 100644
--- a/frontend/src/business/components/settings/organization/OrganizationMember.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationMember.vue
@@ -78,7 +78,7 @@
         <el-form-item :label="$t('commons.phone')" prop="phone">
           <el-input v-model="form.phone" autocomplete="off" :disabled="true"/>
         </el-form-item>
-        <el-form-item :label="$t('commons.role')" prop="roleIds">
+        <el-form-item :label="$t('commons.role')" prop="roleIds" :rules="{required: true, message: $t('role.please_choose_role'), trigger: 'change'}">
           <el-select v-model="form.roleIds" multiple :placeholder="$t('role.please_choose_role')" class="select-width">
             <el-option
               v-for="item in form.allroles"
@@ -175,7 +175,7 @@
         // 编辑使填充角色信息
         this.$set(this.form, 'roleIds', roleIds);
       },
-      updateOrgMember() {
+      updateOrgMember(formName) {
         let param = {
           id: this.form.id,
           name: this.form.name,
@@ -184,11 +184,15 @@
           roleIds: this.form.roleIds,
           organizationId: this.currentUser().lastOrganizationId
         }
-        this.result = this.$post("/organization/member/update", param, () => {
-          this.$success(this.$t('commons.modify_success'));
-          this.updateVisible = false;
-          this.initTableData();
-        });
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            this.result = this.$post("/organization/member/update", param, () => {
+              this.$success(this.$t('commons.modify_success'));
+              this.updateVisible = false;
+              this.initTableData();
+            });
+          }
+        })
       },
       del(row) {
         this.$confirm(this.$t('member.remove_member'), '', {
diff --git a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
index db46c97168..fab60134bc 100644
--- a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
@@ -125,7 +125,7 @@
         <el-form-item :label="$t('commons.phone')" prop="phone">
           <el-input v-model="memberForm.phone" autocomplete="off" :disabled="true"/>
         </el-form-item>
-        <el-form-item :label="$t('commons.role')" prop="roleIds">
+        <el-form-item :label="$t('commons.role')" prop="roleIds" :rules="{required: true, message: $t('role.please_choose_role'), trigger: 'change'}">
           <el-select v-model="memberForm.roleIds" multiple :placeholder="$t('role.please_choose_role')"
                      class="select-width">
             <el-option
@@ -366,7 +366,7 @@
           this.$info(this.$t('commons.remove_cancel'));
         });
       },
-      updateOrgMember() {
+      updateOrgMember(formName) {
         let param = {
           id: this.memberForm.id,
           name: this.memberForm.name,
@@ -375,11 +375,15 @@
           roleIds: this.memberForm.roleIds,
           workspaceId: this.currentWorkspaceRow.id
         }
-        this.result = this.$post("/workspace/member/update", param, () => {
-          this.$success(this.$t('commons.modify_success'));
-          this.dialogWsMemberUpdateVisible = false;
-          this.cellClick(this.currentWorkspaceRow);
-        });
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            this.result = this.$post("/workspace/member/update", param, () => {
+              this.$success(this.$t('commons.modify_success'));
+              this.dialogWsMemberUpdateVisible = false;
+              this.cellClick(this.currentWorkspaceRow);
+            });
+          }
+        })
       },
       buildPagePath(path) {
         return path + "/" + this.dialogCurrentPage + "/" + this.dialogPageSize;
diff --git a/frontend/src/business/components/settings/system/Organization.vue b/frontend/src/business/components/settings/system/Organization.vue
index c64a579a1e..9e9a8dbd83 100644
--- a/frontend/src/business/components/settings/system/Organization.vue
+++ b/frontend/src/business/components/settings/system/Organization.vue
@@ -145,7 +145,7 @@
         <el-form-item :label="$t('commons.phone')" prop="phone">
           <el-input v-model="memberForm.phone" autocomplete="off" :disabled="true"/>
         </el-form-item>
-        <el-form-item :label="$t('commons.role')" prop="roleIds">
+        <el-form-item :label="$t('commons.role')" prop="roleIds" :rules="{required: true, message: $t('role.please_choose_role'), trigger: 'change'}">
           <el-select v-model="memberForm.roleIds" multiple :placeholder="$t('role.please_choose_role')"
                      class="select-width">
             <el-option
@@ -427,7 +427,7 @@
           }
         });
       },
-      updateOrgMember() {
+      updateOrgMember(formName) {
         let param = {
           id: this.memberForm.id,
           name: this.memberForm.name,
@@ -436,10 +436,14 @@
           roleIds: this.memberForm.roleIds,
           organizationId: this.currentRow.id
         }
-        this.result = this.$post("/organization/member/update", param, () => {
-          this.$success(this.$t('commons.modify_success'));
-          this.dialogOrgMemberUpdateVisible = false;
-          this.cellClick(this.currentRow);
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            this.result = this.$post("/organization/member/update", param, () => {
+              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 dfb8091e9f..8c8c6a4fbf 100644
--- a/frontend/src/business/components/settings/system/SystemWorkspace.vue
+++ b/frontend/src/business/components/settings/system/SystemWorkspace.vue
@@ -164,7 +164,7 @@
         <el-form-item :label="$t('commons.phone')" prop="phone">
           <el-input v-model="memberForm.phone" autocomplete="off" :disabled="true"/>
         </el-form-item>
-        <el-form-item :label="$t('commons.role')" prop="roleIds">
+        <el-form-item :label="$t('commons.role')" prop="roleIds" :rules="{required: true, message: $t('role.please_choose_role'), trigger: 'change'}">
           <el-select v-model="memberForm.roleIds" multiple :placeholder="$t('role.please_choose_role')"
                      class="select-width">
             <el-option
@@ -405,7 +405,7 @@
           this.$info(this.$t('commons.remove_cancel'));
         });
       },
-      updateWorkspaceMember() {
+      updateWorkspaceMember(formName) {
         let param = {
           id: this.memberForm.id,
           name: this.memberForm.name,
@@ -414,10 +414,14 @@
           roleIds: this.memberForm.roleIds,
           workspaceId: this.currentWorkspaceRow.id
         }
-        this.result = this.$post("/workspace/member/update", param, () => {
-          this.$success(this.$t('commons.modify_success'));
-          this.dialogWsMemberUpdateVisible = false;
-          this.cellClick(this.currentWorkspaceRow);
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            this.result = this.$post("/workspace/member/update", param, () => {
+              this.$success(this.$t('commons.modify_success'));
+              this.dialogWsMemberUpdateVisible = false;
+              this.cellClick(this.currentWorkspaceRow);
+            });
+          }
         });
       },
     },
diff --git a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
index e332d6becb..f767a6361e 100644
--- a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
+++ b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
@@ -79,7 +79,7 @@
         <el-form-item :label="$t('commons.phone')" prop="phone">
           <el-input v-model="form.phone" autocomplete="off" :disabled="true"/>
         </el-form-item>
-        <el-form-item :label="$t('commons.role')" prop="roleIds">
+        <el-form-item :label="$t('commons.role')" prop="roleIds" :rules="{required: true, message: $t('role.please_choose_role'), trigger: 'change'}">
           <el-select v-model="form.roleIds" multiple :placeholder="$t('role.please_choose_role')" class="select-width">
             <el-option
               v-for="item in form.allroles"
@@ -197,7 +197,7 @@
         // 编辑使填充角色信息
         this.$set(this.form, 'roleIds', roleIds);
       },
-      updateWorkspaceMember() {
+      updateWorkspaceMember(formName) {
         let param = {
           id: this.form.id,
           name: this.form.name,
@@ -206,10 +206,14 @@
           roleIds: this.form.roleIds,
           workspaceId: this.currentUser().lastWorkspaceId
         }
-        this.result = this.$post("/workspace/member/update", param, () => {
-          this.$success(this.$t('commons.modify_success'));
-          this.updateVisible = false;
-          this.initTableData();
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            this.result = this.$post("/workspace/member/update", param, () => {
+              this.$success(this.$t('commons.modify_success'));
+              this.updateVisible = false;
+              this.initTableData();
+            });
+          }
         });
       },
       create() {