账单推送功能

src/api/base/activityInfo.js

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

src/api/base/cooperationInfo.js

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

src/api/base/enterpriseInfo.js

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

src/api/base/recruitInfo.js

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

src/routers/modules/base.js

@@ -102,7 +102,43 @@ var routers = [
                         title: '推送消息管理'
                 }
         },
+        {
         
+                path: '/base/cooperationInfo/list',
+                name: 'BaseCooperationInfoList',
+                // 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/cooperationInfo-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '企业互助管理'
+                }
+        },
+        {
+                path: '/base/activityInfo/list',
+                name: 'BaseActivityInfoList',
+                // 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/activityInfo-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '企联活动管理'
+                }
+        },
+        {
+                path: '/base/recruitInfo/list',
+                name: 'BaseRecruitInfoList',
+                // 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/recruitInfo-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '企业招聘管理'
+                }
+        },
 ]
 
 export default routers;

src/views/base/activityInfo-detail.vue

@@ -0,0 +1,261 @@
+
+<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="title">
+          <el-input
+            v-model="formModel.title"
+            placeholder="请输入标题"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="封面图片" prop="picUrl">
+          <el-upload
+            class="avatar-uploader"
+            name="photoFile"
+            :action="uploadImgUrl"
+            :show-file-list="false"
+            :headers="headers"
+            :data="uploadData"
+            :on-success="handleAvatarSuccess"
+            :before-upload="beforeAvatarUpload"
+            accept="image/png,image/jpeg"
+          >
+            <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="activityTime">
+          <el-date-picker
+            v-model="activityTime"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd HH:mm"
+                            @blur="changePackageTime"
+
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="内容" prop="content">
+          <mce-editor
+            ref="editor"
+            uploadName="upfile"
+            v-model="formModel.content"
+            :url="uploadUrl"
+            :config="editorConfig"
+          ></mce-editor>
+        </el-form-item>
+        <el-form-item label="排序" prop="sortNo">
+          <el-input-number
+            v-model="formModel.sortNo"
+            style="width: 150px"
+            min="1"
+            max="99"
+          ></el-input-number>
+        </el-form-item>
+        <el-form-item label="是否上架" prop="status">
+          <el-radio-group v-model="formModel.status">
+            <el-radio :label="true">是</el-radio>
+            <el-radio :label="false">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting"
+        >确 定</el-button
+      >
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import activityInfoApi from "@/api/base/activityInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import MceEditor from "@/components/Tinymce";
+import { getToken } from "@/utils/auth";
+
+export default {
+  props: ["businessKey", "title"],
+  components: {
+    "mce-editor": MceEditor,
+  },
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        picUrl: [
+          { required: false, message: "图片地址不能为空", trigger: "blur" },
+        ],
+        title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
+        content: [{ required: true, message: "内容不能为空", trigger: "blur" }],
+        activityTime: [
+          { required: false, message: "活动时间不能为空", trigger: "blur" },
+        ],
+        status: [
+          { required: true, message: "是否上架不能为空", trigger: "blur" },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      editorConfig: {
+        height: 300,
+        width: 600,
+      },
+      uploadUrl: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
+      typeList: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+      },
+      uploadImgUrl: Constant.serverUrl + "/uploadPicture",
+      uploadData: {
+        subFolder: "newsInfo",
+      },
+      fileUrl: "",
+      headers: {
+        Authorization: getToken(),
+      },
+      activityTime: ["", ""],
+    };
+  },
+  created() {
+    var self = this;
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleAvatarSuccess(res, file) {
+      this.loading = false;
+      var self = this;
+      self.formModel.picUrl = res.data;
+      self.fileUrl = res.data + "?x-oss-process=image/resize,m_lfit,w_200";
+    },
+    beforeAvatarUpload(file) {
+      this.loading = true;
+      // const isJPG = file.type === "image/jpeg";
+      const isLt2M = file.size / 1024 / 1024 < 2;
+
+      // if (!isJPG) {
+      //   this.$message.error("上传图片只能是 JPG 格式!");
+      // }
+      if (!isLt2M) {
+        this.$message.error("上传图片大小不能超过 2MB!");
+      }
+      return isLt2M;
+    },
+    changePackageTime() {
+      this.form.startTime = this.form.activityTime[0];
+      this.form.endTime = this.form.activityTime[1];
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return activityInfoApi.add(self.formModel);
+            } else {
+              return activityInfoApi.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 activityInfoApi.create();
+      } else {
+        return activityInfoApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+          alert(self.formModel.content);
+
+          if (self.formModel.content != null) {
+            self.$refs.editor.setContent(self.formModel.content);
+          }
+          let picUrl = self.formModel.picUrl;
+          if (picUrl != null) {
+            self.fileUrl = picUrl + "?x-oss-process=image/resize,m_lfit,w_200";
+          }
+
+          let startTime = self.formModel.startTime;
+          // if (startTime != null) {
+          //   self.activityTime[0] = new Date(startTime);
+          // }
+          let endTime = self.formModel.endTime;
+          // if (endTime != null) {
+          //   self.activityTime[1] = new Date(endTime);
+          // }
+
+          self.activityTime = [new Date(startTime), new Date(endTime)];
+
+          let status = self.formModel.status;
+          if (status == null) {
+            self.formModel.status = false;
+          }
+          //activityTime
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>

src/views/base/activityInfo-list.vue

@@ -0,0 +1,366 @@
+<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="/activityInfo">活动管理</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-circle-plus"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchDelete"
+        >删除选中项</el-button
+      >
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height: 400px"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column
+        type="index"
+        label="序号"
+        :index="indexMethod"
+        width="50"
+      ></el-table-column>
+      <el-table-column prop="title" label="标题" width="180" show-overflow-tooltip></el-table-column>
+      <el-table-column
+        prop="startTime"
+        label="开始日期"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="endTime"
+        label="结束日期"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="picUrl"
+        label="封面图片"
+        width="150"
+      >
+        <template slot-scope="{ row }">
+          <a :href="row.picUrl" target="_blank">
+            <el-avatar
+              :size="48"
+              shape="circle"
+              :src="row.picUrl + '?x-oss-process=image/resize,m_fill,w_64,h_64'"
+              :key="row.id"
+            ></el-avatar>
+          </a>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="status"
+        label="上架状态"
+        width="150"
+      >
+      <template slot-scope="{row}">
+        <span v-if="row.status">已上架</span>
+        <span v-else>未上架</span>
+      </template>
+      </el-table-column>
+      <el-table-column prop="sortNo" label="排序" width="80"></el-table-column>
+      <el-table-column
+        prop="createTime"
+        label="创建时间"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="updateTime"
+        label="更新时间"
+        width="150"
+      ></el-table-column>
+      <el-table-column label="操作" width="150">
+        <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>
+    <activityInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></activityInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import ActivityInfoDetail from "./activityInfo-detail";
+import activityInfoApi from "@/api/base/activityInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  name:"BaseActivityInfoList",
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        title: "",
+        startTime: "",
+        endTime: "",
+        picUrl: "",
+        content: "",
+        status: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: "",
+        delFlag: "",
+        sortNo: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+    };
+  },
+  methods: {
+    indexMethod(index) {
+      return (this.pageIndex - 1) * this.pageSize + (index + 1);
+    },
+    changePage(pageIndex) {
+      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("title", self.queryModel.title);
+      formData.append("startTime", self.queryModel.startTime);
+      formData.append("endTime", self.queryModel.endTime);
+      formData.append("picUrl", self.queryModel.picUrl);
+      formData.append("content", self.queryModel.content);
+      formData.append("status", self.queryModel.status);
+      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("sortNo", self.queryModel.sortNo);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      activityInfoApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          activityInfoApi.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(() => {
+        activityInfoApi.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: {
+    "activityInfo-detail": ActivityInfoDetail,
+  },
+};
+</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/cooperationInfo-detail.vue

@@ -0,0 +1,256 @@
+
+<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="type">
+        <el-select
+                v-model="formModel.type"
+                filterable
+                placeholder="请选择类型"
+              >
+                <el-option
+                  v-for="result in typeList"
+                  :key="result.id"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+              </el-select>
+      </el-form-item>
+        <el-form-item label="图片" prop="picUrl">
+          <el-upload
+            class="avatar-uploader"
+            name="photoFile"
+            :action="uploadImgUrl"
+            :show-file-list="false"
+            :headers="headers"
+            :data="uploadData"
+            :on-success="handleAvatarSuccess"
+            :before-upload="beforeAvatarUpload"
+            accept="image/png,image/jpeg"
+          >
+            <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="title">
+          <el-input
+            v-model="formModel.title"
+            placeholder="请输入标题"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="内容" prop="content">
+          <mce-editor
+            ref="editor"
+            uploadName="upfile"
+            v-model="formModel.content"
+            :url="uploadUrl"
+            :config="editorConfig"
+          ></mce-editor>
+        </el-form-item>
+        <el-form-item label="是否上架" prop="status">
+          <el-radio-group v-model="formModel.status">
+            <el-radio :label="true">是</el-radio>
+            <el-radio :label="false">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting"
+        >确 定</el-button
+      >
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import cooperationInfoApi from "@/api/base/cooperationInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import MceEditor from "@/components/Tinymce";
+import { getToken } from "@/utils/auth";
+
+export default {
+  props: ["businessKey", "title"],
+  components: {
+    "mce-editor": MceEditor,
+  },
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        id: [{ required: true, message: "不能为空", trigger: "blur" }],
+        companyId: [
+          { required: true, message: "公司id不能为空", trigger: "blur" },
+        ],
+        type: [{ required: true, message: "类型不能为空", trigger: "blur" }],
+        picUrl: [
+          { required: true, message: "图片地址不能为空", trigger: "blur" },
+        ],
+        title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
+        content: [{ 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" },
+        ],
+        status: [
+          { required: true, message: "是否上架不能为空", trigger: "blur" },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      editorConfig: {
+        height: 300,
+        width: 600,
+      },
+      uploadUrl: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
+      typeList: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+      },
+      uploadImgUrl: Constant.serverUrl + "/uploadPicture",
+      uploadData: {
+        subFolder: "newsInfo",
+      },
+      fileUrl: "",
+      headers: {
+        Authorization: getToken(),
+      },
+    };
+  },
+  created() {
+    var self = this;
+    var formData = new FormData();
+    formData.append("catalogName", "互助类型");
+    dataDictionaryApi.findByCatalogName(formData).then((response) => {
+      var jsonData = response.data;
+      this.typeList = jsonData.data;
+    });
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleAvatarSuccess(res, file) {
+      this.loading = false;
+      var self = this;
+      self.formModel.picUrl = res.data;
+      self.fileUrl = res.data + "?x-oss-process=image/resize,m_lfit,w_200";
+    },
+    beforeAvatarUpload(file) {
+      this.loading = true;
+      // const isJPG = file.type === "image/jpeg";
+      const isLt2M = file.size / 1024 / 1024 < 2;
+
+      // if (!isJPG) {
+      //   this.$message.error("上传图片只能是 JPG 格式!");
+      // }
+      if (!isLt2M) {
+        this.$message.error("上传图片大小不能超过 2MB!");
+      }
+      return isLt2M;
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return cooperationInfoApi.add(self.formModel);
+            } else {
+              return cooperationInfoApi.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 cooperationInfoApi.create();
+      } else {
+        return cooperationInfoApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+
+          if (self.formModel.content != null) {
+            self.$refs.editor.setContent(self.formModel.content);
+          }
+
+          let picUrl = self.formModel.picUrl;
+          if (picUrl != null) {
+            self.fileUrl = picUrl + "?x-oss-process=image/resize,m_lfit,w_200";
+          }
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>

src/views/base/cooperationInfo-list.vue

@@ -0,0 +1,371 @@
+<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/cooperationInfo">企业互助管理</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="type">
+        <el-select
+                v-model="queryModel.type"
+                filterable
+                placeholder="请选择类型"
+                size="mini"
+              >
+                <el-option
+                  v-for="result in typeList"
+                  :key="result.id"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+              </el-select>
+      </el-form-item>
+      <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="status">
+        <el-select
+          v-model="queryModel.status"
+          size="mini"
+          filterable
+          placeholder="请选择"
+          style="width: 100px"
+        >
+          <el-option label="全部" value></el-option>
+          <el-option label="是" value="true"></el-option>
+          <el-option label="否" value="false"></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-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="typeN" label="类型" width="180"></el-table-column>
+      <el-table-column prop="title" label="标题" width="180"></el-table-column>
+      <el-table-column prop="picUrl" label="图片" width="180">
+        <template slot-scope="{ row }">
+          <a :href="row.picUrl" target="_blank">
+            <el-avatar
+              :size="48"
+              shape="circle"
+              :src="row.picUrl + '?x-oss-process=image/resize,m_fill,w_64,h_64'"
+              :key="row.id"
+            ></el-avatar>
+          </a>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="status"
+        label="是否上架"
+        width="180"
+      ></el-table-column>
+      <el-table-column label="操作" width="150" fixed="right">
+        <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>
+    <cooperationInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></cooperationInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import CooperationInfoDetail from "./cooperationInfo-detail";
+import cooperationInfoApi from "@/api/base/cooperationInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+// import SelectTree from "@/components/SelectTree";
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        companyId: "",
+        type: "",
+        picUrl: "",
+        title: "",
+        content: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: "",
+        delFlag: "",
+        status: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      typeList: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+      },
+    };
+  },
+  created() {
+    var self = this;
+    var formData = new FormData();
+    formData.append("catalogName", "互助类型");
+    dataDictionaryApi.findByCatalogName(formData).then((response) => {
+      var jsonData = response.data;
+      this.typeList = jsonData.data;
+    });
+  },
+  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("companyId", self.queryModel.companyId);
+      formData.append("type", self.queryModel.type);
+      formData.append("picUrl", self.queryModel.picUrl);
+      formData.append("title", self.queryModel.title);
+      formData.append("content", self.queryModel.content);
+      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("status", self.queryModel.status);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      cooperationInfoApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          cooperationInfoApi.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(() => {
+        cooperationInfoApi.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: {
+    "cooperationInfo-detail": CooperationInfoDetail,
+    // "el-select-tree": SelectTree,
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/enterpriseInfo-detail.vue

@@ -0,0 +1,242 @@
+
+<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="id">
+          <el-input
+            v-model="formModel.id"
+            placeholder="请输入"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="企联简介" prop="enterpriseIntroduction">
+          <el-input
+            v-model="formModel.enterpriseIntroduction"
+            placeholder="请输入企联简介"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="企联章程" prop="enterpriseConstitution">
+          <el-input
+            v-model="formModel.enterpriseConstitution"
+            placeholder="请输入企联章程"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="组织架构" prop="organStructure">
+          <el-input
+            v-model="formModel.organStructure"
+            placeholder="请输入组织架构"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="基本职能" prop="basicFunction">
+          <el-input
+            v-model="formModel.basicFunction"
+            placeholder="请输入基本职能"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="负责人及分工" prop="chargePerson">
+          <el-input
+            v-model="formModel.chargePerson"
+            placeholder="请输入负责人及分工"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="分会简介" prop="branchIntroduction">
+          <el-input
+            v-model="formModel.branchIntroduction"
+            placeholder="请输入分会简介"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="联系方式" prop="contactInformation">
+          <el-input
+            v-model="formModel.contactInformation"
+            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 enterpriseInfoApi from "@/api/base/enterpriseInfo";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        id: [{ required: true, message: "不能为空", trigger: "blur" }],
+        enterpriseIntroduction: [
+          { required: true, message: "企联简介不能为空", trigger: "blur" },
+        ],
+        enterpriseConstitution: [
+          { required: true, message: "企联章程不能为空", trigger: "blur" },
+        ],
+        organStructure: [
+          { required: true, message: "组织架构不能为空", trigger: "blur" },
+        ],
+        basicFunction: [
+          { required: true, message: "基本职能不能为空", trigger: "blur" },
+        ],
+        chargePerson: [
+          { required: true, message: "负责人及分工不能为空", trigger: "blur" },
+        ],
+        branchIntroduction: [
+          { required: true, message: "分会简介不能为空", trigger: "blur" },
+        ],
+        contactInformation: [
+          { 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,
+    };
+  },
+  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 enterpriseInfoApi.add(self.formModel);
+            } else {
+              return enterpriseInfoApi.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 enterpriseInfoApi.create();
+      } else {
+        return enterpriseInfoApi.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/enterpriseInfo-list.vue

@@ -0,0 +1,213 @@
+<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="/enterpriseInfo">enterpriseInfo管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-divider></el-divider>
+    <el-table
+      :data="tableData"
+      style="min-height: 400px"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column
+        prop="enterpriseIntroduction"
+        label="企联简介"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="enterpriseConstitution"
+        label="企联章程"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="organStructure"
+        label="组织架构"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="basicFunction"
+        label="基本职能"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="chargePerson"
+        label="负责人及分工"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="branchIntroduction"
+        label="分会简介"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="contactInformation"
+        label="联系方式"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="createBy"
+        label="创建人"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="createTime"
+        label="创建时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="updateBy"
+        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
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <enterpriseInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></enterpriseInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import EnterpriseInfoDetail from "./enterpriseInfo-detail";
+import enterpriseInfoApi from "@/api/base/enterpriseInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+    };
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      enterpriseInfoApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "enterpriseInfo-detail": EnterpriseInfoDetail,
+  },
+};
+</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/personInfo-detail.vue

@@ -27,7 +27,7 @@
               <el-select
                 v-model="formModel.companyId"
                 filterable
-                placeholder="请选择"
+                placeholder="请输入所属企业"
                 style="width: 250px"
                 :filter-method="filterMethod"
               >
@@ -123,6 +123,14 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="是否内部人员" prop="inside">
+              <el-radio v-model="formModel.inside" :label="true">是</el-radio>
+              <el-radio v-model="formModel.inside" :label="false">否</el-radio>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="人脸照片" prop="faceImageUrl">
@@ -251,7 +259,7 @@ export default {
         var jsonData = response.data;
         this.registerTypeResult = jsonData.data;
       });
-      
+
     dataDictionaryApi
       .findByCatalogName({
         catalogName: "用户头衔",
@@ -386,6 +394,11 @@ export default {
               idCardUrl + "?x-oss-process=image/resize,m_lfit,h_200";
           }
 
+          let inside = self.formModel.inside;
+          if(inside == null){
+            self.formModel.inside = false;
+          }
+
           let companyId = self.formModel.companyId;
           if (companyId != null) {
             var formData = new FormData();

src/views/base/recruitInfo-detail.vue

@@ -0,0 +1,405 @@
+
+<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-row>
+          <el-col :span="12">
+            <el-form-item label="公司" prop="companyId">
+              <el-select
+                v-model="formModel.companyId"
+                filterable
+                placeholder="请输入公司名称"
+                style="width: 250px"
+                :filter-method="filterMethod"
+              >
+                <el-option
+                  v-for="result in companyInfoResult"
+                  :key="result.id"
+                  :label="result.companyName"
+                  :value="result.id"
+                ></el-option>
+              </el-select> </el-form-item
+          ></el-col>
+        </el-row>
+        <el-form-item label="职务名称" prop="positionName">
+          <el-input
+            v-model="formModel.positionName"
+            placeholder="请输入职务名称"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="公司区域" prop="workRegion">
+              <el-select
+                v-model="formModel.workRegion"
+                filterable
+                placeholder="请选择"
+                style="width: 200px"
+              >
+                <el-option
+                  v-for="result in workRegionResult"
+                  :key="result.value"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="工作年限" prop="workYear">
+              <el-select
+                v-model="formModel.workYear"
+                filterable
+                placeholder="请选择"
+                style="width: 200px"
+              >
+                <el-option
+                  v-for="result in workYearResult"
+                  :key="result.value"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="学历" prop="education">
+              <el-select
+                v-model="formModel.education"
+                filterable
+                placeholder="请选择"
+                style="width: 200px"
+              >
+                <el-option
+                  v-for="result in educationResult"
+                  :key="result.value"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="薪资水平" prop="salaryLevel">
+              <el-select
+                v-model="formModel.salaryLevel"
+                filterable
+                placeholder="请选择"
+                style="width: 200px"
+              >
+                <el-option
+                  v-for="result in salaryLevelResult"
+                  :key="result.value"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="联系电话" prop="contactPhone">
+              <el-input
+                v-model="formModel.contactPhone"
+                placeholder="请输入联系电话"
+                style="width: 300px"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="职务描述" prop="describe">
+              <mce-editor
+                ref="editor"
+                uploadName="upfile"
+                v-model="formModel.describe"
+                :url="uploadUrl"
+                :config="editorConfig"
+              ></mce-editor>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="是否上架" prop="status">
+              <el-radio-group v-model="formModel.status">
+                <el-radio :label="true">是</el-radio>
+                <el-radio :label="false">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </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 recruitInfoApi from "@/api/base/recruitInfo";
+import companyInfoApi from "@/api/base/companyInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+
+import MceEditor from "@/components/Tinymce";
+import { getToken } from "@/utils/auth";
+
+export default {
+  props: ["businessKey", "title"],
+  components: {
+    "mce-editor": MceEditor,
+  },
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        id: [{ required: true, message: "不能为空", trigger: "blur" }],
+        companyId: [
+          { required: true, message: "公司不能为空", trigger: "blur" },
+        ],
+        positionName: [
+          { required: true, message: "职务名称不能为空", trigger: "blur" },
+        ],
+        workRegion: [
+          {
+            required: true,
+            message: "公司区域（数据字典：区域）不能为空",
+            trigger: "blur",
+          },
+        ],
+        workYear: [
+          {
+            required: true,
+            message: "工作年限（数据字典：工作年限）不能为空",
+            trigger: "blur",
+          },
+        ],
+        education: [
+          {
+            required: true,
+            message: "学历（数据字典：学历）不能为空",
+            trigger: "blur",
+          },
+        ],
+        salaryLevel: [
+          {
+            required: true,
+            message: "薪资水平（数据字典：薪资水平）不能为空",
+            trigger: "blur",
+          },
+        ],
+        describe: [
+          { required: true, message: "职务描述不能为空", trigger: "blur" },
+        ],
+        contactPhone: [
+          { required: true, message: "联系电话不能为空", trigger: "blur" },
+        ],
+        status: [
+          { 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" },
+        ],
+        key: [
+          {
+            required: true,
+            message: "公司名称+职务名称不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      workRegionResult: [],
+      workYearResult: [],
+      educationResult: [],
+      salaryLevelResult: [],
+      editorConfig: {
+        height: 300,
+        width: 600,
+      },
+      uploadUrl: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
+      companyInfoResult: [],
+    };
+  },
+  created() {
+    var self = this;
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "区域",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.workRegionResult = jsonData.data;
+      });
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "工作年限",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.workYearResult = jsonData.data;
+      });
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "学历",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.educationResult = jsonData.data;
+      });
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "薪资水平",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.salaryLevelResult = 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 recruitInfoApi.add(self.formModel);
+            } else {
+              return recruitInfoApi.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);
+            }
+          });
+        }
+      });
+    },
+    filterMethod(query, item) {
+      var self = this;
+      var formData = new FormData();
+      formData.append("pageSize", 5);
+      formData.append("companyName", query);
+
+      companyInfoApi.list(formData).then(function (response) {
+        var jsonData = response.data;
+        if (jsonData.result) {
+          self.companyInfoResult = jsonData.data;
+        }
+      });
+    },
+  },
+  mounted: function () {
+    var self = this;
+    (function () {
+      if (self.businessKey.length == 0) {
+        return recruitInfoApi.create();
+      } else {
+        return recruitInfoApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+
+          let status = self.formModel.status;
+          if (status == null) {
+            self.formModel.status = false;
+          }
+
+          if (self.formModel.describe != null) {
+            self.$refs.editor.setContent(self.formModel.describe);
+          }
+
+          let companyId = self.formModel.companyId;
+          if (companyId != null) {
+            var formData = new FormData();
+            formData.append("pageSize", 5);
+            formData.append("companyId", companyId);
+
+            companyInfoApi.list(formData).then(function (response) {
+              var jsonData = response.data;
+              if (jsonData.result) {
+                self.companyInfoResult = jsonData.data;
+              }
+            });
+          }
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>

src/views/base/recruitInfo-list.vue

@@ -0,0 +1,418 @@
+<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="/recruitInfo">企业招聘管理</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="companyId">
+        <el-select
+          v-model="queryModel.companyId"
+          filterable
+          placeholder="请输入公司名称"
+          style="width: 90%"
+          size="mini"
+          :filter-method="filterMethod"
+        >
+          <el-option
+            v-for="company in companyInfoList"
+            :key="company.id"
+            :label="company.companyName"
+            :value="company.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="职务名称" prop="positionName">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.positionName"
+        ></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+          >查询</el-button
+        >&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+          >重置</el-button
+        >&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        @click="handleAdd"
+        >新增</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchDelete"
+        >删除选中项</el-button
+      >
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height: 400px"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column
+        type="index"
+        label="序号"
+        :index="indexMethod"
+        width="50"
+      ></el-table-column>
+      <el-table-column
+        prop="companyName"
+        label="公司"
+        width="150"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="positionName"
+        label="职务名称"
+        width="150"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="workRegionName"
+        label="工作区域"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="workYearName"
+        label="工作年限"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="educationName"
+        label="学历"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="salaryLevelName"
+        label="薪资水平"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="contactPhone"
+        label="联系电话"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="status" label="是否上架" width="180">
+        <template slot-scope="{ row }">
+          <span v-if="row.status">已上架</span>
+          <span v-else>未上架</span>
+        </template></el-table-column
+      >
+      <el-table-column
+        prop="key"
+        label="key"
+        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="操作" width="150" fixed="right">
+        <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>
+    <recruitInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></recruitInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import RecruitInfoDetail from "./recruitInfo-detail";
+import recruitInfoApi from "@/api/base/recruitInfo";
+import companyInfoApi from "@/api/base/companyInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  name: "BaseRecruitInfoList",
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        companyId: "",
+        positionName: "",
+        workRegion: "",
+        workYear: "",
+        education: "",
+        salaryLevel: "",
+        describe: "",
+        contactPhone: "",
+        status: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: "",
+        delFlag: "",
+        key: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      companyInfoList: [],
+    };
+  },
+  methods: {
+    indexMethod(index) {
+      return (this.pageIndex - 1) * this.pageSize + (index + 1);
+    },
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("id", self.queryModel.id);
+      formData.append("companyId", self.queryModel.companyId);
+      formData.append("positionName", self.queryModel.positionName);
+      formData.append("workRegion", self.queryModel.workRegion);
+      formData.append("workYear", self.queryModel.workYear);
+      formData.append("education", self.queryModel.education);
+      formData.append("salaryLevel", self.queryModel.salaryLevel);
+      formData.append("describe", self.queryModel.describe);
+      formData.append("contactPhone", self.queryModel.contactPhone);
+      formData.append("status", self.queryModel.status);
+      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("key", self.queryModel.key);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      recruitInfoApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          recruitInfoApi.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(() => {
+        recruitInfoApi.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);
+      }
+    },
+    filterMethod(query, item) {
+      var self = this;
+      var formData = new FormData();
+      formData.append("pageSize", 5);
+      formData.append("companyName", query);
+
+      companyInfoApi.list(formData).then(function (response) {
+        var jsonData = response.data;
+        if (jsonData.result) {
+          self.companyInfoList = jsonData.data;
+        }
+      });
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "recruitInfo-detail": RecruitInfoDetail,
+  },
+};
+</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/whisperingWall-list.vue

@@ -79,7 +79,7 @@
         width="400"
       ></el-table-column>
       <el-table-column
-        prop="questionBy"
+        prop="questionByN"
         label="提问人"
         width="180"
       ></el-table-column>
@@ -90,7 +90,7 @@
       ></el-table-column>
       <el-table-column prop="answer" label="回答" width="400"></el-table-column>
       <el-table-column
-        prop="answerBy"
+        prop="answerByN"
         label="回答人"
         width="180"
       ></el-table-column>

src/views/sys/user-detail.vue

@@ -28,7 +28,7 @@
             style="width:300px"
           ></el-input>
         </el-form-item>
-        <el-form-item label="所属单位" prop="companyId">
+        <el-form-item label="企业" prop="companyId">
           <!-- <el-select v-model="formModel.companyId" filterable placeholder="请选择" style="width:300px">
             <el-option
               v-for="company in companyResult"
@@ -37,12 +37,26 @@
               :value="company.id"
             ></el-option>
           </el-select> -->
-          <el-select-tree
+          <!-- <el-select-tree
           size="mediumn"
           :options="companyResult"
           v-model="formModel.companyId"
           width="300px"
-        ></el-select-tree>
+        ></el-select-tree> -->
+        <el-select
+                v-model="formModel.companyId"
+                filterable
+                placeholder="请选择"
+                style="width: 250px"
+                :filter-method="filterMethod"
+              >
+                <el-option
+                  v-for="result in companyInfoResult"
+                  :key="result.id"
+                  :label="result.companyName"
+                  :value="result.id"
+                ></el-option>
+              </el-select>
         </el-form-item>
         <el-form-item label="分配角色" prop="roles">
           <el-select
@@ -74,6 +88,7 @@
 import Constant from "@/constant";
 import userApi from "@/api/sys/user";
 import roleApi from "@/api/sys/role";
+import companyInfoApi from "@/api/base/companyInfo";
 import SelectTree from "@/components/SelectTree";
 
 export default {
@@ -102,7 +117,8 @@ export default {
       formModel: {},
       showDialog: true,
       loading: false,
-      submitting: false
+      submitting: false,
+      companyInfoResult:[]
     };
   },
   methods: {
@@ -143,7 +159,20 @@ export default {
           });
         }
       });
