jz.kai 4 lat temu
rodzic
commit
35347e30b8

+ 0 - 50
src/api/base/companyInfo.js

@@ -1,50 +0,0 @@
-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
-}

+ 0 - 46
src/api/base/cooperationInfo.js

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

+ 0 - 50
src/api/base/industryInfo.js

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

+ 0 - 46
src/api/base/messageInfo.js

@@ -1,46 +0,0 @@
-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
-}

+ 0 - 46
src/api/base/messageReceiver.js

@@ -1,46 +0,0 @@
-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
-}

+ 0 - 46
src/api/base/messageType.js

@@ -1,46 +0,0 @@
-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
-}

+ 0 - 46
src/api/base/newsInfo.js

@@ -1,46 +0,0 @@
-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
-}

+ 0 - 50
src/api/base/newsType.js

@@ -1,50 +0,0 @@
-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(formData){
-  return request.post(constant.serverUrl + "/base/newsType/list",formData);
-}
-
-export default {
-  pageList,create,edit,add,update,remove,batchRemove,list
-}

+ 0 - 50
src/api/base/personInfo.js

@@ -1,50 +0,0 @@
-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"
-    }
-  });
-}
-
-function resetPassword(formData){
-  return request.post(constant.serverUrl + "/base/personInfo/resetPassword", formData);
-}
-
-export default {
-  pageList,create,edit,add,update,remove,batchRemove,resetPassword
-}

+ 0 - 46
src/api/base/whisperingWall.js

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

+ 1 - 91
src/routers/modules/base.js

@@ -1,95 +1,5 @@
 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: '新闻管理'
-                }
-        }, {
-                path: '/base/industryInfo/list',
-                name: 'BaseIndustryInfoList',
-                // 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/industryInfo-list.vue'),
-                meta: {
-                        roles: ["admin"],
-                        title: '行业管理'
-                }
-        }, {
-                path: '/base/whisperingWall/list',
-                name: 'BaseWhisperingWallList',
-                // 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/whisperingWall-list.vue'),
-                meta: {
-                        roles: ["admin"],
-                        title: '回音墙管理'
-                }
-        },
-        {
-                path: '/base/messageType/list',
-                name: 'BaseMessageTypeList',
-                // 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/messageType-list.vue'),
-                meta: {
-                        roles: ["admin"],
-                        title: '消息类型管理'
-                }
-        },
-        {
-                path: '/base/cooperationInfo/list',
-                name: 'BaseCooperationInfoList',
-                // route level code-splitting
-                // this generates a separate chunk (about.[hash].js) for this route
-                // which is lazy-loaded when the route is visited.
-                component: () => import('@/views/base/cooperationInfo-list.vue'),
-                meta: {
-                        roles: ["admin"],
-                        title: '企业互助管理'
-                }
-        },
+        
 ]
 
 export default routers;

+ 0 - 447
src/views/base/companyInfo-detail.vue

@@ -1,447 +0,0 @@
-
-<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-tree
-                :props="props"
-                :options="industryList"
-                v-model="formModel.industry"
-                size=""
-                height="200"
-              ></el-select-tree>
-            </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="position">
-              <el-select
-                v-model="formModel.position"
-                filterable
-                placeholder="请选择"
-                style="width: 200px"
-              >
-                <el-option
-                  v-for="position in positionResult"
-                  :key="position.value"
-                  :label="position.name"
-                  :value="position.value"
-                ></el-option> </el-select></el-form-item
-          ></el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="企业logo" prop="logoUrl">
-              <el-upload
-                class="avatar-uploader"
-                name="photoFile"
-                :action="uploadUrl"
-                :show-file-list="false"
-                :headers="headers"
-                :data="uploadData"
-                :on-success="handleAvatarSuccessLogo"
-                :before-upload="beforeAvatarUploadLogo"
-                accept="image/png,image/jpeg"
-              >
-                <img v-if="fileUrlLogo" :src="fileUrlLogo" 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="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 industryInfoApi from "@/api/base/industryInfo";
-import SelectTree from "@/components/SelectTree";
-
-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
-      industryList: [],
-      props: {
-        // 配置项(必选)
-        value: "id",
-        label: "industryName",
-      },
-      positionResult:[],
-      fileUrlLogo: "",
-    };
-  },
-  created() {
-    var self = this;
-
-    industryInfoApi.list().then(function (response) {
-      var jsonData = response.data;
-      if (jsonData.result) {
-        if (jsonData.data != null && jsonData.data != "") {
-          self.industryList = jsonData.data;
-        }
-      }
-    });
-
-    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.regionResult = jsonData.data;
-      });
-
-      dataDictionaryApi
-      .findByCatalogName({
-        catalogName: "企联职务",
-      })
-      .then((response) => {
-        var jsonData = response.data;
-        this.positionResult = 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;
-    },
-    handleAvatarSuccessLogo(res, file) {
-      this.loading = false;
-      var self = this;
-      self.formModel.logoUrl = res.data;
-      self.fileUrlLogo =
-        res.data + "?x-oss-process=image/resize,m_lfit,w_200";
-    },
-    beforeAvatarUploadLogo(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";
-          }
-
-          let logoUrl = self.formModel.logoUrl;
-          if (logoUrl != null) {
-            self.fileUrlLogo =
-              logoUrl + "?x-oss-process=image/resize,m_lfit,h_200";
-          }
-        } else {
-          self.$message.error(jsonData.message + "");
-        }
-      })
-      .catch((error) => {
-        self.$message.error(error + "");
-      });
-  },
-  components: {
-    "el-select-tree": SelectTree,
-  },
-};
-</script>

+ 0 - 640
src/views/base/companyInfo-list.vue

