后台页面功能

src/api/base/feedbackMethod.js

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

src/api/base/loveProject.js

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

src/api/base/regUser.js

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

src/api/base/wishInfo.js

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

src/api/base/wishInfoUserRecord.js

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

src/routers/modules/base.js

@@ -1,4 +1,64 @@
 var routers = [
+    {
+        path: '/base/regUser/list',
+        name: 'baseUserList',
+        // 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/regUser-list.vue'),
+        meta: {
+                roles: ["admin"],
+                title: '用户管理'
+        }
+    },
+    {
+        path: '/base/wishInfo/list',
+        name: 'baseWishInfoList',
+        // 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/wishInfo-list.vue'),
+        meta: {
+                roles: ["admin"],
+                title: '心愿管理'
+        }
+    },
+    {
+        path: '/base/wishInfoUserRecord/list',
+        name: 'baseWishInfoUserRecordList',
+        // 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/wishInfoUserRecord-list.vue'),
+        meta: {
+                roles: ["admin"],
+                title: '互换记录管理'
+        }
+    },
+    {
+        path: '/base/loveProject/list',
+        name: 'baseLoveProjectList',
+        // 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/loveProject-list.vue'),
+        meta: {
+                roles: ["admin"],
+                title: '项目互助管理'
+        }
+    },
+    {
+        path: '/base/feedbackMethod/list',
+        name: 'baseFeedbackMethodList',
+        // 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/feedbackMethod-list.vue'),
+        meta: {
+                roles: ["admin"],
+                title: '回馈方式管理'
+        }
+    },
 ]
 
 export default routers;

src/views/base/feedbackMethod-detail.vue

@@ -0,0 +1,162 @@
+<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"
+    :close-on-click-modal="false"
+  >
+    <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="type">
+            <el-select v-model="formModel.type" placeholder="请选择" style="width: 300px">
+                <el-option
+                v-for="item in typeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value">
+                </el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="详情" prop="detail">
+          <el-input
+            v-model="formModel.detail"
+            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 feedbackMethodApi from "@/api/base/feedbackMethod";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      showPwd: true,
+      ruleValidate: {
+        name: [
+          { required: true, message: "名称不能为空", trigger: "blur" },
+        ],
+        type: [
+          { required: true, message: "类型不能为空", trigger: "blur" },
+        ],
+      },
+      roleList: [],
+      formModel: {},
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      typeList:[]
+    };
+  },
+  created() {
+    dataDictionaryApi.findByCatalogName({catalogName: "回馈方式类型",})
+      .then((response) => {
+          var jsonData = response.data;
+          this.typeList = jsonData.data;
+    });
+  },
+  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 feedbackMethodApi.add(self.formModel);
+            } else {
+              self.formModel.password = null;
+              return feedbackMethodApi.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);
+            }
+          });
+        }
+      });
+    },
+  },
+  async mounted() {
+    var self = this;
+    self.loading = true;
+
+    (function () {
+      if (self.businessKey != null && self.businessKey.length > 0) {
+        return feedbackMethodApi.edit(self.businessKey);
+      } else {
+        return feedbackMethodApi.create();
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+          self.showModal = true;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+
+        self.loading = false;
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+        self.loading = false;
+      });
+  },
+  components: {
+    // "el-select-tree": SelectTree
+  },
+};
+</script>

src/views/base/feedbackMethod-list.vue