-    }
+    },
+    filterMethod(query, item) {
+      var self = this;
+      var formData = new FormData();
+      formData.append("pageSize", 5);
+      formData.append("companyName", query);
+
+      companyInfoApi.list(formData).then(function (response) {
+        var jsonData = response.data;
+        if (jsonData.result) {
+          self.companyInfoResult = jsonData.data;
+        }
+      });
+    },
   },
   async mounted() {
     var self = this;
@@ -169,6 +198,20 @@ export default {
         if (jsonData.result) {
           self.formModel = jsonData.data;
           self.showModal = true;
+
+          let companyId = self.formModel.companyId;
+          if (companyId != null) {
+            var formData = new FormData();
+            formData.append("pageSize", 5);
+            formData.append("companyId", companyId);
+
+            companyInfoApi.list(formData).then(function (response) {
+              var jsonData = response.data;
+              if (jsonData.result) {
+                self.companyInfoResult = jsonData.data;
+              }
+            });
+          }
         } else {
           self.$message.error(jsonData.message + "");
         }
@@ -179,9 +222,6 @@ export default {
         self.$message.error(error + "");
         self.loading = false;
       });
-  },
-  components: {
-    "el-select-tree": SelectTree
   }
 };
 </script>

src/views/sys/user-list.vue

@@ -35,13 +35,21 @@
             :value="company.id"
           ></el-option>
         </el-select> -->