@@ -1,640 +0,0 @@
-<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-tree
-            :props="props"
-            :options="industryList"
-            v-model="queryModel.industry"
-            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-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"
-        show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-        prop="scaleN"
-        label="企业规模"
-        width="120"
-      ></el-table-column>
-      <el-table-column
-        prop="industryName"
-        label="所属行业"
-        width="150"
-      ></el-table-column>
-      <el-table-column
-        prop="positionName"
-        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="logoUrl"
-        label="企业logo"
-        width="180"
-        show-overflow-tooltip
-      >
-        <template slot-scope="{ row }">
-          <a :href="row.logoUrl" target="_blank">
-            <el-avatar
-              :size="48"
-              shape="circle"
-              :src="
-                row.logoUrl +
-                '?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="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 industryInfoApi from "@/api/base/industryInfo";
-import SelectTree from "@/components/SelectTree";
-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
-      industryList:[],
-      props: {
-        // 配置项(必选)
-        value: "id",
-        label: "industryName",
-      },
-    };
-  },
-  created() {
-    var self = this;
-
-    industryInfoApi.list().then(function (response) {
-      var jsonData = response.data;
-      if (jsonData.result) {
-        if (jsonData.data != null && jsonData.data != "") {
-          self.industryList = jsonData.data;
-        }
-      }
-    });
-
-    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.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("region", self.queryModel.region);
-
-      if (self.queryModel.industry != null) {
-        formData.append("industry", self.queryModel.industry);
-      }
-
-      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,
-    "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>

+ 0 - 256
src/views/base/cooperationInfo-detail.vue

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

+ 0 - 371
src/views/base/cooperationInfo-list.vue

@@ -1,371 +0,0 @@
-<template>
-  <div>
-    <el-breadcrumb separator=">">
-      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-      <el-breadcrumb-item>
-        <a href="#">系统管理</a>
-      </el-breadcrumb-item>
-      <el-breadcrumb-item>
-        <a href="/base/cooperationInfo">企业互助管理</a>
-      </el-breadcrumb-item>
-    </el-breadcrumb>
-    <el-divider></el-divider>
-    <!--
-      要resetFields起作用,必须配置:model和prop
-    -->
-    <el-form
-      ref="queryForm"
-      :model="queryModel"
-      inline
-      class="demo-form-inline"
-    >
-      <el-form-item label="类型" prop="type">
-        <el-select
-                v-model="queryModel.type"
-                filterable
-                placeholder="请选择类型"
-                size="mini"
-              >
-                <el-option
-                  v-for="result in typeList"
-                  :key="result.id"
-                  :label="result.name"
-                  :value="result.value"
-                ></el-option>
-              </el-select>
-      </el-form-item>
-      <el-form-item label="标题" prop="title">
-        <el-input type="text" size="mini" v-model="queryModel.title"></el-input>
-      </el-form-item>
-      <el-form-item label="是否上架" prop="status">
-        <el-select
-          v-model="queryModel.status"
-          size="mini"
-          filterable
-          placeholder="请选择"
-          style="width: 100px"
-        >
-          <el-option label="全部" value></el-option>
-          <el-option label="是" value="true"></el-option>
-          <el-option label="否" value="false"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button
-          type="primary"
-          size="mini"
-          icon="ios-search"
-          @click="changePage(1)"
-          :loading="loading"
-          >查询</el-button
-        >&nbsp;
-        <el-button
-          type="info"
-          size="mini"
-          style="margin-left: 8px"
-          @click="handleReset('queryForm')"
-          >重置</el-button
-        >&nbsp;
-      </el-form-item>
-    </el-form>
-    <el-divider></el-divider>
-    <el-row class="button-group">
-      <el-button
-        type="primary"
-        size="small"
-        plain
-        icon="el-icon-circle-plus"
-        @click="handleAdd"
-        >新增</el-button
-      >
-      <el-button
-        type="primary"
-        size="small"
-        plain
-        icon="el-icon-circle-plus"
-        :disabled="multipleSelection.length == 0"
-        @click="handleBatchDelete"
-        >删除选中项</el-button
-      >
-    </el-row>
-    <el-table
-      :data="tableData"
-      style="min-height: 400px"
-      v-loading="loading"
-      stripe
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="typeN" label="类型" width="180"></el-table-column>
-      <el-table-column prop="title" label="标题" width="180"></el-table-column>
-      <el-table-column prop="picUrl" label="图片" width="180">
-        <template slot-scope="{ row }">
-          <a :href="row.picUrl" target="_blank">
-            <el-avatar
-              :size="48"
-              shape="circle"
-              :src="row.picUrl + '?x-oss-process=image/resize,m_fill,w_64,h_64'"
-              :key="row.id"
-            ></el-avatar>
-          </a>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="status"
-        label="是否上架"
-        width="180"
-      ></el-table-column>
-      <el-table-column label="操作" width="150" fixed="right">
-        <template slot-scope="{ row }">
-          <el-button size="mini" type="warning" @click="handleEdit(row)"
-            >编辑</el-button
-          >
-          <el-button size="mini" type="danger" @click="handleDelete(row)"
-            >删除</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      :current-page.sync="pageIndex"
-      :total="totalElements"
-      :page-sizes="pageSizeList"
-      @current-change="changePage"
-      @size-change="pageSizeChange"
-      layout="total, sizes, prev, pager, next, jumper"
-    ></el-pagination>
-    <cooperationInfo-detail
-      v-if="showModal"
-      :businessKey="businessKey"
-      :title="modalTitle"
-      @close="onDetailModalClose"
-    ></cooperationInfo-detail>
-  </div>
-</template>
-<script>
-import Constant from "@/constant";
-import CooperationInfoDetail from "./cooperationInfo-detail";
-import cooperationInfoApi from "@/api/base/cooperationInfo";
-import NProgress from "nprogress"; // progress bar
-import "nprogress/nprogress.css"; // progress bar style
-import dataDictionaryApi from "@/api/sys/dataDictionary";
-// import SelectTree from "@/components/SelectTree";
-
-export default {
-  data() {
-    var self = this;
-
-    return {
-      queryModel: {
-        id: "",
-        companyId: "",
-        type: "",
-        picUrl: "",
-        title: "",
-        content: "",
-        createBy: "",
-        createTime: "",
-        updateBy: "",
-        updateTime: "",
-        delFlag: "",
-        status: "",
-      },
-      loading: false,
-      tableData: [],
-      pageIndex: 1,
-      pageSize: 10,
-      totalPages: 0,
-      totalElements: 0,
-      field: "",
-      direction: "",
-      pageSizeList: [10, 20, 30],
-      multipleSelection: [],
-      showModal: false,
-      modalTitle: "",
-      businessKey: "",
-      typeList: [],
-      props: {
-        // 配置项(必选)
-        value: "id",
-        label: "name",
-      },
-    };
-  },
-  created() {
-    var self = this;
-    var formData = new FormData();
-    formData.append("catalogName", "互助类型");
-    dataDictionaryApi.findByCatalogName(formData).then((response) => {
-      var jsonData = response.data;
-      this.typeList = jsonData.data;
-    });
-  },
-  methods: {
-    changePage(pageIndex) {
-      var self = this;
-
-      self.loading = true;
-
-      self.pageIndex = pageIndex;
-      var formData = new FormData();
-
-      formData.append("pageIndex", self.pageIndex);
-      formData.append("pageSize", self.pageSize);
-
-      formData.append("id", self.queryModel.id);
-      formData.append("companyId", self.queryModel.companyId);
-      formData.append("type", self.queryModel.type);
-      formData.append("picUrl", self.queryModel.picUrl);
-      formData.append("title", self.queryModel.title);
-      formData.append("content", self.queryModel.content);
-      formData.append("createBy", self.queryModel.createBy);
-      formData.append("createTime", self.queryModel.createTime);
-      formData.append("updateBy", self.queryModel.updateBy);
-      formData.append("updateTime", self.queryModel.updateTime);
-      formData.append("delFlag", self.queryModel.delFlag);
-      formData.append("status", self.queryModel.status);
-
-      if (this.field != null) {
-        formData.append("field", this.field);
-      }
-
-      if (this.direction != null) {
-        formData.append("direction", this.direction);
-      }
-
-      cooperationInfoApi
-        .pageList(formData)
-        .then(function (response) {
-          self.loading = false;
-
-          var jsonData = response.data.data;
-
-          self.tableData = jsonData.data;
-          self.totalPages = jsonData.totalPages;
-          self.totalElements = jsonData.recordsTotal;
-        })
-        .catch((error) => {
-          self.loading = false;
-          // self.$message.error(error + "");
-        });
-    },
-    pageSizeChange(pageSize) {
-      this.pageSize = pageSize;
-
-      this.$nextTick(() => {
-        this.changePage(this.pageIndex);
-      });
-    },
-    sortChange(data) {
-      this.field = data.column.field;
-      this.direction = data.order;
-
-      this.changePage(this.pageIndex);
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    handleReset(name) {
-      this.$refs[name].resetFields();
-    },
-    handleAdd() {
-      this.modalTitle = "新增";
-      this.businessKey = "";
-      this.showModal = true;
-    },
-    handleEdit(record) {
-      this.modalTitle = "编辑";
-      this.businessKey = record.id;
-      this.showModal = true;
-    },
-    handleDelete(record) {
-      var self = this;
-
-      self
-        .$confirm("是否确认删除?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-        .then(() => {
-          cooperationInfoApi.remove(record.id).then(function (response) {
-            var jsonData = response.data;
-
-            if (jsonData.result) {
-              // var index = self.tableData.indexOf(record);
-              // self.tableData.splice(index, 1);
-              self.changePage(self.pageIndex);
-
-              self.$message({
-                type: "success",
-                message: "删除成功!",
-              });
-            }
-          });
-        });
-    },
-    handleBatchDelete() {
-      var self = this;
-
-      var idList = this.multipleSelection.map((record) => {
-        return record.id;
-      });
-
-      this.$confirm("是否确认删除选中项?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        cooperationInfoApi.batchRemove(idList).then(function (response) {
-          var jsonData = response.data;
-
-          if (jsonData.result) {
-            self.changePage(self.pageIndex);
-
-            self.$message({
-              type: "success",
-              message: "删除成功!",
-            });
-          }
-        });
-      });
-    },
-    onDetailModalClose(refreshed) {
-      //保存成功后回调
-      this.showModal = false;
-
-      if (refreshed) {
-        this.changePage(this.pageIndex);
-      }
-    },
-  },
-  mounted: function () {
-    this.changePage(1);
-  },
-  components: {
-    "cooperationInfo-detail": CooperationInfoDetail,
-    // "el-select-tree": SelectTree,
-  },
-};
-</script>
-<style lang="scss" scoped>
-.el-breadcrumb {
-  margin: 10px;
-  line-height: 20px;
-}
-
-.el-divider {
-  margin: 5px 0;
-}
-
-.demo-form-inline {
-  margin-left: 10px;
-  text-align: left;
-}
-
-.button-group {
-  margin-left: 10px;
-  text-align: left;
-}
-</style>