@@ -0,0 +1,297 @@
+<template>
+    <div>
+      <el-breadcrumb separator=">">
+        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+        <el-breadcrumb-item>
+          <a href="#">基础信息管理</a>
+        </el-breadcrumb-item>
+        <el-breadcrumb-item>
+          <a href="/base/regUser">用户管理</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-remove"
+          :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"
+          label="名称"
+        ></el-table-column>
+        <el-table-column
+          prop="typeN"
+          label="类型"
+        ></el-table-column>
+        <el-table-column
+          prop="detail"
+          label="详情"
+        ></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="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>
+      <feedbackMethod-detail
+        v-if="showModal"
+        ref="userDetail"
+        :businessKey="businessKey"
+        :title="modalTitle"
+        @close="onDetailModalClose"
+      ></feedbackMethod-detail>
+    </div>
+  </template>
+  <script>
+  import Constant from "@/constant";
+  import feedbackMethodDetail from "./feedbackMethod-detail";
+  import feedbackMethodApi from "@/api/base/feedbackMethod";
+  
+  export default {
+    name: 'regUserList',
+    data() {
+      var self = this;
+  
+      return {
+        queryModel: {
+            name: "",
+        },
+        loading: false,
+        tableData: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPages: 0,
+        totalElements: 0,
+        field: "",
+        direction: "",
+        pageSizeList: [10, 20, 30],
+        multipleSelection: [],
+        modalTitle: "",      
+        businessKey: "",
+        showModal: false,
+        dialogFormVisible:false,
+        newPassword:"",
+        roleResult:[],
+        props: {
+          // 配置项（必选）
+          value: "id",
+          label: "name",
+          children: "children"
+        },
+      };
+    },
+    methods: {
+      changePage(pageIndex) {
+        var self = this;
+  
+        console.log(pageIndex);
+  
+        self.pageIndex = pageIndex;
+        var formData = new FormData();
+  
+        formData.append("pageIndex", self.pageIndex);
+        formData.append("pageSize", self.pageSize);
+  
+        formData.append("name", self.queryModel.name);
+  
+        if (this.field != null) {
+          formData.append("field", this.field);
+        }
+  
+        if (this.direction != null) {
+          formData.append("direction", this.direction);
+        }
+  
+        self.loading = true;
+  
+        feedbackMethodApi.pageList(formData).then(function(response) {
+          self.loading = false;
+  
+          var jsonData = response.data;
+  
+          if(jsonData.result){
+            var pageInfo = jsonData.data;
+  
+            self.tableData = pageInfo.data;
+            self.totalPages = pageInfo.totalPages;
+            self.totalElements = pageInfo.recordsTotal;
+          }
+          else {
+            self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+              });
+          }
+        }).catch((error)=>{
+          self.loading = false;
+        });
+      },
+      pageSizeChange(pageSize) {
+        this.pageSize = pageSize;
+      },
+      sortChange(data) {
+        this.field = data.column.field;
+        this.direction = data.order == "ascending" ? "asc" : "desc";
+  
+        this.changePage(this.pageIndex);
+      },
+      handleSelectionChange(val) {
+        this.multipleSelection = val;
+      },
+      handleReset(name) {
+        this.$refs[name].resetFields();
+      },
+      handleAdd() {
+        var self = this;
+        
+        self.modalTitle = "新增";
+        self.businessKey = "";
+        self.showModal = true;
+      },
+      handleEdit(record) {
+        var self = this;
+        
+        self.modalTitle = "编辑";
+        self.businessKey = record.id;
+        self.showModal = true;
+      },
+      handleDelete(record) {
+        var self = this;
+  
+        this.$confirm("是否确认删除" + record.userName + "？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+            feedbackMethodApi.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(() => {
+            feedbackMethodApi.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() {
+      var self = this;
+      this.changePage(1);
+    },
+    components: {
+      "feedbackMethod-detail": feedbackMethodDetail,
+    }
+  };
+  </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 {
+    padding: 10px;
+    text-align: left;
+  }
+  </style>

src/views/base/loveProject-detail.vue

@@ -0,0 +1,265 @@
+
+<template>
+    <el-dialog
+      :visible.sync="showDialog"
+      :title="title"
+      :modal-append-to-body="false"
+      style="text-align: left"
+      @close="closeDialog"
+      :close-on-click-modal="false"
+    >
+      <div class="user-panel" v-loading="loading">
+        <el-form
+          ref="form"
+          :model="formModel"
+          :rules="ruleValidate"
+          :label-width="'100px'"
+        >
+          <el-form-item label="标题" prop="title">
+            <el-input
+              v-model="formModel.title"
+              placeholder="请输入标题"
+              style="width: 90%"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="联系人" prop="contacts">
+            <el-input
+              v-model="formModel.contacts"
+              placeholder="请输入标题"
+              style="width: 90%"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="联系电话" prop="contactPhone">
+            <el-input
+              v-model="formModel.contactPhone"
+              placeholder="请输入标题"
+              style="width: 90%"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="回馈方式" prop="type">
+              <el-select v-model="formModel.feedbackMethodArray" multiple filterable  placeholder="请选择" style="width: 90%">
+                  <el-option
+                  v-for="item in typeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id">
+                  </el-option>
+              </el-select>
+          </el-form-item>
+          <el-form-item label="内容" prop="content">
+              <mce-editor
+                  ref="editor"
+                  uploadName="upfile"
+                  v-model="formModel.content"
+                  :url="uploadUrl1"
+                  style="width: 90%"
+              ></mce-editor>
+          </el-form-item>
+          <el-form-item label="图片" prop="image">
+            <el-upload
+                style="width:300px"
+                class="avatar-uploader"
+                name="photoFile"
+                :action="uploadUrl"
+                :headers="headers"
+                :data="uploadData"
+                :show-file-list="false"
+                :on-success="handleAvatarSuccess">
+                <img v-if="fileUrl" :src="fileUrl" class="avatar">
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                </el-upload>
+          </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 { getToken } from "@/utils/auth"; // get token from cookie
+  import MceEditor from "@/components/Tinymce";
+  import loveProjectApi from "@/api/base/loveProject";
+  import dataDictionaryApi from "@/api/sys/dataDictionary";
+  import feedbackMethodApi from "@/api/base/feedbackMethod";
+  
+  export default {
+    props: ["businessKey", "title"],
+    data() {
+      return {
+        showPwd: true,
+        ruleValidate: {
+          category: [
+            { required: true, message: "类型不能为空", trigger: "blur" },
+          ],
+          title: [
+            { required: true, message: "标题不能为空", trigger: "blur" },
+          ],
+          amount: [
+            { required: true, message: "数量不能为空", trigger: "blur" },
+          ],
+          studentName: [
+            { required: true, message: "学生姓名不能为空", trigger: "blur" },
+          ],
+          studentType: [
+            { required: true, message: "学生类型不能为空", trigger: "blur" },
+          ],
+        },
+        roleList: [],
+        formModel: {},
+        showDialog: true,
+        loading: false,
+        submitting: false,
+        categoryList:[],
+        typeList:[],
+        //上传地址
+        uploadUrl: Constant.serverUrl + "/uploadPicture",
+        uploadData: {
+            subFolder: "love-donation",
+        },
+        fileUrl: "",
+        fileUrl1: "",
+        headers: {
+            Authorization: getToken(),
+        },
+        uploadUrl1: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
+      };
+    },
+    created() {
+      dataDictionaryApi.findByCatalogName({catalogName: "心愿类型",})
+        .then((response) => {
+            var jsonData = response.data;
+            this.categoryList = jsonData.data;
+      });
+
+      feedbackMethodApi.list()
+        .then((response) => {
+            var jsonData = response.data;
+            this.typeList = jsonData.data;
+      });
+      
+    },
+    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 loveProjectApi.add(self.formModel);
+              } else {
+                self.formModel.password = null;
+                return loveProjectApi.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);
+              }
+            });
+          }
+        });
+      },
+      handleAvatarSuccess(res, file) {
+          var self = this;
+          self.formModel.image = res.data;
+  
+          self.fileUrl =
+            res.data + "?x-oss-process=image/resize,m_lfit,h_300,w_300";
+      },
+    },
+    async mounted() {
+      var self = this;
+      self.loading = true;
+  
+      (function () {
+        if (self.businessKey != null && self.businessKey.length > 0) {
+          return loveProjectApi.edit(self.businessKey);
+        } else {
+          return loveProjectApi.create();
+        }
+      })()
+        .then((response) => {
+          var jsonData = response.data;
+  
+          if (jsonData.result) {
+            self.formModel = jsonData.data;
+            self.showModal = true;
+  
+            let image = self.formModel.image;
+              if (image != null) {
+                  self.fileUrl = image 
+              }
+  
+            if (self.formModel.content != null) {
+              self.$refs.editor.setContent(self.formModel.content);
+            }
+  
+          } else {
+            self.$message.error(jsonData.message + "");
+          }
+  
+          self.loading = false;
+        })
+        .catch((error) => {
+          self.$message.error(error + "");
+          self.loading = false;
+        });
+    },
+    components: {
+      // "el-select-tree": SelectTree
+      "mce-editor": MceEditor,
+    },
+  };
+  </script>
+  <style scoped>
+  .user-panel {
+    margin: 10px auto;
+  }
+  .avatar-uploader .el-upload {
+      border: 1px dashed #d9d9d9;
+      border-radius: 6px;
+      cursor: pointer;
+      position: relative;
+      overflow: hidden;
+    }
+    .avatar-uploader .el-upload:hover {
+      border-color: #409EFF;
+    }
+    .avatar-uploader-icon {
+      font-size: 28px;
+      color: #8c939d;
+      width: 178px;
+      height: 178px;
+      line-height: 178px;
+      text-align: center;
+    }
+    .avatar {
+      width: 178px;
+      height: 178px;
+      display: block;
+    }
+  </style>

