Merge branch 'V2' of http://47.92.161.104:10080/zq/jp-housekeeper-portal into V2

src/api/base/messageInfo.js

@@ -0,0 +1,59 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/message/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/base/message/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/message/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/message/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/message/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/message/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/message/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function recvPageSearch(formData){
+  return request.post(constant.serverUrl + "/base/message/recvPageSearch", formData);
+}
+
+
+function batchSend(formData){
+  return request.post(constant.serverUrl + "/base/message/batchSend",formData);
+}
+
+function sendAll(formData){
+  return request.post(constant.serverUrl + "/base/message/sendAll", formData);
+}
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove,recvPageSearch,batchSend,sendAll
+}

src/routers/modules/base.js

@@ -412,6 +412,18 @@ var routers = [
                         roles: ["admin"],
                         title: '老人手表管理'
                 }
+        },
+        {
+                path: '/base/message/list',
+                name: 'baseMessageList',
+                // route level code-splitting
+                // this generates a separate chunk (about.[hash].js) for this route
+                // which is lazy-loaded when the route is visited.
+                component: () => import('@/views/base/messageInfo-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '消息通知'
+                }
         }
 ]
 

src/views/base/messageInfo-detail.vue

@@ -0,0 +1,184 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align: left"
+    @close="closeDialog"
+    width="800px"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'100px'"
+      >
+        <el-form-item label="标题" prop="title">
+          <el-input
+            v-model="formModel.title"
+            placeholder="请输入标题"
+            style="width: 100%"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="消息类型" prop="type">
+          <el-select
+            v-model="formModel.type"
+            placeholder="请选择"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in typeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="内容" prop="content">
+          <mce-editor
+            ref="editor"
+            uploadName="upfile"
+            v-model="formModel.content"
+            :url="uploadUrl"
+            :config="editorConfig"
+          ></mce-editor>
+        </el-form-item>
+        <el-form-item label="审核状态" prop="status">
+          <el-switch
+            v-model="formModel.status"
+            active-color="#13ce66"
+            active-text="已审核"
+            inactive-color="#ff4949"
+            inactive-text="未审核"
+          ></el-switch>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting"
+        >确 定</el-button
+      >
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import messageInfoApi from "@/api/base/messageInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import { getToken } from "@/utils/auth";
+import MceEditor from "@/components/Tinymce";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      ruleValidate: {
+        title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
+        type: [
+          { required: true, message: "通知类型不能为空", trigger: "blur" },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      formModel: {},
+      typeList: [],
+      editorConfig: {
+        height: 300,
+        width: 660,
+      },
+      uploadUrl: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            self.formModel.content = self.$refs.editor.getContent();
+
+            if (id == null || id.length == 0) {
+              return messageInfoApi.add(self.formModel);
+            } else {
+              return messageInfoApi.update(self.formModel);
+            }
+          })().then(function (response) {
+            var jsonData = response.data;
+
+            if (self.formModel.content != null) {
+              self.$refs.editor.setContent(self.formModel.content);
+            }
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success",
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning",
+              });
+
+              self.$emit("close", false);
+            }
+          });
+        }
+      });
+    },
+  },
+  mounted: function () {
+    var self = this;
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "消息类型",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.typeList = jsonData.data;
+      });
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return messageInfoApi.create();
+      } else {
+        return messageInfoApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+  components: {
+    "mce-editor": MceEditor,
+  },
+};
+</script>

src/views/base/messageInfo-list.vue