+ 0 - 166
src/views/base/industryInfo-detail.vue

@@ -1,166 +0,0 @@
-
-<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="industryName">
-          <el-input
-            v-model="formModel.industryName"
-            placeholder="请输入行业名称"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="上级类型" prop="parentId">
-          <el-select-tree
-            :props="props"
-            :options="industryList"
-            v-model="formModel.parentId"
-            size="mediumn"
-            height="200"
-          ></el-select-tree>
-        </el-form-item>
-        <el-form-item label="排序号" prop="sortNo">
-          <el-input-number
-            v-model="formModel.sortNo"
-            :min="1"
-            style="width: 300px"
-          ></el-input-number>
-        </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 industryInfoApi from "@/api/base/industryInfo";
-import SelectTree from "@/components/SelectTree";
-
-export default {
-  props: ["businessKey", "title"],
-  data() {
-    return {
-      formModel: {},
-      ruleValidate: {
-        industryName: [
-          { required: true, message: "行业名称不能为空", trigger: "blur" },
-        ],
-        sortNo:[
-          { required: true, message: "不能为空", trigger: "blur" },
-        ]
-      },
-      showDialog: true,
-      loading: false,
-      submitting: false,
-      industryList: [],
-      props: {
-        // 配置项(必选)
-        value: "id",
-        label: "industryName",
-      },
-    };
-  },
-  created() {
-    var self = this;
-    var formData = new FormData();
-    formData.append("queryParent", true);
-    industryInfoApi.list(formData).then(function (response) {
-      var jsonData = response.data;
-      if (jsonData.result) {
-        if (jsonData.data != null && jsonData.data != "") {
-          self.industryList = 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 industryInfoApi.add(self.formModel);
-            } else {
-              return industryInfoApi.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 industryInfoApi.create();
-      } else {
-        return industryInfoApi.edit(self.businessKey);
-      }
-    })()
-      .then((response) => {
-        var jsonData = response.data;
-        self.loading = false;
-
-        if (jsonData.result) {
-          self.formModel = jsonData.data;
-        } else {
-          self.$message.error(jsonData.message + "");
-        }
-      })
-      .catch((error) => {
-        self.$message.error(error + "");
-      });
-  },
-  components: {
-    "el-select-tree": SelectTree,
-  },
-};
-</script>

+ 0 - 318
src/views/base/industryInfo-list.vue

@@ -1,318 +0,0 @@
-<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="/industryInfo">行业管理</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="industryName"
-        label="行业名称"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="parentName"
-        label="上级"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="sortNo"
-        label="排序号"
-        width="80"
-      ></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>
-    <industryInfo-detail
-      v-if="showModal"
-      :businessKey="businessKey"
-      :title="modalTitle"
-      @close="onDetailModalClose"
-    ></industryInfo-detail>
-  </div>
-</template>
-<script>
-import Constant from "@/constant";
-import IndustryInfoDetail from "./industryInfo-detail";
-import industryInfoApi from "@/api/base/industryInfo";
-import NProgress from "nprogress"; // progress bar
-import "nprogress/nprogress.css"; // progress bar style
-
-export default {
-  name: "BaseIndustryInfoList",
-  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);
-      }
-
-      industryInfoApi
-        .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(() => {
-          industryInfoApi.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(() => {
-        industryInfoApi.batchRemove(idList).then(function (response) {
-          var jsonData = response.data;
-
-          if (jsonData.result) {
-            self.changePage(self.pageIndex);
-
-            self.$message({
-              type: "success",
-              message: "删除成功!",
-            });
-          }
-        });
-      });
-    },
-    onDetailModalClose(refreshed) {
-      //保存成功后回调
-      this.showModal = false;
-
-      if (refreshed) {
-        this.changePage(this.pageIndex);
-      }
-    },
-  },
-  mounted: function () {
-    this.changePage(1);
-  },
-  components: {
-    "industryInfo-detail": IndustryInfoDetail,
-  },
-};
-</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>