src/views/base/loveProject-list.vue

@@ -0,0 +1,324 @@
+<template>
+    <div>
+      <el-breadcrumb separator=">">
+        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+        <el-breadcrumb-item>
+          <a href="#">基础信息管理</a>
+        </el-breadcrumb-item>
+        <el-breadcrumb-item>
+          <a href="/base/wishInfo">心愿管理</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="title">
+          <el-input type="text" size="mini" v-model="queryModel.title"></el-input>
+        </el-form-item>
+        <el-form-item label="内容类型" prop="type">
+          <el-select v-model="queryModel.type" placeholder="请选择" size="mini">
+            <el-option
+              v-for="item in typeList"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            size="mini"
+            icon="ios-search"
+            @click="changePage(1)"
+            :loading="loading"
+          >查询</el-button>&nbsp;
+          <el-button
+            type="info"
+            size="mini"
+            style="margin-left: 8px"
+            @click="handleReset('queryForm')"
+          >重置</el-button>&nbsp;
+        </el-form-item>
+      </el-form>
+      <el-divider></el-divider>
+      <el-row class="button-group">
+        <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">新增</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          plain
+          icon="el-icon-remove"
+          :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="typeN"
+          label="内容类型"
+        ></el-table-column>
+        <el-table-column  prop="image"  label="图片">
+          <template slot-scope="{row}">
+            <el-image
+            style="width: 50px; height: 50px"
+            :src="row.image">
+            <div slot="error" class="image-slot" >
+              <i class="el-icon-picture-outline"></i>
+            </div>
+          </el-image>
+          </template>
+
+        </el-table-column>
+        <el-table-column
+          prop="contacts"
+          label="联系人"
+        ></el-table-column>
+        <el-table-column
+          prop="contactPhone"
+          label="联系电话"
+        ></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="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>
+      <loveProject-detail
+        v-if="showModal"
+        ref="userDetail"
+        :businessKey="businessKey"
+        :title="modalTitle"
+        @close="onDetailModalClose"
+      ></loveProject-detail>
+    </div>
+  </template>
+  <script>
+  import Constant from "@/constant";
+  import loveProjectDetail from "./loveProject-detail";
+  import loveProjectApi from "@/api/base/loveProject";
+  import dataDictionaryApi from "@/api/sys/dataDictionary";
+  
+  export default {
+    name: 'regUserList',
+    data() {
+      var self = this;
+  
+      return {
+        queryModel: {
+          title: "",
+          type:"",
+        },
+        loading: false,
+        tableData: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPages: 0,
+        totalElements: 0,
+        field: "",
+        direction: "",
+        pageSizeList: [10, 20, 30],
+        multipleSelection: [],
+        modalTitle: "",      
+        businessKey: "",
+        showModal: false,
+        dialogFormVisible:false,
+        typeList:[],
+        props: {
+          // 配置项（必选）
+          value: "id",
+          label: "name",
+          children: "children"
+        },
+      };
+    },
+    created() {
+      dataDictionaryApi.findByCatalogName({catalogName: "内容类型"})
+        .then((response) => {
+            var jsonData = response.data;
+            this.typeList = jsonData.data;
+      });
+    },
+    methods: {
+      changePage(pageIndex) {
+        var self = this;
+  
+        console.log(pageIndex);
+  
+        self.pageIndex = pageIndex;
+        var formData = new FormData();
+  
+        formData.append("pageIndex", self.pageIndex);
+        formData.append("pageSize", self.pageSize);
+        formData.append("title", self.queryModel.title);
+        formData.append("type", self.queryModel.type);
+  
+        self.loading = true;
+  
+        loveProjectApi.pageList(formData).then(function(response) {
+          self.loading = false;
+  
+          var jsonData = response.data;
+  
+          if(jsonData.result){
+            var pageInfo = jsonData.data;
+  
+            self.tableData = pageInfo.data;
+            self.totalPages = pageInfo.totalPages;
+            self.totalElements = pageInfo.recordsTotal;
+          }
+          else {
+            self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+              });
+          }
+        }).catch((error)=>{
+          self.loading = false;
+        });
+      },
+      pageSizeChange(pageSize) {
+        this.pageSize = pageSize;
+      },
+      sortChange(data) {
+        this.field = data.column.field;
+        this.direction = data.order == "ascending" ? "asc" : "desc";
+  
+        this.changePage(this.pageIndex);
+      },
+      handleSelectionChange(val) {
+        this.multipleSelection = val;
+      },
+      handleReset(name) {
+        this.$refs[name].resetFields();
+      },
+      handleAdd() {
+        var self = this;
+        
+        self.modalTitle = "新增";
+        self.businessKey = "";
+        self.showModal = true;
+      },
+      handleEdit(record) {
+        var self = this;
+        
+        self.modalTitle = "编辑";
+        self.businessKey = record.id;
+        self.showModal = true;
+      },
+      handleDelete(record) {
+        var self = this;
+  
+        this.$confirm("是否确认删除？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+            loveProjectApi.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(() => {
+            loveProjectApi.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() {
+      var self = this;
+      this.changePage(1);
+    },
+    components: {
+      "loveProject-detail": loveProjectDetail,
+    }
+  };
+  </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 {
+    padding: 10px;
+    text-align: left;
+  }
+  </style>

src/views/base/regUser-detail.vue

@@ -0,0 +1,156 @@
+<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"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'100px'"
+      >
+        <el-form-item label="昵称" prop="nickName">
+          <el-input
+            v-model="formModel.nickName"
+            placeholder="请输入用户名"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="真实名称" prop="realName">
+          <el-input
+            v-model="formModel.realName"
+            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 regUserApi from "@/api/base/regUser";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      showPwd: true,
+      ruleValidate: {
+        userName: [
+          { required: true, message: "用户名不能为空", trigger: "blur" },
+        ],
+        realName: [
+          { required: true, message: "真实名称不能为空", trigger: "blur" },
+        ],
+        companyId: [
+          { required: true, message: "单位不能为空", trigger: "blur" },
+        ],
+        password: [
+          { required: true, message: "密码不能为空", trigger: "blur" },
+        ],
+        roles: [
+          { required: true, message: "分配角色不能为空", trigger: "blur" },
+        ],
+      },
+      roleList: [],
+      formModel: {},
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      companyProps: {
+        value: "id",
+        label: "name",
+      },
+    };
+  },
+  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 regUserApi.add(self.formModel);
+            } else {
+              self.formModel.password = null;
+              return regUserApi.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);
+            }
+          });
+        }
+      });
+    },
+  },
+  async mounted() {
+    var self = this;
+    self.loading = true;
+
+    (function () {
+      if (self.businessKey != null && self.businessKey.length > 0) {
+        return regUserApi.edit(self.businessKey);
+      } else {
+        return regUserApi.create();
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+          self.showModal = true;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+
+        self.loading = false;
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+        self.loading = false;
+      });
+  },
+  components: {
+    // "el-select-tree": SelectTree
+  },
+};
+</script>

