sz 基础信息功能

src/api/base/electricClientInfo.js

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

src/api/base/electricMeterInfo.js

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

src/api/base/rechargeRecord.js

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

src/api/base/roomInfo.js

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

src/api/base/terminalInfo.js

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

src/routers/modules/sys.js

@@ -64,6 +64,61 @@ var routers = [
                 meta: {
                         roles: ["admin"]
                 }
+        },
+        {
+                path: '/base/terminalInfo/list',
+                name: 'base-terminalInfo-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/terminalInfo-list.vue'),
+                meta: {
+                        roles: ["admin"]
+                }
+        },
+        {
+                path: '/base/electricClientInfo/list',
+                name: 'base-electricClientInfo-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/electricClientInfo-list.vue'),
+                meta: {
+                        roles: ["admin"]
+                }
+        },
+        {
+                path: '/base/electricMeterInfo/list',
+                name: 'base-electricMeterInfo-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/electricMeterInfo-list.vue'),
+                meta: {
+                        roles: ["admin"]
+                }
+        },
+        {
+                path: '/base/rechargeRecord/list',
+                name: 'base-rechargeRecord-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/rechargeRecord-list.vue'),
+                meta: {
+                        roles: ["admin"]
+                }
+        },
+        {
+                path: '/base/roomInfo/list',
+                name: 'base-roomInfo-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/roomInfo-list.vue'),
+                meta: {
+                        roles: ["admin"]
+                }
         }
 ]
 

src/views/base/electricClientInfo-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"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
+        <el-form-item label prop="id">
+          <el-input v-model="formModel.id" placeholder="请输入" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="户号" prop="customerNo">
+          <el-input v-model="formModel.customerNo" placeholder="请输入户号" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="房间号ID" prop="roomId">
+          <el-input v-model="formModel.roomId" placeholder="请输入房间号ID" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="电表号ID" prop="meterId">
+          <el-input v-model="formModel.meterId" placeholder="请输入电表号ID" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="总购电量" prop="electricityTotal">
+          <el-input v-model="formModel.electricityTotal" placeholder="请输入总购电量" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="总购电金额" prop="amountTotal">
+          <el-input v-model="formModel.amountTotal" placeholder="请输入总购电金额" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="购买次数" prop="buyNum">
+          <el-input v-model="formModel.buyNum" placeholder="请输入购买次数" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="剩余电量" prop="electricityRemaining">
+          <el-input
+            v-model="formModel.electricityRemaining"
+            placeholder="请输入剩余电量"
+            style="width:300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="剩余金额" prop="amountRemaining">
+          <el-input v-model="formModel.amountRemaining" placeholder="请输入剩余金额" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label prop="createBy">
+          <el-input v-model="formModel.createBy" placeholder="请输入" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label prop="createTime">
+          <el-input v-model="formModel.createTime" placeholder="请输入" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label prop="updateBy">
+          <el-input v-model="formModel.updateBy" placeholder="请输入" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label prop="updateTime">
+          <el-input v-model="formModel.updateTime" placeholder="请输入" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="是否删除" prop="delFlag">
+          <el-input v-model="formModel.delFlag" placeholder="请输入是否删除" style="width:300px"></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 Constant from "@/constant";
+import electricClientInfoApi from "@/api/base/electricClientInfo";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      ruleValidate: {
+        id: [{ required: true, message: "不能为空", trigger: "blur" }],
+        customerNo: [
+          { required: true, message: "户号不能为空", trigger: "blur" }
+        ],
+        roomId: [
+          { required: true, message: "房间号ID不能为空", trigger: "blur" }
+        ],
+        meterId: [
+          { required: true, message: "电表号ID不能为空", trigger: "blur" }
+        ],
+        electricityTotal: [
+          { required: true, message: "总购电量不能为空", trigger: "blur" }
+        ],
+        amountTotal: [
+          { required: true, message: "总购电金额不能为空", trigger: "blur" }
+        ],
+        buyNum: [
+          { required: true, message: "购买次数不能为空", trigger: "blur" }
+        ],
+        electricityRemaining: [
+          { required: true, message: "剩余电量不能为空", trigger: "blur" }
+        ],
+        amountRemaining: [
+          { required: true, message: "剩余金额不能为空", trigger: "blur" }
+        ],
+        createBy: [{ required: true, message: "不能为空", trigger: "blur" }],
+        createTime: [{ required: true, message: "不能为空", trigger: "blur" }],
+        updateBy: [{ required: true, message: "不能为空", trigger: "blur" }],
+        updateTime: [{ required: true, message: "不能为空", trigger: "blur" }],
+        delFlag: [
+          { required: true, message: "是否删除不能为空", trigger: "blur" }
+        ]
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      formModel: {}
+    };
+  },
+  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 electricClientInfoApi.add(self.formModel);
+            } else {
+              return electricClientInfoApi.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 electricClientInfoApi.create();
+      } else {
+        return electricClientInfoApi.edit(self.menuId);
+      }
+    })()
+      .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>