+ 0 - 178
src/views/base/messageType-detail.vue

@@ -1,178 +0,0 @@
-<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="picUrl">
-              <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-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 messageTypeApi from "@/api/base/messageType";
-import { getToken } from "@/utils/auth"; // get token from cookie
-export default {
-    props: ["businessKey", "title"],
-    data() {
-        return{
-            formModel: {},
-            ruleValidate: {
-                name: [
-                    { required: true, message: "消息类型不能为空", trigger: "blur" }
-                ],
-                
-            },
-            showDialog: true,
-            loading: false,
-            submitting: false,
-            //上传图片start
-            uploadUrl: Constant.serverUrl + "/uploadPicture",
-            uploadData: {
-                subFolder: "companyInfo",
-            },
-            fileUrl: "",
-            headers: {
-                Authorization: getToken(),
-            },
-            props: {
-                // 配置项(必选)
-                value: "id",
-                label: "industryName",
-            },
-        }
-    },
-    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 messageTypeApi.add(self.formModel);
-                    } else {
-                    return messageTypeApi.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.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 messageTypeApi.create();
-        } else {
-            return messageTypeApi.edit(self.businessKey);
-        }
-        })()
-        .then((response) => {
-            var jsonData = response.data;
-            self.loading = false;
-
-            if (jsonData.result) {
-                self.formModel = 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>
-<style scoped>
-.user-panel {
-  margin: 10px auto;
-}
-</style>

+ 0 - 268
src/views/base/messageType-list.vue

@@ -1,268 +0,0 @@
-<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="/industryInfo">消息类型管理</a>
-            </el-breadcrumb-item>
-        </el-breadcrumb>
-        <el-divider></el-divider>
-        <el-form
-        ref="queryForm"
-        :model="queryModel"
-        inline
-        class="demo-form-inline"
-        >
-        <el-form-item label="类型名称" prop="name">
-            <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
-        </el-form-item>
-        <el-form-item>
-            <el-button
-            type="primary"
-            size="mini"
-            icon="ios-search"
-            @click="changePage(1)"
-            :loading="loading"
-            >查询</el-button
-            >&nbsp;
-            <el-button
-            type="info"
-            size="mini"
-            style="margin-left: 8px"
-            @click="handleReset('queryForm')"
-            >重置</el-button
-            >&nbsp;
-        </el-form-item>
-        </el-form>
-        <el-divider></el-divider>
-        <el-row class="button-group">
-            <el-button
-                type="primary"
-                size="small"
-                plain
-                icon="el-icon-circle-plus"
-                @click="handleAdd"
-                >新增</el-button
-            >
-            <el-button
-                type="primary"
-                size="small"
-                plain
-                icon="el-icon-circle-plus"
-                :disabled="multipleSelection.length == 0"
-                @click="handleBatchDelete"
-                >删除选中项</el-button
-            >
-        </el-row>
-        <el-table
-        :data="tableData"
-        style="min-height: 400px"
-        v-loading="loading"
-        stripe
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-        >
-        <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column
-            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="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 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>
-        <messageType-detail
-            v-if="showModal"
-            :businessKey="businessKey"
-            :title="modalTitle"
-            @close="onDetailModalClose"
-        ></messageType-detail>
-    </div>
-</template>
-<script>
-import messageTypeDetail from "./messageType-detail";
-import messageTypeApi from "@/api/base/messageType";
-export default {
-    name: "BaseMessageTypeList",
-    data(){
-        var self = this;
-        return {
-            queryModel: {
-                name: "",
-            },
-            loading: false,
-            tableData: [],
-            pageIndex: 1,
-            pageSize: 10,
-            totalPages: 0,
-            totalElements: 0,
-            field: "",
-            direction: "",
-            pageSizeList: [10, 20, 30],
-            multipleSelection: [],
-            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);
-
-            messageTypeApi.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;
-        },
-        handleBatchDelete() {
-            var self = this;
-
-            var idList = this.multipleSelection.map((record) => {
-                return record.id;
-            });
-
-            this.$confirm("是否确认删除选中项?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                messageTypeApi.batchRemove(idList).then(function (response) {
-                var jsonData = response.data;
-
-                if (jsonData.result) {
-                    self.changePage(self.pageIndex);
-
-                    self.$message({
-                    type: "success",
-                    message: "删除成功!",
-                    });
-                }
-                });
-            });
-        },
-        onDetailModalClose(refreshed) {
-            //保存成功后回调
-            this.showModal = false;
-
-            if (refreshed) {
-                this.changePage(this.pageIndex);
-            }
-        },
-        
-    },
-    mounted: function () {
-        this.changePage(1);
-    },
-    components: {
-        "messageType-detail": messageTypeDetail,
-    },
-    
-}
-</script>
-<style 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>

