账单推送功能

src/api/base/billDetail.js

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

src/api/base/billInfo.js

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

src/api/base/personInfo.js

@@ -41,10 +41,20 @@ function batchRemove(idList){
   });
 }
 
+function getPersonData(idList){
+  return request.post(constant.serverUrl + "/base/personInfo/getPersonData",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+
+
 function resetPassword(formData){
   return request.post(constant.serverUrl + "/base/personInfo/resetPassword", formData);
 }
 
 export default {
-  pageList,create,edit,add,update,remove,batchRemove,resetPassword
+  pageList,create,edit,add,update,remove,batchRemove,resetPassword,getPersonData
 }

src/routers/modules/base.js

@@ -78,6 +78,30 @@ var routers = [
                         title: '消息类型管理'
                 }
         },
+        {
+                path: '/base/pushMessage/list',
+                name: 'BasePushMessageList',
+                // 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/pushMessage-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '推送消息管理'
+                }
+        },
+        {
+                path: '/base/billInfo/list',
+                name: 'BaseBillInfoList',
+                // 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/billInfo-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '推送消息管理'
+                }
+        },
         
 ]
 

src/views/base/billDetail-detail.vue

@@ -0,0 +1,134 @@
+<template>
+    <el-dialog
+        :visible.sync="showDialog"
+        :title="title"
+        :modal-append-to-body="true"
+        style="text-align: left"
+        @close="closeDialog"
+        :close-on-click-modal="false"
+        append-to-body
+        width="30%"
+    >
+        <div class="user-panel" v-loading="loading">
+        <el-form
+            ref="form"
+            :model="formModel"
+            :rules="ruleValidate"
+            :label-width="'100px'"
+        >
+            <el-form-item :label = item.key :prop = item.val v-for="(item, index) in domains" :key="index" >
+                <el-input v-model="item.val" type="number"></el-input>
+            </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 billDetailApi from "@/api/base/billDetail";
+export default {
+    props: ["businessKey", "title"],
+    data() {
+        return {
+            formModel: {},
+            ruleValidate: {
+                industryName: [
+                    { required: true, message: "行业名称不能为空", trigger: "blur" },
+                    ],
+                    sortNo:[
+                    { required: true, message: "不能为空", trigger: "blur" },
+                ]
+            },
+            domains:[],
+            showDialog: true,
+            loading: false,
+            submitting: false,
+            props: {
+                // 配置项（必选）
+                value: "id",
+                label: "industryName",
+            },
+        }
+    },
+    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.billDetailList = self.domains;
+
+                    if (id == null || id.length == 0) {
+                        return billDetailApi.add(self.formModel);
+                    } else {
+                        return billDetailApi.update(self.formModel);
+                    }
+                })().then(function (response) {
+                    var jsonData = response.data;
+
+                    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;
+
+        (function () {
+        if (self.businessKey.length == 0) {
+            return billDetailApi.create();
+        } else {
+            return billDetailApi.edit(self.businessKey);
+        }
+        })()
+        .then((response) => {
+            var jsonData = response.data;
+            self.loading = false;
+
+            if (jsonData.result) {
+                self.domains = jsonData.data.billDetailList;
+                self.formModel.id = jsonData.data.id;
+
+                //self.formModel = jsonData.data;
+            } else {
+                self.$message.error(jsonData.message + "");
+            }
+        })
+        .catch((error) => {
+            self.$message.error(error + "");
+        });
+    },
+}
+</script>
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>

src/views/base/billDetail-list.vue

