管理端前端功能提交

src/api/base/companyInfo.js

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

src/api/base/messageInfo.js

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

src/api/base/messageReceiver.js

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

src/api/base/messageType.js

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

src/api/base/newsInfo.js

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

src/api/base/newsType.js

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

src/api/base/personInfo.js

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

src/components/SelectTree/index.vue

@@ -174,9 +174,7 @@ export default {
     },
     filterNode(value, data) {
       if (!value) return true;
-
-      var name = data[this.props.label];
-      return name.indexOf(value) !== -1;
+      return data.name.indexOf(value) !== -1;
     }
   },
   watch: {

src/routers/modules/base.js

@@ -1,5 +1,49 @@
 var routers = [
-        
+        {
+                path: '/base/companyInfo/list',
+                name: 'BaseCompanyInfoList',
+                // 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/companyInfo-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '企业管理'
+                }
+        }, {
+                path: '/base/personInfo/list',
+                name: 'BasePersonInfoList',
+                // 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/personInfo-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '企业人员管理'
+                }
+        },{
+                path: '/base/newsType/list',
+                name: 'BaseNewsTypeList',
+                // 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/newsType-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '新闻分类管理'
+                }
+        },{
+                path: '/base/newsInfo/list',
+                name: 'BaseNewsInfoList',
+                // 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/newsInfo-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '新闻管理'
+                }
+        },
 ]
 
 export default routers;

src/views/Login.vue

@@ -2,7 +2,7 @@
   <div class="login-container">
     <div class="login-form">
       <h3>
-        <img src="../assets/logo.png" width="269" height="65"/>
+        <img src="../assets/logo.png" width="400" height="80"/>
       </h3>
       <el-card class="box-card">
         <el-tabs v-model="activeName" @tab-click="handleTabClick">
@@ -46,12 +46,12 @@
               >登录</el-button>
             </el-form>
           </el-tab-pane>
-          <el-tab-pane label="微信扫码登录" name="second">
+          <!-- <el-tab-pane label="微信扫码登录" name="second">
             <div style="text-align:center;" v-loading="loading">
               <img :src="qrcodeUrl" style="width:300px;fit-object:cover;"/>
               <div>扫码后，页面将自动跳转......</div>
             </div>
-          </el-tab-pane>
+          </el-tab-pane> -->
         </el-tabs>
       </el-card>
     </div>

src/views/base/companyInfo-detail.vue

