群成员管理UI完善

src/views/modules/master/masteruserrelation-add-or-update.vue

@@ -1,8 +1,8 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="用户名" prop="nickname">
-          <el-input v-model="dataForm.nickname" placeholder="用户名"></el-input>
+          <el-form-item label="群内昵称" prop="nickname">
+          <el-input v-model="dataForm.nickname" placeholder="群内昵称"></el-input>
       </el-form-item>
           <el-form-item label="用户头像" prop="userAvatar">
           <el-input v-model="dataForm.userAvatar" placeholder="" disabled></el-input>
@@ -75,25 +75,25 @@ export default {
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         userAvatar: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         mobile: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         realName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         loginName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         deptId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         deptName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         manageFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         revision: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }

src/views/modules/master/masteruserrelation-add.vue

@@ -98,21 +98,29 @@ export default {
     // 昵称改变事件监听
     nameInputBlur (index, event) {
       if (event.target.value === null || event.target.value === '') {
-        alert('昵称不能为空！')
-        return
+        this.$message({
+          message: '昵称不能为空！',
+          type: 'warning'
+        })
       }
       this.formData[index].nickName = event.target.value
     },
     // 表单提交
     dataFormSubmitHandle () {
       if (this.formData.length < 1 || this.formData[0].username === '') {
-        alert('请选择书记！')
+        this.$message({
+          message: '请选择书记！',
+          type: 'warning'
+        })
         return false
       }
       // 昵称非空校验
       for (var i = 0; i < this.formData.length; i++) {
         if (this.formData[i].nickName === '' || this.formData[i].nickName === null) {
-          alert('存在空昵称，请完善！')
+          this.$message({
+            message: '存在空昵称，请完善昵称！',
+            type: 'warning'
+          })
           return false
         }
       }
@@ -138,6 +146,8 @@ export default {
             this.$emit('refreshDataList')
             // 清空所选列表
             this.formData = [{ deptName: '', username: '', nickName: '' }]
+            // 返回主列表
+            this.backToUserRelationList()
           }
         })
       }).catch(() => {})

src/views/modules/master/masteruserrelation.vue

@@ -61,8 +61,8 @@
         <el-table-column prop="createdTime" label="添加时间" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="170">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.manageFlag == '1'" type="text" size="small" @click="updateManageFlagHandle(scope.row.id)">解除管理员</el-button>
-            <el-button v-if="scope.row.manageFlag == '0'" type="text" size="small" @click="updateManageFlagHandle(scope.row.id)">设置管理员</el-button>
+            <el-button v-if="scope.row.manageFlag == '1'" type="text" size="small" @click="updateManageFlagHandle(scope.row.id,'解除管理员')">解除管理员</el-button>
+            <el-button v-if="scope.row.manageFlag == '0'" type="text" size="small" @click="updateManageFlagHandle(scope.row.id,'设置管理员')">设置管理员</el-button>
             <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
@@ -119,8 +119,8 @@ export default {
         return '管理员'
       }
     },
-    updateManageFlagHandle (id) {
-      this.$confirm(this.$t('prompt.info', { 'handle': '更改成员身份' }), this.$t('prompt.title'), {
+    updateManageFlagHandle (id, promptInfo) {
+      this.$confirm(this.$t('prompt.info', { 'handle': promptInfo }), this.$t('prompt.title'), {
         confirmButtonText: this.$t('confirm'),
         cancelButtonText: this.$t('cancel'),
         type: 'warning'