+ 0 - 307
src/views/base/newsInfo-detail.vue

@@ -1,307 +0,0 @@
-
-<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"
-              size=""
-              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-form-item label="排序号" prop="sortNo">
-          <el-input-number
-            v-model="formModel.sortNo"
-            :min="1"
-            style="width: 300px"
-          ></el-input-number>
-        </el-form-item>
-        <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: {
-        companyId: [{ required: true, message: "请选择", trigger: "blur" }],
-        newsTypeId: [{ required: true, message: "请选择", trigger: "blur" }],
-        title: [{ required: true, message: "不能为空", trigger: "blur" }],
-        sortNo:[
-          { 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,w_200";
-          }
-        } else {
-          self.$message.error(jsonData.message + "");
-        }
-      })
-      .catch((error) => {
-        self.$message.error(error + "");
-      });
-  },
-};
-</script>

+ 0 - 412
src/views/base/newsInfo-list.vue

@@ -1,412 +0,0 @@
-<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="120"
-      ><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
-        prop="sortNo"
-        label="排序号"
-        width="80"
-      ></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>

+ 0 - 180
src/views/base/newsType-detail.vue

@@ -1,180 +0,0 @@
-
-<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="sortNo">
-          <el-input-number
-            v-model="formModel.sortNo"
-            :min="1"
-            style="width: 300px"
-          ></el-input-number>
-        </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" },
-        ],
-        sortNo:[
-          { required: true, message: "不能为空", trigger: "blur" },
-        ]
-      },
-      showDialog: true,
-      loading: false,
-      submitting: false,
-      newsTypeList: [],
-      props: {
-        // 配置项(必选)
-        value: "id",
-        label: "name",
-      },
-    };
-  },
-  created() {
-    var self = this;
-    
-    var formData = new FormData();
-    formData.append("queryParent", true);
-    newsTypeApi.list(formData).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>

+ 0 - 332
src/views/base/newsType-list.vue

@@ -1,332 +0,0 @@
-<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="是否展示" width="120">
-        <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
-        prop="sortNo"
-        label="排序号"
-        width="80"
-      ></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>

+ 0 - 411
src/views/base/personInfo-detail.vue

@@ -1,411 +0,0 @@
-
-<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: 250px"
-                :filter-method="filterMethod"
-              >
-                <el-option
-                  v-for="result in companyInfoResult"
-                  :key="result.id"
-                  :label="result.companyName"
-                  :value="result.id"
-                ></el-option>
-              </el-select> </el-form-item
-          ></el-col>
-          <el-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="12">
-            <el-form-item label="身份证号码" prop="idCard">
-              <el-input
-                v-model="formModel.idCard"
-                placeholder="请输入身份证号码"
-                style="width: 300px"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="头衔" prop="title">
-              <el-select
-                v-model="formModel.title"
-                filterable
-                placeholder="请选择"
-                style="width: 200px"
-              >
-                <el-option
-                  v-for="title in titleResult"
-                  :key="title.value"
-                  :label="title.name"
-                  :value="title.value"
-                ></el-option>
-              </el-select>
-            </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
-      titleResult: [],
-    };
-  },
-  created() {
-    var self = this;
-
-    dataDictionaryApi
-      .findByCatalogName({
-        catalogName: "注册用户类型",
-      })
-      .then((response) => {
-        var jsonData = response.data;
-        this.registerTypeResult = jsonData.data;
-      });
-      
-    dataDictionaryApi
-      .findByCatalogName({
-        catalogName: "用户头衔",
-      })
-      .then((response) => {
-        var jsonData = response.data;
-        this.titleResult = 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;
-    },
-    filterMethod(query, item) {
-      var self = this;
-      var formData = new FormData();
-      formData.append("pageSize", 5);
-      formData.append("companyName", query);
-
-      companyInfoApi.list(formData).then(function (response) {
-        var jsonData = response.data;
-        if (jsonData.result) {
-          self.companyInfoResult = jsonData.data;
-        }
-      });
-    },
-  },
-  mounted: function () {
-    var self = this;
-
-    (function () {
-      if (self.businessKey.length == 0) {
-        return 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";
-          }
-
-          let companyId = self.formModel.companyId;
-          if (companyId != null) {
-            var formData = new FormData();
-            formData.append("pageSize", 5);
-            formData.append("companyId", companyId);
-
-            companyInfoApi.list(formData).then(function (response) {
-              var jsonData = response.data;
-              if (jsonData.result) {
-                self.companyInfoResult = jsonData.data;
-              }
-            });
-          }
-        } else {
-          self.$message.error(jsonData.message + "");
-        }
-      })
-      .catch((error) => {
-        self.$message.error(error + "");
-      });
-  },
-};
-</script>