@@ -0,0 +1,368 @@
+
+<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"
+    width="900px"
+  >
+    <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="companyName">
+              <el-input
+                v-model="formModel.companyName"
+                placeholder="请输入企业名称"
+                style="width: 300px"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="社会信用代码" prop="creditCode">
+              <el-input
+                v-model="formModel.creditCode"
+                placeholder="请输入社会信用代码"
+                style="width: 300px"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="所在地区" prop="region">
+              <el-select
+                v-model="formModel.region"
+                filterable
+                placeholder="请选择"
+                style="width: 200px"
+              >
+                <el-option
+                  v-for="region in regionResult"
+                  :key="region.value"
+                  :label="region.name"
+                  :value="region.value"
+                ></el-option>
+              </el-select> </el-form-item
+          ></el-col>
+          <el-col :span="12">
+            <el-form-item label="企业类型" prop="type">
+              <el-select
+                v-model="formModel.type"
+                filterable
+                placeholder="请选择"
+                style="width: 200px"
+              >
+                <el-option
+                  v-for="type in typeResult"
+                  :key="type.value"
+                  :label="type.name"
+                  :value="type.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="所属行业" prop="industry">
+              <el-select
+                v-model="formModel.industry"
+                filterable
+                placeholder="请选择"
+                style="width: 200px"
+              >
+                <el-option
+                  v-for="industry in industryResult"
+                  :key="industry.value"
+                  :label="industry.name"
+                  :value="industry.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="企业规模" prop="scale">
+              <el-select
+                v-model="formModel.scale"
+                filterable
+                placeholder="请选择"
+                style="width: 200px"
+              >
+                <el-option
+                  v-for="scale in scaleResult"
+                  :key="scale.value"
+                  :label="scale.name"
+                  :value="scale.value"
+                ></el-option> </el-select></el-form-item
+          ></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="营业执照" prop="businessLicenseUrl">
+              <el-upload
+                class="avatar-uploader"
+                name="photoFile"
+                :action="uploadUrl"
+                :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-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="企业地址" prop="address">
+              <el-input
+                v-model="formModel.address"
+                placeholder="请输入企业地址"
+                style="width: 80%"
+              ></el-input> </el-form-item
+          ></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="企业介绍" prop="companyIntroduction">
+              <el-input
+                v-model="formModel.companyIntroduction"
+                placeholder="请输入企业介绍"
+                style="width: 80%"
+              ></el-input> </el-form-item
+          ></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="企业家介绍" prop="enterpriserIntroduction">
+              <el-input
+                v-model="formModel.enterpriserIntroduction"
+                placeholder="请输入企业家介绍"
+                style="width: 80%"
+              ></el-input> </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 companyInfoApi from "@/api/base/companyInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+
+import { getToken } from "@/utils/auth"; // get token from cookie
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        companyName: [
+          { required: true, message: "企业名称不能为空", trigger: "blur" },
+        ],
+        type: [
+          {
+            required: true,
+            message: "企业类型不能为空",
+            trigger: "blur",
+          },
+        ],
+        scale: [
+          {
+            required: true,
+            message: "企业规模不能为空",
+            trigger: "blur",
+          },
+        ],
+        industry: [
+          {
+            required: true,
+            message: "所属行业不能为空",
+            trigger: "blur",
+          },
+        ],
+        region: [
+          {
+            required: true,
+            message: "所在地区不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      industryResult: [],
+      regionResult: [],
+      scaleResult: [],
+      typeResult: [],
+      //上传图片start
+      uploadUrl: Constant.serverUrl + "/uploadPicture",
+      uploadData: {
+        subFolder: "companyInfo",
+      },
+      fileUrl: "",
+      headers: {
+        Authorization: getToken(),
+      },
+      //上传图片end
+    };
+  },
+  created() {
+    var self = this;
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "企业类型",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.typeResult = jsonData.data;
+      });
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "企业规模",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.scaleResult = jsonData.data;
+      });
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "所属行业",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.industryResult = jsonData.data;
+      });
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "区域",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.regionResult = 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 companyInfoApi.add(self.formModel);
+            } else {
+              return companyInfoApi.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) {
+      this.loading = false;
+      var self = this;
+      self.formModel.businessLicenseUrl = 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;
+    },
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return companyInfoApi.create();
+      } else {
+        return companyInfoApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+
+          let businessLicenseUrl = self.formModel.businessLicenseUrl;
+          if (businessLicenseUrl != null) {
+            self.fileUrl =
+              businessLicenseUrl +
+              "?x-oss-process=image/resize,m_lfit,h_200";
+          }
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>

src/views/base/companyInfo-list.vue

@@ -0,0 +1,609 @@
+<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="/companyInfo">企业管理</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="companyName">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.companyName"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="所在区域" prop="region">
+        <el-select
+          v-model="queryModel.region"
+          filterable
+          placeholder="请选择"
+          style="width: 120px"
+          size="mini"
+        >
+          <el-option
+            v-for="region in regionResult"
+            :key="region.value"
+            :label="region.name"
+            :value="region.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="企业类型" prop="type">
+        <el-select
+          v-model="queryModel.type"
+          filterable
+          placeholder="请选择"
+          style="width: 120px"
+          size="mini"
+        >
+          <el-option
+            v-for="type in typeResult"
+            :key="type.value"
+            :label="type.name"
+            :value="type.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="企业规模" prop="scale">
+        <el-select
+          v-model="queryModel.scale"
+          filterable
+          placeholder="请选择"
+          style="width: 120px"
+          size="mini"
+        >
+          <el-option
+            v-for="scale in scaleResult"
+            :key="scale.value"
+            :label="scale.name"
+            :value="scale.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="所属行业" prop="industry">
+        <el-select
+          v-model="queryModel.industry"
+          filterable
+          placeholder="请选择"
+          style="width: 150px"
+          size="mini"
+        >
+          <el-option
+            v-for="industry in industryResult"
+            :key="industry.value"
+            :label="industry.name"
+            :value="industry.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-circle-plus"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchDelete"
+        >删除选中项</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-upload2"
+        @click="batchImportVisible = true"
+        >导入</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="regionN"
+        label="所在地区"
+        width="100"
+      ></el-table-column>
+      <el-table-column
+        prop="typeN"
+        label="企业类型"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="scaleN"
+        label="企业规模"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="industryN"
+        label="所属行业"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="companyName"
+        label="企业名称"
+        width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="creditCode"
+        label="社会信用代码"
+        width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="address"
+        label="企业地址"
+        width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="businessLicenseUrl"
+        label="营业执照"
+        width="180"
+        show-overflow-tooltip
+      >
+        <template slot-scope="{ row }">
+          <a :href="row.businessLicenseUrl" target="_blank">
+            <el-avatar
+              :size="48"
+              shape="circle"
+              :src="
+                row.businessLicenseUrl +
+                '?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="companyIntroduction"
+        label="企业介绍"
+        width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="enterpriserIntroduction"
+        label="企业家介绍"
+        width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column label="操作" width="180" 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>
+    <companyInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+      width="100%"
+    ></companyInfo-detail>
+    <!--批量导入S-->
+    <el-dialog
+      title="导入"
+      :visible.sync="batchImportVisible"
+      :modal-append-to-body="false"
+      style="text-align: left"
+      :close-on-click-modal="false"
+    >
+      <el-form label-width="150px">
+        <el-form-item label="模板下载">
+          <el-link
+            href="http://rccs.oss-cn-hangzhou.aliyuncs.com/enterprise-federation/%E5%AF%BC%E5%85%A5%E4%BC%81%E4%B8%9A%E6%A8%A1%E6%9D%BF.xlsx"
+            type="primary"
+            target="_blank"
+            >点击下载模板</el-link
+          >
+        </el-form-item>
+        <el-form-item label="上传文件">
+          <el-upload
+            class="upload-demo"
+            accept=".xlsx"
+            :action="uploadUrlXls"
+            :data="uploadXlsData"
+            :headers="headers"
+            :on-preview="handleBatchImportPreview"
+            name="uploadFile"
+            :multiple="true"
+            :limit="1"
+            :on-remove="handleBatchImportRemove"
+            :before-remove="beforeBatchImportRemove"
+            :before-upload="beforeUpload"
+            :on-exceed="handleBatchImportExceed"
+            :on-success="handleBatchImportSuccess"
+            :file-list="batchImportFileList"
+          >
+            <el-button size="small" type="primary" :loading="xlsLoading"
+              >点击上传</el-button
+            >
+            <div slot="tip" class="el-upload__tip">
+              只能上传xls文件，且不超过500kb
+            </div>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="batchImportVisible = false"
+          >关 闭</el-button
+        >
+      </div>
+    </el-dialog>
+    <!--批量导入E-->
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import CompanyInfoDetail from "./companyInfo-detail";
+import companyInfoApi from "@/api/base/companyInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+import { getToken } from "@/utils/auth"; // get token from cookie
+
+export default {
+  name: "BaseCompanyInfoList",
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        companyName: "",
+        type: "",
+        scale: "",
+        industry: "",
+        region: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      industryResult: [],
+      regionResult: [],
+      scaleResult: [],
+      typeResult: [],
+      //导入S
+      batchImportVisible: false,
+      batchImportFileList: [],
+      uploadUrlXls: Constant.serverUrl + "/base/companyInfo/importXls",
+      uploadXlsData: {
+        subFolder: "company",
+        companyId: "",
+      },
+      headers: {
+        Authorization: getToken(),
+      },
+      xlsLoading: false,
+      //导入E
+    };
+  },
+  created() {
+    var self = this;
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "企业类型",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.typeResult = jsonData.data;
+      });
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "企业规模",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.scaleResult = jsonData.data;
+      });
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "所属行业",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.industryResult = jsonData.data;
+      });
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "区域",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.regionResult = jsonData.data;
+      });
+  },
+  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("companyName", self.queryModel.companyName);
+      formData.append("type", self.queryModel.type);
+      formData.append("scale", self.queryModel.scale);
+      formData.append("industry", self.queryModel.industry);
+      formData.append("region", self.queryModel.region);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      companyInfoApi
+        .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(() => {
+          companyInfoApi.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(() => {
+        companyInfoApi.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);
+      }
+    },
+    beforeUpload(file, fileList) {
+      //导入前判断
+    },
+    //批量导入-上传成功
+    handleBatchImportSuccess(response, file, fileList) {
+      var self = this;
+      self.xlsLoading = false;
+      if (response.result) {
+        self.$message.success(response.message);
+        this.batchImportFileList = [];
+        this.changePage(1);
+        this.batchImportVisible = false;
+      } else {
+        //this.$message.error(response.message);
+        this.batchImportFileList = [];
+        this.changePage(1);
+
+        if (response.data != null) {
+          //下载有错误信息提示的报表
+          //window.open(response.data);
+          self.$message({
+            showClose: true,
+            dangerouslyUseHTMLString: true,
+            message:
+              response.message +
+              `,<a href="${response.data}" target="_blank">点击下载未导入的数据报表</a>&nbsp;`,
+            duration: 30000,
+          });
+        }
+      }
+    },
+    //批量导入-预览
+    handleBatchImportPreview(file) {
+      console.log(file.url);
+    },
+    //批量导入-移除
+    handleBatchImportRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    //批量导入-移除前操作
+    beforeBatchImportRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    //批量导入-文件超出个数限制时的钩子
+    handleBatchImportExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "companyInfo-detail": CompanyInfoDetail,
+  },
+};
+</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/newsInfo-detail.vue