src/views/base/electricClientInfo-list.vue

@@ -0,0 +1,379 @@
+<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="/electricClientInfo">electricClientInfo管理</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-item label prop="id">
+        <el-input type="text" size="mini" v-model="queryModel.id"></el-input>
+      </el-form-item>
+      <el-form-item label="户号" prop="customerNo">
+        <el-input type="text" size="mini" v-model="queryModel.customerNo"></el-input>
+      </el-form-item>
+      <el-form-item label="房间号ID" prop="roomId">
+        <el-input type="text" size="mini" v-model="queryModel.roomId"></el-input>
+      </el-form-item>
+      <el-form-item label="电表号ID" prop="meterId">
+        <el-input type="text" size="mini" v-model="queryModel.meterId"></el-input>
+      </el-form-item>
+      <el-form-item label="总购电量" prop="electricityTotal">
+        <el-input type="text" size="mini" v-model="queryModel.electricityTotal"></el-input>
+      </el-form-item>
+      <el-form-item label="总购电金额" prop="amountTotal">
+        <el-input type="text" size="mini" v-model="queryModel.amountTotal"></el-input>
+      </el-form-item>
+      <el-form-item label="购买次数" prop="buyNum">
+        <el-input type="text" size="mini" v-model="queryModel.buyNum"></el-input>
+      </el-form-item>
+      <el-form-item label="剩余电量" prop="electricityRemaining">
+        <el-input type="text" size="mini" v-model="queryModel.electricityRemaining"></el-input>
+      </el-form-item>
+      <el-form-item label="剩余金额" prop="amountRemaining">
+        <el-input type="text" size="mini" v-model="queryModel.amountRemaining"></el-input>
+      </el-form-item>
+      <el-form-item label prop="createBy">
+        <el-input type="text" size="mini" v-model="queryModel.createBy"></el-input>
+      </el-form-item>
+      <el-form-item label prop="createTime">
+        <el-input type="text" size="mini" v-model="queryModel.createTime"></el-input>
+      </el-form-item>
+      <el-form-item label prop="updateBy">
+        <el-input type="text" size="mini" v-model="queryModel.updateBy"></el-input>
+      </el-form-item>
+      <el-form-item label prop="updateTime">
+        <el-input type="text" size="mini" v-model="queryModel.updateTime"></el-input>
+      </el-form-item>
+      <el-form-item label="是否删除" prop="delFlag">
+        <el-input type="text" size="mini" v-model="queryModel.delFlag"></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 prop="id" sort-by="id_" label sortable="custom" width="180"></el-table-column>
+      <el-table-column
+        prop="customerNo"
+        sort-by="customer_no"
+        label="户号"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="roomId" sort-by="room_id" label="房间号ID" sortable="custom" width="180"></el-table-column>
+      <el-table-column
+        prop="meterId"
+        sort-by="meter_id"
+        label="电表号ID"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="electricityTotal"
+        sort-by="electricity_total"
+        label="总购电量"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="amountTotal"
+        sort-by="amount_total"
+        label="总购电金额"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="buyNum" sort-by="buy_num" label="购买次数" sortable="custom" width="180"></el-table-column>
+      <el-table-column
+        prop="electricityRemaining"
+        sort-by="electricity_remaining"
+        label="剩余电量"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="amountRemaining"
+        sort-by="amount_remaining"
+        label="剩余金额"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="createBy" sort-by="create_by" 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="updateBy" sort-by="update_by" 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 prop="delFlag" sort-by="del_flag" label="是否删除" sortable="custom" width="180"></el-table-column>
+      <el-table-column label="操作">
+        <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>
+        </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>
+    <electricClientInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></electricClientInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import ElectricClientInfoDetail from "./electricClientInfo-detail";
+import electricClientInfoApi from "@/api/base/electricClientInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        customerNo: "",
+        roomId: "",
+        meterId: "",
+        electricityTotal: "",
+        amountTotal: "",
+        buyNum: "",
+        electricityRemaining: "",
+        amountRemaining: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: "",
+        delFlag: ""
+      },
+      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);
+
+      formData.append("id", self.queryModel.id);
+      formData.append("customerNo", self.queryModel.customerNo);
+      formData.append("roomId", self.queryModel.roomId);
+      formData.append("meterId", self.queryModel.meterId);
+      formData.append("electricityTotal", self.queryModel.electricityTotal);
+      formData.append("amountTotal", self.queryModel.amountTotal);
+      formData.append("buyNum", self.queryModel.buyNum);
+      formData.append(
+        "electricityRemaining",
+        self.queryModel.electricityRemaining
+      );
+      formData.append("amountRemaining", self.queryModel.amountRemaining);
+      formData.append("createBy", self.queryModel.createBy);
+      formData.append("createTime", self.queryModel.createTime);
+      formData.append("updateBy", self.queryModel.updateBy);
+      formData.append("updateTime", self.queryModel.updateTime);
+      formData.append("delFlag", self.queryModel.delFlag);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      electricClientInfoApi
+        .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;
+    },
+    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(() => {
+          electricClientInfoApi.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(() => {
+        electricClientInfoApi.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);
+  },
+  components: {
+    "electricClientInfo-detail": ElectricClientInfoDetail
+  }
+};
+</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/electricMeterInfo-detail.vue

@@ -0,0 +1,154 @@
+
+<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"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
+        <el-form-item label prop="id">
+          <el-input v-model="formModel.id" placeholder="请输入" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="表号" prop="meterNo">
+          <el-input v-model="formModel.meterNo" placeholder="请输入表号" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="单位号" prop="unitNo">
+          <el-input v-model="formModel.unitNo" placeholder="请输入单位号" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="标识名称" prop="name">
+          <el-input v-model="formModel.name" placeholder="请输入标识名称" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="所属终端ID" prop="terminalId">
+          <el-input v-model="formModel.terminalId" placeholder="请输入所属终端ID" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label prop="createBy">
+          <el-input v-model="formModel.createBy" placeholder="请输入" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label prop="createTime">
+          <el-input v-model="formModel.createTime" placeholder="请输入" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label prop="updateBy">
+          <el-input v-model="formModel.updateBy" placeholder="请输入" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label prop="updateTime">
+          <el-input v-model="formModel.updateTime" placeholder="请输入" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="是否删除" prop="delFlag">
+          <el-input v-model="formModel.delFlag" placeholder="请输入是否删除" style="width:300px"></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 Constant from "@/constant";
+import electricMeterInfoApi from "@/api/base/electricMeterInfo";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      ruleValidate: {
+        id: [{ required: true, message: "不能为空", trigger: "blur" }],
+        meterNo: [{ required: true, message: "表号不能为空", trigger: "blur" }],
+        unitNo: [
+          { required: true, message: "单位号不能为空", trigger: "blur" }
+        ],
+        name: [
+          { required: true, message: "标识名称不能为空", trigger: "blur" }
+        ],
+        terminalId: [
+          { required: true, message: "所属终端ID不能为空", trigger: "blur" }
+        ],
+        createBy: [{ required: true, message: "不能为空", trigger: "blur" }],
+        createTime: [{ required: true, message: "不能为空", trigger: "blur" }],
+        updateBy: [{ required: true, message: "不能为空", trigger: "blur" }],
+        updateTime: [{ required: true, message: "不能为空", trigger: "blur" }],
+        delFlag: [
+          { required: true, message: "是否删除不能为空", trigger: "blur" }
+        ]
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      formModel: {}
+    };
+  },
+  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 electricMeterInfoApi.add(self.formModel);
+            } else {
+              return electricMeterInfoApi.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 electricMeterInfoApi.create();
+      } else {
+        return electricMeterInfoApi.edit(self.menuId);
+      }
+    })()
+      .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>

