Merge branch 'dev' of http://94.191.59.107:3000/wukai/lzga-doc into dev

src/api/doc/msgAccepter.js

@@ -42,3 +42,49 @@ export function delMsgAccepter(msgId) {
     method: 'delete'
   })
 }
+
+// 查询角色已授权用户列表
+export function allocatedUserList(query) {
+  return request({
+    url: '/doc/msgAccepter/allocatedList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询角色未授权用户列表
+export function unallocatedUserList(query) {
+  return request({
+    url: '/doc/msgAccepter/unallocatedList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 取消用户授权角色
+export function msgUserCancel(data) {
+  return request({
+    url: '/doc/msgAccepter/cancel',
+    method: 'put',
+    data: data
+  })
+}
+
+// 批量取消用户授权角色
+export function msgUserCancelAll(data) {
+  return request({
+    url: '/doc/msgAccepter/cancelAll',
+    method: 'put',
+    params: data
+  })
+}
+
+// 授权用户选择
+export function shareUserSelectAll(data) {
+  return request({
+    url: '/doc/msgAccepter/selectAll',
+    method: 'put',
+    params: data
+  })
+}
+

src/router/index.js

@@ -360,6 +360,20 @@ export const dynamicRoutes = [{
       activeMenu: '/doc/group'
     }
   }]
+},{
+  path: '/doc/msg-user/',
+  component: Layout,
+  hidden: true,
+  permissions: ['doc:info'],
+  children: [{
+    path: 'user/:msgId(\\d+)',
+    component: () => import('@/views/doc/msgAccepter/index'),
+    name: 'GroupUser',
+    meta: {
+      title: '消息接收人员',
+      activeMenu: '/setting/msg-msg'
+    }
+  }]
 }, {
   path: '/doc/group-space/',
   component: Layout,

src/views/doc/msg/msg.vue

@@ -37,6 +37,7 @@
             v-hasPermi="['doc:msg:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
             v-hasPermi="['doc:msg:remove']">删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-user" @click="handleMsgUser(scope.row)">选择消息接收人员</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -53,22 +54,6 @@
         <el-form-item label="消息内容">
           <editor v-model="form.msgContent" :min-height="192" />
         </el-form-item>
-        <el-form-item label="对象类型" prop="msgAcceptType">
-          <el-select v-model="form.msgAcceptType" placeholder="请选择对象类型">
-            <el-option v-for="dict in dict.type.msg_type" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <!-- <el-form-item label="接收对象" prop="msgAcceptSelect">
-          <el-input v-model="form.msgAcceptSelect" type="textarea" placeholder="请输入内容" />
-        </el-form-item> -->
-        <el-form-item label="接收对象" prop="msgAcceptSelect">
-          <treeselect v-model="form.msgAcceptList" :multiple="true" :options="deptOptions" :show-count="true"
-            :disable-branch-nodes="false" placeholder="请选择部门"></treeselect>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -84,18 +69,11 @@
     getMsg,
     delMsg,
     addMsg,
-    updateMsg,
-    deptTreeSelect
+    updateMsg
   } from "@/api/doc/msg";
-  import Treeselect from "@riophae/vue-treeselect";
-  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
   export default {
     name: "Msg",
-    dicts: ['msg_type'],
-    components: {
-      Treeselect
-    },
     data() {
       return {
         // 部门树选项
@@ -143,29 +121,22 @@
             message: "消息标题不能为空",
             trigger: "blur"
           }],
-          msgType: [{
-            required: true,
-            message: "消息类型不能为空",
-            trigger: "change"
-          }],
           msgContent: [{
             required: true,
             message: "消息内容不能为空",
             trigger: "blur"
-          }],
-          msgAcceptType: [{
-            required: true,
-            message: "对象类型不能为空",
-            trigger: "change"
-          }],
+          }]
         },
       };
     },
     created() {
       this.getList();
-      this.getDeptTree();
     },
     methods: {
+      /** 选择消息接收人员 */
+      handleMsgUser(row) {
+        this.$router.push("/doc/msg-user/user/" + row.msgId);
+      },
       /** 查询系统消息列表 */
       getList() {
         this.loading = true;
@@ -175,12 +146,6 @@
           this.loading = false;
         });
       },
-      /** 查询部门下拉树结构 */
-      getDeptTree() {
-        deptTreeSelect().then(response => {
-          this.deptOptions = response.data;
-        });
-      },
       // 取消按钮
       cancel() {
         this.open = false;
@@ -275,4 +240,4 @@
       }
     }
   };
-</script>
+</script>

src/views/doc/msgAccepter/index.vue