src/views/base/regUser-list.vue

@@ -0,0 +1,337 @@
+<template>
+    <div>
+      <el-breadcrumb separator=">">
+        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+        <el-breadcrumb-item>
+          <a href="#">基础信息管理</a>
+        </el-breadcrumb-item>
+        <el-breadcrumb-item>
+          <a href="/base/regUser">爱心人士管理</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="realName">
+          <el-input type="text" size="mini" v-model="queryModel.realName"></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-remove"
+          :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="headImg"
+          label="头像"
+          width="180"
+        >
+            <template slot-scope="{row}">
+                <el-avatar :size="size" :src="row.headImg">
+                    <img src="https://cube.elemecdn.com/e/fd/0fc7d20532fdaf769a25683617711png.png"/>
+                </el-avatar>
+            </template>
+        </el-table-column>
+        <el-table-column
+          prop="nickName"
+          label="昵称"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="realName"
+          label="真实姓名"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="createTime"
+          label="创建时间"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="updateTime"
+          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>
+            <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>
+      <regUser-detail
+        v-if="showModal"
+        ref="userDetail"
+        :businessKey="businessKey"
+        :title="modalTitle"
+        @close="onDetailModalClose"
+      ></regUser-detail>
+      <el-dialog
+        title="修改密码"
+        :visible.sync="dialogFormVisible"
+        :modal-append-to-body="false"
+        :close-on-click-modal="false"
+        style="width:100%"
+      >
+        <el-form>
+          <el-form-item label="新密码" prop="password">
+            <el-input v-model="newPassword" placeholder="请输入新密码" style="width:50%" show-password></el-input>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dialogFormVisible = false">取 消</el-button>
+          <el-button type="primary" @click="changePw">确 定</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </template>
+  <script>
+  import Constant from "@/constant";
+  import regUserDetail from "./regUser-detail";
+  import regUserApi from "@/api/base/regUser";
+  
+  export default {
+    name: 'regUserList',
+    data() {
+      var self = this;
+  
+      return {
+        queryModel: {
+          userName: "",
+          realName: "",
+          roleId:"",
+          companyId:""
+        },
+        loading: false,
+        tableData: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPages: 0,
+        totalElements: 0,
+        field: "",
+        direction: "",
+        pageSizeList: [10, 20, 30],
+        multipleSelection: [],
+        modalTitle: "",      
+        businessKey: "",
+        showModal: false,
+        dialogFormVisible:false,
+        newPassword:"",
+        roleResult:[],
+        props: {
+          // 配置项（必选）
+          value: "id",
+          label: "name",
+          children: "children"
+        },
+      };
+    },
+    methods: {
+      changePage(pageIndex) {
+        var self = this;
+  
+        console.log(pageIndex);
+  
+        self.pageIndex = pageIndex;
+        var formData = new FormData();
+  
+        formData.append("pageIndex", self.pageIndex);
+        formData.append("pageSize", self.pageSize);
+  
+        formData.append("userName", self.queryModel.userName);
+        formData.append("realName", self.queryModel.realName);
+        formData.append("companyId", self.queryModel.companyId);
+        
+  
+  
+        formData.append("roleId", self.queryModel.roleId);
+  
+        if (this.field != null) {
+          formData.append("field", this.field);
+        }
+  
+        if (this.direction != null) {
+          formData.append("direction", this.direction);
+        }
+  
+        self.loading = true;
+  
+        regUserApi.pageList(formData).then(function(response) {
+          self.loading = false;
+  
+          var jsonData = response.data;
+  
+          if(jsonData.result){
+            var pageInfo = jsonData.data;
+  
+            self.tableData = pageInfo.data;
+            self.totalPages = pageInfo.totalPages;
+            self.totalElements = pageInfo.recordsTotal;
+          }
+          else {
+            self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+              });
+          }
+        }).catch((error)=>{
+          self.loading = false;
+        });
+      },
+      pageSizeChange(pageSize) {
+        this.pageSize = pageSize;
+      },
+      sortChange(data) {
+        this.field = data.column.field;
+        this.direction = data.order == "ascending" ? "asc" : "desc";
+  
+        this.changePage(this.pageIndex);
+      },
+      handleSelectionChange(val) {
+        this.multipleSelection = val;
+      },
+      handleReset(name) {
+        this.$refs[name].resetFields();
+      },
+      handleAdd() {
+        var self = this;
+        
+        self.modalTitle = "新增用户";
+        self.businessKey = "";
+        self.showModal = true;
+      },
+      handleEdit(record) {
+        var self = this;
+        
+        self.modalTitle = "编辑用户";
+        self.businessKey = record.id;
+        self.showModal = true;
+      },
+      handleDelete(record) {
+        var self = this;
+  
+        this.$confirm("是否确认删除？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+        regUserApi.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(() => {
+        regUserApi.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() {
+      var self = this;
+      this.changePage(1);
+    },
+    components: {
+      "regUser-detail": regUserDetail,
+    }
+  };
+  </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 {
+    padding: 10px;
+    text-align: left;
+  }
+  </style>

src/views/base/wishInfo-detail.vue

@@ -0,0 +1,334 @@
+
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align: left"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+    width="1400px"
+  >
+    <div class="user-panel" v-loading="loading">
+
+      <el-row :gutter="20">
+        <el-col :span="14">
+          <div class="grid-content bg-purple">
+            <el-card class="box-card">
+              <div slot="header" class="clearfix">
+                <span>基本信息</span>
+              </div>
+              <div  class="text item">
+              <el-form
+                ref="form"
+                :model="formModel"
+                :rules="ruleValidate"
+                :label-width="'100px'"
+              >
+                <el-form-item label="类别" prop="category">
+                    <el-select v-model="formModel.category" placeholder="请选择" style="width: 90%">
+                        <el-option
+                        v-for="item in categoryList"
+                        :key="item.value"
+                        :label="item.name"
+                        :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="标题" prop="title">
+                  <el-input
+                    v-model="formModel.title"
+                    placeholder="请输入标题"
+                    style="width: 90%"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="数量" prop="amount">
+                  <el-input-number
+                    v-model="formModel.amount"
+                    placeholder="请输入数量"
+                    style="width: 90%"
+                    :min="1"
+                  ></el-input-number>
+                </el-form-item>
+                <el-form-item label="图片" prop="image">
+                  <el-upload
+                      style="width:300px"
+                      class="avatar-uploader"
+                      name="photoFile"
+                      :action="uploadUrl"
+                      :headers="headers"
+                      :data="uploadData"
+                      :show-file-list="false"
+                      :on-success="handleAvatarSuccess">
+                      <img v-if="fileUrl" :src="fileUrl" class="avatar">
+                      <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                      </el-upload>
+                </el-form-item>
+                <el-form-item label="作品简介" prop="introduction">
+                    <mce-editor
+                        ref="editor"
+                        uploadName="upfile"
+                        v-model="formModel.introduction"
+                        :url="uploadUrl1"
+                        style="width: 90%"
+                    ></mce-editor>
+                </el-form-item>
+              </el-form>
+            </div>
+            </el-card>
+          </div>
+        </el-col>
+        <el-col :span="10">
+          <div class="grid-content bg-purple">
+            <el-card class="box-card" style="height:943px">
+              <div slot="header" class="clearfix">
+                <span>学生心愿</span>
+              </div>
+              <div  class="text item">
+                <el-form ref="form2" :model="formModel" inline :rules="ruleValidate" :label-width="'100px'">
+                    <el-table 
+                    class="compact-table"
+                    :data="formModel.studentAspirationsList" >
+                        <el-table-column prop="name" label="心愿">
+                        <template slot-scope="scope">
+                            <el-form-item
+                            :prop="'studentAspirationsList.' + scope.$index + '.name'"
+                            :rules="ruleValidate['name']"
+                            >
+                            <el-input placeholder="心愿"  v-model="scope.row.name"  size="mini"> 
+                            </el-input>
+                            </el-form-item>
+                        </template>
+                        </el-table-column>
+                        <el-table-column prop="studentName" label="学生姓名">
+                        <template slot-scope="scope">
+                            <el-form-item
+                            :prop="'studentAspirationsList.' + scope.$index + '.studentName'"
+                            :rules="ruleValidate['studentName']"
+                            >
+                            <el-input placeholder="学生" v-model="scope.row.studentName"  size="mini">
+                            </el-input>
+                            </el-form-item>
+                        </template>
+                        </el-table-column>
+                        <el-table-column label="操作" width="100" fixed="right">
+                        <template slot-scope="{row}">
+                            <el-form-item>
+                            <i class="el-icon-delete my-font" @click="handleDelete(row)"></i>
+                            <i class="el-icon-document-add my-font" @click="handleInsert(row)"></i>
+                            </el-form-item>
+                        </template>
+                        </el-table-column>
+                    </el-table>
+                </el-form>
+              </div>
+              <div class="el-table__empty-block">
+                <el-button icon="el-icon-circle-plus-outline" @click="handleAdd()">新增</el-button>
+              </div>
+            </el-card>
+          </div>
+        </el-col>
+      </el-row>
+    </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 { getToken } from "@/utils/auth"; // get token from cookie
+import MceEditor from "@/components/Tinymce";
+import wishInfoApi from "@/api/base/wishInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      showPwd: true,
+      ruleValidate: {
+        category: [
+          { required: true, message: "类型不能为空", trigger: "blur" },
+        ],
+        title: [
+          { required: true, message: "标题不能为空", trigger: "blur" },
+        ],
+        amount: [
+          { required: true, message: "数量不能为空", trigger: "blur" },
+        ],
+        studentName: [
+          { required: true, message: "学生姓名不能为空", trigger: "blur" },
+        ],
+        studentType: [
+          { required: true, message: "学生类型不能为空", trigger: "blur" },
+        ],
+      },
+      roleList: [],
+      formModel: {
+        studentAspirationsList:[],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      categoryList:[],
+      //上传地址
+      uploadUrl: Constant.serverUrl + "/uploadPicture",
+      uploadData: {
+          subFolder: "love-donation",
+      },
+      fileUrl: "",
+      fileUrl1: "",
+      headers: {
+          Authorization: getToken(),
+      },
+      uploadUrl1: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
+    };
+  },
+  created() {
+    dataDictionaryApi.findByCatalogName({catalogName: "心愿类型",})
+      .then((response) => {
+          var jsonData = response.data;
+          this.categoryList = jsonData.data;
+    });
+  },
+  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 wishInfoApi.add(self.formModel);
+            } else {
+              self.formModel.password = null;
+              return wishInfoApi.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);
+            }
+          });
+        }
+      });
+    },
+    handleAvatarSuccess(res, file) {
+        var self = this;
+        self.formModel.image = res.data;
+
+        self.fileUrl =
+          res.data + "?x-oss-process=image/resize,m_lfit,h_300,w_300";
+    },
+    handleAdd() {
+      this.formModel.studentAspirationsList.push({
+        name: "",
+        studentName: "",
+      });
+    },
+    handleInsert(row) {
+      this.formModel.studentAspirationsList.push({
+          name: "",
+          studentName: "",
+        });
+    },
+    handleDelete(row) {
+      var studentAspirationsList = this.formModel.studentAspirationsList;
+
+      studentAspirationsList.splice(studentAspirationsList.indexOf(row), 1);
+    },
+  },
+  async mounted() {
+    var self = this;
+    self.loading = true;
+
+    (function () {
+      if (self.businessKey != null && self.businessKey.length > 0) {
+        return wishInfoApi.edit(self.businessKey);
+      } else {
+        return wishInfoApi.create();
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+          self.showModal = true;
+
+          let image = self.formModel.image;
+            if (image != null) {
+                self.fileUrl = image 
+            }
+
+          if (self.formModel.introduction != null) {
+            self.$refs.editor.setContent(self.formModel.introduction);
+          }
+
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+
+        self.loading = false;
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+        self.loading = false;
+      });
+  },
+  components: {
+    // "el-select-tree": SelectTree
+    "mce-editor": MceEditor,
+  },
+};
+</script>
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+.avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+</style>