src/views/base/electricMeterInfo-list.vue

@@ -0,0 +1,322 @@
+<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="/electricMeterInfo">electricMeterInfo管理</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-item label prop="id">
+        <el-input type="text" size="mini" v-model="queryModel.id"></el-input>
+      </el-form-item>
+      <el-form-item label="表号" prop="meterNo">
+        <el-input type="text" size="mini" v-model="queryModel.meterNo"></el-input>
+      </el-form-item>
+      <el-form-item label="单位号" prop="unitNo">
+        <el-input type="text" size="mini" v-model="queryModel.unitNo"></el-input>
+      </el-form-item>
+      <el-form-item label="标识名称" prop="name">
+        <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
+      </el-form-item>
+      <el-form-item label="所属终端ID" prop="terminalId">
+        <el-input type="text" size="mini" v-model="queryModel.terminalId"></el-input>
+      </el-form-item>
+      <el-form-item label prop="createBy">
+        <el-input type="text" size="mini" v-model="queryModel.createBy"></el-input>
+      </el-form-item>
+      <el-form-item label prop="createTime">
+        <el-input type="text" size="mini" v-model="queryModel.createTime"></el-input>
+      </el-form-item>
+      <el-form-item label prop="updateBy">
+        <el-input type="text" size="mini" v-model="queryModel.updateBy"></el-input>
+      </el-form-item>
+      <el-form-item label prop="updateTime">
+        <el-input type="text" size="mini" v-model="queryModel.updateTime"></el-input>
+      </el-form-item>
+      <el-form-item label="是否删除" prop="delFlag">
+        <el-input type="text" size="mini" v-model="queryModel.delFlag"></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 prop="id" sort-by="id_" label sortable="custom" width="180"></el-table-column>
+      <el-table-column prop="meterNo" sort-by="meter_no" label="表号" sortable="custom" width="180"></el-table-column>
+      <el-table-column prop="unitNo" sort-by="unit_no" label="单位号" sortable="custom" width="180"></el-table-column>
+      <el-table-column prop="name" sort-by="name_" label="标识名称" sortable="custom" width="180"></el-table-column>
+      <el-table-column
+        prop="terminalId"
+        sort-by="terminal_id"
+        label="所属终端ID"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="createBy" sort-by="create_by" 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="updateBy" sort-by="update_by" 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 prop="delFlag" sort-by="del_flag" label="是否删除" sortable="custom" width="180"></el-table-column>
+      <el-table-column label="操作">
+        <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>
+        </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>
+    <electricMeterInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></electricMeterInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import ElectricMeterInfoDetail from "./electricMeterInfo-detail";
+import electricMeterInfoApi from "@/api/base/electricMeterInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        meterNo: "",
+        unitNo: "",
+        name: "",
+        terminalId: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: "",
+        delFlag: ""
+      },
+      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);
+
+      formData.append("id", self.queryModel.id);
+      formData.append("meterNo", self.queryModel.meterNo);
+      formData.append("unitNo", self.queryModel.unitNo);
+      formData.append("name", self.queryModel.name);
+      formData.append("terminalId", self.queryModel.terminalId);
+      formData.append("createBy", self.queryModel.createBy);
+      formData.append("createTime", self.queryModel.createTime);
+      formData.append("updateBy", self.queryModel.updateBy);
+      formData.append("updateTime", self.queryModel.updateTime);
+      formData.append("delFlag", self.queryModel.delFlag);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      electricMeterInfoApi
+        .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;
+    },
+    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(() => {
+          electricMeterInfoApi.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(() => {
+        electricMeterInfoApi.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);
+  },
+  components: {
+    "electricMeterInfo-detail": ElectricMeterInfoDetail
+  }
+};
+</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/rechargeRecord-detail.vue

@@ -0,0 +1,164 @@
+
+<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"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
+        <el-form-item label prop="id">
+          <el-input v-model="formModel.id" placeholder="请输入" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label prop="createBy">
+          <el-input v-model="formModel.createBy" placeholder="请输入" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label prop="createTime">
+          <el-input v-model="formModel.createTime" placeholder="请输入" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label prop="updateBy">
+          <el-input v-model="formModel.updateBy" placeholder="请输入" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label prop="updateTime">
+          <el-input v-model="formModel.updateTime" placeholder="请输入" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="是否删除" prop="delFlag">
+          <el-input v-model="formModel.delFlag" placeholder="请输入是否删除" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="流水号" prop="serialNumber">
+          <el-input v-model="formModel.serialNumber" placeholder="请输入流水号" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="充值金额" prop="buyAmount">
+          <el-input v-model="formModel.buyAmount" placeholder="请输入充值金额" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="充值度数" prop="buyElectricity">
+          <el-input v-model="formModel.buyElectricity" placeholder="请输入充值度数" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="支付类型:微信,支付宝,现金等" prop="buyType">
+          <el-input
+            v-model="formModel.buyType"
+            placeholder="请输入支付类型:微信,支付宝,现金等"
+            style="width:300px"
+          ></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 Constant from "@/constant";
+import rechargeRecordApi from "@/api/base/rechargeRecord";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      ruleValidate: {
+        id: [{ required: true, message: "不能为空", trigger: "blur" }],
+        createBy: [{ required: true, message: "不能为空", trigger: "blur" }],
+        createTime: [{ required: true, message: "不能为空", trigger: "blur" }],
+        updateBy: [{ required: true, message: "不能为空", trigger: "blur" }],
+        updateTime: [{ required: true, message: "不能为空", trigger: "blur" }],
+        delFlag: [
+          { required: true, message: "是否删除不能为空", trigger: "blur" }
+        ],
+        serialNumber: [
+          { required: true, message: "流水号不能为空", trigger: "blur" }
+        ],
+        buyAmount: [
+          { required: true, message: "充值金额不能为空", trigger: "blur" }
+        ],
+        buyElectricity: [
+          { required: true, message: "充值度数不能为空", trigger: "blur" }
+        ],
+        buyType: [
+          {
+            required: true,
+            message: "支付类型:微信,支付宝,现金等不能为空",
+            trigger: "blur"
+          }
+        ]
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      formModel: {}
+    };
+  },
+  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 rechargeRecordApi.add(self.formModel);
+            } else {
+              return rechargeRecordApi.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 rechargeRecordApi.create();
+      } else {
+        return rechargeRecordApi.edit(self.menuId);
+      }
+    })()
+      .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>

