消息通知修改。

src/api/base/messageInfo.js

@@ -41,6 +41,10 @@ function batchRemove(idList){
   });
 }
 
+function recvPageSearch(formData){
+  return request.post(constant.serverUrl + "/base/message/recvPageSearch", formData);
+}
+
 export default {
-  pageList,create,edit,add,update,remove,batchRemove
+  pageList,create,edit,add,update,remove,batchRemove,recvPageSearch
 }

src/views/base/messageInfo-list.vue

@@ -20,13 +20,13 @@
         <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" multiple placeholder="请选择">
+        <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" multiple placeholder="请选择">
+        <el-select v-model="queryModel.type" size="mini" multiple placeholder="请选择">
           <el-option
             v-for="item in typeList"
             :key="item.id"
@@ -95,9 +95,18 @@
         label="审核状态"
         sortable="custom"
         width="180"
-      ></el-table-column>
+      >
+        <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="type"
+        prop="typeN"
         sort-by="type_"
         label="消息类型"
         sortable="custom"
@@ -117,14 +126,12 @@
         sortable="custom"
         width="180"
       ></el-table-column>
-      <el-table-column label="操作">
+      <el-table-column label="操作" fixed="right" width="250">
         <template slot-scope="{ row }">
-          <el-button size="mini" type="warning" @click="handleEdit(row)"
-            >编辑</el-button
-          >
-          <el-button size="mini" type="danger" @click="handleDelete(row)"
-            >删除</el-button
-          >
+          <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>
@@ -142,11 +149,24 @@
       :title="modalTitle"
       @close="onDetailModalClose"
     ></messageInfo-detail>
+    <el-dialog
+      :visible.sync="showSendModal"
+      title="发送对象选中"
+      :modal-append-to-body="false"
+      style="text-align: left"
+      width="800px"
+    >
+      <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
@@ -176,6 +196,7 @@ export default {
       showModal: false,
       modalTitle: "",
       businessKey: "",
+      showSendModal: false
     };
   },
   methods: {
@@ -297,6 +318,13 @@ export default {
           }
         });
       });
+    },
+    handleSendMsg(row) {
+      this.businessKey = row.id;      
+      this.showSendModal = true;
+    },
+    handleRecvList(row) {
+
     },
     onDetailModalClose(refreshed) {
       //保存成功后回调
@@ -321,6 +349,7 @@ export default {
   },
   components: {
     "messageInfo-detail": MessageInfoDetail,
+    "messageInfo-send" : MessageInfoSend
   },
 };
 </script>

src/views/base/messageInfo-send.vue

@@ -0,0 +1,356 @@
+<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" multiple placeholder="请选择" size="mini">
+          <el-option :value="item.id" v-for="item in roleList" :key="item.key">{{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="name"
+        label="姓名"
+        width="100"
+      ></el-table-column>
+      <el-table-column
+        prop="sex"
+        label="性别"
+        width="100"
+      ></el-table-column>
+      <el-table-column
+        prop="phone"
+        label="电话"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="companyName"
+        label="单位名称"
+        width="150"
+      ></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: "",
+        structureId: "",
+        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);
+          formData.append("companyStructureId", self.queryModel.companyStructureId);
+          formData.append("roleId", self.queryModel.roleId);
+          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.map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认对选中人发送消息？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        messageInfoApi.batchSend(idList).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>