@@ -0,0 +1,298 @@
+
+<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"
+    :width="'800px'"
+    @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'"
+        :inline="true"
+      >
+        <el-row>
+          <el-form-item label="企业" prop="companyId">
+            <el-select
+              v-model="formModel.companyId"
+              filterable
+              placeholder="请选择"
+              style="width: 90%"
+              :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-row>
+        <el-row>
+          <el-form-item label="新闻类型" prop="newsTypeId">
+            <el-select-tree
+              :props="props"
+              :options="newsTypeList"
+              v-model="formModel.newsTypeId"
+              height="200"
+            ></el-select-tree>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="标题" prop="title">
+            <el-input
+              v-model="formModel.title"
+              placeholder="请输入标题"
+              style="width: 300px"
+            ></el-input>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <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-row>
+        <el-row>
+          <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-row>
+        <el-row>
+          <el-form-item label="是否首页展示(轮播)" prop="topFlag">
+            <el-radio-group v-model="formModel.topFlag">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </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 newsInfoApi from "@/api/base/newsInfo";
+import newsTypeApi from "@/api/base/newsType";
+import companyInfoApi from "@/api/base/companyInfo";
+import SelectTree from "@/components/SelectTree";
+import MceEditor from "@/components/Tinymce";
+import { getToken } from "@/utils/auth";
+
+export default {
+  props: ["businessKey", "title"],
+  components: {
+    "mce-editor": MceEditor,
+    "el-select-tree": SelectTree,
+  },
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        title: [{ required: true, message: "不能为空", trigger: "blur" }],
+        status: [{ required: true, message: "请选择", trigger: "blur" }],
+        isSign: [{ required: true, message: "请选择", trigger: "blur" }],
+        isReceive: [{ required: true, message: "请选择", trigger: "blur" }],
+        typeId: [{ required: true, message: "请选择", trigger: "blur" }],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      editorConfig: {
+        height: 500,
+        width: 600,
+      },
+      uploadUrl: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
+      newsInfoList: [],
+      newsTypeList: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+      },
+      companyInfoList: [],
+      //上传图片start
+      uploadImgUrl: Constant.serverUrl + "/uploadPicture",
+      uploadData: {
+        subFolder: "newsInfo",
+      },
+      fileUrl: "",
+      headers: {
+        Authorization: getToken(),
+      },
+      //上传图片end
+    };
+  },
+  created() {
+    var self = this;
+    newsTypeApi.list().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.newsTypeList = 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;
+
+            self.formModel.content = self.$refs.editor.getContent();
+            if (id == null || id.length == 0) {
+              return newsInfoApi.add(self.formModel);
+            } else {
+              return newsInfoApi.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.companyInfoList = jsonData.data;
+        }
+      });
+    },
+    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;
+    },
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return newsInfoApi.create();
+      } else {
+        return newsInfoApi.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);
+          }
+
+          if (self.formModel.topFlag != null) {
+            self.formModel.topFlag = false;
+          }
+
+          if (self.formModel.companyName != null) {
+            var formData = new FormData();
+            formData.append("pageSize", 5);
+            formData.append("companyName", self.formModel.companyName);
+
+            companyInfoApi.list(formData).then(function (response) {
+              var jsonData = response.data;
+              if (jsonData.result) {
+                self.companyInfoList = jsonData.data;
+              }
+            });
+          }
+
+          let picUrl = self.formModel.picUrl;
+          if (picUrl != null) {
+            self.fileUrl =
+              picUrl +
+              "?x-oss-process=image/resize,m_lfit,h_200";
+          }
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>