src/views/base/wishInfo-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="/base/wishInfo">心愿管理</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="title">
+          <el-input type="text" size="mini" v-model="queryModel.title"></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-remove"
+          :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="categoryN"
+          label="类别"
+        ></el-table-column>
+        <el-table-column
+          prop="title"
+          label="标题"
+          width="180"
+        ></el-table-column>
+        <el-table-column  prop="image"  label="图片">
+          <template slot-scope="{row}">
+            <el-image
+            style="width: 50px; height: 50px"
+            :src="row.image">
+            <div slot="error" class="image-slot" >
+              <i class="el-icon-picture-outline"></i>
+            </div>
+          </el-image>
+          </template>
+
+        </el-table-column>
+        <el-table-column
+          prop="amount"
+          label="数量"
+        ></el-table-column>
+        <el-table-column
+          prop="status"
+          label="显示状态"
+        ></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="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>
+      <wishInfo-detail
+        v-if="showModal"
+        ref="userDetail"
+        :businessKey="businessKey"
+        :title="modalTitle"
+        @close="onDetailModalClose"
+      ></wishInfo-detail>
+    </div>
+  </template>
+  <script>
+  import Constant from "@/constant";
+  import wishInfoDetail from "./wishInfo-detail";
+  import wishInfoApi from "@/api/base/wishInfo";
+  
+  export default {
+    name: 'regUserList',
+    data() {
+      var self = this;
+  
+      return {
+        queryModel: {
+          title: "",
+        },
+        loading: false,
+        tableData: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPages: 0,
+        totalElements: 0,
+        field: "",
+        direction: "",
+        pageSizeList: [10, 20, 30],
+        multipleSelection: [],
+        modalTitle: "",      
+        businessKey: "",
+        showModal: false,
+        dialogFormVisible:false,
+        newPassword:"",
+        roleResult:[],
+        props: {
+          // 配置项（必选）
+          value: "id",
+          label: "name",
+          children: "children"
+        },
+      };
+    },
+    methods: {
+      changePage(pageIndex) {
+        var self = this;
+  
+        console.log(pageIndex);
+  
+        self.pageIndex = pageIndex;
+        var formData = new FormData();
+  
+        formData.append("pageIndex", self.pageIndex);
+        formData.append("pageSize", self.pageSize);
+        formData.append("title", self.queryModel.title);
+  
+        self.loading = true;
+  
+        wishInfoApi.pageList(formData).then(function(response) {
+          self.loading = false;
+  
+          var jsonData = response.data;
+  
+          if(jsonData.result){
+            var pageInfo = jsonData.data;
+  
+            self.tableData = pageInfo.data;
+            self.totalPages = pageInfo.totalPages;
+            self.totalElements = pageInfo.recordsTotal;
+          }
+          else {
+            self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+              });
+          }
+        }).catch((error)=>{
+          self.loading = false;
+        });
+      },
+      pageSizeChange(pageSize) {
+        this.pageSize = pageSize;
+      },
+      sortChange(data) {
+        this.field = data.column.field;
+        this.direction = data.order == "ascending" ? "asc" : "desc";
+  
+        this.changePage(this.pageIndex);
+      },
+      handleSelectionChange(val) {
+        this.multipleSelection = val;
+      },
+      handleReset(name) {
+        this.$refs[name].resetFields();
+      },
+      handleAdd() {
+        var self = this;
+        
+        self.modalTitle = "新增";
+        self.businessKey = "";
+        self.showModal = true;
+      },
+      handleEdit(record) {
+        var self = this;
+        
+        self.modalTitle = "编辑";
+        self.businessKey = record.id;
+        self.showModal = true;
+      },
+      handleDelete(record) {
+        var self = this;
+  
+        this.$confirm("是否确认删除" + record.userName + "？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+            wishInfoApi.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(() => {
+            wishInfoApi.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() {
+      var self = this;
+      this.changePage(1);
+    },
+    components: {
+      "wishInfo-detail": wishInfoDetail,
+    }
+  };
+  </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 {
+    padding: 10px;
+    text-align: left;
+  }
+  </style>

src/views/base/wishInfoUserRecord-detail.vue

@@ -0,0 +1,290 @@
+
+<template>
+    <el-dialog
+      :visible.sync="showDialog"
+      :title="title"
+      :modal-append-to-body="false"
+      style="text-align: left"
+      @close="closeDialog"
+      :close-on-click-modal="false"
+      width="1000px"
+    >
+      <div class="user-panel" v-loading="loading">
+        <el-descriptions class="margin-top" :column="3"  border>
+            <el-descriptions-item>
+            <template slot="label">
+                流水号
+            </template>
+            {{formModel.wishInfoUserRecord.num}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+            <template slot="label">
+                爱心人士
+            </template>
+            {{formModel.wishInfoUserRecord.regUserName}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+            <template slot="label">
+                是否现场互换心愿
+            </template>
+            <span v-if="formModel.wishInfoUserRecord.isSpot">是</span>
+            <span v-else>否</span>
+            </el-descriptions-item>
+            <el-descriptions-item>
+            <template slot="label">
+
+                学生心愿
+            </template>
+            篮球
+            </el-descriptions-item>
+            <el-descriptions-item span="2">
+            <template slot="label">
+                作品图片
+            </template>
+            <el-link :href="formModel.wishInfo.image" target="blank_"  :underline="false">
+                <el-image
+                    style="width: 100px; height: 100px"
+                    :src="formModel.wishInfo.image">
+                </el-image>
+            </el-link>
+            </el-descriptions-item>
+            <el-descriptions-item>
+            <template slot="label">
+                学生姓名
+            </template>
+            {{formModel.wishInfo.studentName}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+            <template slot="label">
+                学生类型
+            </template>
+            {{formModel.wishInfo.studentType}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+            <template slot="label">
+                互换状态
+            </template>
+            {{formModel.wishInfoUserRecord.statusN}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+            <template slot="label">
+                收件人
+            </template>
+            {{formModel.wishInfoUserRecord.recipients}}
+            </el-descriptions-item>
+            <el-descriptions-item span="2">
+            <template slot="label">
+                收件人电话
+            </template>
+            {{formModel.wishInfoUserRecord.recipientsPhone}}
+            </el-descriptions-item>
+            <el-descriptions-item span="3">
+            <template slot="label">
+                收件人地址
+            </template>
+            {{formModel.wishInfoUserRecord.recipientsAddress}}
+            </el-descriptions-item>
+
+            <el-descriptions-item>
+            <template slot="label">
+                寄件人
+            </template>
+            {{formModel.wishInfoUserRecord.sender}}
+            </el-descriptions-item>
+            <el-descriptions-item span="2">
+            <template slot="label">
+                寄件人电话
+            </template>
+            {{formModel.wishInfoUserRecord.senderPhone}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+            <template slot="label">
+                寄件人地址
+            </template>
+            {{formModel.wishInfoUserRecord.senderAddress}}
+            </el-descriptions-item>
+        </el-descriptions>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="closeDialog">取 消</el-button>
+      </span>
+    </el-dialog>
+  </template>
+  <script>
+  import Constant from "@/constant";
+  import { getToken } from "@/utils/auth"; // get token from cookie
+  import wishInfoUserRecordApi from "@/api/base/wishInfoUserRecord";
+  import dataDictionaryApi from "@/api/sys/dataDictionary";
+  
+  export default {
+    props: ["businessKey", "title"],
+    data() {
+      return {
+        showPwd: true,
+        ruleValidate: {
+          category: [
+            { required: true, message: "类型不能为空", trigger: "blur" },
+          ],
+          title: [
+            { required: true, message: "标题不能为空", trigger: "blur" },
+          ],
+          amount: [
+            { required: true, message: "数量不能为空", trigger: "blur" },
+          ],
+          studentName: [
+            { required: true, message: "学生姓名不能为空", trigger: "blur" },
+          ],
+          studentType: [
+            { required: true, message: "学生类型不能为空", trigger: "blur" },
+          ],
+        },
+        roleList: [],
+        formModel: {
+            wishInfoUserRecord:[],
+            wishInfo:[]
+        },
+        showDialog: true,
+        loading: false,
+        submitting: false,
+        categoryList:[],
+        //上传地址
+        uploadUrl: Constant.serverUrl + "/uploadPicture",
+        uploadData: {
+            subFolder: "love-donation",
+        },
+        fileUrl: "",
+        fileUrl1: "",
+        headers: {
+            Authorization: getToken(),
+        },
+        uploadUrl1: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
+      };
+    },
+    created() {
+      dataDictionaryApi.findByCatalogName({catalogName: "心愿类型",})
+        .then((response) => {
+            var jsonData = response.data;
+            this.categoryList = jsonData.data;
+      });
+    },
+    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 wishInfoUserRecordApi.add(self.formModel);
+              } else {
+                self.formModel.password = null;
+                return wishInfoUserRecordApi.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);
+              }
+            });
+          }
+        });
+      },
+      handleAvatarSuccess(res, file) {
+          var self = this;
+          self.formModel.image = res.data;
+  
+          self.fileUrl =
+            res.data + "?x-oss-process=image/resize,m_lfit,h_300,w_300";
+      },
+    },
+    async mounted() {
+      var self = this;
+      self.loading = true;
+  
+      (function () {
+        if (self.businessKey != null && self.businessKey.length > 0) {
+          return wishInfoUserRecordApi.edit(self.businessKey);
+        } else {
+          return wishInfoUserRecordApi.create();
+        }
+      })()
+        .then((response) => {
+          var jsonData = response.data;
+  
+          if (jsonData.result) {
+            self.formModel = jsonData.data;
+
+            //alert(JSON.stringify(self.formModel))
+
+            self.showModal = true;
+  
+            let image = self.formModel.image;
+              if (image != null) {
+                  self.fileUrl = image 
+              }
+  
+            if (self.formModel.introduction != null) {
+              self.$refs.editor.setContent(self.formModel.introduction);
+            }
+  
+          } else {
+            self.$message.error(jsonData.message + "");
+          }
+  
+          self.loading = false;
+        })
+        .catch((error) => {
+          self.$message.error(error + "");
+          self.loading = false;
+        });
+    },
+    components: {
+    },
+  };
+  </script>
+  <style scoped>
+  .user-panel {
+    margin: 10px auto;
+  }
+  .avatar-uploader .el-upload {
+      border: 1px dashed #d9d9d9;
+      border-radius: 6px;
+      cursor: pointer;
+      position: relative;
+      overflow: hidden;
+    }
+    .avatar-uploader .el-upload:hover {
+      border-color: #409EFF;
+    }
+    .avatar-uploader-icon {
+      font-size: 28px;
+      color: #8c939d;
+      width: 178px;
+      height: 178px;
+      line-height: 178px;
+      text-align: center;
+    }
+    .avatar {
+      width: 178px;
+      height: 178px;
+      display: block;
+    }
+  </style>