@@ -0,0 +1,375 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">基础信息</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/base/message/list">消息管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="标题" prop="title">
+        <el-input type="text" size="mini" v-model="queryModel.title"></el-input>
+      </el-form-item>
+      <el-form-item label="审核状态" prop="status">
+        <el-select v-model="queryModel.status" size="mini" multiple placeholder="请选择">
+          <el-option value="0">未审核</el-option>
+          <el-option value="1">已审核</el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="消息类型" prop="type">
+        <el-select v-model="queryModel.type" size="mini" multiple placeholder="请选择">
+          <el-option
+            v-for="item in typeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+          >查询</el-button
+        >&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+          >重置</el-button
+        >&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        @click="handleAdd"
+        >新增</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchDelete"
+        >删除选中项</el-button
+      >
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height: 400px"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column
+        prop="title"
+        sort-by="title_"
+        label="标题"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="status"
+        sort-by="status_"
+        label="审核状态"
+        sortable="custom"
+        width="180"
+      >
+        <template slot-scope="{row}">
+            <el-switch
+            disabled
+            v-model="row.status"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+          ></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="typeN"
+        sort-by="type_"
+        label="消息类型"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="createTime"
+        sort-by="create_time"
+        label="创建时间"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="updateTime"
+        sort-by="update_time"
+        label="更新时间"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column label="操作" fixed="right" width="250">
+        <template slot-scope="{ row }">
+          <el-link size="mini" type="primary" @click="handleEdit(row)">编辑</el-link>-
+          <el-link size="mini" type="primary" @click="handleSendMsg(row)">发送消息</el-link>-
+          <el-link size="mini" type="primary" @click="handleRecvList(row)">接收列表</el-link>-
+          <el-link size="mini" type="primary" @click="handleDelete(row)">删除</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+    <messageInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></messageInfo-detail>
+    <el-dialog
+      :visible.sync="showSendModal"
+      title="发送对象选中"
+      :modal-append-to-body="false"
+      style="text-align: left"
+      width="1000px"
+    >
+      <messageInfo-send
+        v-if="showSendModal"
+        :messageId="businessKey"
+      ></messageInfo-send>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import MessageInfoDetail from "./messageInfo-detail";
+import MessageInfoSend from "./messageInfo-send";
+import messageInfoApi from "@/api/base/messageInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        title: "",
+        status: "",
+        type: "",
+      },
+      typeList: [],
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      showSendModal: false
+    };
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("title", self.queryModel.title);
+      formData.append("status", self.queryModel.status);
+      formData.append("type", self.queryModel.type);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      messageInfoApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          messageInfoApi.remove(record.id).then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        messageInfoApi.batchRemove(idList).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+      });
+    },
+    handleSendMsg(row) {
+      this.businessKey = row.id;      
+      this.showSendModal = true;
+    },
+    handleRecvList(row) {
+
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+  },
+  mounted: function () {
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "消息类型",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.typeList = jsonData.data;
+      });
+
+    this.changePage(1);
+  },
+  components: {
+    "messageInfo-detail": MessageInfoDetail,
+    "messageInfo-send" : MessageInfoSend
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/messageInfo-send.vue

@@ -0,0 +1,388 @@
+<template>
+  <div>
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      :rules="ruleValidate"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="所属单位" prop="companyId">
+        <el-select-tree
+          size="mini"
+          :options="companyList"
+          v-model="queryModel.companyId"
+          height="200"
+        ></el-select-tree>
+      </el-form-item>
+      <el-form-item label="所属机构" prop="structureId">
+          <el-select-tree
+            size="mini"
+            :props="structProps"
+            :options="structureList"
+            v-model="queryModel.companyStructureId"
+            height="200"
+          ></el-select-tree>
+      </el-form-item>
+      <el-form-item label="所属角色" prop="roleId">
+        <el-select v-model="queryModel.roleId" placeholder="请选择" clearable size="mini">
+          <el-option :value="item.id" v-for="item in roleList" :key="item.key" :label="item.personRoleName"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="姓名" prop="name">
+        <el-input v-model="queryModel.name" size="mini"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+          >查询</el-button
+        >&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+          >重置</el-button
+        >&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        @click="handleSendAll"
+        >全部发送</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchSend"
+        >对选中人发送</el-button
+      >
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height: 400px"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column
+        prop="receiverId"
+        label="消息状态"
+        width="100"
+      >
+        <template slot-scope="{row}">
+            <span v-html="'已发送'" v-if="row.receiverId!=null " style="color:green;"></span>
+            <span v-html="'未发送'" v-else style="color:gray;"></span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="name"
+        label="姓名"
+        width="100"
+      ></el-table-column>
+      <el-table-column
+        prop="sex"
+        label="性别"
+        width="100"
+      >
+        <template slot-scope="{row}">
+          {{row.sex=='1' ? '男' : '女'}}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="phone"
+        label="电话"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="companyName"
+        label="单位名称"
+        width="200"
+      ></el-table-column>
+      <el-table-column
+        prop="companyStructName"
+        label="机构名称"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="roleName"
+        label="角色名称"
+        width="150"
+      ></el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+  </div>
+</template>
+<script>
+import SelectTree from "@/components/SelectTree";
+import Constant from "@/constant";
+import messageInfoApi from "@/api/base/messageInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import companyInfoApi from "@/api/base/companyInfo";
+import companyStructureInfoApi from "@/api/base/companyStructureInfo";
+import personRoleInfoApi from "@/api/base/personRoleInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  props:{
+    messageId: {
+      default: "",
+      type: String
+    }
+  },
+  watch: {
+    "queryModel.companyId":function(newVal,oldVal){
+      var self = this;
+
+      var formData = new FormData();
+      formData.append("companyId", newVal);
+
+      //查询单位下机构
+      companyStructureInfoApi.list(formData)
+      .then(response=>{
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.structureList = jsonData.data;
+          }
+      })
+
+      //查询单位下角色
+      personRoleInfoApi.listByCompanyId(formData)
+      .then(response=>{
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.roleList = jsonData.data;
+          }
+      })
+    }
+  },
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        companyId: "",
+        companyStructureId: "",
+        roleId: "",
+        name: ""
+      },
+      ruleValidate: {
+        companyId: [{ required: true, message: "单位不能为空", trigger: "blur" }],
+      },
+      companyList: [],
+      structureList: [],
+      roleList: [],
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      structProps: {
+        // 配置项（必选）
+        value: "id",
+        label: "structureName",
+        children: "children"
+      }
+    };
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+      this.$refs["queryForm"].validate((valid) => {
+        if (valid) {
+          self.loading = true;
+
+          self.pageIndex = pageIndex;
+          var formData = new FormData();
+
+          formData.append("pageIndex", self.pageIndex);
+          formData.append("pageSize", self.pageSize);
+
+          formData.append("messageId", self.messageId);
+          formData.append("companyId", self.queryModel.companyId);
+
+          if(self.queryModel.companyStructureId!=null){
+            formData.append("companyStructureId", self.queryModel.companyStructureId);
+          }
+
+          if(self.queryModel.roleId!=null){
+          formData.append("roleId", self.queryModel.roleId);
+          }
+
+          if(self.queryModel.name!=null){
+            formData.append("name", self.queryModel.name);
+          }
+
+          messageInfoApi
+            .recvPageSearch(formData)
+            .then(function (response) {
+              self.loading = false;
+
+              var jsonData = response.data.data;
+
+              self.tableData = jsonData.data;
+              self.totalPages = jsonData.totalPages;
+              self.totalElements = jsonData.recordsTotal;
+            })
+            .catch((error) => {
+              self.loading = false;
+            });
+        }
+      });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleSendAll(record) {
+      var self = this;
+      var formData = new FormData();
+
+      formData.append("messageId", self.messageId);
+      formData.append("companyId", self.queryModel.companyId);
+      formData.append("structureId", self.queryModel.structureId);
+      formData.append("roleId", self.queryModel.roleId);
+      formData.append("name", self.queryModel.name);
+
+      self.$confirm("是否确认全部发送消息?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          messageInfoApi.sendAll(formData).then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "发送成功!",
+              });
+            }
+          });
+        });
+    },
+    handleBatchSend() {
+      var self = this;
+
+      var idList = this.multipleSelection
+      .filter((record)=>{
+        return record.receiverId==null
+      })
+      .map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认对选中人发送消息？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        var formData = new FormData();
+
+        formData.append("messageId", self.messageId);
+        formData.append("personIds", idList.join(","));
+
+        messageInfoApi.batchSend(formData).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "发送成功!",
+            });
+          }
+        });
+      });
+    }
+  },
+  created() {
+    var self = this;
+
+    companyInfoApi.list().then(function(response) {
+      var jsonData = response.data;
+
+      if (jsonData.result) {
+        self.companyList = jsonData.data;
+      }
+    });
+  },
+  mounted() {
+    // this.changePage(1);
+  },
+  components: {
+    "el-select-tree": SelectTree
+  }
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/sys/dataDictionary-detail.vue

@@ -71,7 +71,9 @@ export default {
     };
 
     return {
-      formModel: {},
+      formModel: {
+        id: ""
+      },
       ruleValidate: {
         name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
         value: [{ validator: validateValue, trigger: "blur" }],