+ 0 - 616
src/views/base/personInfo-list.vue

@@ -1,616 +0,0 @@
-<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="200"
-        show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-        prop="registerTypeName"
-        label="注册类型"
-        width="120"
-      ></el-table-column>
-      <el-table-column
-        prop="titleName"
-        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-row
-            ><el-col :span="7">
-              <el-link type="primary" @click="handleEdit(row)" gutter>编辑</el-link>
-            </el-col>
-            <el-col :span="7">
-              <el-link type="danger" @click="handleDelete(row)">删除</el-link>
-            </el-col>
-            <el-col :span="10">
-              <el-link type="warning" @click="resetPassword(row)"
-                >密码重置</el-link
-              >
-            </el-col>
-          </el-row>
-        </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;
-        }
-      });
-    },
-    resetPassword(record) {
-      var self = this;
-      var formData = new FormData();
-      formData.append("id", record.id);
-      self
-        .$confirm("是否确认重置密码?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-        .then(() => {
-          personInfoApi.resetPassword(formData).then(function (response) {
-            var jsonData = response.data;
-
-            if (jsonData.result) {
-              self.changePage(self.pageIndex);
-
-              self.$message({
-                type: "success",
-                message: "重置成功!",
-              });
-            }
-          });
-        });
-    },
-  },
-  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>

+ 0 - 169
src/views/base/whisperingWall-detail.vue

@@ -1,169 +0,0 @@
-
-<style scoped>
-.user-panel {
-  margin: 10px auto;
-}
-</style>
-<template>
-  <el-dialog
-    :visible.sync="showDialog"
-    :title="title"
-    :modal-append-to-body="false"
-    style="text-align: left"
-    @close="closeDialog"
-    :close-on-click-modal="false"
-  >
-    <div class="user-panel" v-loading="loading">
-      <el-form
-        ref="form"
-        :model="formModel"
-        :rules="ruleValidate"
-        :label-width="'100px'"
-      >
-        <!-- <el-form-item label="类型" prop="type">
-          <el-select v-model="formModel.type">
-            <el-option label="后端接口" value="1"></el-option>
-            <el-option label="前端页面" value="2"></el-option>
-          </el-select>
-        </el-form-item> -->
-        <!-- <el-form-item label="提问" prop="question">
-          <el-input
-            v-model="formModel.question"
-            placeholder="请输入提问"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item> -->
-        <el-form-item label="回答" prop="answer">
-          <el-input
-            v-model="formModel.answer"
-            placeholder="请输入回答"
-            type="textarea"
-            :autosize="{ minRows: 10}"
-            style="width: 700px"
-          ></el-input>
-        </el-form-item>
-      </el-form>
-    </div>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="closeDialog">取 消</el-button>
-      <el-button type="primary" @click="handleSubmit" :loading="submitting"
-        >确 定</el-button
-      >
-    </span>
-  </el-dialog>
-</template>
-<script>
-import Constant from "@/constant";
-import whisperingWallApi from "@/api/base/whisperingWall";
-
-export default {
-  props: ["businessKey", "title"],
-  data() {
-    return {
-      formModel: {},
-      ruleValidate: {
-        id: [{ required: true, message: "编号不能为空", trigger: "blur" }],
-        question: [
-          { required: true, message: "提问不能为空", trigger: "blur" },
-        ],
-        questionBy: [
-          { required: true, message: "提问人不能为空", trigger: "blur" },
-        ],
-        questionTime: [
-          { required: true, message: "提问时间不能为空", trigger: "blur" },
-        ],
-        answer: [{ required: true, message: "回答不能为空", trigger: "blur" }],
-        answerBy: [
-          { required: true, message: "回答人不能为空", trigger: "blur" },
-        ],
-        answerTime: [
-          { required: true, message: "回答时间不能为空", trigger: "blur" },
-        ],
-        type: [{ required: true, message: "类型不能为空", trigger: "blur" }],
-        delFlag: [
-          { required: true, message: "是否删除不能为空", trigger: "blur" },
-        ],
-        createBy: [
-          { required: true, message: "创建人不能为空", trigger: "blur" },
-        ],
-        createTime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" },
-        ],
-        updateBy: [
-          { required: true, message: "更新人不能为空", trigger: "blur" },
-        ],
-        updateTime: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" },
-        ],
-      },
-      showDialog: true,
-      loading: false,
-      submitting: false,
-    };
-  },
-  methods: {
-    closeDialog() {
-      this.$emit("close", false);
-    },
-    handleSubmit() {
-      var self = this;
-
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          (function () {
-            var id = self.formModel.id;
-
-            if (id == null || id.length == 0) {
-              return whisperingWallApi.add(self.formModel);
-            } else {
-              return whisperingWallApi.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 whisperingWallApi.create();
-      } else {
-        return whisperingWallApi.edit(self.businessKey);
-      }
-    })()
-      .then((response) => {
-        var jsonData = response.data;
-        self.loading = false;
-
-        if (jsonData.result) {
-          self.formModel = jsonData.data;
-        } else {
-          self.$message.error(jsonData.message + "");
-        }
-      })
-      .catch((error) => {
-        self.$message.error(error + "");
-      });
-  },
-};
-</script>