@@ -1,6 +1,12 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="用户ID" prop="userId">
+        <el-input v-model="queryParams.userId" placeholder="请输入用户ID" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="用户姓名" prop="userName">
+        <el-input v-model="queryParams.userName" placeholder="请输入用户姓名" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -9,228 +15,195 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['doc:msgAccepter:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['doc:msgAccepter:edit']"
-        >修改</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">分配成员</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['doc:msgAccepter:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-circle-close" size="mini" :disabled="multiple"
+          @click="msgUserCancelAll" v-hasPermi="['doc:groupUser:remove']">删除成员</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['doc:msgAccepter:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-close" size="mini" @click="handleClose">关闭</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="msgAccepterList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="groupUserList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="消息ID" align="center" prop="msgId" />
-      <el-table-column label="用户ID" align="center" prop="userId" />
-      <el-table-column label="已读状态" align="center" prop="msgStatus" />
+      <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
+      <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
+      <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
+      <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['doc:msgAccepter:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['doc:msgAccepter:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-circle-close" @click="msgUserCancel(scope.row)" >删除成员</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改消息接收对象对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+    <select-user ref="select" :msgId="queryParams.msgId" @ok="handleQuery" />
   </div>
 </template>
 
 <script>
-import { listMsgAccepter, getMsgAccepter, delMsgAccepter, addMsgAccepter, updateMsgAccepter } from "@/api/doc/msgAccepter";
-
-export default {
-  name: "MsgAccepter",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 消息接收对象表格数据
-      msgAccepterList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        msgStatus: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询消息接收对象列表 */
-    getList() {
-      this.loading = true;
-      listMsgAccepter(this.queryParams).then(response => {
-        this.msgAccepterList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
+  import {
+    listMsgAccepter,
+    msgUserCancelAll,
+    msgUserCancel
+  } from "@/api/doc/msgAccepter";
+  import selectUser from "./selectUser";
+  export default {
+    name: "MsgUser",
+    dicts: ['sys_normal_disable'],
+    components: {
+      selectUser
     },
-    // 表单重置
-    reset() {
-      this.form = {
-        msgId: null,
-        userId: null,
-        msgStatus: null
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 人员表格数据
+        groupUserList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          userId: null,
+          userName: null,
+          msgId: null
+        },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {}
       };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.msgId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加消息接收对象";
     },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const msgId = row.msgId || this.ids
-      getMsgAccepter(msgId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改消息接收对象";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.msgId != null) {
-            updateMsgAccepter(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addMsgAccepter(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
+    created() {
+      const msgId = this.$route.params && this.$route.params.msgId;
+      if (msgId) {
+        this.queryParams.msgId = msgId;
+        this.getList();
+      }
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const msgIds = row.msgId || this.ids;
-      this.$modal.confirm('是否确认删除消息接收对象编号为"' + msgIds + '"的数据项？').then(function() {
-        return delMsgAccepter(msgIds);
-      }).then(() => {
+    methods: {
+      // 返回按钮
+      handleClose() {
+        const obj = {
+          path: "/setting/msg-msg"
+        };
+        this.$tab.closeOpenPage(obj);
+      },
+      /** 查询人员列表 */
+      getList() {
+        this.loading = true;
+        listMsgAccepter(this.queryParams).then(response => {
+          this.groupUserList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          msgId: null,
+          userId: null,
+          userName: null
+        };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
         this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.userId)
+        this.single = selection.length !== 1
+        this.multiple = !selection.length
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.$refs.select.show();
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.msgId != null) {
+              updateGroupUser(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              addGroupUser(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          }
+        });
+      },
+      /** 删除按钮操作 */
+      msgUserCancelAll(row) {
+        const msgId = this.queryParams.msgId;
+        const userIds = this.ids.join(",");
+        this.$modal.confirm('是否确认删除选中的人员？').then(function() {
+          return msgUserCancelAll({
+            msgId: msgId,
+            userIds: userIds
+          });
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      },
+      /** 删除按钮操作 */
+      msgUserCancel(row) {
+        const msgId = this.queryParams.msgId;
+        const userIds = row.userId
+        this.$modal.confirm('是否确认删除人员"' + row.userName + '"的数据项？').then(function() {
+          return msgUserCancelAll({
+            msgId: msgId,
+            userIds: userIds
+          });
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      },
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('doc/msgAccepter/export', {
-        ...this.queryParams
-      }, `msgAccepter_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
+  };
+</script>

src/views/doc/msgAccepter/selectUser.vue

@@ -0,0 +1,130 @@
+<template>
+  <!-- 授权用户 -->
+  <el-dialog title="选择用户" :visible.sync="visible" width="800px" top="5vh" append-to-body>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+      <el-form-item label="用户名称" prop="userName">
+        <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="手机号码" prop="phonenumber">
+        <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-row>
+      <el-table @row-click="clickRow" ref="table" :data="userList" @selection-change="handleSelectionChange"
+        height="260px">
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
+        <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
+        <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
+        <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
+        <el-table-column label="状态" align="center" prop="status">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="handleSelectUser">确 定</el-button>
+      <el-button @click="visible = false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import {
+    unallocatedUserList,
+    shareUserSelectAll
+  } from "@/api/doc/msgAccepter";
+  export default {
+    dicts: ['sys_normal_disable'],
+    props: {
+      // 角色编号
+      msgId: {
+        type: [String]
+      }
+    },
+    data() {
+      return {
+        // 遮罩层
+        visible: false,
+        // 选中数组值
+        userIds: [],
+        // 总条数
+        total: 0,
+        // 未授权用户数据
+        userList: [],
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          msgId: null,
+          // userName: undefined,
+          // phonenumber: undefined
+        }
+      };
+    },
+    methods: {
+      // 显示弹框
+      show() {
+        this.queryParams.msgId = parseInt(this.msgId);
+        this.getList();
+        this.visible = true;
+      },
+      clickRow(row) {
+        this.$refs.table.toggleRowSelection(row);
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.userIds = selection.map(item => item.userId);
+      },
+      // 查询表数据
+      getList() {
+        unallocatedUserList(this.queryParams).then(res => {
+          this.userList = res.rows;
+          this.total = res.total;
+        });
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      /** 选择授权用户操作 */
+      handleSelectUser() {
+        const msgId = this.queryParams.msgId;
+        const userIds = this.userIds.join(",");
+        if (userIds == "") {
+          this.$modal.msgError("请选择要分配的用户");
+          return;
+        }
+        shareUserSelectAll({
+          msgId: msgId,
+          userIds: userIds
+        }).then(res => {
+          this.$modal.msgSuccess(res.msg);
+          if (res.code === 200) {
+            this.visible = false;
+            this.$emit("ok");
+          }
+        });
+      }
+    }
+  };
+</script>