src/views/base/wishInfoUserRecord-list.vue

@@ -0,0 +1,308 @@
+<template>
+    <div>
+      <el-breadcrumb separator=">">
+        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+        <el-breadcrumb-item>
+          <a href="#">基础信息管理</a>
+        </el-breadcrumb-item>
+        <el-breadcrumb-item>
+          <a href="/base/wishInfo">心愿管理</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="title">
+          <el-input type="text" size="mini" v-model="queryModel.title"></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-remove"
+          :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="num"
+          label="流水号"
+        ></el-table-column>
+        <el-table-column
+          prop="regUserName"
+          label="爱心人士"
+        ></el-table-column>
+        <el-table-column
+          prop="studentName"
+          label="学生姓名"
+        ></el-table-column>
+        <el-table-column
+          prop="studentType"
+          label="学生类型"
+        ></el-table-column>
+        <el-table-column  prop="isSpot"  label="是否现场互换心愿">
+            <template slot-scope="{row}">
+                <span v-if="row.isSpot">是</span>
+                <span v-else>否</span>
+          </template>
+        </el-table-column>
+        <el-table-column  prop="status"  label="互换状态">
+            <template slot-scope="{row}">
+                <span v-if="row.status=='0'">互换中</span>
+                <span v-else-if="row.status=='1'" style="color:#67C23A">已完成</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="deliveryTime"
+          label="发货时间"
+          width="130"
+        ></el-table-column>
+        <el-table-column
+          prop="completionTime"
+          label="完成时间"
+          width="130"
+        ></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>
+      <wishInfoUserRecord-detail
+        v-if="showModal"
+        ref="userDetail"
+        :businessKey="businessKey"
+        :title="modalTitle"
+        @close="onDetailModalClose"
+      ></wishInfoUserRecord-detail>
+    </div>
+  </template>
+  <script>
+  import Constant from "@/constant";
+  import wishInfoUserRecordDetail from "./wishInfoUserRecord-detail";
+  import wishInfoUserRecordApi from "@/api/base/wishInfoUserRecord";
+  
+  export default {
+    name: 'regUserList',
+    data() {
+      var self = this;
+  
+      return {
+        queryModel: {
+          title: "",
+        },
+        loading: false,
+        tableData: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPages: 0,
+        totalElements: 0,
+        field: "",
+        direction: "",
+        pageSizeList: [10, 20, 30],
+        multipleSelection: [],
+        modalTitle: "",      
+        businessKey: "",
+        showModal: false,
+        dialogFormVisible:false,
+        newPassword:"",
+        roleResult:[],
+        props: {
+          // 配置项（必选）
+          value: "id",
+          label: "name",
+          children: "children"
+        },
+      };
+    },
+    methods: {
+      changePage(pageIndex) {
+        var self = this;
+  
+        console.log(pageIndex);
+  
+        self.pageIndex = pageIndex;
+        var formData = new FormData();
+  
+        formData.append("pageIndex", self.pageIndex);
+        formData.append("pageSize", self.pageSize);
+        formData.append("title", self.queryModel.title);
+  
+        self.loading = true;
+  
+        wishInfoUserRecordApi.pageList(formData).then(function(response) {
+          self.loading = false;
+  
+          var jsonData = response.data;
+  
+          if(jsonData.result){
+            var pageInfo = jsonData.data;
+  
+            self.tableData = pageInfo.data;
+            self.totalPages = pageInfo.totalPages;
+            self.totalElements = pageInfo.recordsTotal;
+          }
+          else {
+            self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+              });
+          }
+        }).catch((error)=>{
+          self.loading = false;
+        });
+      },
+      pageSizeChange(pageSize) {
+        this.pageSize = pageSize;
+      },
+      sortChange(data) {
+        this.field = data.column.field;
+        this.direction = data.order == "ascending" ? "asc" : "desc";
+  
+        this.changePage(this.pageIndex);
+      },
+      handleSelectionChange(val) {
+        this.multipleSelection = val;
+      },
+      handleReset(name) {
+        this.$refs[name].resetFields();
+      },
+      handleAdd() {
+        var self = this;
+        
+        self.modalTitle = "新增";
+        self.businessKey = "";
+        self.showModal = true;
+      },
+      handleEdit(record) {
+        var self = this;
+        
+        self.modalTitle = "编辑";
+        self.businessKey = record.id;
+        self.showModal = true;
+      },
+      handleDelete(record) {
+        var self = this;
+  
+        this.$confirm("是否确认删除" + record.userName + "？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+            wishInfoUserRecordApi.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(() => {
+            wishInfoUserRecordApi.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() {
+      var self = this;
+      this.changePage(1);
+    },
+    components: {
+      "wishInfoUserRecord-detail": wishInfoUserRecordDetail,
+    }
+  };
+  </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 {
+    padding: 10px;
+    text-align: left;
+  }
+  </style>