-        <el-select-tree
-          size="mini"
-          :props="props"
-          :options="companyResult"
-          v-model="queryModel.companyId"
-          height="200"
-        ></el-select-tree>
+        <el-select
+                v-model="queryModel.companyId"
+                filterable
+                placeholder="请选择"
+                style="width: 250px"
+                :filter-method="filterMethod"
+                size="mini"
+              >
+                <el-option
+                  v-for="result in companyInfoResult"
+                  :key="result.id"
+                  :label="result.companyName"
+                  :value="result.id"
+                ></el-option>
+              </el-select>
       </el-form-item>
       <el-form-item label="角色" prop="roleId">
         <el-select
@@ -180,6 +188,7 @@ import Constant from "@/constant";
 import UserDetail from "./user-detail";
 import userApi from "@/api/sys/user";
 import roleApi from "@/api/sys/role";
+import companyInfoApi from "@/api/base/companyInfo";
 import SelectTree from "@/components/SelectTree";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
@@ -219,6 +228,7 @@ export default {
         label: "name",
         children: "children"
       },
+      companyInfoResult:[]
     };
   },
   methods: {
@@ -388,7 +398,20 @@ export default {
           });
         }
       });
-    }
+    },
+    filterMethod(query, item) {
+      var self = this;
+      var formData = new FormData();
+      formData.append("pageSize", 5);
+      formData.append("companyName", query);
+
+      companyInfoApi.list(formData).then(function (response) {
+        var jsonData = response.data;
+        if (jsonData.result) {
+          self.companyInfoResult = jsonData.data;
+        }
+      });
+    },
   },
   mounted: function() {
     var self = this;
@@ -410,7 +433,7 @@ export default {
   },
   components: {
     "user-detail": UserDetail,
-    "el-select-tree": SelectTree,
+    // "el-select-tree": SelectTree,
   }
 };
 </script>