@@ -0,0 +1,388 @@
+<template>
+    <el-dialog
+        :visible.sync="showDialog"
+        :title="title"
+        :modal-append-to-body="false"
+        style="text-align: left"
+        @close="closeDialog"
+        :close-on-click-modal="false"
+        width="70%"
+    >
+        <!-- <el-form
+            ref="queryForm"
+            :model="queryModel"
+            inline
+            class="demo-form-inline"
+            >
+            <el-form-item label="企业名称" prop="companyName">
+                <el-input
+                type="text"
+                size="mini"
+                v-model="queryModel.companyName"
+                ></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-row class="button-group">
+            <el-button
+                type="primary"
+                size="small"
+                plain
+                icon="el-icon-upload2"
+                @click="batchImportVisible = true"
+                >导入</el-button
+            >
+            <el-button
+                type="success"
+                size="small"
+                plain
+                icon="el-icon-s-promotion"
+                @click="pushMessage"
+                >推送账单消息</el-button
+            >
+        </el-row>
+        <el-table
+            :data="tableData"
+            style="min-height: 400px"
+            v-loading="loading"
+            stripe
+            @sort-change="sortChange"
+            >
+            <el-table-column
+                type="index"
+                label="序号"
+                :index="indexMethod"
+            ></el-table-column>
+            <el-table-column
+                prop="companyName"
+                label="企业名称"
+            ></el-table-column>
+            <el-table-column
+                prop="billDetail"
+                label="账单明细"
+            ></el-table-column>
+            <el-table-column prop="rushStatus" label="推送状态">
+                <template slot-scope="{ row }">
+                    <span v-if="row.rushStatus==0">未推送</span>
+                    <span v-else-if="row.rushStatus==1">已推送</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                prop="payStatusN"
+                label="支付状态"
+            ></el-table-column>
+            <el-table-column label="操作" >
+                <template slot-scope="{ row }">
+                    <el-button v-if="row.payStatus!=20" size="mini" type="warning" @click="handleEdit(row)"
+                        >编辑</el-button
+                    >
+                    <el-button v-if="row.payStatus!=20" size="mini" type="danger" @click="handleDelete(row)"
+                        >删除</el-button
+                    >
+                </template>
+            </el-table-column>
+            </el-table>
+            <el-pagination
+            style="text-align: center"
+            :current-page.sync="pageIndex"
+            :total="totalElements"
+            :page-sizes="pageSizeList"
+            @current-change="changePage"
+            @size-change="pageSizeChange"
+            layout="total, sizes, prev, pager, next, jumper"
+            ></el-pagination>
+            <billDetail-detail
+                v-if="showModal"
+                :businessKey="businessKey"
+                :title="modalTitle"
+                @close="onDetailModalClose"
+            ></billDetail-detail>
+            <!--批量导入S-->
+            <el-dialog
+            title="导入"
+            :visible.sync="batchImportVisible"
+            :modal-append-to-body="true"
+            style="text-align: left"
+            :close-on-click-modal="false"
+            append-to-body
+            >
+            <el-form label-width="150px">
+                <el-form-item label="模板下载">
+                <el-link
+                    href="http://rccs.oss-cn-hangzhou.aliyuncs.com/enterprise-federation/%E5%AF%BC%E5%85%A5%E4%BC%81%E4%B8%9A%E8%B4%A6%E5%8D%95%E6%A8%A1%E6%9D%BF.xlsx"
+                    type="primary"
+                    target="_blank"
+                    >点击下载模板</el-link
+                >
+                </el-form-item>
+                <el-form-item label="上传文件">
+                <el-upload
+                    class="upload-demo"
+                    accept=".xlsx"
+                    :action="uploadUrlXls"
+                    :data="uploadXlsData"
+                    :headers="headers"
+                    :on-preview="handleBatchImportPreview"
+                    name="uploadFile"
+                    :multiple="true"
+                    :limit="1"
+                    :on-remove="handleBatchImportRemove"
+                    :before-remove="beforeBatchImportRemove"
+                    :before-upload="beforeUpload"
+                    :on-exceed="handleBatchImportExceed"
+                    :on-success="handleBatchImportSuccess"
+                    :file-list="batchImportFileList"
+                >
+                    <el-button size="small" type="primary" :loading="xlsLoading"
+                    >点击上传</el-button
+                    >
+                    <div slot="tip" class="el-upload__tip">
+                    只能上传xls文件，且不超过500kb
+                    </div>
+                </el-upload>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="batchImportVisible = false"
+                >关 闭</el-button
+                >
+            </div>
+            </el-dialog>
+            <!--批量导入E-->
+    </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import billDetailApi from "@/api/base/billDetail";
+import billDetailDetail from "./billDetail-detail";
+import "nprogress/nprogress.css"; // progress bar style
+import { getToken } from "@/utils/auth"; // get token from cookie
+
+export default {
+    props: ["businessKey", "title"],
+    data(){
+        return {
+            queryModel: {},
+            showDialog: true,
+            loading: false,
+            submitting: false,
+            tableData: [],
+            pageIndex: 1,
+            pageSize: 10,
+            totalPages: 0,
+            totalElements: 0,
+            field: "",
+            direction: "",
+            pageSizeList: [10, 20, 30],
+            multipleSelection: [],
+            showModal: false,
+            batchImportVisible: false,
+            batchImportFileList: [],
+            uploadUrlXls: Constant.serverUrl + "/base/billDetail/importXls",
+            uploadXlsData: {
+                billId: this.businessKey,
+            },
+            headers: {
+                Authorization: getToken(),
+            },
+            xlsLoading: false,
+            
+        }
+    },
+    methods:{
+        closeDialog() {
+            this.$emit("close", false);
+        },
+        indexMethod(index) {
+            return (this.pageIndex - 1) * this.pageSize + (index + 1);
+        },
+        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("billId", self.businessKey);
+            billDetailApi
+                .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();
+        },
+        handleEdit(record) {
+            this.modalTitle = "编辑";
+            this.businessKey = record.id;
+            this.showModal = true;
+        },
+        onDetailModalClose(refreshed) {
+            //保存成功后回调
+            this.showModal = false;
+
+            if (refreshed) {
+                this.changePage(this.pageIndex);
+            }
+        },
+        handleDelete(record) {
+            var self = this;
+
+            self.$confirm("是否确认删除?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+                })
+                .then(() => {
+                billDetailApi.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: "删除成功!",
+                    });
+                    }
+                });
+            });
+        },
+        beforeUpload(file, fileList) {
+            //导入前判断
+        },
+            //批量导入-上传成功
+        handleBatchImportSuccess(response, file, fileList) {
+            var self = this;
+            self.xlsLoading = false;
+            if (response.result) {
+                self.$message.success(response.message);
+                this.batchImportFileList = [];
+                this.changePage(1);
+                this.batchImportVisible = false;
+            } else {
+                //this.$message.error(response.message);
+                this.batchImportFileList = [];
+                this.changePage(1);
+
+                if (response.data != null) {
+                //下载有错误信息提示的报表
+                //window.open(response.data);
+                self.$message({
+                    showClose: true,
+                    dangerouslyUseHTMLString: true,
+                    message:
+                    response.message +
+                    `,<a href="${response.data}" target="_blank">点击下载未导入的数据报表</a>&nbsp;`,
+                    duration: 30000,
+                });
+                }
+            }
+        },
+        //批量导入-预览
+        handleBatchImportPreview(file) {
+        console.log(file.url);
+        },
+        //批量导入-移除
+        handleBatchImportRemove(file, fileList) {
+        console.log(file, fileList);
+        },
+        //批量导入-移除前操作
+        beforeBatchImportRemove(file, fileList) {
+        console.log(file, fileList);
+        },
+        //批量导入-文件超出个数限制时的钩子
+        handleBatchImportExceed(files, fileList) {
+            this.$message.warning(
+                `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+                files.length + fileList.length
+                } 个文件`
+            );
+        },
+        pushMessage(){
+            var self = this;
+            var billId = this.businessKey;
+
+            self.$confirm("是否确认推送消息?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+                })
+                .then(() => {
+
+                billDetailApi.pushMessage(billId).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: "推送消息成功!",
+                        });
+                    }
+                });
+            });
+        }
+    },
+    mounted: function () {
+        this.changePage(1);
+    },
+    components: {
+        "billDetail-detail":billDetailDetail,
+    },
+}
+</script>
+<style scoped>
+
+</style>

