群成员管理提示信息

src/views/modules/master/master-user.vue

@@ -96,7 +96,7 @@ export default {
           message: '请选择书记！',
           type: 'warning'
         })
-        return
+        return false
       }
       this.$emit('connectResponse', this.responseData)
       this.visible = false

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

@@ -9,33 +9,31 @@
       </el-form>
       <div v-for="(item, index) in this.formData" :key="index">
         <el-form :inline="true" :rules="dataRule" ref="item" :model="item" @keyup.enter.native="dataFormSubmitHandle()">
+          <div style="text-align: left;">{{"书记"+(index+1)+":"}}</div>
           <el-row>
-            <div style="text-align: left;">{{"书记"+(index+1)+":"}}</div>
-            <el-row>
-                <el-form-item label="选择书记：" prop="deptName">
-                    <el-input v-model="item.deptName"
-                              :disabled="true"
-                              type="text"
-                              clearable
-                              style="width: 30rem;">
-                    </el-input>&emsp;
-                    <el-input v-model="item.realName"
-                              :disabled="true"
-                              type="text"
-                              clearable
-                              style="width: 10rem;">
-                    </el-input> &emsp;
-                    <el-button @click="selectUserMethod(index)">{{"选择书记"}}</el-button>&emsp;&emsp;
-                </el-form-item>
-                <el-form-item label="群内昵称：" prop="nickName">
-                    <el-input v-model="item.nickName"
-                              type="text"
-                              style="width: 30rem;"
-                              maxlength="60">
-                    </el-input>&emsp;
-                    <el-button @click="deleteUserMethod(index)">{{"删除"}}</el-button>&emsp;&emsp;
-                </el-form-item>
-            </el-row>
+              <el-form-item label="选择书记：" prop="deptName">
+                  <el-input v-model="item.deptName"
+                            :disabled="true"
+                            type="text"
+                            clearable
+                            style="width: 30rem;">
+                  </el-input>&emsp;
+                  <el-input v-model="item.realName"
+                            :disabled="true"
+                            type="text"
+                            clearable
+                            style="width: 10rem;">
+                  </el-input> &emsp;
+                  <el-button @click="selectUserMethod(index)">{{"选择书记"}}</el-button>&emsp;&emsp;
+              </el-form-item>
+              <el-form-item label="群内昵称：" prop="nickName">
+                  <el-input v-model="item.nickName"
+                            type="text"
+                            style="width: 30rem;"
+                            maxlength="60">
+                  </el-input>&emsp;
+                  <el-button @click="deleteUserMethod(index)">{{"删除"}}</el-button>&emsp;&emsp;
+              </el-form-item>
           </el-row>
         </el-form>
       </div>

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="cancelManageFlagHandle(scope.row.id)">解除管理员</el-button>
-            <el-button v-if="scope.row.manageFlag == '0'" type="text" size="small" @click="setManageFlagHandle(scope.row.id)">设置管理员</el-button>
+            <el-button v-if="scope.row.manageFlag == '1'" type="text" size="small" @click="updateManageFlagHandle(scope.row.id,'0')">解除管理员</el-button>
+            <el-button v-if="scope.row.manageFlag == '0'" type="text" size="small" @click="updateManageFlagHandle(scope.row.id,'1')">设置管理员</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>
@@ -79,26 +79,6 @@
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-      <el-dialog
-          title="确认要设置管理员身份吗?"
-          :visible.sync="setManagerDialog"
-          width="30%">
-        <span>将该成员设置为管理员身份，管理员可以将通知和话题置顶、关闭等权限。</span>
-        <span slot="footer" class="dialog-footer">
-          <el-button @click="setManagerDialog = false">取 消</el-button>
-          <el-button type="primary" @click="updateManageFlagHandle" :disabled="disAbled">确 定</el-button>
-       </span>
-      </el-dialog>
-      <el-dialog
-          title="确认要解除管理员身份吗?"
-          :visible.sync="cancelManagerDialog"
-          width="30%">
-        <span>将该成员的管理权限解除，解除后无法管理，不能置顶、关闭等权限。</span>
-        <span slot="footer" class="dialog-footer">
-          <el-button @click="cancelManagerDialog = false">取 消</el-button>
-          <el-button type="primary" @click="updateManageFlagHandle" :disabled="disAbled">确 定</el-button>
-       </span>
-      </el-dialog>
     </div>
   </el-card>
 </template>
@@ -134,11 +114,7 @@ export default {
             return time.getTime() < new Date(EndDateVal).getTime()
           }
         }
-      },
-      updateManageFlagId: '',
-      disAbled: false,
-      setManagerDialog: false,
-      cancelManagerDialog: false
+      }
     }
   },
   components: {
@@ -159,32 +135,41 @@ export default {
         return '管理员'
       }
     },
-    setManageFlagHandle (id) {
-      this.setManagerDialog = true
-      this.updateManageFlagId = id
-    },
-    cancelManageFlagHandle (id) {
-      this.cancelManagerDialog = true
-      this.updateManageFlagId = id
-    },
-    updateManageFlagHandle () {
-      this.disAbled = true
-      this.$http.get(`/cloudAnalysis/masteruserrelation/updateManageFlag/${this.updateManageFlagId}`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.$message({
-          message: this.$t('prompt.success'),
-          type: 'success',
-          duration: 500,
-          onClose: () => {
-            this.setManagerDialog = false
-            this.cancelManagerDialog = false
-            this.disAbled = false
-            this.getDataList()
+    updateManageFlagHandle (id, flag) {
+      let contentInfo = ''
+      let titleInfo = ''
+      if (flag === '0') {
+        contentInfo = '将该成员的管理权限解除，解除后无法管理，不能置顶、关闭等权限。'
+        titleInfo = '确认要解除管理员身份吗?'
+      } else {
+        contentInfo = '将该成员设置为管理员身份，管理员可以将通知和话题置顶、关闭等权限。'
+        titleInfo = '确认要设置管理员身份吗?'
+      }
+      this.$confirm(contentInfo, titleInfo, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.disAbled = true
+        this.$http.get(`/cloudAnalysis/masteruserrelation/updateManageFlag/${id}`).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
           }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.getDataList()
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'success',
+            message: '操作成功！'
+          })
         })
-      }).catch(() => { })
+      }).catch(() => {})
     }
   }
 }