src/views/base/newsInfo-list.vue

@@ -0,0 +1,407 @@
+<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="/newsInfo">新闻管理</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="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="newsTypeId">
+        <el-select-tree
+          :props="props"
+          :options="newsTypeList"
+          v-model="queryModel.newsTypeId"
+          size="mini"
+          height="200"
+        ></el-select-tree>
+      </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="180"
+      ></el-table-column>
+      <el-table-column
+        prop="newsTypeName"
+        label="新闻类型"
+        width="150"
+      ></el-table-column>
+      <el-table-column prop="title" label="标题" width="200" show-overflow-tooltip></el-table-column>
+      <el-table-column
+        prop="readerNum"
+        label="阅读人数"
+        width="120"
+      ></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="topFlag"
+        label="是否主页展示(轮播)"
+        width="180"
+      ><template slot-scope="{ row }">
+          <el-switch
+            v-model="row.topFlag"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            @change="updateSwitch(row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="180" 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>
+    <newsInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></newsInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import NewsInfoDetail from "./newsInfo-detail";
+import newsInfoApi from "@/api/base/newsInfo";
+import newsTypeApi from "@/api/base/newsType";
+import companyInfoApi from "@/api/base/companyInfo";
+import SelectTree from "@/components/SelectTree";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        companyId: "",
+        title: "",
+        newsTypeId: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      newsTypeList: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+      },
+      companyInfoList: [],
+    };
+  },
+  created() {
+    var self = this;
+    newsTypeApi.list().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.newsTypeList = jsonData.data;
+        }
+      }
+    });
+  },
+  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("companyId", self.queryModel.companyId);
+      formData.append("title", self.queryModel.title);
+      if (self.queryModel.newsTypeId != null) {
+        formData.append("newsTypeId", self.queryModel.newsTypeId);
+      }
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      newsInfoApi
+        .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(() => {
+          newsInfoApi.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(() => {
+        newsInfoApi.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;
+        }
+      });
+    },
+    updateSwitch(row) {
+      newsInfoApi.update(row);
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "newsInfo-detail": NewsInfoDetail,
+    "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/newsType-detail.vue

@@ -0,0 +1,167 @@
+
+<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="parentId">
+          <el-select-tree
+            :props="props"
+            :options="newsTypeList"
+            v-model="formModel.parentId"
+            size="mediumn"
+            height="200"
+          ></el-select-tree>
+        </el-form-item>
+        <el-form-item label="代码" prop="code">
+          <el-input
+            v-model="formModel.code"
+            placeholder="请输入代码"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="是否展示" prop="name">
+          <el-radio v-model="formModel.showFlag" :label="true">显示</el-radio>
+          <el-radio v-model="formModel.showFlag" :label="false">隐藏</el-radio>
+        </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 newsTypeApi from "@/api/base/newsType";
+import SelectTree from "@/components/SelectTree";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        name: [
+          { required: true, message: "类型名称不能为空", trigger: "blur" },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      newsTypeList: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+      },
+    };
+  },
+  created() {
+    var self = this;
+    newsTypeApi.list().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.newsTypeList = 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 newsTypeApi.add(self.formModel);
+            } else {
+              return newsTypeApi.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 newsTypeApi.create();
+      } else {
+        return newsTypeApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+          if(self.formModel.showFlag == null){
+            self.formModel.showFlag = false;
+          }
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+  components: {
+    "el-select-tree": SelectTree,
+  },
+};
+</script>