src/views/base/billInfo-detail.vue

@@ -0,0 +1,141 @@
+<template>
+    <el-dialog
+        :visible.sync="showDialog"
+        :title="title"
+        :modal-append-to-body="false"
+        style="text-align: left"
+        @close="closeDialog"
+        :close-on-click-modal="false"
+    >
+    <div class="user-panel" v-loading="loading">
+        <el-form
+            ref="form"
+            :model="formModel"
+            :rules="ruleValidate"
+            :label-width="'150px'"
+        >
+        <el-form-item label="账单名称" prop="billName">
+            <el-input
+                v-model="formModel.billName"
+                placeholder="请输入账单名称"
+            ></el-input>
+        </el-form-item>
+        <el-form-item label="账单备注" prop="billRemark">
+            <el-input
+                v-model="formModel.billRemark"
+                placeholder="请输入账单备注"
+            ></el-input>
+        </el-form-item>
+        <el-form-item label="手机端会费公示" prop="wxShow">
+            <el-radio-group v-model="formModel.wxShow">
+                <el-radio :label="true">是</el-radio>
+                <el-radio :label="false">否</el-radio>
+            </el-radio-group>
+        </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 billInfoApi from "@/api/base/billInfo";
+export default {
+    props: ["businessKey", "title"],
+    data() {
+        return {
+            formModel: {},
+            ruleValidate: {
+                industryName: [
+                { required: true, message: "行业名称不能为空", trigger: "blur" },
+                ],
+                sortNo:[
+                { required: true, message: "不能为空", trigger: "blur" },
+                ]
+            },
+            showDialog: true,
+            loading: false,
+            submitting: false,
+            props: {
+                // 配置项（必选）
+                value: "id",
+                label: "industryName",
+            },
+        }
+    },
+    methods: {
+        closeDialog() {
+        this.$emit("close", false);
+        },
+        handleSubmit() {
+            var self = this;
+
+            this.$refs["form"].validate((valid) => {
+                if (valid) {
+                (function () {
+                    var id = self.formModel.id;
+
+                    if (id == null || id.length == 0) {
+                    return billInfoApi.add(self.formModel);
+                    } else {
+                    return billInfoApi.update(self.formModel);
+                    }
+                })().then(function (response) {
+                    var jsonData = response.data;
+
+                    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;
+
+        (function () {
+        if (self.businessKey.length == 0) {
+            return billInfoApi.create();
+        } else {
+            return billInfoApi.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 + "");
+        });
+    },
+}
+</script>
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>

src/views/base/billInfo-list.vue

@@ -0,0 +1,362 @@
+<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="/billInfo">账单推送管理</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="billName">
+            <el-input
+            type="text"
+            size="mini"
+            v-model="queryModel.billName"
+            ></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="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
+            type="index"
+            label="序号"
+            :index="indexMethod"
+        ></el-table-column>
+        <el-table-column
+            prop="billName"
+            label="账单名称"
+        ></el-table-column>
+        <el-table-column
+            prop="billRemark"
+            label="账单备注"
+        ></el-table-column>
+        <el-table-column prop="wxShow"  label="手机端会费公示">
+            <template slot-scope="{ row }">
+                <span v-if="row.wxShow">是</span>
+                <span v-else>否</span>
+            </template>
+        </el-table-column>
+        <el-table-column prop="status" label="推送状态">
+            <template slot-scope="{ row }">
+                <span v-if="row.status">推送成功</span>
+                <span v-else>推送失败</span>
+            </template>
+        </el-table-column>
+        <el-table-column label="操作"  width="200">
+            <template slot-scope="{ row }">
+                <el-col :span="12">
+                    <el-link size="mini" type="primary" @click="handleBillDetail(row)"
+                        >子账单</el-link
+                    >
+                </el-col>
+                <el-col :span="12">
+                    <el-link size="mini" type="success" @click="pushMessage(row)"
+                        >推送账单消息</el-link
+                    >
+                </el-col>
+                <el-col :span="12">
+                    <el-link size="mini" type="warning" @click="handleEdit(row)"
+                        >编辑</el-link
+                    >
+                </el-col>
+                <el-col :span="12">
+                    <el-link size="mini" type="danger" @click="handleDelete(row)"
+                        >删除</el-link
+                    >
+                </el-col>
+            </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>
+        <billInfo-detail
+        v-if="showModal"
+        :businessKey="businessKey"
+        :title="modalTitle"
+        @close="onDetailModalClose"
+        ></billInfo-detail>
+        <billDetail-list
+        v-if="showModal2"
+        :businessKey="businessKey"
+        :title="modalTitle2"
+        @close="onDetailModalClose2"
+        ></billDetail-list>
+    </div>
+</template>
+<script>
+import Constant from "@/constant";
+import billInfoDetail from "./billInfo-detail";
+import billDetailList from "./billDetail-list";
+import billInfoApi from "@/api/base/billInfo";
+import billDetailApi from "@/api/base/billDetail";
+export default {
+    name: "BaseBillInfoList",
+    data() {
+        return{
+            queryModel: {
+                billName:"",
+            },
+            loading: false,
+            tableData: [],
+            pageIndex: 1,
+            pageSize: 10,
+            totalPages: 0,
+            totalElements: 0,
+            field: "",
+            direction: "",
+            pageSizeList: [10, 20, 30],
+            multipleSelection: [],
+            showModal: false,
+            showModal2: false,
+        }
+    },
+    methods:{
+        indexMethod(index) {
+            return (this.pageIndex - 1) * this.pageSize + (index + 1);
+        },
+        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("billName", self.queryModel.billName);
+
+            billInfoApi
+                .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;
+        },
+        handleBillDetail(record){
+            this.modalTitle2 = "子账单";
+            this.businessKey = record.id;
+            this.showModal2 = true;
+        },
+        handleDelete(record) {
+            var self = this;
+
+            self
+                .$confirm("是否确认删除?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+                })
+                .then(() => {
+                billInfoApi.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(() => {
+                billInfoApi.batchRemove(idList).then(function (response) {
+                var jsonData = response.data;
+
+                if (jsonData.result) {
+                    self.changePage(self.pageIndex);
+
+                    self.$message({
+                    type: "success",
+                    message: "删除成功!",
+                    });
+                }
+                });
+            });
+        },
+        onDetailModalClose(refreshed) {
+            //保存成功后回调
+            this.showModal = false;
+
+            if (refreshed) {
+                this.changePage(this.pageIndex);
+            }
+        },
+        onDetailModalClose2(refreshed) {
+            //保存成功后回调
+            this.showModal2 = false;
+
+            if (refreshed) {
+                this.changePage(this.pageIndex);
+            }
+        },
+        pushMessage(record){
+            var self = this;
+            var billId = record.id
+
+            self.$confirm("是否确认推送消息?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+                })
+                .then(() => {
+
+                billDetailApi.pushMessage(billId).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: "推送消息成功!",
+                        });
+                    }
+                });
+            });
+        }
+    },
+    mounted: function () {
+        this.changePage(1);
+    },
+    components: {
+        "billInfo-detail": billInfoDetail,
+        "billDetail-list":billDetailList,
+    },
+}
+</script>
+<style 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/pushMessage-list.vue

@@ -0,0 +1,246 @@
+<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="/pushMessage">推送消息管理</a>
+        </el-breadcrumb-item>
+        </el-breadcrumb>
+        <el-divider></el-divider>
+        <el-form
+            ref="queryForm"
+            :model="queryModel"
+            >
+            <el-form-item label="选择模版：" prop="personName">
+                <el-col :span="6">
+                    <el-input
+                    type="text"
+                    size="mini"
+                    v-model="queryModel.personName"
+                    ></el-input>
+                </el-col>
+            </el-form-item>
+            <el-form-item label="推送模式：" prop="personName">
+                <el-col :span="4">
+                    <el-checkbox-group v-model="checkList">
+                        <el-checkbox label="短信推送"></el-checkbox>
+                        <el-checkbox label="微信推送"></el-checkbox>
+                    </el-checkbox-group>
+                </el-col>
+            </el-form-item>
+            <el-form-item label="消息内容：" prop="idCard">
+                <el-col :span="6">
+                    <el-input type="textarea" :rows="4"></el-input>
+                </el-col>
+            </el-form-item>
+        </el-form>
+        <el-row class="button-group">
+            <el-button
+                type="primary"
+                size="small"
+                plain
+                icon="el-icon-circle-plus"
+                @click="handleAdd"
+                >添加用户</el-button
+            >
+            <el-button
+                type="success"
+                size="small"
+                plain
+                icon="el-icon-receiving"
+                @click="handleAdd"
+                >保存草稿</el-button
+            >
+            <el-button
+                type="danger"
+                size="small"
+                plain
+                icon="el-icon-s-promotion"
+                @click="handleAdd"
+                >推送消息</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="id" v-if="false"></el-table-column>
+            <el-table-column
+                type="index"
+                label="序号"
+                :index="indexMethod"
+            ></el-table-column>
+            <el-table-column
+                prop="personName"
+                label="推送用户"
+            ></el-table-column>
+            <el-table-column
+                prop="phone"
+                label="手机号码"
+            ></el-table-column>
+            <el-table-column
+                prop="pushType"
+                label="推送渠道"
+            ></el-table-column>
+            <el-table-column
+                prop="pushTime"
+                label="推送时间"
+            ></el-table-column>
+            <el-table-column
+                prop="status"
+                label="推送状态"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column label="操作"  f>
+            </el-table-column>
+            
+        </el-table>
+        <pushPerson-list
+            v-if="showModal"
+            :businessKey="businessKey"
+            :title="modalTitle"
+            @close="onDetailModalClose"
+        ></pushPerson-list>
+    </div>
+</template>
+<script>
+import pushPersonList from "./pushPerson-list";
+import personInfoApi from "@/api/base/personInfo";
+export default {
+    name: "BasePushMessageList",
+    data() {
+        return {
+            queryModel: {},
+            checkList:[],
+            loading: false,
+            tableData: [],
+            pageIndex: 1,
+            pageSize: 10,
+            totalPages: 0,
+            totalElements: 0,
+            field: "",
+            direction: "",
+            pageSizeList: [10, 20, 30],
+            multipleSelection: [],
+            showModal: false,
+            modalTitle: "",
+            businessKey: "",
+        }
+    },
+    methods: {
+        indexMethod(index) {
+            return (this.pageIndex - 1) * this.pageSize + (index + 1);
+        },
+        changePage(pageIndex) {
+
+        },
+        handleAdd() {
+            this.modalTitle = "新增";
+            this.businessKey = "";
+            this.showModal = true;
+        },
+        onDetailModalClose(refreshed) {
+            var self = this;
+            //保存成功后回调
+            this.showModal = false;
+
+            if (refreshed.re) {
+
+                var idList = refreshed.idList;
+
+                personInfoApi.getPersonData(idList).then(function (response) {
+                    var jsonData = response.data;
+
+                    if (jsonData.result) {
+
+                        var data = jsonData.data;
+
+                        var reAddList="";
+
+                        for(var i=0;i<data.length;i++){
+                            var id = data[i].id;
+
+                            var isAdd = true;
+
+                            for(var j=0;j<self.tableData.length;j++){
+                               if(self.tableData[j].id==id){
+                                   isAdd = false;
+                                   reAddList = reAddList + self.tableData[j].personName+","
+                               }
+                            }
+                            if(isAdd){
+                                let row = {
+                                    id:id,
+                                    personName: data[i].personName,
+                                    phone: data[i].phone,
+                                    pushType: "",
+                                    pushTime: "",
+                                    status: "",
+                                }
+                                self.tableData.push(row);
+                            }
+                        }
+                        
+                        if(reAddList!=""){
+                            self.$message({
+                                message: reAddList + "已添加在名单中，不能重复添加！",
+                                type: "error",
+                            });
+                        }
+                        
+                    }
+                });
+            }
+        },
+        sortChange(data) {
+            this.field = data.column.field;
+            this.direction = data.order;
+
+            //this.changePage(this.pageIndex);
+        },
+        handleSelectionChange(val) {
+            this.multipleSelection = val;
+        },
+        pageSizeChange(pageSize) {
+            this.pageSize = pageSize;
+
+            this.$nextTick(() => {
+                this.changePage(this.pageIndex);
+            });
+        },
+    },
+    components: {
+        "pushPerson-list": pushPersonList,
+    },
+    
+}
+</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/pushPerson-list.vue

@@ -0,0 +1,200 @@
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align: left"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+    width="60%"
+  >
+    <div>
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="姓名" prop="personName">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.personName"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="电话" prop="phone">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.phone"
+        ></el-input>
+      </el-form-item>
+    <el-form-item label="公司" prop="companyName">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.companyName"
+        ></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="handleAdd"
+        >批量添加</el-button
+      >
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height: 400px"
+      v-loading="loading"
+      stripe
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column
+        prop="personName"
+        label="姓名"
+        width="200"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="phone"
+        label="电话"
+      ></el-table-column>
+      <el-table-column
+        prop="companyName"
+        label="公司"
+      ></el-table-column>
+      <el-table-column label="操作" width="180" fixed="right">
+        <template slot-scope="{ row }">
+              <el-link type="primary" @click="handleEdit(row)" gutter>添加</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+        style="text-align: center"
+      :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>
+  </el-dialog>
+</template>
+<script>
+import personInfoApi from "@/api/base/personInfo";
+export default {
+    props: ["businessKey", "title"],
+    data(){
+        return{
+            queryModel:{},
+            showDialog: true,
+            loading: false,
+            tableData: [],
+            pageIndex: 1,
+            pageSize: 10,
+            totalPages: 0,
+            totalElements: 0,
+            pageSizeList: [10, 20, 30],
+            multipleSelection: [],
+        }
+    },
+    methods:{
+        handleAdd(){
+            var idList = this.multipleSelection.map((record) => {
+              return record.id;
+            });
+
+            var flag = false;
+
+            if(idList.length > 0){
+              flag = true;
+            }
+
+            var data = {
+               re : flag,
+               idList : idList
+            }
+
+            this.$emit("close", data);
+        },
+        closeDialog() {
+            var idList =[];
+            var data = {
+               re : false,
+               idList : idList
+            }
+            this.$emit("close", data);
+        },
+        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);
+
+
+            personInfoApi
+                .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 + "");
+            });
+        },
+        handleSelectionChange(val) {
+            this.multipleSelection = val;
+        },
+        pageSizeChange(pageSize) {
+            this.pageSize = pageSize;
+
+            this.$nextTick(() => {
+                this.changePage(this.pageIndex);
+            });
+        },
+    },
+    mounted: function () {
+        this.changePage(1);
+    },
+}
+</script>
+<style scoped>
+
+</style>