+ 0 - 340
src/views/base/whisperingWall-list.vue

@@ -1,340 +0,0 @@
-<template>
-  <div>
-    <el-breadcrumb separator=">">
-      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-      <el-breadcrumb-item>
-        <a href="#">基础信息管理</a>
-      </el-breadcrumb-item>
-      <el-breadcrumb-item>
-        <a href="/base/whisperingWall">回音墙管理</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="question">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.question"
-        ></el-input>
-      </el-form-item>
-      <el-form-item>
-        <el-button
-          type="primary"
-          size="mini"
-          icon="ios-search"
-          @click="changePage(1)"
-          :loading="loading"
-          >查询</el-button
-        >&nbsp;
-        <el-button
-          type="info"
-          size="mini"
-          style="margin-left: 8px"
-          @click="handleReset('queryForm')"
-          >重置</el-button
-        >&nbsp;
-      </el-form-item>
-    </el-form>
-    <el-divider></el-divider>
-    <el-row class="button-group">
-      <!-- <el-button
-        type="primary"
-        size="small"
-        plain
-        icon="el-icon-circle-plus"
-        @click="handleAdd"
-        >新增</el-button
-      > -->
-      <el-button
-        type="primary"
-        size="small"
-        plain
-        icon="el-icon-circle-plus"
-        :disabled="multipleSelection.length == 0"
-        @click="handleBatchDelete"
-        >删除选中项</el-button
-      >
-    </el-row>
-    <el-table
-      :data="tableData"
-      style="min-height: 400px"
-      v-loading="loading"
-      stripe
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column
-        prop="question"
-        label="提问"
-        width="400"
-      ></el-table-column>
-      <el-table-column
-        prop="questionByN"
-        label="提问人"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="questionTime"
-        label="提问时间"
-        width="180"
-      ></el-table-column>
-      <el-table-column prop="answer" label="回答" width="400"></el-table-column>
-      <el-table-column
-        prop="answerByN"
-        label="回答人"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="answerTime"
-        label="回答时间"
-        width="180"
-      ></el-table-column>
-      <el-table-column prop="type" label="类型" width="180"></el-table-column>
-      <el-table-column label="操作" width="150" fixed="right">
-        <template slot-scope="{ row }">
-          <el-button size="mini" type="warning" @click="handleEdit(row)"
-            >编辑</el-button
-          >
-          <el-button size="mini" type="danger" @click="handleDelete(row)"
-            >删除</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      :current-page.sync="pageIndex"
-      :total="totalElements"
-      :page-sizes="pageSizeList"
-      @current-change="changePage"
-      @size-change="pageSizeChange"
-      layout="total, sizes, prev, pager, next, jumper"
-    ></el-pagination>
-    <whisperingWall-detail
-      v-if="showModal"
-      :businessKey="businessKey"
-      :title="modalTitle"
-      @close="onDetailModalClose"
-    ></whisperingWall-detail>
-  </div>
-</template>
-<script>
-import Constant from "@/constant";
-import WhisperingWallDetail from "./whisperingWall-detail";
-import whisperingWallApi from "@/api/base/whisperingWall";
-import NProgress from "nprogress"; // progress bar
-import "nprogress/nprogress.css"; // progress bar style
-
-export default {
-  name: "BaseWhisperingWallList",
-  data() {
-    var self = this;
-
-    return {
-      queryModel: {
-        id: "",
-        question: "",
-        questionBy: "",
-        questionTime: "",
-        answer: "",
-        answerBy: "",
-        answerTime: "",
-        type: "",
-        delFlag: "",
-        createBy: "",
-        createTime: "",
-        updateBy: "",
-        updateTime: "",
-      },
-      loading: false,
-      tableData: [],
-      pageIndex: 1,
-      pageSize: 10,
-      totalPages: 0,
-      totalElements: 0,
-      field: "",
-      direction: "",
-      pageSizeList: [10, 20, 30],
-      multipleSelection: [],
-      showModal: false,
-      modalTitle: "",
-      businessKey: "",
-    };
-  },
-  methods: {
-    changePage(pageIndex) {
-      var self = this;
-
-      self.loading = true;
-
-      self.pageIndex = pageIndex;
-      var formData = new FormData();
-
-      formData.append("pageIndex", self.pageIndex);
-      formData.append("pageSize", self.pageSize);
-
-      formData.append("id", self.queryModel.id);
-      formData.append("question", self.queryModel.question);
-      formData.append("questionBy", self.queryModel.questionBy);
-      formData.append("questionTime", self.queryModel.questionTime);
-      formData.append("answer", self.queryModel.answer);
-      formData.append("answerBy", self.queryModel.answerBy);
-      formData.append("answerTime", self.queryModel.answerTime);
-      formData.append("type", self.queryModel.type);
-      formData.append("delFlag", self.queryModel.delFlag);
-      formData.append("createBy", self.queryModel.createBy);
-      formData.append("createTime", self.queryModel.createTime);
-      formData.append("updateBy", self.queryModel.updateBy);
-      formData.append("updateTime", self.queryModel.updateTime);
-
-      if (this.field != null) {
-        formData.append("field", this.field);
-      }
-
-      if (this.direction != null) {
-        formData.append("direction", this.direction);
-      }
-
-      whisperingWallApi
-        .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(() => {
-          whisperingWallApi.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(() => {
-        whisperingWallApi.batchRemove(idList).then(function (response) {
-          var jsonData = response.data;
-
-          if (jsonData.result) {
-            self.changePage(self.pageIndex);
-
-            self.$message({
-              type: "success",
-              message: "删除成功!",
-            });
-          }
-        });
-      });
-    },
-    onDetailModalClose(refreshed) {
-      //保存成功后回调
-      this.showModal = false;
-
-      if (refreshed) {
-        this.changePage(this.pageIndex);
-      }
-    },
-  },
-  mounted: function () {
-    this.changePage(1);
-  },
-  components: {
-    "whisperingWall-detail": WhisperingWallDetail,
-  },
-};
-</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>

+ 22 - 36
src/views/sys/user-detail.vue

@@ -29,21 +29,7 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="企业" prop="companyId">
-          <!-- <el-select v-model="formModel.companyId" filterable placeholder="请选择" style="width:300px">
-            <el-option
-              v-for="company in companyResult"
-              :key="company.id"
-              :label="company.name"
-              :value="company.id"
-            ></el-option>
-          </el-select> -->
-          <!-- <el-select-tree
-          size="mediumn"
-          :options="companyResult"
-          v-model="formModel.companyId"
-          width="300px"
-        ></el-select-tree> -->
-        <el-select
+        <!-- <el-select
                 v-model="formModel.companyId"
                 filterable
                 placeholder="请选择"
@@ -56,7 +42,7 @@
                   :label="result.companyName"
                   :value="result.id"
                 ></el-option>
-              </el-select>
+              </el-select> -->
         </el-form-item>
         <el-form-item label="分配角色" prop="roles">
           <el-select
@@ -88,7 +74,7 @@
 import Constant from "@/constant";
 import userApi from "@/api/sys/user";
 import roleApi from "@/api/sys/role";
-import companyInfoApi from "@/api/base/companyInfo";
+// import companyInfoApi from "@/api/base/companyInfo";
 import SelectTree from "@/components/SelectTree";
 
 export default {
@@ -118,7 +104,7 @@ export default {
       showDialog: true,
       loading: false,
       submitting: false,
-      companyInfoResult:[]
+      // companyInfoResult:[]
     };
   },
   methods: {
@@ -162,16 +148,16 @@ export default {
     },
     filterMethod(query, item) {
       var self = this;
-      var formData = new FormData();
-      formData.append("pageSize", 5);
-      formData.append("companyName", query);
+      // var formData = new FormData();
+      // formData.append("pageSize", 5);
+      // formData.append("companyName", query);
 
-      companyInfoApi.list(formData).then(function (response) {
-        var jsonData = response.data;
-        if (jsonData.result) {
-          self.companyInfoResult = jsonData.data;
-        }
-      });
+      // companyInfoApi.list(formData).then(function (response) {
+      //   var jsonData = response.data;
+      //   if (jsonData.result) {
+      //     self.companyInfoResult = jsonData.data;
+      //   }
+      // });
     },
   },
   async mounted() {
@@ -201,16 +187,16 @@ export default {
 
           let companyId = self.formModel.companyId;
           if (companyId != null) {
-            var formData = new FormData();
-            formData.append("pageSize", 5);
-            formData.append("companyId", companyId);
+            // var formData = new FormData();
+            // formData.append("pageSize", 5);
+            // formData.append("companyId", companyId);
 
-            companyInfoApi.list(formData).then(function (response) {
-              var jsonData = response.data;
-              if (jsonData.result) {
-                self.companyInfoResult = jsonData.data;
-              }
-            });
+            // companyInfoApi.list(formData).then(function (response) {
+            //   var jsonData = response.data;
+            //   if (jsonData.result) {
+            //     self.companyInfoResult = jsonData.data;
+            //   }
+            // });
           }
         } else {
           self.$message.error(jsonData.message + "");

+ 10 - 31
src/views/sys/user-list.vue

@@ -20,21 +20,7 @@
       <el-form-item label="真实名称" prop="realName">
         <el-input type="text" size="mini" v-model="queryModel.realName"></el-input>
       </el-form-item>
-      <el-form-item label="所属单位" prop="companyId">
-        <!-- <el-select
-          v-model="queryModel.companyId"
-          size="mini"
-          filterable
-          placeholder="请选择"
-          style="width:200px"
-        >
-          <el-option
-            v-for="company in companyResult"
-            :key="company.id"
-            :label="company.name"
-            :value="company.id"
-          ></el-option>
-        </el-select> -->
+      <!-- <el-form-item label="所属单位" prop="companyId">
         <el-select
                 v-model="queryModel.companyId"
                 filterable
@@ -50,7 +36,7 @@
                   :value="result.id"
                 ></el-option>
               </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="角色" prop="roleId">
         <el-select
           v-model="queryModel.roleId"
@@ -188,7 +174,7 @@ import Constant from "@/constant";
 import UserDetail from "./user-detail";
 import userApi from "@/api/sys/user";
 import roleApi from "@/api/sys/role";
-import companyInfoApi from "@/api/base/companyInfo";
+// import companyInfoApi from "@/api/base/companyInfo";
 import SelectTree from "@/components/SelectTree";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
@@ -228,7 +214,7 @@ export default {
         label: "name",
         children: "children"
       },
-      companyInfoResult:[]
+      // companyInfoResult:[]
     };
   },
   methods: {
@@ -405,25 +391,18 @@ export default {
       formData.append("pageSize", 5);
       formData.append("companyName", query);
 
-      companyInfoApi.list(formData).then(function (response) {
-        var jsonData = response.data;
-        if (jsonData.result) {
-          self.companyInfoResult = jsonData.data;
-        }
-      });
+      // companyInfoApi.list(formData).then(function (response) {
+      //   var jsonData = response.data;
+      //   if (jsonData.result) {
+      //     self.companyInfoResult = jsonData.data;
+      //   }
+      // });
     },
   },
   mounted: function() {
     var self = this;
     this.changePage(1);
 
-    // companyInfoApi.list().then(function(response) {
-    //   var jsonData = response.data;
-    //   if (jsonData.result) {
-    //     self.companyResult = jsonData.data;
-    //   }
-    // });
-
     roleApi.selectAll().then(function(response) {
       var jsonData = response.data;
       if (jsonData.result) {