src/views/base/rechargeRecord-list.vue

@@ -0,0 +1,340 @@
+<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="/rechargeRecord">rechargeRecord管理</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-item label prop="id">
+        <el-input type="text" size="mini" v-model="queryModel.id"></el-input>
+      </el-form-item>
+      <el-form-item label prop="createBy">
+        <el-input type="text" size="mini" v-model="queryModel.createBy"></el-input>
+      </el-form-item>
+      <el-form-item label prop="createTime">
+        <el-input type="text" size="mini" v-model="queryModel.createTime"></el-input>
+      </el-form-item>
+      <el-form-item label prop="updateBy">
+        <el-input type="text" size="mini" v-model="queryModel.updateBy"></el-input>
+      </el-form-item>
+      <el-form-item label prop="updateTime">
+        <el-input type="text" size="mini" v-model="queryModel.updateTime"></el-input>
+      </el-form-item>
+      <el-form-item label="是否删除" prop="delFlag">
+        <el-input type="text" size="mini" v-model="queryModel.delFlag"></el-input>
+      </el-form-item>
+      <el-form-item label="流水号" prop="serialNumber">
+        <el-input type="text" size="mini" v-model="queryModel.serialNumber"></el-input>
+      </el-form-item>
+      <el-form-item label="充值金额" prop="buyAmount">
+        <el-input type="text" size="mini" v-model="queryModel.buyAmount"></el-input>
+      </el-form-item>
+      <el-form-item label="充值度数" prop="buyElectricity">
+        <el-input type="text" size="mini" v-model="queryModel.buyElectricity"></el-input>
+      </el-form-item>
+      <el-form-item label="支付类型:微信,支付宝,现金等" prop="buyType">
+        <el-input type="text" size="mini" v-model="queryModel.buyType"></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 prop="id" sort-by="id_" label sortable="custom" width="180"></el-table-column>
+      <el-table-column prop="createBy" sort-by="create_by" 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="updateBy" sort-by="update_by" 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 prop="delFlag" sort-by="del_flag" label="是否删除" sortable="custom" width="180"></el-table-column>
+      <el-table-column
+        prop="serialNumber"
+        sort-by="serial_number"
+        label="流水号"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="buyAmount"
+        sort-by="buy_amount"
+        label="充值金额"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="buyElectricity"
+        sort-by="buy_electricity"
+        label="充值度数"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="buyType"
+        sort-by="buy_type"
+        label="支付类型:微信,支付宝,现金等"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column label="操作">
+        <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>
+        </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>
+    <rechargeRecord-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></rechargeRecord-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import RechargeRecordDetail from "./rechargeRecord-detail";
+import rechargeRecordApi from "@/api/base/rechargeRecord";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: "",
+        delFlag: "",
+        serialNumber: "",
+        buyAmount: "",
+        buyElectricity: "",
+        buyType: ""
+      },
+      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);
+
+      formData.append("id", self.queryModel.id);
+      formData.append("createBy", self.queryModel.createBy);
+      formData.append("createTime", self.queryModel.createTime);
+      formData.append("updateBy", self.queryModel.updateBy);
+      formData.append("updateTime", self.queryModel.updateTime);
+      formData.append("delFlag", self.queryModel.delFlag);
+      formData.append("serialNumber", self.queryModel.serialNumber);
+      formData.append("buyAmount", self.queryModel.buyAmount);
+      formData.append("buyElectricity", self.queryModel.buyElectricity);
+      formData.append("buyType", self.queryModel.buyType);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      rechargeRecordApi
+        .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;
+    },
+    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(() => {
+          rechargeRecordApi.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(() => {
+        rechargeRecordApi.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);
+  },
+  components: {
+    "rechargeRecord-detail": RechargeRecordDetail
+  }
+};
+</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/roomInfo-detail.vue

@@ -0,0 +1,190 @@
+<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"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="formModel.name" placeholder="请输入名称" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="编号" prop="number">
+          <el-input v-model="formModel.number" placeholder="请输入编号" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="类型:" prop="type">
+          <el-select v-model="formModel.type" @change="selectType">
+            <el-option label="园区" value="1"></el-option>
+            <el-option label="楼栋" value="2"></el-option>
+            <el-option label="房号" value="3"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="排序号" prop="sortNo">
+          <el-input v-model="formModel.sortNo" placeholder="请输入排序号" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="上级菜单" prop="parentId">
+          <el-select
+            v-model="formModel.parentId"
+            filterable
+            remote
+            placeholder=""
+            :remote-method="queryRoomInfo"
+            style="width:300px"
+            v-bind:disabled="disabledInput"
+          >
+            <el-option
+              v-for="roomInfo in roomInfoListFilter"
+              :key="roomInfo.id"
+              :label="roomInfo.name"
+              :value="roomInfo.id"
+            ></el-option>
+          </el-select>
+        </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 roomInfoApi from "@/api/base/roomInfo";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      ruleValidate: {
+        name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
+        type: [
+          {
+            required: true,
+            message: "类型:园区/楼栋/房号不能为空",
+            trigger: "blur"
+          }
+        ],
+        sortNo: [
+          { required: true, message: "排序号不能为空", trigger: "blur" }
+        ]
+      },
+      roomInfoList: [],
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      formModel: {},
+      disabledInput:true,
+      parentType:"",
+    };
+  },
+  computed: {
+    roomInfoListFilter() {
+      var self = this;
+
+      return self.roomInfoList.filter(roomInfo => {
+        return self.formModel.parentId != roomInfo.id;
+      });
+    }
+  },
+  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 roomInfoApi.add(self.formModel);
+            } else {
+              return roomInfoApi.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);
+            }
+          });
+        }
+      });
+    },
+    queryRoomInfo(keywords) {
+      var formData = new FormData();
+      formData.append("keywords", keywords);
+      formData.append("parentType", this.parentType);
+      //formData.append("excludeId", this.formModel.id);
+      formData.append("limit", 10);
+    
+      return roomInfoApi.query(formData).then(response => {
+        var jsonData = response.data;
+
+        if (jsonData.result) {
+          this.roomInfoList = jsonData.data;
+        } else {
+          this.$message.error(jsonData.message + "");
+        }
+      });
+    },
+    selectType(keywords){
+      this.parentType = keywords;
+      this.queryRoomInfo("");
+      if(keywords != "1"){
+        this.disabledInput = false;
+      }
+    }
+  },
+  async mounted() {
+    var self = this;
+    self.loading = true;
+    (function() {
+      if (self.businessKey.length == 0) {
+        return roomInfoApi.create();
+      } else {
+        return roomInfoApi.edit(self.businessKey);
+      }
+    })()
+      .then(response => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+          if(self.formModel.parentId != ""){
+            this.parentType = self.formModel.type;
+            this.queryRoomInfo("");
+            this.disabledInput = false;
+          }
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch(error => {
+        self.$message.error(error + "");
+      });
+  }
+};
+</script>