src/views/base/newsType-list.vue

@@ -0,0 +1,327 @@
+<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="/newsType">新闻类型管理</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 label="上级类型" prop="parentName">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.parentName"
+        ></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="name"
+        label="类型名称"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="parentName"
+        label="上级"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="code" label="代码" width="120"></el-table-column>
+      <el-table-column label="是否展示">
+        <template slot-scope="{ row }">
+          <el-switch
+            v-model="row.showFlag"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            @change="updateSwitch(row)"
+          ></el-switch>
+        </template>
+      </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>
+    <newsType-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></newsType-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import NewsTypeDetail from "./newsType-detail";
+import newsTypeApi from "@/api/base/newsType";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  name: "BaseNewsTypeList",
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        name: "",
+        parentName: "",
+      },
+      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("name", self.queryModel.name);
+      formData.append("parentName", self.queryModel.parentName);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      newsTypeApi
+        .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(() => {
+          newsTypeApi.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(() => {
+        newsTypeApi.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);
+      }
+    },
+    updateSwitch(row) {
+      newsTypeApi.update(row);
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "newsType-detail": NewsTypeDetail,
+  },
+};
+</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

@@ -0,0 +1,357 @@
+
+<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"
+    width="900px"
+  >
+    <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: 200px"
+              >
+                <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-col :span="12">
+            <el-form-item label="注册类型" prop="registerType">
+              <el-select
+                v-model="formModel.registerType"
+                filterable
+                placeholder="请选择"
+                style="width: 200px"
+              >
+                <el-option
+                  v-for="type in registerTypeResult"
+                  :key="type.value"
+                  :label="type.name"
+                  :value="type.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="用户名称" prop="userName">
+              <el-input
+                v-model="formModel.userName"
+                placeholder="请输入用户名称"
+                style="width: 300px"
+              ></el-input> </el-form-item
+          ></el-col>
+          <el-col :span="12">
+            <el-form-item label="姓名" prop="personName">
+              <el-input
+                v-model="formModel.personName"
+                placeholder="请输入姓名"
+                style="width: 300px"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="手机号码" prop="phone">
+              <el-input
+                v-model="formModel.phone"
+                placeholder="请输入手机号码"
+                style="width: 300px"
+              ></el-input> </el-form-item
+          ></el-col>
+          <el-col :span="12">
+            <el-form-item label="openId" prop="openId">
+              <el-input
+                v-model="formModel.openId"
+                placeholder="请输入openId"
+                style="width: 300px"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="身份证号码" prop="idCard">
+              <el-input
+                v-model="formModel.idCard"
+                placeholder="请输入身份证号码"
+                style="width: 300px"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="人脸照片" prop="faceImageUrl">
+              <el-upload
+                class="avatar-uploader"
+                name="photoFile"
+                :action="uploadUrl"
+                :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-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="身份证照片" prop="idCardUrl">
+              <el-upload
+                class="avatar-uploader"
+                name="photoFile"
+                :action="uploadUrl"
+                :show-file-list="false"
+                :headers="headers"
+                :data="uploadData"
+                :on-success="handleAvatarSuccessIdCard"
+                :before-upload="beforeAvatarUploadIdcard"
+                accept="image/png,image/jpeg"
+              >
+                <img v-if="fileUrlIdCard" :src="fileUrlIdCard" class="avatar" />
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input
+                v-model="formModel.remark"
+                placeholder="请输入备注"
+                style="width: 300px"
+              ></el-input>
+            </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 personInfoApi from "@/api/base/personInfo";
+import companyInfoApi from "@/api/base/companyInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+
+import { getToken } from "@/utils/auth"; // get token from cookie
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        personName: [
+          { required: true, message: "姓名不能为空", trigger: "blur" },
+        ],
+        userName: [
+          { required: true, message: "用户名称不能为空", trigger: "blur" },
+        ],
+        idCard: [
+          { required: true, message: "身份证号码不能为空", trigger: "blur" },
+        ],
+        companyId: [
+          { required: true, message: "对应公司不能为空", trigger: "blur" },
+        ],
+        registerType: [
+          {
+            required: true,
+            message: "注册类型不能为空",
+            trigger: "blur",
+          },
+        ],
+        phone: [
+          { required: true, message: "手机号码不能为空", trigger: "blur" },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      registerTypeResult: [],
+      companyInfoResult: [],
+      //上传图片start
+      uploadUrl: Constant.serverUrl + "/uploadPicture",
+      uploadData: {
+        subFolder: "personInfo",
+      },
+      fileUrl: "",
+      headers: {
+        Authorization: getToken(),
+      },
+      fileUrlIdCard:""
+      //上传图片end
+    };
+  },
+  created() {
+    var self = this;
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "注册用户类型",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.registerTypeResult = jsonData.data;
+      });
+
+    companyInfoApi.list().then((response) => {
+      var jsonData = response.data;
+      this.companyInfoResult = 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 personInfoApi.add(self.formModel);
+            } else {
+              return personInfoApi.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) {
+      this.loading = false;
+      var self = this;
+      self.formModel.faceImageUrl = 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;
+    },
+    handleAvatarSuccessIdCard(res, file) {
+      this.loading = false;
+      var self = this;
+      self.formModel.idCardUrl = res.data;
+      self.fileUrlIdCard = res.data + "?x-oss-process=image/resize,m_lfit,w_200";
+    },
+    beforeAvatarUploadIdcard(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;
+    },
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return personInfoApi.create();
+      } else {
+        return personInfoApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+          let faceImageUrl = self.formModel.faceImageUrl;
+          if (faceImageUrl != null) {
+            self.fileUrl =
+              faceImageUrl +
+              "?x-oss-process=image/resize,m_lfit,h_200";
+          }
+
+          let idCardUrl = self.formModel.idCardUrl;
+          if (idCardUrl != null) {
+            self.fileUrlIdCard =
+              idCardUrl +
+              "?x-oss-process=image/resize,m_lfit,h_200";
+          }
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>

src/views/base/personInfo-list.vue

@@ -0,0 +1,578 @@
+<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="/personInfo">企业人员管理</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="registerType">
+        <el-select
+          v-model="queryModel.registerType"
+          filterable
+          placeholder="请选择"
+          style="width: 120px"
+          size="mini"
+        >
+          <el-option
+            v-for="type in registerTypeResult"
+            :key="type.value"
+            :label="type.name"
+            :value="type.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="姓名" prop="personName">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.personName"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="身份证号码" prop="idCard">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.idCard"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="openId" prop="openId">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.openId"
+        ></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-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-upload2"
+        @click="batchImportVisible = true"
+        >导入</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"
+      ></el-table-column>
+      <el-table-column
+        prop="registerTypeName"
+        label="注册类型"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="personName"
+        label="姓名"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="userName"
+        label="用户名称"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="idCard"
+        label="身份证号码"
+        width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="phone"
+        label="手机号码"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="faceImageUrl" label="人脸照片" width="180">
+        <template slot-scope="{ row }">
+          <a :href="row.faceImageUrl" target="_blank">
+            <el-avatar
+              :size="48"
+              shape="circle"
+              :src="
+                row.faceImageUrl +
+                '?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="idCardUrl" label="身份证照片" width="180"
+        ><template slot-scope="{ row }">
+          <a :href="row.idCardUrl" target="_blank">
+            <el-avatar
+              :size="48"
+              shape="circle"
+              :src="
+                row.idCardUrl + '?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="openId"
+        label="openId"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="remark"
+        label="备注"
+        width="180"
+        show-overflow-tooltip=""
+      ></el-table-column>
+      <el-table-column label="操作" width="180" 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>
+    <personInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></personInfo-detail>
+    <!--批量导入S-->
+    <el-dialog
+      title="导入"
+      :visible.sync="batchImportVisible"
+      :modal-append-to-body="false"
+      style="text-align: left"
+      :close-on-click-modal="false"
+    >
+      <el-form label-width="150px">
+        <el-form-item label="模板下载">
+          <el-link
+            href="http://rccs.oss-cn-hangzhou.aliyuncs.com/enterprise-federation/%E5%AF%BC%E5%85%A5%E4%BC%81%E4%B8%9A%E7%94%A8%E6%88%B7%E6%A8%A1%E6%9D%BF.xlsx"
+            type="primary"
+            target="_blank"
+            >点击下载模板</el-link
+          >
+        </el-form-item>
+        <el-form-item label="上传文件">
+          <el-upload
+            class="upload-demo"
+            accept=".xlsx"
+            :action="uploadUrlXls"
+            :data="uploadXlsData"
+            :headers="headers"
+            :on-preview="handleBatchImportPreview"
+            name="uploadFile"
+            :multiple="true"
+            :limit="1"
+            :on-remove="handleBatchImportRemove"
+            :before-remove="beforeBatchImportRemove"
+            :before-upload="beforeUpload"
+            :on-exceed="handleBatchImportExceed"
+            :on-success="handleBatchImportSuccess"
+            :file-list="batchImportFileList"
+          >
+            <el-button size="small" type="primary" :loading="xlsLoading"
+              >点击上传</el-button
+            >
+            <div slot="tip" class="el-upload__tip">
+              只能上传xls文件，且不超过500kb
+            </div>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="batchImportVisible = false"
+          >关 闭</el-button
+        >
+      </div>
+    </el-dialog>
+    <!--批量导入E-->
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import PersonInfoDetail from "./personInfo-detail";
+import personInfoApi from "@/api/base/personInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import companyInfoApi from "@/api/base/companyInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+import { getToken } from "@/utils/auth"; // get token from cookie
+
+export default {
+  name: "BasePersonInfoList",
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        companyId:"",
+        companyName: "",
+        registerType: "",
+        personName: "",
+        idCard: "",
+        openId: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      registerTypeResult: [],
+      //导入S
+      batchImportVisible: false,
+      batchImportFileList: [],
+      uploadUrlXls: Constant.serverUrl + "/base/personInfo/importXls",
+      uploadXlsData: {
+        subFolder: "company",
+        companyId: "",
+      },
+      headers: {
+        Authorization: getToken(),
+      },
+      xlsLoading: false,
+      //导入E
+      companyInfoList:[],
+    };
+  },
+  created() {
+    var self = this;
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "注册用户类型",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.registerTypeResult = jsonData.data;
+      });
+  },
+  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("companyId", self.queryModel.companyId);
+      formData.append("registerType", self.queryModel.registerType);
+      formData.append("personName", self.queryModel.personName);
+      formData.append("idCard", self.queryModel.idCard);
+      formData.append("openId", self.queryModel.openId);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      personInfoApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    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(() => {
+          personInfoApi.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(() => {
+        personInfoApi.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);
+      }
+    },
+    beforeUpload(file, fileList) {
+      //导入前判断
+    },
+    //批量导入-上传成功
+    handleBatchImportSuccess(response, file, fileList) {
+      var self = this;
+      self.xlsLoading = false;
+      if (response.result) {
+        self.$message.success(response.message);
+        this.batchImportFileList = [];
+        this.changePage(1);
+        this.batchImportVisible = false;
+      } else {
+        //this.$message.error(response.message);
+        this.batchImportFileList = [];
+        this.changePage(1);
+
+        if (response.data != null) {
+          //下载有错误信息提示的报表
+          //window.open(response.data);
+          self.$message({
+            showClose: true,
+            dangerouslyUseHTMLString: true,
+            message:
+              response.message +
+              `,<a href="${response.data}" target="_blank">点击下载未导入的数据报表</a>&nbsp;`,
+            duration: 30000,
+          });
+        }
+      }
+    },
+    //批量导入-预览
+    handleBatchImportPreview(file) {
+      console.log(file.url);
+    },
+    //批量导入-移除
+    handleBatchImportRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    //批量导入-移除前操作
+    beforeBatchImportRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    //批量导入-文件超出个数限制时的钩子
+    handleBatchImportExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
+    },
+    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: {
+    "personInfo-detail": PersonInfoDetail,
+  },
+};
+</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/layout/index.vue

@@ -18,7 +18,7 @@
           </el-dropdown-menu>
         </el-dropdown>
       </div>
-      <div style="position:absolute;bottom:0px;left:255px;right:400px;">
+      <div style="position:absolute;bottom:0px;left:275px;right:400px;">
         <tags-view />
       </div>
     </el-header>