基础信息管理完成

src/api/base/message.js

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

src/routers/modules/base.js

@@ -1,5 +1,6 @@
 var routers = [
         {
+                //险种管理
                 path: '/base/insuranceDefinition/list',
                 name: 'base-insuranceDefinition-list',
                 // route level code-splitting
@@ -11,6 +12,7 @@ var routers = [
                 }
         },
         {
+                //险种限额管理
                 path: '/base/insuranceDefinitionLimit/list',
                 name: 'base-insuranceDefinitionLimit-list',
                 // route level code-splitting
@@ -22,6 +24,7 @@ var routers = [
                 }
         },
         {
+                //行业管理
                 path: '/base/jobs/list',
                 name: 'base-jobs-list',
                 // route level code-splitting
@@ -33,6 +36,7 @@ var routers = [
                 }
         },
         {
+                //收费标准
                 path: '/base/insuranceJobs/list',
                 name: 'base-insuranceJobs-list',
                 // route level code-splitting
@@ -44,6 +48,7 @@ var routers = [
                 }
         },
         {
+                //代理人管理
                 path: '/base/insuranceAgent/list',
                 name: 'base-insuranceAgent-list',
                 // route level code-splitting
@@ -55,6 +60,7 @@ var routers = [
                 }
         },
         {
+                //企业信息管理
                 path: '/base/company/list',
                 name: 'base-company-list',
                 // route level code-splitting
@@ -64,7 +70,21 @@ var routers = [
                 meta: {
                         roles: ["admin"]
                 }
+        },
+        {
+                //我的消息
+                path: '/base/message/list',
+                name: 'base-message-list',
+                // 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/message-list.vue'),
+                meta: {
+                        roles: ["admin"]
+                }
         }
+
+        
 ]
 
 export default routers;

src/views/base/insuranceAgent-list.vue

@@ -6,7 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/insuranceAgent">insuranceAgent管理</a>
+        <a href="/insuranceAgent">代理人管理</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>

src/views/base/insuranceDefinitionLimit-detail.vue

@@ -57,12 +57,16 @@ export default {
     return {
       formModel: {},
       ruleValidate: {
-        definitionId: [
-          { required: true, message: "险种不能为空", trigger: "blur" }
-        ],
         name: [
           { required: true, message: "限额名称不能为空", trigger: "blur" }
         ],
+        definitionId: [
+          {
+            required: true,
+            message: "请至少选择一个险种",
+            trigger: "blur"
+          }
+        ],
         limit: [
           {
             required: true,

src/views/base/insuranceDefinitionLimit-list.vue

@@ -69,7 +69,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="definitionId" sort-by="definition_id" label="险种名称" width="180"></el-table-column>
+      <el-table-column prop="definition.name" sort-by="definition_id" label="险种名称" width="180"></el-table-column>
       <el-table-column prop="name" sort-by="name_" label="限额名称" width="180"></el-table-column>
       <el-table-column prop="limit" sort-by="limit_" label="责任限额/免赔额" width="180"></el-table-column>
       <el-table-column prop="unit" sort-by="unit_" label="计算单位(次/元/人/万)" width="180"></el-table-column>

src/views/base/insuranceJobs-detail.vue

@@ -7,26 +7,16 @@
 <template>
   <el-dialog
     :visible.sync="showDialog"
-    :title="title"
+    :title="modalTitle"
     :modal-append-to-body="false"
     style="text-align:left;"
     @close="closeDialog"
   >
     <div class="user-panel" v-loading="loading">
       <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
-        <el-form-item label="行业" prop="jobsId">
-          <el-select v-model="queryModel.jobsId" filterable placeholder="请选择" style="width:300px">
-            <el-option
-              v-for="resultJobs in queryJobsResult"
-              :key="resultJobs.id"
-              :label="resultJobs.name"
-              :value="resultJobs.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="险种" prop="definitionId">
           <el-select
-            v-model="queryModel.definitionId"
+            v-model="formModel.definitionId"
             filterable
             placeholder="请选择"
             style="width:300px"
@@ -39,8 +29,18 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="收费标准(月)" prop="charges">
-          <el-input v-model="formModel.charges" placeholder="请输入收费标准(月)" style="width:300px"></el-input>
+        <el-form-item label="行业" prop="jobsId">
+          <el-select v-model="formModel.jobsId" filterable placeholder="请选择" style="width:300px">
+            <el-option
+              v-for="resultJobs in queryJobsResult"
+              :key="resultJobs.id"
+              :label="resultJobs.name"
+              :value="resultJobs.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="收费标准" prop="charges">
+          <el-input v-model.number="formModel.charges" placeholder="收费标准" style="width:300px"></el-input>
         </el-form-item>
       </el-form>
     </div>
@@ -52,28 +52,44 @@
 </template>
 <script>
 import Constant from "@/constant";
-import insuranceJobsApi from "@/api/base/insuranceJobs";
 import jobsApi from "@/api/base/jobs";
+import insuranceJobsApi from "@/api/base/insuranceJobs";
 import insuranceDefinitionApi from "@/api/base/insuranceDefinition";
 
 export default {
-  props: ["businessKey", "title"],
+  props: ["businessKey", "modalTitle"],
   data() {
     return {
+      formModel: {},
       ruleValidate: {
-        jobsId: [{ required: true, message: "行业不能为空", trigger: "blur" }],
+        jobsId: [
+          {
+            required: true,
+            message: "请至少选择一个行业",
+            trigger: "blur"
+          }
+        ],
         definitionId: [
-          { required: true, message: "险种不能为空", trigger: "blur" }
+          {
+            required: true,
+            message: "请至少选择一个险种",
+            trigger: "blur"
+          }
         ],
         charges: [
-          { required: true, message: "收费标准(月)不能为空", trigger: "blur" }
+          {
+            type: "number",
+            required: true,
+            message: "收费标准必须输入数字",
+            trigger: "blur"
+          }
         ]
       },
       showDialog: true,
       loading: false,
       submitting: false,
-      queryJobsResult: [],
-      queryResult: []
+      queryResult: [],
+      queryJobsResult: []
     };
   },
   methods: {
@@ -82,12 +98,10 @@ export default {
     },
     handleSubmit() {
       var self = this;
-
       this.$refs["form"].validate(valid => {
         if (valid) {
           (function() {
             var id = self.formModel.id;
-
             if (id == null || id.length == 0) {
               return insuranceJobsApi.add(self.formModel);
             } else {
@@ -123,17 +137,15 @@ export default {
       var jsonData = response.data;
       this.queryResult = jsonData.data;
     });
-
     await jobsApi.list().then(response => {
       var jsonData = response.data;
       this.queryJobsResult = jsonData.data;
     });
-
     (function() {
       if (self.businessKey.length == 0) {
         return insuranceJobsApi.create();
       } else {
-        return insuranceJobsApi.edit(self.menuId);
+        return insuranceJobsApi.edit(self.businessKey);
       }
     })()
       .then(response => {

src/views/base/insuranceJobs-list.vue

@@ -82,10 +82,9 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="id" sort-by="id_" label="编号" width="180"></el-table-column>
-      <el-table-column prop="jobsId" sort-by="jobs_id" label="行业" width="180"></el-table-column>
-      <el-table-column prop="definitionId" sort-by="definition_id" label="险种" width="180"></el-table-column>
-      <el-table-column prop="charges" sort-by="charges_" label="收费标准(月)" width="180"></el-table-column>
+      <el-table-column prop="jobs.name" label="行业" width="250"></el-table-column>
+      <el-table-column prop="definition.name" label="险种" width="180"></el-table-column>
+      <el-table-column prop="charges" label="收费标准(月)" width="180"></el-table-column>
       <el-table-column label="操作">
         <template slot-scope="{row}">
           <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>

src/views/base/jobs-detail.vue

@@ -55,7 +55,14 @@ export default {
     return {
       formModel: {},
       ruleValidate: {
-        name: [{ required: true, message: "险种不能为空", trigger: "blur" }]
+        name: [{ required: true, message: "行业名称不能为空", trigger: "blur" }],
+        definitionId: [
+          {
+            required: true,
+            message: "请至少选择一个险种",
+            trigger: "blur"
+          }
+        ],
       },
       showDialog: true,
       loading: false,

src/views/base/jobs-list.vue

@@ -69,7 +69,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="definitionId" sort-by="definition_id" label="险种" width="180"></el-table-column>
+      <el-table-column prop="definition.name" sort-by="definition_id" label="险种" width="180"></el-table-column>
       <el-table-column prop="name" sort-by="name_" label="行业" width="180"></el-table-column>
       <el-table-column prop="content" sort-by="content_" label="详细信息" width="180"></el-table-column>
       <el-table-column prop="status" sort-by="status_" label="状态" width="180"></el-table-column>

src/views/base/message-list.vue

@@ -0,0 +1,222 @@
+<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="/message">消息管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <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" label="标题" width="180"></el-table-column>
+      <el-table-column prop="content" label="内容" width="180"></el-table-column>
+      <el-table-column prop="senderId" label="发送人" width="180"></el-table-column>
+      <el-table-column prop="createTime" label="发送时间" width="180"></el-table-column>
+      <el-table-column label="操作">
+        <template slot-scope="{row}">
+          <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+        </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>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import messageApi from "@/api/base/message";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: ""
+    };
+  },
+  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);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      messageApi
+        .pageList(formData)
+        .then(function(response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPage;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch(error => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+    },
+    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();
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+        .then(() => {
+          messageApi.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(() => {
+        messageApi.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);
+      }
+    }
+  },
+  mounted: function() {
+    this.changePage(1);
+  }
+};
+</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/business/insuranceAdd-list.vue

@@ -6,7 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/businessInsuranceApplication">新增投保管理</a>
+        <a href="/businessInsuranceApplication">新增投保代办管理</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>