src/views/base/roomInfo-list.vue

@@ -0,0 +1,305 @@
+<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="/roomInfo">房间管理</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-item label="名称" prop="name">
+        <el-input type="text" size="mini" v-model="queryModel.name"></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;"
+      row-key="id"
+      border
+      lazy
+      :load="load"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column prop="name" sort-by="name_" label="名称" sortable="custom" width="180"></el-table-column>
+      <el-table-column prop="number" sort-by="number_" label="编号" sortable="custom" width="180"></el-table-column>
+      <el-table-column prop="type" sort-by="type_" label="类型" sortable="custom" width="180">
+        <template slot-scope="scope">		
+          <p v-if="scope.row.type=='1'">
+						园区
+					</p>
+          <p v-if="scope.row.type=='2'">
+						楼栋
+					</p>
+          <p v-if="scope.row.type=='3'">
+						房号
+					</p>
+        </template>
+      </el-table-column>
+      <el-table-column prop="sortNo" sort-by="sort_no" label="排序号" sortable="custom" width="180"></el-table-column>
+      <el-table-column label="操作">
+        <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>
+        </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>
+    <roomInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></roomInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import RoomInfoDetail from "./roomInfo-detail";
+import roomInfoApi from "@/api/base/roomInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        name: "",
+        number: "",
+        type: "1",
+        sortNo: "",
+        parentId: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: "",
+        delFlag: ""
+      },
+      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);
+
+      formData.append("id", self.queryModel.id);
+      formData.append("name", self.queryModel.name);
+      formData.append("number", self.queryModel.number);
+      formData.append("type", self.queryModel.type);
+      formData.append("sortNo", self.queryModel.sortNo);
+      formData.append("parentId", self.queryModel.parentId);
+      formData.append("createBy", self.queryModel.createBy);
+      formData.append("createTime", self.queryModel.createTime);
+      formData.append("updateBy", self.queryModel.updateBy);
+      formData.append("updateTime", self.queryModel.updateTime);
+      formData.append("delFlag", self.queryModel.delFlag);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      roomInfoApi
+        .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;
+    },
+    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(() => {
+          roomInfoApi.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(() => {
+        roomInfoApi.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);
+  },
+  components: {
+    "roomInfo-detail": RoomInfoDetail
+  }
+};
+</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/terminalInfo-detail.vue

@@ -0,0 +1,111 @@
+<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"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
+        <el-form-item label="终端名称" prop="name">
+          <el-input v-model="formModel.name" placeholder="请输入终端注释" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="formModel.remark" placeholder="请输入备注" style="width:300px"></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 Constant from "@/constant";
+import terminalInfoApi from "@/api/base/terminalInfo";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      ruleValidate: {
+        name: [{ required: true, message: "终端名称不能为空", trigger: "blur" }]
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      formModel: {}
+    };
+  },
+  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 terminalInfoApi.add(self.formModel);
+            } else {
+              return terminalInfoApi.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 terminalInfoApi.create();
+      } else {
+        return terminalInfoApi.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>

src/views/base/terminalInfo-list.vue

@@ -0,0 +1,278 @@
+<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="/terminalInfo">终端管理</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-item label="终端名称" prop="name">
+        <el-input type="text" size="mini" v-model="queryModel.name"></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 prop="name" sort-by="name_" label="终端名称" sortable="custom" width="180"></el-table-column>
+      <el-table-column prop="remark" sort-by="remark_" label="备注" sortable="custom" width="180"></el-table-column>
+      <el-table-column label="操作">
+        <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>
+        </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>
+    <terminalInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></terminalInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import TerminalInfoDetail from "./terminalInfo-detail";
+import terminalInfoApi from "@/api/base/terminalInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        name: "",
+        remark: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: "",
+        delFlag: ""
+      },
+      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);
+
+      formData.append("id", self.queryModel.id);
+      formData.append("name", self.queryModel.name);
+      formData.append("remark", self.queryModel.remark);
+      formData.append("createBy", self.queryModel.createBy);
+      formData.append("createTime", self.queryModel.createTime);
+      formData.append("updateBy", self.queryModel.updateBy);
+      formData.append("updateTime", self.queryModel.updateTime);
+      formData.append("delFlag", self.queryModel.delFlag);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      terminalInfoApi
+        .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.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(() => {
+          terminalInfoApi.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(() => {
+        terminalInfoApi.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);
+  },
+  components: {
+    "terminalInfo-detail": TerminalInfoDetail
+  }
+};
+</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

@@ -75,13 +75,10 @@ export default {
         sortNo: [
           { required: true, message: "显示序号不能为空", trigger: "blur" }
         ],
-        parentId: [
-          { required: true, message: "所属目录不能为空", trigger: "blur" }
-        ],
         dataType: [
           {
             required: true,
-            message: "1-字典目录,2-数据不能为空",
+            message: "字典类型不能为空",
             trigger: "blur"
           }
         ]
@@ -110,7 +107,6 @@ export default {
         if (valid) {
           (function() {
             var id = self.formModel.id;
-            alert(self.formModel.parentId);
             if (id == null || id.length == 0) {
               return dataDictionaryApi.add(self.formModel);
             } else {
@@ -159,6 +155,7 @@ export default {
   mounted: function() {
     var self = this;
     self.loading = true;
+    this.queryMenu("");
     (function() {
       if (self.dictId.length == 0) {
         return dataDictionaryApi.create();

src/views/sys/dataDictionary-list.vue

@@ -174,6 +174,7 @@ export default {
     },
     pageSizeChange(pageSize) {
       this.pageSize = pageSize;
+      this.changePage(this.pageIndex);
     },
     sortChange(data) {
       this.field = data.column.field;

src/views/sys/dataDictionary-test-detail.vue

@@ -110,7 +110,6 @@ export default {
         if (valid) {
           (function() {
             var id = self.formModel.id;
-            alert(self.formModel.parentId);
             if (id == null || id.length == 0) {
               return dataDictionaryApi.add(self.formModel);
             } else {