4 years ago · 6c1555f8e7
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1,6 @@
 
				-OUT_PUT_DIR=dist/enterprise-portal
			
 
				+OUT_PUT_DIR=dist/bus-portal
			
 
				 
			
 
				-VUE_APP_BACKEND_URL=http://127.0.0.1:8086/enterprise-federation
			
 
				+VUE_APP_BACKEND_URL=http://127.0.0.1:8086/smart-bus-server
			
 
				 #VUE_APP_BACKEND_URL=http://ykt-test.xiaoxinda.com/enterprise-server
			
 
				 #VUE_APP_BACKEND_URL=http://qylhhapi.xiaoxinda.com/enterprise-server
			
 
				 
			
--- a/.env.production
+++ b/.env.production
@@ -1,4 +1,4 @@
 
				-OUT_PUT_DIR=dist/qylhh-admin
			
 
				+OUT_PUT_DIR=dist/bus-admin
			
 
				 
			
 
				 VUE_APP_BACKEND_URL=http://qylhhapi.xiaoxinda.com/enterprise-server
			
 
				 
			
--- a/.env.test
+++ b/.env.test
@@ -1,4 +1,4 @@
 
				-OUT_PUT_DIR=dist/enterprise-portal
			
 
				+OUT_PUT_DIR=dist/bus-portal
			
 
				 
			
 
				 VUE_APP_BACKEND_URL=http://ykt-test.xiaoxinda.com/enterprise-server
			
 
				 
			
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 
				 {
			
 
				-  "name": "smart-community-server-manager",
			
 
				+  "name": "smart-bus-server-manager",
			
 
				   "version": "0.1.0",
			
 
				   "lockfileVersion": 1,
			
 
				   "requires": true,
			
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 
				 {
			
 
				-  "name": "smart-community-server-manager",
			
 
				+  "name": "smart-bus-server-manager",
			
 
				   "version": "0.1.0",
			
 
				   "private": true,
			
 
				   "scripts": {
			
--- a/public/index.html
+++ b/public/index.html
@@ -6,7 +6,7 @@
 
				     <meta name="viewport" content="width=device-width,initial-scale=1.0">
			
 
				     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
			
 
				     <script type="text/javascript" src="./static/tinymce/tinymce.min.js"></script>
			
 
				-    <title>荆州市企业联合会</title>
			
 
				+    <title>车信达</title>
			
 
				   </head>
			
 
				   <body>
			
 
				     <noscript>
			
--- a/src/api/base/activityInfo.js
+++ b/src/api/base/activityInfo.js
@@ -1,46 +0,0 @@
 
				-import request from '@/utils/request'
			
 
				-import constant from '@/constant'
			
 
				-
			
 
				-function pageList(formData){
			
 
				-  return request.post(constant.serverUrl + "/base/activityInfo/pageList", formData);
			
 
				-}
			
 
				-
			
 
				-function create(){
			
 
				-  return request.get(constant.serverUrl + "/base/activityInfo/create");
			
 
				-}
			
 
				-
			
 
				-function edit(id){
			
 
				-  return request.get(constant.serverUrl + "/base/activityInfo/edit/" + id);
			
 
				-}
			
 
				-
			
 
				-function add(formModel){
			
 
				-  return request.post(constant.serverUrl + "/base/activityInfo/add", formModel,{
			
 
				-    headers: {
			
 
				-      "Content-Type": "application/json"
			
 
				-    }
			
 
				-  });
			
 
				-}
			
 
				-
			
 
				-function update(formModel){  
			
 
				-  return request.post(constant.serverUrl + "/base/activityInfo/update", formModel,{
			
 
				-    headers: {
			
 
				-      "Content-Type": "application/json"
			
 
				-    }
			
 
				-  });
			
 
				-}
			
 
				-
			
 
				-function remove(id){
			
 
				-  return request.post(constant.serverUrl + "/base/activityInfo/delete/" + id);
			
 
				-}
			
 
				-
			
 
				-function batchRemove(idList){
			
 
				-  return request.post(constant.serverUrl + "/base/activityInfo/batchDelete",idList,{
			
 
				-    headers: {
			
 
				-      "Content-Type": "application/json"
			
 
				-    }
			
 
				-  });
			
 
				-}
			
 
				-
			
 
				-export default {
			
 
				-  pageList,create,edit,add,update,remove,batchRemove
			
 
				-}
			
--- a/src/api/base/billDetail.js
+++ b/src/api/base/billDetail.js
@@ -1,56 +0,0 @@
 
				-import request from '@/utils/request'
			
 
				-import constant from '@/constant'
			
 
				-
			
 
				-function pageList(formData) {
			
 
				-  return request.post(constant.serverUrl + "/base/billDetail/pageList", formData);
			
 
				-}
			
 
				-
			
 
				-function create() {
			
 
				-  return request.get(constant.serverUrl + "/base/billDetail/create");
			
 
				-}
			
 
				-
			
 
				-function edit(id) {
			
 
				-  return request.get(constant.serverUrl + "/base/billDetail/edit/" + id);
			
 
				-}
			
 
				-
			
 
				-function add(formModel) {
			
 
				-  return request.post(constant.serverUrl + "/base/billDetail/add", formModel, {
			
 
				-    headers: {
			
 
				-      "Content-Type": "application/json"
			
 
				-    }
			
 
				-  });
			
 
				-}
			
 
				-
			
 
				-function update(formModel) {
			
 
				-  return request.post(constant.serverUrl + "/base/billDetail/update", formModel, {
			
 
				-    headers: {
			
 
				-      "Content-Type": "application/json"
			
 
				-    }
			
 
				-  });
			
 
				-}
			
 
				-
			
 
				-function remove(id) {
			
 
				-  return request.post(constant.serverUrl + "/base/billDetail/delete/" + id);
			
 
				-}
			
 
				-
			
 
				-function batchRemove(idList) {
			
 
				-  return request.post(constant.serverUrl + "/base/billDetail/batchDelete", idList, {
			
 
				-    headers: {
			
 
				-      "Content-Type": "application/json"
			
 
				-    }
			
 
				-  });
			
 
				-}
			
 
				-
			
 
				-function pushMessage(billId) {
			
 
				-  return request.post(constant.serverUrl + "/base/billDetail/pushMessage/" + billId);
			
 
				-}
			
 
				-
			
 
				-function getBillInfo(billId) {
			
 
				-  return request.get(constant.serverUrl + "/base/billDetail/getBillInfo/" + billId);
			
 
				-}
			
 
				-
			
 
				-
			
 
				-
			
 
				-export default {
			
 
				-  pageList, create, edit, add, update, remove, batchRemove,pushMessage,getBillInfo
			
 
				-}
			
--- a/src/api/base/billInfo.js
+++ b/src/api/base/billInfo.js
@@ -1,46 +0,0 @@
 
				-import request from '@/utils/request'
			
 
				-import constant from '@/constant'
			
 
				-
			
 
				-function pageList(formData) {
			
 
				-  return request.post(constant.serverUrl + "/base/billInfo/pageList", formData);
			
 
				-}
			
 
				-
			
 
				-function create() {
			
 
				-  return request.get(constant.serverUrl + "/base/billInfo/create");
			
 
				-}
			
 
				-
			
 
				-function edit(id) {
			
 
				-  return request.get(constant.serverUrl + "/base/billInfo/edit/" + id);
			
 
				-}
			
 
				-
			
 
				-function add(formModel) {
			
 
				-  return request.post(constant.serverUrl + "/base/billInfo/add", formModel, {
			
 
				-    headers: {
			
 
				-      "Content-Type": "application/json"
			
 
				-    }
			
 
				-  });
			
 
				-}
			
 
				-
			
 
				-function update(formModel) {
			
 
				-  return request.post(constant.serverUrl + "/base/billInfo/update", formModel, {
			
 
				-    headers: {
			
 
				-      "Content-Type": "application/json"
			
 
				-    }
			
 
				-  });
			
 
				-}
			
 
				-
			
 
				-function remove(id) {
			
 
				-  return request.post(constant.serverUrl + "/base/billInfo/delete/" + id);
			
 
				-}
			
 
				-
			
 
				-function batchRemove(idList) {
			
 
				-  return request.post(constant.serverUrl + "/base/billInfo/batchDelete", idList, {
			
 
				-    headers: {
			
 
				-      "Content-Type": "application/json"
			
 
				-    }
			
 
				-  });
			
 
				-}
			
 
				-
			
 
				-export default {
			
 
				-  pageList, create, edit, add, update, remove, batchRemove
			
 
				-}
			
--- a/src/api/base/cooperationInfo.js
+++ b/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
			
 
				-}
			
--- a/src/api/base/enterpriseInfo.js
+++ b/src/api/base/enterpriseInfo.js
@@ -1,46 +0,0 @@
 
				-import request from '@/utils/request'
			
 
				-import constant from '@/constant'
			
 
				-
			
 
				-function pageList(formData){
			
 
				-  return request.post(constant.serverUrl + "/base/enterpriseInfo/pageList", formData);
			
 
				-}
			
 
				-
			
 
				-function create(){
			
 
				-  return request.get(constant.serverUrl + "/base/enterpriseInfo/create");
			
 
				-}
			
 
				-
			
 
				-function edit(id){
			
 
				-  return request.get(constant.serverUrl + "/base/enterpriseInfo/edit/" + id);
			
 
				-}
			
 
				-
			
 
				-function add(formModel){
			
 
				-  return request.post(constant.serverUrl + "/base/enterpriseInfo/add", formModel,{
			
 
				-    headers: {
			
 
				-      "Content-Type": "application/json"
			
 
				-    }
			
 
				-  });
			
 
				-}
			
 
				-
			
 
				-function update(formModel){  
			
 
				-  return request.post(constant.serverUrl + "/base/enterpriseInfo/update", formModel,{
			
 
				-    headers: {
			
 
				-      "Content-Type": "application/json"
			
 
				-    }
			
 
				-  });
			
 
				-}
			
 
				-
			
 
				-function remove(id){
			
 
				-  return request.post(constant.serverUrl + "/base/enterpriseInfo/delete/" + id);
			
 
				-}
			
 
				-
			
 
				-function batchRemove(idList){
			
 
				-  return request.post(constant.serverUrl + "/base/enterpriseInfo/batchDelete",idList,{
			
 
				-    headers: {
			
 
				-      "Content-Type": "application/json"
			
 
				-    }
			
 
				-  });
			
 
				-}
			
 
				-
			
 
				-export default {
			
 
				-  pageList,create,edit,add,update,remove,batchRemove
			
 
				-}
			
--- a/src/api/base/industryInfo.js
+++ b/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
			
 
				-}
			
--- a/src/api/base/messageInfo.js
+++ b/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
			
 
				-}
			
--- a/src/api/base/messageReceiver.js
+++ b/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
			
 
				-}
			
--- a/src/api/base/messageType.js
+++ b/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
			
 
				-}
			
--- a/src/api/base/newsInfo.js
+++ b/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
			
 
				-}
			
--- a/src/api/base/newsType.js
+++ b/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
			
 
				-}
			
--- a/src/api/base/personInfo.js
+++ b/src/api/base/personInfo.js
@@ -1,60 +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 getPersonData(idList){
			
 
				-  return request.post(constant.serverUrl + "/base/personInfo/getPersonData",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,getPersonData
			
 
				-}
			
--- a/src/api/base/recruitInfo.js
+++ b/src/api/base/recruitInfo.js
@@ -1,46 +0,0 @@
 
				-import request from '@/utils/request'
			
 
				-import constant from '@/constant'
			
 
				-
			
 
				-function pageList(formData){
			
 
				-  return request.post(constant.serverUrl + "/base/recruitInfo/pageList", formData);
			
 
				-}
			
 
				-
			
 
				-function create(){
			
 
				-  return request.get(constant.serverUrl + "/base/recruitInfo/create");
			
 
				-}
			
 
				-
			
 
				-function edit(id){
			
 
				-  return request.get(constant.serverUrl + "/base/recruitInfo/edit/" + id);
			
 
				-}
			
 
				-
			
 
				-function add(formModel){
			
 
				-  return request.post(constant.serverUrl + "/base/recruitInfo/add", formModel,{
			
 
				-    headers: {
			
 
				-      "Content-Type": "application/json"
			
 
				-    }
			
 
				-  });
			
 
				-}
			
 
				-
			
 
				-function update(formModel){  
			
 
				-  return request.post(constant.serverUrl + "/base/recruitInfo/update", formModel,{
			
 
				-    headers: {
			
 
				-      "Content-Type": "application/json"
			
 
				-    }
			
 
				-  });
			
 
				-}
			
 
				-
			
 
				-function remove(id){
			
 
				-  return request.post(constant.serverUrl + "/base/recruitInfo/delete/" + id);
			
 
				-}
			
 
				-
			
 
				-function batchRemove(idList){
			
 
				-  return request.post(constant.serverUrl + "/base/recruitInfo/batchDelete",idList,{
			
 
				-    headers: {
			
 
				-      "Content-Type": "application/json"
			
 
				-    }
			
 
				-  });
			
 
				-}
			
 
				-
			
 
				-export default {
			
 
				-  pageList,create,edit,add,update,remove,batchRemove
			
 
				-}
			
--- a/src/api/base/whisperingWall.js
+++ b/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
			
 
				-}
			
--- a/src/routers/modules/base.js
+++ b/src/routers/modules/base.js
@@ -10,134 +10,6 @@ var routers = [
 
				                         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/pushMessage/list',
			
 
				-                name: 'BasePushMessageList',
			
 
				-                // 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/pushMessage-list.vue'),
			
 
				-                meta: {
			
 
				-                        roles: ["admin"],
			
 
				-                        title: '推送消息管理'
			
 
				-                }
			
 
				-        },
			
 
				-        {
			
 
				-                path: '/base/billInfo/list',
			
 
				-                name: 'BaseBillInfoList',
			
 
				-                // 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/billInfo-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: '企业互助管理'
			
 
				-                }
			
 
				-        },
			
 
				-        {
			
 
				-                path: '/base/activityInfo/list',
			
 
				-                name: 'BaseActivityInfoList',
			
 
				-                // route level code-splitting
			
 
				-                // this generates a separate chunk (about.[hash].js) for this route
			
 
				-                // which is lazy-loaded when the route is visited.
			
 
				-                component: () => import('@/views/base/activityInfo-list.vue'),
			
 
				-                meta: {
			
 
				-                        roles: ["admin"],
			
 
				-                        title: '企联活动管理'
			
 
				-                }
			
 
				-        },
			
 
				-        {
			
 
				-                path: '/base/recruitInfo/list',
			
 
				-                name: 'BaseRecruitInfoList',
			
 
				-                // route level code-splitting
			
 
				-                // this generates a separate chunk (about.[hash].js) for this route
			
 
				-                // which is lazy-loaded when the route is visited.
			
 
				-                component: () => import('@/views/base/recruitInfo-list.vue'),
			
 
				-                meta: {
			
 
				-                        roles: ["admin"],
			
 
				-                        title: '企业招聘管理'
			
 
				-                }
			
 
				         },
			
 
				 ]
			
 
				 
			
--- a/src/views/base/activityInfo-detail.vue
+++ b/src/views/base/activityInfo-detail.vue
@@ -1,261 +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="title">
			
 
				-          <el-input
			
 
				-            v-model="formModel.title"
			
 
				-            placeholder="请输入标题"
			
 
				-            style="width: 300px"
			
 
				-          ></el-input>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="封面图片" prop="picUrl">
			
 
				-          <el-upload
			
 
				-            class="avatar-uploader"
			
 
				-            name="photoFile"
			
 
				-            :action="uploadImgUrl"
			
 
				-            :show-file-list="false"
			
 
				-            :headers="headers"
			
 
				-            :data="uploadData"
			
 
				-            :on-success="handleAvatarSuccess"
			
 
				-            :before-upload="beforeAvatarUpload"
			
 
				-            accept="image/png,image/jpeg"
			
 
				-          >
			
 
				-            <img v-if="fileUrl" :src="fileUrl" class="avatar" />
			
 
				-            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
			
 
				-          </el-upload>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="活动时间" prop="activityTime">
			
 
				-          <el-date-picker
			
 
				-            v-model="activityTime"
			
 
				-            type="datetimerange"
			
 
				-            range-separator="至"
			
 
				-            start-placeholder="开始日期"
			
 
				-            end-placeholder="结束日期"
			
 
				-            value-format="yyyy-MM-dd HH:mm"
			
 
				-            @blur="changePackageTime"
			
 
				-          >
			
 
				-          </el-date-picker>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="内容" prop="content">
			
 
				-          <mce-editor
			
 
				-            ref="editor"
			
 
				-            uploadName="upfile"
			
 
				-            v-model="formModel.content"
			
 
				-            :url="uploadUrl"
			
 
				-            :config="editorConfig"
			
 
				-          ></mce-editor>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="排序" prop="sortNo">
			
 
				-          <el-input-number
			
 
				-            v-model="formModel.sortNo"
			
 
				-            style="width: 150px"
			
 
				-            min="1"
			
 
				-            max="99"
			
 
				-          ></el-input-number>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="是否上架" prop="status">
			
 
				-          <el-radio-group v-model="formModel.status">
			
 
				-            <el-radio :label="true">是</el-radio>
			
 
				-            <el-radio :label="false">否</el-radio>
			
 
				-          </el-radio-group>
			
 
				-        </el-form-item>
			
 
				-      </el-form>
			
 
				-    </div>
			
 
				-    <span slot="footer" class="dialog-footer">
			
 
				-      <el-button @click="closeDialog">取 消</el-button>
			
 
				-      <el-button type="primary" @click="handleSubmit" :loading="submitting"
			
 
				-        >确 定</el-button
			
 
				-      >
			
 
				-    </span>
			
 
				-  </el-dialog>
			
 
				-</template>
			
 
				-<script>
			
 
				-import Constant from "@/constant";
			
 
				-import activityInfoApi from "@/api/base/activityInfo";
			
 
				-import dataDictionaryApi from "@/api/sys/dataDictionary";
			
 
				-import MceEditor from "@/components/Tinymce";
			
 
				-import { getToken } from "@/utils/auth";
			
 
				-
			
 
				-export default {
			
 
				-  props: ["businessKey", "title"],
			
 
				-  components: {
			
 
				-    "mce-editor": MceEditor,
			
 
				-  },
			
 
				-  data() {
			
 
				-    return {
			
 
				-      formModel: {},
			
 
				-      ruleValidate: {
			
 
				-        picUrl: [
			
 
				-          { required: true, message: "图片地址不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-        title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
			
 
				-        content: [{ required: true, message: "内容不能为空", trigger: "blur" }],
			
 
				-        activityTime: [
			
 
				-          { required: false, message: "活动时间不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-        status: [
			
 
				-          { required: true, message: "是否上架不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-      },
			
 
				-      showDialog: true,
			
 
				-      loading: false,
			
 
				-      submitting: false,
			
 
				-      editorConfig: {
			
 
				-        height: 400,
			
 
				-        width: "90%",
			
 
				-      },
			
 
				-      uploadUrl: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
			
 
				-      typeList: [],
			
 
				-      props: {
			
 
				-        // 配置项（必选）
			
 
				-        value: "id",
			
 
				-        label: "name",
			
 
				-      },
			
 
				-      uploadImgUrl: Constant.serverUrl + "/uploadPicture",
			
 
				-      uploadData: {
			
 
				-        subFolder: "newsInfo",
			
 
				-      },
			
 
				-      fileUrl: "",
			
 
				-      headers: {
			
 
				-        Authorization: getToken(),
			
 
				-      },
			
 
				-      activityTime: ["", ""],
			
 
				-    };
			
 
				-  },
			
 
				-  created() {
			
 
				-    var self = this;
			
 
				-  },
			
 
				-  methods: {
			
 
				-    closeDialog() {
			
 
				-      this.$emit("close", false);
			
 
				-    },
			
 
				-    handleAvatarSuccess(res, file) {
			
 
				-      this.loading = false;
			
 
				-      var self = this;
			
 
				-      self.formModel.picUrl = res.data;
			
 
				-      self.fileUrl = res.data + "?x-oss-process=image/resize,m_lfit,w_200";
			
 
				-    },
			
 
				-    beforeAvatarUpload(file) {
			
 
				-      this.loading = true;
			
 
				-      // const isJPG = file.type === "image/jpeg";
			
 
				-      const isLt2M = file.size / 1024 / 1024 < 2;
			
 
				-
			
 
				-      // if (!isJPG) {
			
 
				-      //   this.$message.error("上传图片只能是 JPG 格式!");
			
 
				-      // }
			
 
				-      if (!isLt2M) {
			
 
				-        this.$message.error("上传图片大小不能超过 2MB!");
			
 
				-      }
			
 
				-      return isLt2M;
			
 
				-    },
			
 
				-    changePackageTime() {
			
 
				-      this.formModel.startTime = this.activityTime[0];
			
 
				-      this.formModel.endTime = this.activityTime[1];
			
 
				-    },
			
 
				-    handleSubmit() {
			
 
				-      var self = this;
			
 
				-
			
 
				-      this.$refs["form"].validate((valid) => {
			
 
				-        if (valid) {
			
 
				-          (function () {
			
 
				-            var id = self.formModel.id;
			
 
				-
			
 
				-            if (id == null || id.length == 0) {
			
 
				-              return activityInfoApi.add(self.formModel);
			
 
				-            } else {
			
 
				-              return activityInfoApi.update(self.formModel);
			
 
				-            }
			
 
				-          })().then(function (response) {
			
 
				-            var jsonData = response.data;
			
 
				-
			
 
				-            if (jsonData.result) {
			
 
				-              self.$message({
			
 
				-                message: "保存成功!",
			
 
				-                type: "success",
			
 
				-              });
			
 
				-
			
 
				-              self.$emit("close", true);
			
 
				-            } else {
			
 
				-              self.$message({
			
 
				-                message: jsonData.message + "",
			
 
				-                type: "warning",
			
 
				-              });
			
 
				-
			
 
				-              self.$emit("close", false);
			
 
				-            }
			
 
				-          });
			
 
				-        }
			
 
				-      });
			
 
				-    },
			
 
				-  },
			
 
				-  mounted: function () {
			
 
				-    var self = this;
			
 
				-
			
 
				-    (function () {
			
 
				-      if (self.businessKey.length == 0) {
			
 
				-        return activityInfoApi.create();
			
 
				-      } else {
			
 
				-        return activityInfoApi.edit(self.businessKey);
			
 
				-      }
			
 
				-    })()
			
 
				-      .then((response) => {
			
 
				-        var jsonData = response.data;
			
 
				-        self.loading = false;
			
 
				-        if (jsonData.result) {
			
 
				-          self.formModel = jsonData.data;
			
 
				-
			
 
				-          if (self.formModel.content != null) {
			
 
				-            self.$refs.editor.setContent(self.formModel.content);
			
 
				-          }
			
 
				-          let picUrl = self.formModel.picUrl;
			
 
				-          if (picUrl != null) {
			
 
				-            self.fileUrl = picUrl + "?x-oss-process=image/resize,m_lfit,w_200";
			
 
				-          }
			
 
				-
			
 
				-          let startTime = self.formModel.startTime;
			
 
				-          // if (startTime != null) {
			
 
				-          //   self.activityTime[0] = new Date(startTime);
			
 
				-          // }
			
 
				-          let endTime = self.formModel.endTime;
			
 
				-          // if (endTime != null) {
			
 
				-          //   self.activityTime[1] = new Date(endTime);
			
 
				-          // }
			
 
				-
			
 
				-          if (startTime != null) {
			
 
				-            self.activityTime = [new Date(startTime), new Date(endTime)];
			
 
				-          }
			
 
				-
			
 
				-          let status = self.formModel.status;
			
 
				-          if (status == null) {
			
 
				-            self.formModel.status = false;
			
 
				-          }
			
 
				-          //activityTime
			
 
				-        } else {
			
 
				-          self.$message.error(jsonData.message + "");
			
 
				-        }
			
 
				-      })
			
 
				-      .catch((error) => {
			
 
				-        self.$message.error(error + "");
			
 
				-      });
			
 
				-  },
			
 
				-};
			
 
				-</script>
			
--- a/src/views/base/activityInfo-list.vue
+++ b/src/views/base/activityInfo-list.vue
@@ -1,366 +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="/activityInfo">活动管理</a>
			
 
				-      </el-breadcrumb-item>
			
 
				-    </el-breadcrumb>
			
 
				-    <el-divider></el-divider>
			
 
				-    <!--
			
 
				-      要resetFields起作用，必须配置:model和prop
			
 
				-    -->
			
 
				-    <el-form
			
 
				-      ref="queryForm"
			
 
				-      :model="queryModel"
			
 
				-      inline
			
 
				-      class="demo-form-inline"
			
 
				-    >
			
 
				-      <el-form-item label="标题" prop="title">
			
 
				-        <el-input type="text" size="mini" v-model="queryModel.title"></el-input>
			
 
				-      </el-form-item>
			
 
				-      <el-form-item>
			
 
				-        <el-button
			
 
				-          type="primary"
			
 
				-          size="mini"
			
 
				-          icon="ios-search"
			
 
				-          @click="changePage(1)"
			
 
				-          :loading="loading"
			
 
				-          >查询</el-button
			
 
				-        >&nbsp;
			
 
				-        <el-button
			
 
				-          type="info"
			
 
				-          size="mini"
			
 
				-          style="margin-left: 8px"
			
 
				-          @click="handleReset('queryForm')"
			
 
				-          >重置</el-button
			
 
				-        >&nbsp;
			
 
				-      </el-form-item>
			
 
				-    </el-form>
			
 
				-    <el-divider></el-divider>
			
 
				-    <el-row class="button-group">
			
 
				-      <el-button
			
 
				-        type="primary"
			
 
				-        size="small"
			
 
				-        plain
			
 
				-        icon="el-icon-circle-plus"
			
 
				-        @click="handleAdd"
			
 
				-        >新增</el-button
			
 
				-      >
			
 
				-      <el-button
			
 
				-        type="primary"
			
 
				-        size="small"
			
 
				-        plain
			
 
				-        icon="el-icon-circle-plus"
			
 
				-        :disabled="multipleSelection.length == 0"
			
 
				-        @click="handleBatchDelete"
			
 
				-        >删除选中项</el-button
			
 
				-      >
			
 
				-    </el-row>
			
 
				-    <el-table
			
 
				-      :data="tableData"
			
 
				-      style="min-height: 400px"
			
 
				-      v-loading="loading"
			
 
				-      stripe
			
 
				-      @sort-change="sortChange"
			
 
				-      @selection-change="handleSelectionChange"
			
 
				-    >
			
 
				-      <el-table-column type="selection" width="55"></el-table-column>
			
 
				-      <el-table-column
			
 
				-        type="index"
			
 
				-        label="序号"
			
 
				-        :index="indexMethod"
			
 
				-        width="50"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column prop="title" label="标题" width="180" show-overflow-tooltip></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="startTime"
			
 
				-        label="开始日期"
			
 
				-        width="150"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="endTime"
			
 
				-        label="结束日期"
			
 
				-        width="150"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="picUrl"
			
 
				-        label="封面图片"
			
 
				-        width="150"
			
 
				-      >
			
 
				-        <template slot-scope="{ row }">
			
 
				-          <a :href="row.picUrl" target="_blank">
			
 
				-            <el-avatar
			
 
				-              :size="48"
			
 
				-              shape="circle"
			
 
				-              :src="row.picUrl + '?x-oss-process=image/resize,m_fill,w_64,h_64'"
			
 
				-              :key="row.id"
			
 
				-            ></el-avatar>
			
 
				-          </a>
			
 
				-        </template>
			
 
				-      </el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="status"
			
 
				-        label="上架状态"
			
 
				-        width="150"
			
 
				-      >
			
 
				-      <template slot-scope="{row}">
			
 
				-        <span v-if="row.status">已上架</span>
			
 
				-        <span v-else>未上架</span>
			
 
				-      </template>
			
 
				-      </el-table-column>
			
 
				-      <el-table-column prop="sortNo" label="排序" width="80"></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="createTime"
			
 
				-        label="创建时间"
			
 
				-        width="150"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="updateTime"
			
 
				-        label="更新时间"
			
 
				-        width="150"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column label="操作" width="150">
			
 
				-        <template slot-scope="{ row }">
			
 
				-          <el-button size="mini" type="warning" @click="handleEdit(row)"
			
 
				-            >编辑</el-button
			
 
				-          >
			
 
				-          <el-button size="mini" type="danger" @click="handleDelete(row)"
			
 
				-            >删除</el-button
			
 
				-          >
			
 
				-        </template>
			
 
				-      </el-table-column>
			
 
				-    </el-table>
			
 
				-    <el-pagination
			
 
				-      :current-page.sync="pageIndex"
			
 
				-      :total="totalElements"
			
 
				-      :page-sizes="pageSizeList"
			
 
				-      @current-change="changePage"
			
 
				-      @size-change="pageSizeChange"
			
 
				-      layout="total, sizes, prev, pager, next, jumper"
			
 
				-    ></el-pagination>
			
 
				-    <activityInfo-detail
			
 
				-      v-if="showModal"
			
 
				-      :businessKey="businessKey"
			
 
				-      :title="modalTitle"
			
 
				-      @close="onDetailModalClose"
			
 
				-    ></activityInfo-detail>
			
 
				-  </div>
			
 
				-</template>
			
 
				-<script>
			
 
				-import Constant from "@/constant";
			
 
				-import ActivityInfoDetail from "./activityInfo-detail";
			
 
				-import activityInfoApi from "@/api/base/activityInfo";
			
 
				-import NProgress from "nprogress"; // progress bar
			
 
				-import "nprogress/nprogress.css"; // progress bar style
			
 
				-
			
 
				-export default {
			
 
				-  name:"BaseActivityInfoList",
			
 
				-  data() {
			
 
				-    var self = this;
			
 
				-
			
 
				-    return {
			
 
				-      queryModel: {
			
 
				-        id: "",
			
 
				-        title: "",
			
 
				-        startTime: "",
			
 
				-        endTime: "",
			
 
				-        picUrl: "",
			
 
				-        content: "",
			
 
				-        status: "",
			
 
				-        createBy: "",
			
 
				-        createTime: "",
			
 
				-        updateBy: "",
			
 
				-        updateTime: "",
			
 
				-        delFlag: "",
			
 
				-        sortNo: "",
			
 
				-      },
			
 
				-      loading: false,
			
 
				-      tableData: [],
			
 
				-      pageIndex: 1,
			
 
				-      pageSize: 10,
			
 
				-      totalPages: 0,
			
 
				-      totalElements: 0,
			
 
				-      field: "",
			
 
				-      direction: "",
			
 
				-      pageSizeList: [10, 20, 30],
			
 
				-      multipleSelection: [],
			
 
				-      showModal: false,
			
 
				-      modalTitle: "",
			
 
				-      businessKey: "",
			
 
				-    };
			
 
				-  },
			
 
				-  methods: {
			
 
				-    indexMethod(index) {
			
 
				-      return (this.pageIndex - 1) * this.pageSize + (index + 1);
			
 
				-    },
			
 
				-    changePage(pageIndex) {
			
 
				-      var self = this;
			
 
				-
			
 
				-      self.loading = true;
			
 
				-
			
 
				-      self.pageIndex = pageIndex;
			
 
				-      var formData = new FormData();
			
 
				-
			
 
				-      formData.append("pageIndex", self.pageIndex);
			
 
				-      formData.append("pageSize", self.pageSize);
			
 
				-
			
 
				-      formData.append("id", self.queryModel.id);
			
 
				-      formData.append("title", self.queryModel.title);
			
 
				-      formData.append("startTime", self.queryModel.startTime);
			
 
				-      formData.append("endTime", self.queryModel.endTime);
			
 
				-      formData.append("picUrl", self.queryModel.picUrl);
			
 
				-      formData.append("content", self.queryModel.content);
			
 
				-      formData.append("status", self.queryModel.status);
			
 
				-      formData.append("createBy", self.queryModel.createBy);
			
 
				-      formData.append("createTime", self.queryModel.createTime);
			
 
				-      formData.append("updateBy", self.queryModel.updateBy);
			
 
				-      formData.append("updateTime", self.queryModel.updateTime);
			
 
				-      formData.append("delFlag", self.queryModel.delFlag);
			
 
				-      formData.append("sortNo", self.queryModel.sortNo);
			
 
				-
			
 
				-      if (this.field != null) {
			
 
				-        formData.append("field", this.field);
			
 
				-      }
			
 
				-
			
 
				-      if (this.direction != null) {
			
 
				-        formData.append("direction", this.direction);
			
 
				-      }
			
 
				-
			
 
				-      activityInfoApi
			
 
				-        .pageList(formData)
			
 
				-        .then(function (response) {
			
 
				-          self.loading = false;
			
 
				-
			
 
				-          var jsonData = response.data.data;
			
 
				-
			
 
				-          self.tableData = jsonData.data;
			
 
				-          self.totalPages = jsonData.totalPages;
			
 
				-          self.totalElements = jsonData.recordsTotal;
			
 
				-        })
			
 
				-        .catch((error) => {
			
 
				-          self.loading = false;
			
 
				-          // self.$message.error(error + "");
			
 
				-        });
			
 
				-    },
			
 
				-    pageSizeChange(pageSize) {
			
 
				-      this.pageSize = pageSize;
			
 
				-
			
 
				-      this.$nextTick(() => {
			
 
				-        this.changePage(this.pageIndex);
			
 
				-      });
			
 
				-    },
			
 
				-    sortChange(data) {
			
 
				-      this.field = data.column.field;
			
 
				-      this.direction = data.order;
			
 
				-
			
 
				-      this.changePage(this.pageIndex);
			
 
				-    },
			
 
				-    handleSelectionChange(val) {
			
 
				-      this.multipleSelection = val;
			
 
				-    },
			
 
				-    handleReset(name) {
			
 
				-      this.$refs[name].resetFields();
			
 
				-    },
			
 
				-    handleAdd() {
			
 
				-      this.modalTitle = "新增";
			
 
				-      this.businessKey = "";
			
 
				-      this.showModal = true;
			
 
				-    },
			
 
				-    handleEdit(record) {
			
 
				-      this.modalTitle = "编辑";
			
 
				-      this.businessKey = record.id;
			
 
				-      this.showModal = true;
			
 
				-    },
			
 
				-    handleDelete(record) {
			
 
				-      var self = this;
			
 
				-
			
 
				-      self
			
 
				-        .$confirm("是否确认删除?", "提示", {
			
 
				-          confirmButtonText: "确定",
			
 
				-          cancelButtonText: "取消",
			
 
				-          type: "warning",
			
 
				-        })
			
 
				-        .then(() => {
			
 
				-          activityInfoApi.remove(record.id).then(function (response) {
			
 
				-            var jsonData = response.data;
			
 
				-
			
 
				-            if (jsonData.result) {
			
 
				-              // var index = self.tableData.indexOf(record);
			
 
				-              // self.tableData.splice(index, 1);
			
 
				-              self.changePage(self.pageIndex);
			
 
				-
			
 
				-              self.$message({
			
 
				-                type: "success",
			
 
				-                message: "删除成功!",
			
 
				-              });
			
 
				-            }
			
 
				-          });
			
 
				-        });
			
 
				-    },
			
 
				-    handleBatchDelete() {
			
 
				-      var self = this;
			
 
				-
			
 
				-      var idList = this.multipleSelection.map((record) => {
			
 
				-        return record.id;
			
 
				-      });
			
 
				-
			
 
				-      this.$confirm("是否确认删除选中项？", "提示", {
			
 
				-        confirmButtonText: "确定",
			
 
				-        cancelButtonText: "取消",
			
 
				-        type: "warning",
			
 
				-      }).then(() => {
			
 
				-        activityInfoApi.batchRemove(idList).then(function (response) {
			
 
				-          var jsonData = response.data;
			
 
				-
			
 
				-          if (jsonData.result) {
			
 
				-            self.changePage(self.pageIndex);
			
 
				-
			
 
				-            self.$message({
			
 
				-              type: "success",
			
 
				-              message: "删除成功!",
			
 
				-            });
			
 
				-          }
			
 
				-        });
			
 
				-      });
			
 
				-    },
			
 
				-    onDetailModalClose(refreshed) {
			
 
				-      //保存成功后回调
			
 
				-      this.showModal = false;
			
 
				-
			
 
				-      if (refreshed) {
			
 
				-        this.changePage(this.pageIndex);
			
 
				-      }
			
 
				-    },
			
 
				-  },
			
 
				-  mounted: function () {
			
 
				-    this.changePage(1);
			
 
				-  },
			
 
				-  components: {
			
 
				-    "activityInfo-detail": ActivityInfoDetail,
			
 
				-  },
			
 
				-};
			
 
				-</script>
			
 
				-<style lang="scss" scoped>
			
 
				-.el-breadcrumb {
			
 
				-  margin: 10px;
			
 
				-  line-height: 20px;
			
 
				-}
			
 
				-
			
 
				-.el-divider {
			
 
				-  margin: 5px 0;
			
 
				-}
			
 
				-
			
 
				-.demo-form-inline {
			
 
				-  margin-left: 10px;
			
 
				-  text-align: left;
			
 
				-}
			
 
				-
			
 
				-.button-group {
			
 
				-  margin-left: 10px;
			
 
				-  text-align: left;
			
 
				-}
			
 
				-</style>
			
--- a/src/views/base/billDetail-detail.vue
+++ b/src/views/base/billDetail-detail.vue
@@ -1,134 +0,0 @@
 
				-<template>
			
 
				-    <el-dialog
			
 
				-        :visible.sync="showDialog"
			
 
				-        :title="title"
			
 
				-        :modal-append-to-body="true"
			
 
				-        style="text-align: left"
			
 
				-        @close="closeDialog"
			
 
				-        :close-on-click-modal="false"
			
 
				-        append-to-body
			
 
				-        width="30%"
			
 
				-    >
			
 
				-        <div class="user-panel" v-loading="loading">
			
 
				-        <el-form
			
 
				-            ref="form"
			
 
				-            :model="formModel"
			
 
				-            :rules="ruleValidate"
			
 
				-            :label-width="'100px'"
			
 
				-        >
			
 
				-            <el-form-item :label = item.key :prop = item.val v-for="(item, index) in domains" :key="index" >
			
 
				-                <el-input v-model="item.val" type="number"></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 billDetailApi from "@/api/base/billDetail";
			
 
				-export default {
			
 
				-    props: ["businessKey", "title"],
			
 
				-    data() {
			
 
				-        return {
			
 
				-            formModel: {},
			
 
				-            ruleValidate: {
			
 
				-                industryName: [
			
 
				-                    { required: true, message: "行业名称不能为空", trigger: "blur" },
			
 
				-                    ],
			
 
				-                    sortNo:[
			
 
				-                    { required: true, message: "不能为空", trigger: "blur" },
			
 
				-                ]
			
 
				-            },
			
 
				-            domains:[],
			
 
				-            showDialog: true,
			
 
				-            loading: false,
			
 
				-            submitting: false,
			
 
				-            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;
			
 
				-
			
 
				-                    self.formModel.billDetailList = self.domains;
			
 
				-
			
 
				-                    if (id == null || id.length == 0) {
			
 
				-                        return billDetailApi.add(self.formModel);
			
 
				-                    } else {
			
 
				-                        return billDetailApi.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 billDetailApi.create();
			
 
				-        } else {
			
 
				-            return billDetailApi.edit(self.businessKey);
			
 
				-        }
			
 
				-        })()
			
 
				-        .then((response) => {
			
 
				-            var jsonData = response.data;
			
 
				-            self.loading = false;
			
 
				-
			
 
				-            if (jsonData.result) {
			
 
				-                self.domains = jsonData.data.billDetailList;
			
 
				-                self.formModel.id = jsonData.data.id;
			
 
				-
			
 
				-                //self.formModel = jsonData.data;
			
 
				-            } else {
			
 
				-                self.$message.error(jsonData.message + "");
			
 
				-            }
			
 
				-        })
			
 
				-        .catch((error) => {
			
 
				-            self.$message.error(error + "");
			
 
				-        });
			
 
				-    },
			
 
				-}
			
 
				-</script>
			
 
				-<style scoped>
			
 
				-.user-panel {
			
 
				-  margin: 10px auto;
			
 
				-}
			
 
				-</style>
			
--- a/src/views/base/billDetail-list.vue
+++ b/src/views/base/billDetail-list.vue
@@ -1,454 +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"
			
 
				-        width="70%"
			
 
				-    >
			
 
				-        <!-- <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>
			
 
				-                <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-row class="button-group">
			
 
				-            <el-button
			
 
				-                type="primary"
			
 
				-                size="small"
			
 
				-                plain
			
 
				-                icon="el-icon-upload2"
			
 
				-                @click="batchImportVisible = true"
			
 
				-                v-if="this.showPushBtn"
			
 
				-                >导入</el-button
			
 
				-            >
			
 
				-            <el-button
			
 
				-                type="success"
			
 
				-                size="small"
			
 
				-                plain
			
 
				-                icon="el-icon-s-promotion"
			
 
				-                @click="pushMessage"
			
 
				-                v-if="this.showPushBtn"
			
 
				-                >推送账单消息</el-button
			
 
				-            >
			
 
				-        </el-row>
			
 
				-        <el-table
			
 
				-            :data="tableData"
			
 
				-            style="min-height: 400px"
			
 
				-            v-loading="loading"
			
 
				-            stripe
			
 
				-            @sort-change="sortChange"
			
 
				-            >
			
 
				-            <el-table-column
			
 
				-                type="index"
			
 
				-                label="序号"
			
 
				-                :index="indexMethod"
			
 
				-            ></el-table-column>
			
 
				-            <el-table-column
			
 
				-                prop="companyName"
			
 
				-                label="企业名称"
			
 
				-            ></el-table-column>
			
 
				-            <el-table-column
			
 
				-                prop="billDetail"
			
 
				-                label="账单明细"
			
 
				-            ></el-table-column>
			
 
				-            <el-table-column prop="rushStatus" label="推送状态">
			
 
				-                <template slot-scope="{ row }">
			
 
				-                    <span v-if="row.rushStatus==0">未推送</span>
			
 
				-                    <span v-else-if="row.rushStatus==1">已推送</span>
			
 
				-                </template>
			
 
				-            </el-table-column>
			
 
				-            <el-table-column
			
 
				-                prop="payStatusN"
			
 
				-                label="支付状态"
			
 
				-            ></el-table-column>
			
 
				-            <el-table-column prop="isTicketUrl" label="是否上传发票">
			
 
				-                <template slot-scope="{ row }">
			
 
				-                    <span v-if="row.isTicketUrl">
			
 
				-                        <el-link type="primary" :href="row.ticketUrl">已上传</el-link>
			
 
				-                    </span>
			
 
				-                    <span v-else>未上传</span>
			
 
				-                </template>
			
 
				-            </el-table-column>
			
 
				-            <el-table-column label="操作"  width="250" >
			
 
				-                <template slot-scope="{ row }">
			
 
				-                    <el-button v-if="row.payStatus!=20" size="mini" type="warning" @click="handleEdit(row)"
			
 
				-                        >编辑</el-button
			
 
				-                    >
			
 
				-                    <el-button v-if="row.payStatus!=20" size="mini" type="danger" @click="handleDelete(row)"
			
 
				-                        >删除</el-button
			
 
				-                    >
			
 
				-                    <el-upload
			
 
				-                        class="avatar-uploader"
			
 
				-                        name="uploadFile"
			
 
				-                        :action="uploadUrl"
			
 
				-                        :show-file-list="false"
			
 
				-                        :headers="headers"
			
 
				-                        :data="uploadData"
			
 
				-                        :on-success="handleAvatarSuccess"
			
 
				-                        :before-upload="beforeAvatarUpload"
			
 
				-                    >
			
 
				-                        <el-button v-if="row.payStatus==20" size="mini" type="primary" @click="handleLoad(row)"
			
 
				-                            >发票上传</el-button
			
 
				-                        >
			
 
				-                    </el-upload>
			
 
				-                </template>
			
 
				-            </el-table-column>
			
 
				-            </el-table>
			
 
				-            <el-pagination
			
 
				-            style="text-align: center"
			
 
				-            :current-page.sync="pageIndex"
			
 
				-            :total="totalElements"
			
 
				-            :page-sizes="pageSizeList"
			
 
				-            @current-change="changePage"
			
 
				-            @size-change="pageSizeChange"
			
 
				-            layout="total, sizes, prev, pager, next, jumper"
			
 
				-            ></el-pagination>
			
 
				-            <billDetail-detail
			
 
				-                v-if="showModal"
			
 
				-                :businessKey="businessKey"
			
 
				-                :title="modalTitle"
			
 
				-                @close="onDetailModalClose"
			
 
				-            ></billDetail-detail>
			
 
				-            <!--批量导入S-->
			
 
				-            <el-dialog
			
 
				-            title="导入"
			
 
				-            :visible.sync="batchImportVisible"
			
 
				-            :modal-append-to-body="true"
			
 
				-            style="text-align: left"
			
 
				-            :close-on-click-modal="false"
			
 
				-            append-to-body
			
 
				-            >
			
 
				-            <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%E8%B4%A6%E5%8D%95%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-->
			
 
				-    </el-dialog>
			
 
				-</template>
			
 
				-<script>
			
 
				-import Constant from "@/constant";
			
 
				-import billDetailApi from "@/api/base/billDetail";
			
 
				-import billDetailDetail from "./billDetail-detail";
			
 
				-import "nprogress/nprogress.css"; // progress bar style
			
 
				-import { getToken } from "@/utils/auth"; // get token from cookie
			
 
				-
			
 
				-export default {
			
 
				-    props: ["businessKey", "title"],
			
 
				-    data(){
			
 
				-        return {
			
 
				-            queryModel: {},
			
 
				-            showDialog: true,
			
 
				-            showPushBtn:true,
			
 
				-            loading: false,
			
 
				-            submitting: false,
			
 
				-            tableData: [],
			
 
				-            pageIndex: 1,
			
 
				-            pageSize: 10,
			
 
				-            totalPages: 0,
			
 
				-            totalElements: 0,
			
 
				-            field: "",
			
 
				-            direction: "",
			
 
				-            pageSizeList: [10, 20, 30],
			
 
				-            multipleSelection: [],
			
 
				-            showModal: false,
			
 
				-            batchImportVisible: false,
			
 
				-            batchImportFileList: [],
			
 
				-            uploadUrlXls: Constant.serverUrl + "/base/billDetail/importXls",
			
 
				-            uploadUrl: Constant.serverUrl + "/base/billDetail/uploadTicket",
			
 
				-            uploadData: {
			
 
				-                subFolder: "billDetail",
			
 
				-            },
			
 
				-            uploadXlsData: {
			
 
				-                billId: this.businessKey,
			
 
				-            },
			
 
				-            headers: {
			
 
				-                Authorization: getToken(),
			
 
				-            },
			
 
				-            xlsLoading: false,
			
 
				-            
			
 
				-        }
			
 
				-    },
			
 
				-    methods:{
			
 
				-        closeDialog() {
			
 
				-            this.$emit("close", false);
			
 
				-        },
			
 
				-        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("billId", self.businessKey);
			
 
				-            billDetailApi
			
 
				-                .pageList(formData)
			
 
				-                .then(function (response) {
			
 
				-                self.loading = false;
			
 
				-
			
 
				-                var jsonData = response.data.data;
			
 
				-
			
 
				-                self.tableData = jsonData.data;
			
 
				-                self.totalPages = jsonData.totalPages;
			
 
				-                self.totalElements = jsonData.recordsTotal;
			
 
				-                })
			
 
				-                .catch((error) => {
			
 
				-                self.loading = false;
			
 
				-                // self.$message.error(error + "");
			
 
				-                });
			
 
				-        },
			
 
				-        pageSizeChange(pageSize) {
			
 
				-            this.pageSize = pageSize;
			
 
				-
			
 
				-            this.$nextTick(() => {
			
 
				-                this.changePage(this.pageIndex);
			
 
				-            });
			
 
				-        },
			
 
				-        sortChange(data) {
			
 
				-            this.field = data.column.field;
			
 
				-            this.direction = data.order;
			
 
				-
			
 
				-            this.changePage(this.pageIndex);
			
 
				-        },
			
 
				-        handleSelectionChange(val) {
			
 
				-            this.multipleSelection = val;
			
 
				-        },
			
 
				-        handleReset(name) {
			
 
				-            this.$refs[name].resetFields();
			
 
				-        },
			
 
				-        handleEdit(record) {
			
 
				-            this.modalTitle = "编辑";
			
 
				-            this.businessKey = record.id;
			
 
				-            this.showModal = true;
			
 
				-        },
			
 
				-        onDetailModalClose(refreshed) {
			
 
				-            //保存成功后回调
			
 
				-            this.showModal = false;
			
 
				-
			
 
				-            if (refreshed) {
			
 
				-                this.changePage(this.pageIndex);
			
 
				-            }
			
 
				-        },
			
 
				-        handleDelete(record) {
			
 
				-            var self = this;
			
 
				-
			
 
				-            self.$confirm("是否确认删除?", "提示", {
			
 
				-                confirmButtonText: "确定",
			
 
				-                cancelButtonText: "取消",
			
 
				-                type: "warning",
			
 
				-                })
			
 
				-                .then(() => {
			
 
				-                billDetailApi.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: "删除成功!",
			
 
				-                    });
			
 
				-                    }
			
 
				-                });
			
 
				-            });
			
 
				-        },
			
 
				-        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
			
 
				-                } 个文件`
			
 
				-            );
			
 
				-        },
			
 
				-        pushMessage(){
			
 
				-            var self = this;
			
 
				-            var billId = this.businessKey;
			
 
				-
			
 
				-            self.$confirm("是否确认推送消息?", "提示", {
			
 
				-                confirmButtonText: "确定",
			
 
				-                cancelButtonText: "取消",
			
 
				-                type: "warning",
			
 
				-                })
			
 
				-                .then(() => {
			
 
				-
			
 
				-                billDetailApi.pushMessage(billId).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: "推送消息成功!",
			
 
				-                        });
			
 
				-                    }
			
 
				-                });
			
 
				-            });
			
 
				-        },
			
 
				-        handleLoad(row){
			
 
				-            this.uploadData["id"] = row.id;
			
 
				-        },
			
 
				-        handleAvatarSuccess(res, file) {
			
 
				-            this.loading = false;
			
 
				-            var self = this;
			
 
				-            self.changePage(self.pageIndex);
			
 
				-            self.$message({
			
 
				-                type: "success",
			
 
				-                message: "发票上传成功!",
			
 
				-            });
			
 
				-        },
			
 
				-        beforeAvatarUpload(file) {
			
 
				-            this.loading = true;
			
 
				-        }
			
 
				-
			
 
				-
			
 
				-    },
			
 
				-    mounted: function () {
			
 
				-        this.changePage(1);
			
 
				-
			
 
				-        var self = this;
			
 
				-        var billId = this.businessKey;
			
 
				-
			
 
				-        billDetailApi.getBillInfo(billId).then(function (response) {
			
 
				-            var jsonData = response.data;
			
 
				-
			
 
				-            if (jsonData.result) {
			
 
				-                // var index = self.tableData.indexOf(record);
			
 
				-                // self.tableData.splice(index, 1);
			
 
				-                if(jsonData.data){
			
 
				-                    self.showPushBtn=false;
			
 
				-                }
			
 
				-                else{
			
 
				-                    self.showPushBtn=true;
			
 
				-                }
			
 
				-                
			
 
				-
			
 
				-            }
			
 
				-        });
			
 
				-    },
			
 
				-    components: {
			
 
				-        "billDetail-detail":billDetailDetail,
			
 
				-    },
			
 
				-}
			
 
				-</script>
			
 
				-<style scoped>
			
 
				-
			
 
				-</style>
			
--- a/src/views/base/billInfo-detail.vue
+++ b/src/views/base/billInfo-detail.vue
@@ -1,207 +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="'150px'"
			
 
				-        >
			
 
				-        <el-form-item label="账单名称" prop="billName">
			
 
				-            <el-input
			
 
				-                v-model="formModel.billName"
			
 
				-                placeholder="请输入账单名称"
			
 
				-            ></el-input>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="账单备注" prop="billRemark">
			
 
				-            <el-input
			
 
				-                v-model="formModel.billRemark"
			
 
				-                placeholder="请输入账单备注"
			
 
				-            ></el-input>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="手机端会费公示" prop="wxShow">
			
 
				-            <el-radio-group v-model="formModel.wxShow" @change="wxShowChange()">
			
 
				-                <el-radio :label="true">是</el-radio>
			
 
				-                <el-radio :label="false">否</el-radio>
			
 
				-            </el-radio-group>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="图片" prop="picUrl"  v-if="formModel.wxShow">
			
 
				-              <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 billInfoApi from "@/api/base/billInfo";
			
 
				-import { getToken } from "@/utils/auth"; // get token from cookie
			
 
				-export default {
			
 
				-    props: ["businessKey", "title"],
			
 
				-    data() {
			
 
				-        return {
			
 
				-            formModel: {},
			
 
				-            ruleValidate: {
			
 
				-                billName: [
			
 
				-                { required: true, message: "账单名称不能为空", trigger: "blur" },
			
 
				-                ]
			
 
				-            },
			
 
				-            showDialog: true,
			
 
				-            loading: false,
			
 
				-            submitting: false,
			
 
				-            props: {
			
 
				-                // 配置项（必选）
			
 
				-                value: "id",
			
 
				-                label: "industryName",
			
 
				-            },
			
 
				-            //上传图片start
			
 
				-            uploadUrl: Constant.serverUrl + "/uploadPicture",
			
 
				-            uploadData: {
			
 
				-                subFolder: "billInfo",
			
 
				-            },
			
 
				-            fileUrl: "",
			
 
				-            headers: {
			
 
				-                Authorization: getToken(),
			
 
				-            },
			
 
				-        }
			
 
				-    },
			
 
				-    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 billInfoApi.add(self.formModel);
			
 
				-                    } else {
			
 
				-                    return billInfoApi.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 billInfoApi.create();
			
 
				-        } else {
			
 
				-            return billInfoApi.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;
			
 
				-}
			
 
				-.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>
			
--- a/src/views/base/billInfo-list.vue
+++ b/src/views/base/billInfo-list.vue
@@ -1,366 +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="/billInfo">账单推送管理</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="billName">
			
 
				-            <el-input
			
 
				-            type="text"
			
 
				-            size="mini"
			
 
				-            v-model="queryModel.billName"
			
 
				-            ></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-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"
			
 
				-        ></el-table-column>
			
 
				-        <el-table-column
			
 
				-            prop="billName"
			
 
				-            label="账单名称"
			
 
				-        ></el-table-column>
			
 
				-        <el-table-column
			
 
				-            prop="billRemark"
			
 
				-            label="账单备注"
			
 
				-        ></el-table-column>
			
 
				-        <el-table-column prop="wxShow"  label="手机端会费公示">
			
 
				-            <template slot-scope="{ row }">
			
 
				-                <span v-if="row.wxShow">是</span>
			
 
				-                <span v-else>否</span>
			
 
				-            </template>
			
 
				-        </el-table-column>
			
 
				-        <el-table-column prop="picUrl" label="图片">
			
 
				-            <template slot-scope="{ row }">
			
 
				-                <a :href="row.picUrl" target="_blank" v-if="row.picUrl">
			
 
				-                    <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="推送状态">
			
 
				-            <template slot-scope="{ row }">
			
 
				-                <span v-if="row.status=='0'">未推送</span>
			
 
				-                <span v-if="row.status=='1'">已推送</span>
			
 
				-            </template>
			
 
				-        </el-table-column>
			
 
				-        <el-table-column label="操作"  width="200">
			
 
				-            <template slot-scope="{ row }">
			
 
				-                <el-col :span="12">
			
 
				-                    <el-link size="mini" type="primary" @click="handleBillDetail(row)"
			
 
				-                        >子账单</el-link
			
 
				-                    >
			
 
				-                </el-col>
			
 
				-                <el-col :span="12">
			
 
				-                    <el-link size="mini" type="success" @click="pushMessage(row)" v-if="row.isPay==false">推送账单消息</el-link
			
 
				-                    >
			
 
				-                </el-col>
			
 
				-                <el-col :span="12">
			
 
				-                    <el-link size="mini" type="warning" @click="handleEdit(row)"
			
 
				-                        >编辑</el-link
			
 
				-                    >
			
 
				-                </el-col>
			
 
				-                <el-col :span="12">
			
 
				-                    <el-link size="mini" type="danger" @click="handleDelete(row)" v-if="row.isPay==false">删除</el-link
			
 
				-                    >
			
 
				-                </el-col>
			
 
				-            </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>
			
 
				-        <billInfo-detail
			
 
				-        v-if="showModal"
			
 
				-        :businessKey="businessKey"
			
 
				-        :title="modalTitle"
			
 
				-        @close="onDetailModalClose"
			
 
				-        ></billInfo-detail>
			
 
				-        <billDetail-list
			
 
				-        v-if="showModal2"
			
 
				-        :businessKey="businessKey"
			
 
				-        :title="modalTitle2"
			
 
				-        @close="onDetailModalClose2"
			
 
				-        ></billDetail-list>
			
 
				-    </div>
			
 
				-</template>
			
 
				-<script>
			
 
				-import Constant from "@/constant";
			
 
				-import billInfoDetail from "./billInfo-detail";
			
 
				-import billDetailList from "./billDetail-list";
			
 
				-import billInfoApi from "@/api/base/billInfo";
			
 
				-import billDetailApi from "@/api/base/billDetail";
			
 
				-export default {
			
 
				-    name: "BaseBillInfoList",
			
 
				-    data() {
			
 
				-        return{
			
 
				-            queryModel: {
			
 
				-                billName:"",
			
 
				-            },
			
 
				-            loading: false,
			
 
				-            tableData: [],
			
 
				-            pageIndex: 1,
			
 
				-            pageSize: 10,
			
 
				-            totalPages: 0,
			
 
				-            totalElements: 0,
			
 
				-            field: "",
			
 
				-            direction: "",
			
 
				-            pageSizeList: [10, 20, 30],
			
 
				-            multipleSelection: [],
			
 
				-            showModal: false,
			
 
				-            showModal2: false,
			
 
				-        }
			
 
				-    },
			
 
				-    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("billName", self.queryModel.billName);
			
 
				-
			
 
				-            billInfoApi
			
 
				-                .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;
			
 
				-        },
			
 
				-        handleBillDetail(record){
			
 
				-            this.modalTitle2 = "子账单";
			
 
				-            this.businessKey = record.id;
			
 
				-            this.showModal2 = true;
			
 
				-        },
			
 
				-        handleDelete(record) {
			
 
				-            var self = this;
			
 
				-
			
 
				-            self
			
 
				-                .$confirm("是否确认删除?", "提示", {
			
 
				-                confirmButtonText: "确定",
			
 
				-                cancelButtonText: "取消",
			
 
				-                type: "warning",
			
 
				-                })
			
 
				-                .then(() => {
			
 
				-                billInfoApi.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(() => {
			
 
				-                billInfoApi.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);
			
 
				-            }
			
 
				-        },
			
 
				-        onDetailModalClose2(refreshed) {
			
 
				-            //保存成功后回调
			
 
				-            this.showModal2 = false;
			
 
				-
			
 
				-            if (refreshed) {
			
 
				-                this.changePage(this.pageIndex);
			
 
				-            }
			
 
				-        },
			
 
				-        pushMessage(record){
			
 
				-            var self = this;
			
 
				-            var billId = record.id
			
 
				-
			
 
				-            self.$confirm("是否确认推送消息?", "提示", {
			
 
				-                confirmButtonText: "确定",
			
 
				-                cancelButtonText: "取消",
			
 
				-                type: "warning",
			
 
				-                })
			
 
				-                .then(() => {
			
 
				-
			
 
				-                billDetailApi.pushMessage(billId).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: "推送消息成功!",
			
 
				-                        });
			
 
				-                    }
			
 
				-                });
			
 
				-            });
			
 
				-        }
			
 
				-    },
			
 
				-    mounted: function () {
			
 
				-        this.changePage(1);
			
 
				-    },
			
 
				-    components: {
			
 
				-        "billInfo-detail": billInfoDetail,
			
 
				-        "billDetail-list":billDetailList,
			
 
				-    },
			
 
				-}
			
 
				-</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>
			
--- a/src/views/base/companyInfo-detail.vue
+++ b/src/views/base/companyInfo-detail.vue
@@ -205,7 +205,6 @@
 
				 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
			
@@ -278,15 +277,6 @@ export default {
 
				   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: "企业类型",
			
--- a/src/views/base/companyInfo-list.vue
+++ b/src/views/base/companyInfo-list.vue
@@ -324,7 +324,6 @@ 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
			
@@ -385,14 +384,6 @@ export default {
 
				   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({
			
--- a/src/views/base/cooperationInfo-detail.vue
+++ b/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: false, 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: 400,
			
 
				-        width: "90%",
			
 
				-      },
			
 
				-      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>
			
--- a/src/views/base/cooperationInfo-list.vue
+++ b/src/views/base/cooperationInfo-list.vue
@@ -1,372 +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">
			
 
				-        <template slot-scope="{ row }">
			
 
				-          <span v-if="row.status">已上架</span>
			
 
				-          <span v-else>未上架</span>
			
 
				-        </template></el-table-column
			
 
				-      >
			
 
				-      <el-table-column label="操作" width="150">
			
 
				-        <template slot-scope="{ row }">
			
 
				-          <el-button size="mini" type="warning" @click="handleEdit(row)"
			
 
				-            >编辑</el-button
			
 
				-          >
			
 
				-          <el-button size="mini" type="danger" @click="handleDelete(row)"
			
 
				-            >删除</el-button
			
 
				-          >
			
 
				-        </template>
			
 
				-      </el-table-column>
			
 
				-    </el-table>
			
 
				-    <el-pagination
			
 
				-      :current-page.sync="pageIndex"
			
 
				-      :total="totalElements"
			
 
				-      :page-sizes="pageSizeList"
			
 
				-      @current-change="changePage"
			
 
				-      @size-change="pageSizeChange"
			
 
				-      layout="total, sizes, prev, pager, next, jumper"
			
 
				-    ></el-pagination>
			
 
				-    <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>
			
--- a/src/views/base/enterpriseInfo-detail.vue
+++ b/src/views/base/enterpriseInfo-detail.vue
@@ -1,242 +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="id">
			
 
				-          <el-input
			
 
				-            v-model="formModel.id"
			
 
				-            placeholder="请输入"
			
 
				-            style="width: 300px"
			
 
				-          ></el-input>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="企联简介" prop="enterpriseIntroduction">
			
 
				-          <el-input
			
 
				-            v-model="formModel.enterpriseIntroduction"
			
 
				-            placeholder="请输入企联简介"
			
 
				-            style="width: 300px"
			
 
				-          ></el-input>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="企联章程" prop="enterpriseConstitution">
			
 
				-          <el-input
			
 
				-            v-model="formModel.enterpriseConstitution"
			
 
				-            placeholder="请输入企联章程"
			
 
				-            style="width: 300px"
			
 
				-          ></el-input>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="组织架构" prop="organStructure">
			
 
				-          <el-input
			
 
				-            v-model="formModel.organStructure"
			
 
				-            placeholder="请输入组织架构"
			
 
				-            style="width: 300px"
			
 
				-          ></el-input>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="基本职能" prop="basicFunction">
			
 
				-          <el-input
			
 
				-            v-model="formModel.basicFunction"
			
 
				-            placeholder="请输入基本职能"
			
 
				-            style="width: 300px"
			
 
				-          ></el-input>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="负责人及分工" prop="chargePerson">
			
 
				-          <el-input
			
 
				-            v-model="formModel.chargePerson"
			
 
				-            placeholder="请输入负责人及分工"
			
 
				-            style="width: 300px"
			
 
				-          ></el-input>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="分会简介" prop="branchIntroduction">
			
 
				-          <el-input
			
 
				-            v-model="formModel.branchIntroduction"
			
 
				-            placeholder="请输入分会简介"
			
 
				-            style="width: 300px"
			
 
				-          ></el-input>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="联系方式" prop="contactInformation">
			
 
				-          <el-input
			
 
				-            v-model="formModel.contactInformation"
			
 
				-            placeholder="请输入联系方式"
			
 
				-            style="width: 300px"
			
 
				-          ></el-input>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="创建人" prop="createBy">
			
 
				-          <el-input
			
 
				-            v-model="formModel.createBy"
			
 
				-            placeholder="请输入创建人"
			
 
				-            style="width: 300px"
			
 
				-          ></el-input>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="创建时间" prop="createTime">
			
 
				-          <el-input
			
 
				-            v-model="formModel.createTime"
			
 
				-            placeholder="请输入创建时间"
			
 
				-            style="width: 300px"
			
 
				-          ></el-input>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="更新人" prop="updateBy">
			
 
				-          <el-input
			
 
				-            v-model="formModel.updateBy"
			
 
				-            placeholder="请输入更新人"
			
 
				-            style="width: 300px"
			
 
				-          ></el-input>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="更新时间" prop="updateTime">
			
 
				-          <el-input
			
 
				-            v-model="formModel.updateTime"
			
 
				-            placeholder="请输入更新时间"
			
 
				-            style="width: 300px"
			
 
				-          ></el-input>
			
 
				-        </el-form-item>
			
 
				-        <el-form-item label="是否删除" prop="delFlag">
			
 
				-          <el-input
			
 
				-            v-model="formModel.delFlag"
			
 
				-            placeholder="请输入是否删除"
			
 
				-            style="width: 300px"
			
 
				-          ></el-input>
			
 
				-        </el-form-item>
			
 
				-      </el-form>
			
 
				-    </div>
			
 
				-    <span slot="footer" class="dialog-footer">
			
 
				-      <el-button @click="closeDialog">取 消</el-button>
			
 
				-      <el-button type="primary" @click="handleSubmit" :loading="submitting"
			
 
				-        >确 定</el-button
			
 
				-      >
			
 
				-    </span>
			
 
				-  </el-dialog>
			
 
				-</template>
			
 
				-<script>
			
 
				-import Constant from "@/constant";
			
 
				-import enterpriseInfoApi from "@/api/base/enterpriseInfo";
			
 
				-
			
 
				-export default {
			
 
				-  props: ["businessKey", "title"],
			
 
				-  data() {
			
 
				-    return {
			
 
				-      formModel: {},
			
 
				-      ruleValidate: {
			
 
				-        id: [{ required: true, message: "不能为空", trigger: "blur" }],
			
 
				-        enterpriseIntroduction: [
			
 
				-          { required: true, message: "企联简介不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-        enterpriseConstitution: [
			
 
				-          { required: true, message: "企联章程不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-        organStructure: [
			
 
				-          { required: true, message: "组织架构不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-        basicFunction: [
			
 
				-          { required: true, message: "基本职能不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-        chargePerson: [
			
 
				-          { required: true, message: "负责人及分工不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-        branchIntroduction: [
			
 
				-          { required: true, message: "分会简介不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-        contactInformation: [
			
 
				-          { required: true, message: "联系方式不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-        createBy: [
			
 
				-          { required: true, message: "创建人不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-        createTime: [
			
 
				-          { required: true, message: "创建时间不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-        updateBy: [
			
 
				-          { required: true, message: "更新人不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-        updateTime: [
			
 
				-          { required: true, message: "更新时间不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-        delFlag: [
			
 
				-          { required: true, message: "是否删除不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-      },
			
 
				-      showDialog: true,
			
 
				-      loading: false,
			
 
				-      submitting: false,
			
 
				-    };
			
 
				-  },
			
 
				-  methods: {
			
 
				-    closeDialog() {
			
 
				-      this.$emit("close", false);
			
 
				-    },
			
 
				-    handleSubmit() {
			
 
				-      var self = this;
			
 
				-
			
 
				-      this.$refs["form"].validate((valid) => {
			
 
				-        if (valid) {
			
 
				-          (function () {
			
 
				-            var id = self.formModel.id;
			
 
				-
			
 
				-            if (id == null || id.length == 0) {
			
 
				-              return enterpriseInfoApi.add(self.formModel);
			
 
				-            } else {
			
 
				-              return enterpriseInfoApi.update(self.formModel);
			
 
				-            }
			
 
				-          })().then(function (response) {
			
 
				-            var jsonData = response.data;
			
 
				-
			
 
				-            if (jsonData.result) {
			
 
				-              self.$message({
			
 
				-                message: "保存成功!",
			
 
				-                type: "success",
			
 
				-              });
			
 
				-
			
 
				-              self.$emit("close", true);
			
 
				-            } else {
			
 
				-              self.$message({
			
 
				-                message: jsonData.message + "",
			
 
				-                type: "warning",
			
 
				-              });
			
 
				-
			
 
				-              self.$emit("close", false);
			
 
				-            }
			
 
				-          });
			
 
				-        }
			
 
				-      });
			
 
				-    },
			
 
				-  },
			
 
				-  mounted: function () {
			
 
				-    var self = this;
			
 
				-
			
 
				-    (function () {
			
 
				-      if (self.businessKey.length == 0) {
			
 
				-        return enterpriseInfoApi.create();
			
 
				-      } else {
			
 
				-        return enterpriseInfoApi.edit(self.businessKey);
			
 
				-      }
			
 
				-    })()
			
 
				-      .then((response) => {
			
 
				-        var jsonData = response.data;
			
 
				-        self.loading = false;
			
 
				-
			
 
				-        if (jsonData.result) {
			
 
				-          self.formModel = jsonData.data;
			
 
				-        } else {
			
 
				-          self.$message.error(jsonData.message + "");
			
 
				-        }
			
 
				-      })
			
 
				-      .catch((error) => {
			
 
				-        self.$message.error(error + "");
			
 
				-      });
			
 
				-  },
			
 
				-};
			
 
				-</script>
			
--- a/src/views/base/enterpriseInfo-list.vue
+++ b/src/views/base/enterpriseInfo-list.vue
@@ -1,213 +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="/enterpriseInfo">enterpriseInfo管理</a>
			
 
				-      </el-breadcrumb-item>
			
 
				-    </el-breadcrumb>
			
 
				-    <el-divider></el-divider>
			
 
				-    <!--
			
 
				-      要resetFields起作用，必须配置:model和prop
			
 
				-    -->
			
 
				-    <el-divider></el-divider>
			
 
				-    <el-table
			
 
				-      :data="tableData"
			
 
				-      style="min-height: 400px"
			
 
				-      v-loading="loading"
			
 
				-      stripe
			
 
				-      @sort-change="sortChange"
			
 
				-      @selection-change="handleSelectionChange"
			
 
				-    >
			
 
				-      <el-table-column
			
 
				-        prop="enterpriseIntroduction"
			
 
				-        label="企联简介"
			
 
				-        width="180"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="enterpriseConstitution"
			
 
				-        label="企联章程"
			
 
				-        width="180"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="organStructure"
			
 
				-        label="组织架构"
			
 
				-        width="180"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="basicFunction"
			
 
				-        label="基本职能"
			
 
				-        width="180"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="chargePerson"
			
 
				-        label="负责人及分工"
			
 
				-        width="180"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="branchIntroduction"
			
 
				-        label="分会简介"
			
 
				-        width="180"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="contactInformation"
			
 
				-        label="联系方式"
			
 
				-        width="180"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="createBy"
			
 
				-        label="创建人"
			
 
				-        width="180"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="createTime"
			
 
				-        label="创建时间"
			
 
				-        width="180"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="updateBy"
			
 
				-        label="更新人"
			
 
				-        width="180"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="updateTime"
			
 
				-        label="更新时间"
			
 
				-        width="180"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column label="操作">
			
 
				-        <template slot-scope="{ row }">
			
 
				-          <el-button size="mini" type="warning" @click="handleEdit(row)"
			
 
				-            >编辑</el-button
			
 
				-          >
			
 
				-        </template>
			
 
				-      </el-table-column>
			
 
				-    </el-table>
			
 
				-    <enterpriseInfo-detail
			
 
				-      v-if="showModal"
			
 
				-      :businessKey="businessKey"
			
 
				-      :title="modalTitle"
			
 
				-      @close="onDetailModalClose"
			
 
				-    ></enterpriseInfo-detail>
			
 
				-  </div>
			
 
				-</template>
			
 
				-<script>
			
 
				-import Constant from "@/constant";
			
 
				-import EnterpriseInfoDetail from "./enterpriseInfo-detail";
			
 
				-import enterpriseInfoApi from "@/api/base/enterpriseInfo";
			
 
				-import NProgress from "nprogress"; // progress bar
			
 
				-import "nprogress/nprogress.css"; // progress bar style
			
 
				-
			
 
				-export default {
			
 
				-  data() {
			
 
				-    var self = this;
			
 
				-
			
 
				-    return {
			
 
				-      queryModel: {
			
 
				-      },
			
 
				-      loading: false,
			
 
				-      tableData: [],
			
 
				-      pageIndex: 1,
			
 
				-      pageSize: 10,
			
 
				-      totalPages: 0,
			
 
				-      totalElements: 0,
			
 
				-      field: "",
			
 
				-      direction: "",
			
 
				-      pageSizeList: [10, 20, 30],
			
 
				-      multipleSelection: [],
			
 
				-      showModal: false,
			
 
				-      modalTitle: "",
			
 
				-      businessKey: "",
			
 
				-    };
			
 
				-  },
			
 
				-  methods: {
			
 
				-    changePage(pageIndex) {
			
 
				-      var self = this;
			
 
				-
			
 
				-      self.loading = true;
			
 
				-
			
 
				-      self.pageIndex = pageIndex;
			
 
				-      var formData = new FormData();
			
 
				-
			
 
				-      formData.append("pageIndex", self.pageIndex);
			
 
				-      formData.append("pageSize", self.pageSize);
			
 
				-
			
 
				-      enterpriseInfoApi
			
 
				-        .pageList(formData)
			
 
				-        .then(function (response) {
			
 
				-          self.loading = false;
			
 
				-
			
 
				-          var jsonData = response.data.data;
			
 
				-
			
 
				-          self.tableData = jsonData.data;
			
 
				-          self.totalPages = jsonData.totalPages;
			
 
				-          self.totalElements = jsonData.recordsTotal;
			
 
				-        })
			
 
				-        .catch((error) => {
			
 
				-          self.loading = false;
			
 
				-          // self.$message.error(error + "");
			
 
				-        });
			
 
				-    },
			
 
				-    pageSizeChange(pageSize) {
			
 
				-      this.pageSize = pageSize;
			
 
				-
			
 
				-      this.$nextTick(() => {
			
 
				-        this.changePage(this.pageIndex);
			
 
				-      });
			
 
				-    },
			
 
				-    sortChange(data) {
			
 
				-      this.field = data.column.field;
			
 
				-      this.direction = data.order;
			
 
				-
			
 
				-      this.changePage(this.pageIndex);
			
 
				-    },
			
 
				-    handleSelectionChange(val) {
			
 
				-      this.multipleSelection = val;
			
 
				-    },
			
 
				-    handleReset(name) {
			
 
				-      this.$refs[name].resetFields();
			
 
				-    },
			
 
				-    handleEdit(record) {
			
 
				-      this.modalTitle = "编辑";
			
 
				-      this.businessKey = record.id;
			
 
				-      this.showModal = true;
			
 
				-    },
			
 
				-    onDetailModalClose(refreshed) {
			
 
				-      //保存成功后回调
			
 
				-      this.showModal = false;
			
 
				-
			
 
				-      if (refreshed) {
			
 
				-        this.changePage(this.pageIndex);
			
 
				-      }
			
 
				-    },
			
 
				-  },
			
 
				-  mounted: function () {
			
 
				-    this.changePage(1);
			
 
				-  },
			
 
				-  components: {
			
 
				-    "enterpriseInfo-detail": EnterpriseInfoDetail,
			
 
				-  },
			
 
				-};
			
 
				-</script>
			
 
				-<style lang="scss" scoped>
			
 
				-.el-breadcrumb {
			
 
				-  margin: 10px;
			
 
				-  line-height: 20px;
			
 
				-}
			
 
				-
			
 
				-.el-divider {
			
 
				-  margin: 5px 0;
			
 
				-}
			
 
				-
			
 
				-.demo-form-inline {
			
 
				-  margin-left: 10px;
			
 
				-  text-align: left;
			
 
				-}
			
 
				-
			
 
				-.button-group {
			
 
				-  margin-left: 10px;
			
 
				-  text-align: left;
			
 
				-}
			
 
				-</style>
			
--- a/src/views/base/industryInfo-detail.vue
+++ b/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>
			
--- a/src/views/base/industryInfo-list.vue
+++ b/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>
			
--- a/src/views/base/messageType-detail.vue
+++ b/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>
			
--- a/src/views/base/messageType-list.vue
+++ b/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>
			
--- a/src/views/base/newsInfo-detail.vue
+++ b/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: 400,
			
 
				-        width: "90%",
			
 
				-      },
			
 
				-      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>
			
--- a/src/views/base/newsInfo-list.vue
+++ b/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>
			
--- a/src/views/base/newsType-detail.vue
+++ b/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>
			
--- a/src/views/base/newsType-list.vue
+++ b/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>
			
--- a/src/views/base/personInfo-detail.vue
+++ b/src/views/base/personInfo-detail.vue
@@ -1,424 +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="12">
			
 
				-            <el-form-item label="是否内部人员" prop="inside">
			
 
				-              <el-radio v-model="formModel.inside" :label="true">是</el-radio>
			
 
				-              <el-radio v-model="formModel.inside" :label="false">否</el-radio>
			
 
				-            </el-form-item>
			
 
				-          </el-col>
			
 
				-        </el-row>
			
 
				-        <el-row>
			
 
				-          <el-col :span="24">
			
 
				-            <el-form-item label="人脸照片" prop="faceImageUrl">
			
 
				-              <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 inside = self.formModel.inside;
			
 
				-          if(inside == null){
			
 
				-            self.formModel.inside = false;
			
 
				-          }
			
 
				-
			
 
				-          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>
			
--- a/src/views/base/personInfo-list.vue
+++ b/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>
			
--- a/src/views/base/pushMessage-list.vue
+++ b/src/views/base/pushMessage-list.vue
@@ -1,246 +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="/pushMessage">推送消息管理</a>
			
 
				-        </el-breadcrumb-item>
			
 
				-        </el-breadcrumb>
			
 
				-        <el-divider></el-divider>
			
 
				-        <el-form
			
 
				-            ref="queryForm"
			
 
				-            :model="queryModel"
			
 
				-            >
			
 
				-            <el-form-item label="选择模版：" prop="personName">
			
 
				-                <el-col :span="6">
			
 
				-                    <el-input
			
 
				-                    type="text"
			
 
				-                    size="mini"
			
 
				-                    v-model="queryModel.personName"
			
 
				-                    ></el-input>
			
 
				-                </el-col>
			
 
				-            </el-form-item>
			
 
				-            <el-form-item label="推送模式：" prop="personName">
			
 
				-                <el-col :span="4">
			
 
				-                    <el-checkbox-group v-model="checkList">
			
 
				-                        <el-checkbox label="短信推送"></el-checkbox>
			
 
				-                        <el-checkbox label="微信推送"></el-checkbox>
			
 
				-                    </el-checkbox-group>
			
 
				-                </el-col>
			
 
				-            </el-form-item>
			
 
				-            <el-form-item label="消息内容：" prop="idCard">
			
 
				-                <el-col :span="6">
			
 
				-                    <el-input type="textarea" :rows="4"></el-input>
			
 
				-                </el-col>
			
 
				-            </el-form-item>
			
 
				-        </el-form>
			
 
				-        <el-row class="button-group">
			
 
				-            <el-button
			
 
				-                type="primary"
			
 
				-                size="small"
			
 
				-                plain
			
 
				-                icon="el-icon-circle-plus"
			
 
				-                @click="handleAdd"
			
 
				-                >添加用户</el-button
			
 
				-            >
			
 
				-            <el-button
			
 
				-                type="success"
			
 
				-                size="small"
			
 
				-                plain
			
 
				-                icon="el-icon-receiving"
			
 
				-                @click="handleAdd"
			
 
				-                >保存草稿</el-button
			
 
				-            >
			
 
				-            <el-button
			
 
				-                type="danger"
			
 
				-                size="small"
			
 
				-                plain
			
 
				-                icon="el-icon-s-promotion"
			
 
				-                @click="handleAdd"
			
 
				-                >推送消息</el-button
			
 
				-            >
			
 
				-            
			
 
				-        </el-row>
			
 
				-        <el-table
			
 
				-                :data="tableData"
			
 
				-                style="min-height: 400px"
			
 
				-                v-loading="loading"
			
 
				-                stripe
			
 
				-                @sort-change="sortChange"
			
 
				-                @selection-change="handleSelectionChange"
			
 
				-            >
			
 
				-            <el-table-column type="selection" width="55"></el-table-column>
			
 
				-            <el-table-column prop="id" v-if="false"></el-table-column>
			
 
				-            <el-table-column
			
 
				-                type="index"
			
 
				-                label="序号"
			
 
				-                :index="indexMethod"
			
 
				-            ></el-table-column>
			
 
				-            <el-table-column
			
 
				-                prop="personName"
			
 
				-                label="推送用户"
			
 
				-            ></el-table-column>
			
 
				-            <el-table-column
			
 
				-                prop="phone"
			
 
				-                label="手机号码"
			
 
				-            ></el-table-column>
			
 
				-            <el-table-column
			
 
				-                prop="pushType"
			
 
				-                label="推送渠道"
			
 
				-            ></el-table-column>
			
 
				-            <el-table-column
			
 
				-                prop="pushTime"
			
 
				-                label="推送时间"
			
 
				-            ></el-table-column>
			
 
				-            <el-table-column
			
 
				-                prop="status"
			
 
				-                label="推送状态"
			
 
				-                show-overflow-tooltip
			
 
				-            ></el-table-column>
			
 
				-            <el-table-column label="操作"  f>
			
 
				-            </el-table-column>
			
 
				-            
			
 
				-        </el-table>
			
 
				-        <pushPerson-list
			
 
				-            v-if="showModal"
			
 
				-            :businessKey="businessKey"
			
 
				-            :title="modalTitle"
			
 
				-            @close="onDetailModalClose"
			
 
				-        ></pushPerson-list>
			
 
				-    </div>
			
 
				-</template>
			
 
				-<script>
			
 
				-import pushPersonList from "./pushPerson-list";
			
 
				-import personInfoApi from "@/api/base/personInfo";
			
 
				-export default {
			
 
				-    name: "BasePushMessageList",
			
 
				-    data() {
			
 
				-        return {
			
 
				-            queryModel: {},
			
 
				-            checkList:[],
			
 
				-            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) {
			
 
				-
			
 
				-        },
			
 
				-        handleAdd() {
			
 
				-            this.modalTitle = "新增";
			
 
				-            this.businessKey = "";
			
 
				-            this.showModal = true;
			
 
				-        },
			
 
				-        onDetailModalClose(refreshed) {
			
 
				-            var self = this;
			
 
				-            //保存成功后回调
			
 
				-            this.showModal = false;
			
 
				-
			
 
				-            if (refreshed.re) {
			
 
				-
			
 
				-                var idList = refreshed.idList;
			
 
				-
			
 
				-                personInfoApi.getPersonData(idList).then(function (response) {
			
 
				-                    var jsonData = response.data;
			
 
				-
			
 
				-                    if (jsonData.result) {
			
 
				-
			
 
				-                        var data = jsonData.data;
			
 
				-
			
 
				-                        var reAddList="";
			
 
				-
			
 
				-                        for(var i=0;i<data.length;i++){
			
 
				-                            var id = data[i].id;
			
 
				-
			
 
				-                            var isAdd = true;
			
 
				-
			
 
				-                            for(var j=0;j<self.tableData.length;j++){
			
 
				-                               if(self.tableData[j].id==id){
			
 
				-                                   isAdd = false;
			
 
				-                                   reAddList = reAddList + self.tableData[j].personName+","
			
 
				-                               }
			
 
				-                            }
			
 
				-                            if(isAdd){
			
 
				-                                let row = {
			
 
				-                                    id:id,
			
 
				-                                    personName: data[i].personName,
			
 
				-                                    phone: data[i].phone,
			
 
				-                                    pushType: "",
			
 
				-                                    pushTime: "",
			
 
				-                                    status: "",
			
 
				-                                }
			
 
				-                                self.tableData.push(row);
			
 
				-                            }
			
 
				-                        }
			
 
				-                        
			
 
				-                        if(reAddList!=""){
			
 
				-                            self.$message({
			
 
				-                                message: reAddList + "已添加在名单中，不能重复添加！",
			
 
				-                                type: "error",
			
 
				-                            });
			
 
				-                        }
			
 
				-                        
			
 
				-                    }
			
 
				-                });
			
 
				-            }
			
 
				-        },
			
 
				-        sortChange(data) {
			
 
				-            this.field = data.column.field;
			
 
				-            this.direction = data.order;
			
 
				-
			
 
				-            //this.changePage(this.pageIndex);
			
 
				-        },
			
 
				-        handleSelectionChange(val) {
			
 
				-            this.multipleSelection = val;
			
 
				-        },
			
 
				-        pageSizeChange(pageSize) {
			
 
				-            this.pageSize = pageSize;
			
 
				-
			
 
				-            this.$nextTick(() => {
			
 
				-                this.changePage(this.pageIndex);
			
 
				-            });
			
 
				-        },
			
 
				-    },
			
 
				-    components: {
			
 
				-        "pushPerson-list": pushPersonList,
			
 
				-    },
			
 
				-    
			
 
				-}
			
 
				-</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>
			
--- a/src/views/base/pushPerson-list.vue
+++ b/src/views/base/pushPerson-list.vue
@@ -1,200 +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"
			
 
				-    width="60%"
			
 
				-  >
			
 
				-    <div>
			
 
				-    <el-form
			
 
				-      ref="queryForm"
			
 
				-      :model="queryModel"
			
 
				-      inline
			
 
				-      class="demo-form-inline"
			
 
				-    >
			
 
				-      <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="phone">
			
 
				-        <el-input
			
 
				-          type="text"
			
 
				-          size="mini"
			
 
				-          v-model="queryModel.phone"
			
 
				-        ></el-input>
			
 
				-      </el-form-item>
			
 
				-    <el-form-item label="公司" prop="companyName">
			
 
				-        <el-input
			
 
				-          type="text"
			
 
				-          size="mini"
			
 
				-          v-model="queryModel.companyName"
			
 
				-        ></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-row>
			
 
				-    <el-table
			
 
				-      :data="tableData"
			
 
				-      style="min-height: 400px"
			
 
				-      v-loading="loading"
			
 
				-      stripe
			
 
				-      @selection-change="handleSelectionChange"
			
 
				-    >
			
 
				-      <el-table-column type="selection" width="55"></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="personName"
			
 
				-        label="姓名"
			
 
				-        width="200"
			
 
				-        show-overflow-tooltip
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="phone"
			
 
				-        label="电话"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="companyName"
			
 
				-        label="公司"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column label="操作" width="180" fixed="right">
			
 
				-        <template slot-scope="{ row }">
			
 
				-              <el-link type="primary" @click="handleEdit(row)" gutter>添加</el-link>
			
 
				-        </template>
			
 
				-      </el-table-column>
			
 
				-    </el-table>
			
 
				-    <el-pagination
			
 
				-        style="text-align: center"
			
 
				-      :current-page.sync="pageIndex"
			
 
				-      :total="totalElements"
			
 
				-      :page-sizes="pageSizeList"
			
 
				-      @current-change="changePage"
			
 
				-      @size-change="pageSizeChange"
			
 
				-      layout="total, sizes, prev, pager, next, jumper"
			
 
				-    ></el-pagination>
			
 
				-    </div>
			
 
				-  </el-dialog>
			
 
				-</template>
			
 
				-<script>
			
 
				-import personInfoApi from "@/api/base/personInfo";
			
 
				-export default {
			
 
				-    props: ["businessKey", "title"],
			
 
				-    data(){
			
 
				-        return{
			
 
				-            queryModel:{},
			
 
				-            showDialog: true,
			
 
				-            loading: false,
			
 
				-            tableData: [],
			
 
				-            pageIndex: 1,
			
 
				-            pageSize: 10,
			
 
				-            totalPages: 0,
			
 
				-            totalElements: 0,
			
 
				-            pageSizeList: [10, 20, 30],
			
 
				-            multipleSelection: [],
			
 
				-        }
			
 
				-    },
			
 
				-    methods:{
			
 
				-        handleAdd(){
			
 
				-            var idList = this.multipleSelection.map((record) => {
			
 
				-              return record.id;
			
 
				-            });
			
 
				-
			
 
				-            var flag = false;
			
 
				-
			
 
				-            if(idList.length > 0){
			
 
				-              flag = true;
			
 
				-            }
			
 
				-
			
 
				-            var data = {
			
 
				-               re : flag,
			
 
				-               idList : idList
			
 
				-            }
			
 
				-
			
 
				-            this.$emit("close", data);
			
 
				-        },
			
 
				-        closeDialog() {
			
 
				-            var idList =[];
			
 
				-            var data = {
			
 
				-               re : false,
			
 
				-               idList : idList
			
 
				-            }
			
 
				-            this.$emit("close", data);
			
 
				-        },
			
 
				-        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);
			
 
				-
			
 
				-
			
 
				-            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 + "");
			
 
				-            });
			
 
				-        },
			
 
				-        handleSelectionChange(val) {
			
 
				-            this.multipleSelection = val;
			
 
				-        },
			
 
				-        pageSizeChange(pageSize) {
			
 
				-            this.pageSize = pageSize;
			
 
				-
			
 
				-            this.$nextTick(() => {
			
 
				-                this.changePage(this.pageIndex);
			
 
				-            });
			
 
				-        },
			
 
				-    },
			
 
				-    mounted: function () {
			
 
				-        this.changePage(1);
			
 
				-    },
			
 
				-}
			
 
				-</script>
			
 
				-<style scoped>
			
 
				-
			
 
				-</style>
			
--- a/src/views/base/recruitInfo-detail.vue
+++ b/src/views/base/recruitInfo-detail.vue
@@ -1,405 +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-row>
			
 
				-          <el-col :span="12">
			
 
				-            <el-form-item label="公司" prop="companyId">
			
 
				-              <el-select
			
 
				-                v-model="formModel.companyId"
			
 
				-                filterable
			
 
				-                placeholder="请输入公司名称"
			
 
				-                style="width: 250px"
			
 
				-                :filter-method="filterMethod"
			
 
				-              >
			
 
				-                <el-option
			
 
				-                  v-for="result in companyInfoResult"
			
 
				-                  :key="result.id"
			
 
				-                  :label="result.companyName"
			
 
				-                  :value="result.id"
			
 
				-                ></el-option>
			
 
				-              </el-select> </el-form-item
			
 
				-          ></el-col>
			
 
				-        </el-row>
			
 
				-        <el-form-item label="职务名称" prop="positionName">
			
 
				-          <el-input
			
 
				-            v-model="formModel.positionName"
			
 
				-            placeholder="请输入职务名称"
			
 
				-            style="width: 300px"
			
 
				-          ></el-input>
			
 
				-        </el-form-item>
			
 
				-        <el-row>
			
 
				-          <el-col :span="12">
			
 
				-            <el-form-item label="公司区域" prop="workRegion">
			
 
				-              <el-select
			
 
				-                v-model="formModel.workRegion"
			
 
				-                filterable
			
 
				-                placeholder="请选择"
			
 
				-                style="width: 200px"
			
 
				-              >
			
 
				-                <el-option
			
 
				-                  v-for="result in workRegionResult"
			
 
				-                  :key="result.value"
			
 
				-                  :label="result.name"
			
 
				-                  :value="result.value"
			
 
				-                ></el-option>
			
 
				-              </el-select>
			
 
				-            </el-form-item>
			
 
				-          </el-col>
			
 
				-
			
 
				-          <el-col :span="12">
			
 
				-            <el-form-item label="工作年限" prop="workYear">
			
 
				-              <el-select
			
 
				-                v-model="formModel.workYear"
			
 
				-                filterable
			
 
				-                placeholder="请选择"
			
 
				-                style="width: 200px"
			
 
				-              >
			
 
				-                <el-option
			
 
				-                  v-for="result in workYearResult"
			
 
				-                  :key="result.value"
			
 
				-                  :label="result.name"
			
 
				-                  :value="result.value"
			
 
				-                ></el-option>
			
 
				-              </el-select>
			
 
				-            </el-form-item>
			
 
				-          </el-col>
			
 
				-        </el-row>
			
 
				-        <el-row>
			
 
				-          <el-col :span="12">
			
 
				-            <el-form-item label="学历" prop="education">
			
 
				-              <el-select
			
 
				-                v-model="formModel.education"
			
 
				-                filterable
			
 
				-                placeholder="请选择"
			
 
				-                style="width: 200px"
			
 
				-              >
			
 
				-                <el-option
			
 
				-                  v-for="result in educationResult"
			
 
				-                  :key="result.value"
			
 
				-                  :label="result.name"
			
 
				-                  :value="result.value"
			
 
				-                ></el-option>
			
 
				-              </el-select>
			
 
				-            </el-form-item>
			
 
				-          </el-col>
			
 
				-          <el-col :span="12">
			
 
				-            <el-form-item label="薪资水平" prop="salaryLevel">
			
 
				-              <el-select
			
 
				-                v-model="formModel.salaryLevel"
			
 
				-                filterable
			
 
				-                placeholder="请选择"
			
 
				-                style="width: 200px"
			
 
				-              >
			
 
				-                <el-option
			
 
				-                  v-for="result in salaryLevelResult"
			
 
				-                  :key="result.value"
			
 
				-                  :label="result.name"
			
 
				-                  :value="result.value"
			
 
				-                ></el-option>
			
 
				-              </el-select>
			
 
				-            </el-form-item>
			
 
				-          </el-col>
			
 
				-        </el-row>
			
 
				-        <el-row>
			
 
				-          <el-col :span="12">
			
 
				-            <el-form-item label="联系电话" prop="contactPhone">
			
 
				-              <el-input
			
 
				-                v-model="formModel.contactPhone"
			
 
				-                placeholder="请输入联系电话"
			
 
				-                style="width: 300px"
			
 
				-              ></el-input>
			
 
				-            </el-form-item>
			
 
				-          </el-col>
			
 
				-        </el-row>
			
 
				-        <el-row>
			
 
				-          <el-col :span="24">
			
 
				-            <el-form-item label="职务描述" prop="describe">
			
 
				-              <mce-editor
			
 
				-                ref="editor"
			
 
				-                uploadName="upfile"
			
 
				-                v-model="formModel.describe"
			
 
				-                :url="uploadUrl"
			
 
				-                :config="editorConfig"
			
 
				-              ></mce-editor>
			
 
				-            </el-form-item>
			
 
				-          </el-col>
			
 
				-        </el-row>
			
 
				-        <el-row>
			
 
				-          <el-col :span="12">
			
 
				-            <el-form-item label="是否上架" prop="status">
			
 
				-              <el-radio-group v-model="formModel.status">
			
 
				-                <el-radio :label="true">是</el-radio>
			
 
				-                <el-radio :label="false">否</el-radio>
			
 
				-              </el-radio-group>
			
 
				-            </el-form-item>
			
 
				-          </el-col>
			
 
				-        </el-row>
			
 
				-      </el-form>
			
 
				-    </div>
			
 
				-    <span slot="footer" class="dialog-footer">
			
 
				-      <el-button @click="closeDialog">取 消</el-button>
			
 
				-      <el-button type="primary" @click="handleSubmit" :loading="submitting"
			
 
				-        >确 定</el-button
			
 
				-      >
			
 
				-    </span>
			
 
				-  </el-dialog>
			
 
				-</template>
			
 
				-<script>
			
 
				-import Constant from "@/constant";
			
 
				-import recruitInfoApi from "@/api/base/recruitInfo";
			
 
				-import companyInfoApi from "@/api/base/companyInfo";
			
 
				-import dataDictionaryApi from "@/api/sys/dataDictionary";
			
 
				-
			
 
				-import MceEditor from "@/components/Tinymce";
			
 
				-import { getToken } from "@/utils/auth";
			
 
				-
			
 
				-export default {
			
 
				-  props: ["businessKey", "title"],
			
 
				-  components: {
			
 
				-    "mce-editor": MceEditor,
			
 
				-  },
			
 
				-  data() {
			
 
				-    return {
			
 
				-      formModel: {},
			
 
				-      ruleValidate: {
			
 
				-        id: [{ required: true, message: "不能为空", trigger: "blur" }],
			
 
				-        companyId: [
			
 
				-          { required: true, message: "公司不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-        positionName: [
			
 
				-          { required: true, message: "职务名称不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-        workRegion: [
			
 
				-          {
			
 
				-            required: true,
			
 
				-            message: "公司区域（数据字典：区域）不能为空",
			
 
				-            trigger: "blur",
			
 
				-          },
			
 
				-        ],
			
 
				-        workYear: [
			
 
				-          {
			
 
				-            required: true,
			
 
				-            message: "工作年限（数据字典：工作年限）不能为空",
			
 
				-            trigger: "blur",
			
 
				-          },
			
 
				-        ],
			
 
				-        education: [
			
 
				-          {
			
 
				-            required: true,
			
 
				-            message: "学历（数据字典：学历）不能为空",
			
 
				-            trigger: "blur",
			
 
				-          },
			
 
				-        ],
			
 
				-        salaryLevel: [
			
 
				-          {
			
 
				-            required: true,
			
 
				-            message: "薪资水平（数据字典：薪资水平）不能为空",
			
 
				-            trigger: "blur",
			
 
				-          },
			
 
				-        ],
			
 
				-        describe: [
			
 
				-          { required: true, message: "职务描述不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-        contactPhone: [
			
 
				-          { required: true, message: "联系电话不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-        status: [
			
 
				-          { required: true, message: "状态是否上架不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-        createBy: [
			
 
				-          { required: true, message: "创建人不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-        createTime: [
			
 
				-          { required: true, message: "创建时间不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-        updateBy: [
			
 
				-          { required: true, message: "更新人不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-        updateTime: [
			
 
				-          { required: true, message: "更新时间不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-        delFlag: [
			
 
				-          { required: true, message: "是否删除不能为空", trigger: "blur" },
			
 
				-        ],
			
 
				-        key: [
			
 
				-          {
			
 
				-            required: true,
			
 
				-            message: "公司名称+职务名称不能为空",
			
 
				-            trigger: "blur",
			
 
				-          },
			
 
				-        ],
			
 
				-      },
			
 
				-      showDialog: true,
			
 
				-      loading: false,
			
 
				-      submitting: false,
			
 
				-      workRegionResult: [],
			
 
				-      workYearResult: [],
			
 
				-      educationResult: [],
			
 
				-      salaryLevelResult: [],
			
 
				-      editorConfig: {
			
 
				-        height: 400,
			
 
				-        width: "90%",
			
 
				-      },
			
 
				-      uploadUrl: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
			
 
				-      companyInfoResult: [],
			
 
				-    };
			
 
				-  },
			
 
				-  created() {
			
 
				-    var self = this;
			
 
				-
			
 
				-    dataDictionaryApi
			
 
				-      .findByCatalogName({
			
 
				-        catalogName: "区域",
			
 
				-      })
			
 
				-      .then((response) => {
			
 
				-        var jsonData = response.data;
			
 
				-        this.workRegionResult = jsonData.data;
			
 
				-      });
			
 
				-
			
 
				-    dataDictionaryApi
			
 
				-      .findByCatalogName({
			
 
				-        catalogName: "工作年限",
			
 
				-      })
			
 
				-      .then((response) => {
			
 
				-        var jsonData = response.data;
			
 
				-        this.workYearResult = jsonData.data;
			
 
				-      });
			
 
				-
			
 
				-    dataDictionaryApi
			
 
				-      .findByCatalogName({
			
 
				-        catalogName: "学历",
			
 
				-      })
			
 
				-      .then((response) => {
			
 
				-        var jsonData = response.data;
			
 
				-        this.educationResult = jsonData.data;
			
 
				-      });
			
 
				-
			
 
				-    dataDictionaryApi
			
 
				-      .findByCatalogName({
			
 
				-        catalogName: "薪资水平",
			
 
				-      })
			
 
				-      .then((response) => {
			
 
				-        var jsonData = response.data;
			
 
				-        this.salaryLevelResult = jsonData.data;
			
 
				-      });
			
 
				-  },
			
 
				-  methods: {
			
 
				-    closeDialog() {
			
 
				-      this.$emit("close", false);
			
 
				-    },
			
 
				-    handleSubmit() {
			
 
				-      var self = this;
			
 
				-
			
 
				-      this.$refs["form"].validate((valid) => {
			
 
				-        if (valid) {
			
 
				-          (function () {
			
 
				-            var id = self.formModel.id;
			
 
				-
			
 
				-            if (id == null || id.length == 0) {
			
 
				-              return recruitInfoApi.add(self.formModel);
			
 
				-            } else {
			
 
				-              return recruitInfoApi.update(self.formModel);
			
 
				-            }
			
 
				-          })().then(function (response) {
			
 
				-            var jsonData = response.data;
			
 
				-
			
 
				-            if (jsonData.result) {
			
 
				-              self.$message({
			
 
				-                message: "保存成功!",
			
 
				-                type: "success",
			
 
				-              });
			
 
				-
			
 
				-              self.$emit("close", true);
			
 
				-            } else {
			
 
				-              self.$message({
			
 
				-                message: jsonData.message + "",
			
 
				-                type: "warning",
			
 
				-              });
			
 
				-
			
 
				-              self.$emit("close", false);
			
 
				-            }
			
 
				-          });
			
 
				-        }
			
 
				-      });
			
 
				-    },
			
 
				-    filterMethod(query, item) {
			
 
				-      var self = this;
			
 
				-      var formData = new FormData();
			
 
				-      formData.append("pageSize", 5);
			
 
				-      formData.append("companyName", query);
			
 
				-
			
 
				-      companyInfoApi.list(formData).then(function (response) {
			
 
				-        var jsonData = response.data;
			
 
				-        if (jsonData.result) {
			
 
				-          self.companyInfoResult = jsonData.data;
			
 
				-        }
			
 
				-      });
			
 
				-    },
			
 
				-  },
			
 
				-  mounted: function () {
			
 
				-    var self = this;
			
 
				-    (function () {
			
 
				-      if (self.businessKey.length == 0) {
			
 
				-        return recruitInfoApi.create();
			
 
				-      } else {
			
 
				-        return recruitInfoApi.edit(self.businessKey);
			
 
				-      }
			
 
				-    })()
			
 
				-      .then((response) => {
			
 
				-        var jsonData = response.data;
			
 
				-        self.loading = false;
			
 
				-
			
 
				-        if (jsonData.result) {
			
 
				-          self.formModel = jsonData.data;
			
 
				-
			
 
				-          let status = self.formModel.status;
			
 
				-          if (status == null) {
			
 
				-            self.formModel.status = false;
			
 
				-          }
			
 
				-
			
 
				-          if (self.formModel.describe != null) {
			
 
				-            self.$refs.editor.setContent(self.formModel.describe);
			
 
				-          }
			
 
				-
			
 
				-          let companyId = self.formModel.companyId;
			
 
				-          if (companyId != null) {
			
 
				-            var formData = new FormData();
			
 
				-            formData.append("pageSize", 5);
			
 
				-            formData.append("companyId", companyId);
			
 
				-
			
 
				-            companyInfoApi.list(formData).then(function (response) {
			
 
				-              var jsonData = response.data;
			
 
				-              if (jsonData.result) {
			
 
				-                self.companyInfoResult = jsonData.data;
			
 
				-              }
			
 
				-            });
			
 
				-          }
			
 
				-        } else {
			
 
				-          self.$message.error(jsonData.message + "");
			
 
				-        }
			
 
				-      })
			
 
				-      .catch((error) => {
			
 
				-        self.$message.error(error + "");
			
 
				-      });
			
 
				-  },
			
 
				-};
			
 
				-</script>
			
--- a/src/views/base/recruitInfo-list.vue
+++ b/src/views/base/recruitInfo-list.vue
@@ -1,418 +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="/recruitInfo">企业招聘管理</a>
			
 
				-      </el-breadcrumb-item>
			
 
				-    </el-breadcrumb>
			
 
				-    <el-divider></el-divider>
			
 
				-    <!--
			
 
				-      要resetFields起作用，必须配置:model和prop
			
 
				-    -->
			
 
				-    <el-form
			
 
				-      ref="queryForm"
			
 
				-      :model="queryModel"
			
 
				-      inline
			
 
				-      class="demo-form-inline"
			
 
				-    >
			
 
				-      <el-form-item label="公司名称" prop="companyId">
			
 
				-        <el-select
			
 
				-          v-model="queryModel.companyId"
			
 
				-          filterable
			
 
				-          placeholder="请输入公司名称"
			
 
				-          style="width: 90%"
			
 
				-          size="mini"
			
 
				-          :filter-method="filterMethod"
			
 
				-        >
			
 
				-          <el-option
			
 
				-            v-for="company in companyInfoList"
			
 
				-            :key="company.id"
			
 
				-            :label="company.companyName"
			
 
				-            :value="company.id"
			
 
				-          ></el-option>
			
 
				-        </el-select>
			
 
				-      </el-form-item>
			
 
				-      <el-form-item label="职务名称" prop="positionName">
			
 
				-        <el-input
			
 
				-          type="text"
			
 
				-          size="mini"
			
 
				-          v-model="queryModel.positionName"
			
 
				-        ></el-input>
			
 
				-      </el-form-item>
			
 
				-      <el-form-item>
			
 
				-        <el-button
			
 
				-          type="primary"
			
 
				-          size="mini"
			
 
				-          icon="ios-search"
			
 
				-          @click="changePage(1)"
			
 
				-          :loading="loading"
			
 
				-          >查询</el-button
			
 
				-        >&nbsp;
			
 
				-        <el-button
			
 
				-          type="info"
			
 
				-          size="mini"
			
 
				-          style="margin-left: 8px"
			
 
				-          @click="handleReset('queryForm')"
			
 
				-          >重置</el-button
			
 
				-        >&nbsp;
			
 
				-      </el-form-item>
			
 
				-    </el-form>
			
 
				-    <el-divider></el-divider>
			
 
				-    <el-row class="button-group">
			
 
				-      <el-button
			
 
				-        type="primary"
			
 
				-        size="small"
			
 
				-        plain
			
 
				-        icon="el-icon-circle-plus"
			
 
				-        @click="handleAdd"
			
 
				-        >新增</el-button
			
 
				-      >
			
 
				-      <el-button
			
 
				-        type="primary"
			
 
				-        size="small"
			
 
				-        plain
			
 
				-        icon="el-icon-circle-plus"
			
 
				-        :disabled="multipleSelection.length == 0"
			
 
				-        @click="handleBatchDelete"
			
 
				-        >删除选中项</el-button
			
 
				-      >
			
 
				-    </el-row>
			
 
				-    <el-table
			
 
				-      :data="tableData"
			
 
				-      style="min-height: 400px"
			
 
				-      v-loading="loading"
			
 
				-      stripe
			
 
				-      @sort-change="sortChange"
			
 
				-      @selection-change="handleSelectionChange"
			
 
				-    >
			
 
				-      <el-table-column type="selection" width="55"></el-table-column>
			
 
				-      <el-table-column
			
 
				-        type="index"
			
 
				-        label="序号"
			
 
				-        :index="indexMethod"
			
 
				-        width="50"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="companyName"
			
 
				-        label="公司"
			
 
				-        width="150"
			
 
				-        show-overflow-tooltip
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="positionName"
			
 
				-        label="职务名称"
			
 
				-        width="150"
			
 
				-        show-overflow-tooltip
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="workRegionName"
			
 
				-        label="工作区域"
			
 
				-        width="180"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="workYearName"
			
 
				-        label="工作年限"
			
 
				-        width="180"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="educationName"
			
 
				-        label="学历"
			
 
				-        width="180"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="salaryLevelName"
			
 
				-        label="薪资水平"
			
 
				-        width="180"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="contactPhone"
			
 
				-        label="联系电话"
			
 
				-        width="180"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column prop="status" label="是否上架" width="180">
			
 
				-        <template slot-scope="{ row }">
			
 
				-          <span v-if="row.status">已上架</span>
			
 
				-          <span v-else>未上架</span>
			
 
				-        </template></el-table-column
			
 
				-      >
			
 
				-      <el-table-column
			
 
				-        prop="key"
			
 
				-        label="key"
			
 
				-        width="180"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="createTime"
			
 
				-        label="创建时间"
			
 
				-        width="180"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column
			
 
				-        prop="updateTime"
			
 
				-        label="更新时间"
			
 
				-        width="180"
			
 
				-      ></el-table-column>
			
 
				-      <el-table-column label="操作" width="150" fixed="right">
			
 
				-        <template slot-scope="{ row }">
			
 
				-          <el-button size="mini" type="warning" @click="handleEdit(row)"
			
 
				-            >编辑</el-button
			
 
				-          >
			
 
				-          <el-button size="mini" type="danger" @click="handleDelete(row)"
			
 
				-            >删除</el-button
			
 
				-          >
			
 
				-        </template>
			
 
				-      </el-table-column>
			
 
				-    </el-table>
			
 
				-    <el-pagination
			
 
				-      :current-page.sync="pageIndex"
			
 
				-      :total="totalElements"
			
 
				-      :page-sizes="pageSizeList"
			
 
				-      @current-change="changePage"
			
 
				-      @size-change="pageSizeChange"
			
 
				-      layout="total, sizes, prev, pager, next, jumper"
			
 
				-    ></el-pagination>
			
 
				-    <recruitInfo-detail
			
 
				-      v-if="showModal"
			
 
				-      :businessKey="businessKey"
			
 
				-      :title="modalTitle"
			
 
				-      @close="onDetailModalClose"
			
 
				-    ></recruitInfo-detail>
			
 
				-  </div>
			
 
				-</template>
			
 
				-<script>
			
 
				-import Constant from "@/constant";
			
 
				-import RecruitInfoDetail from "./recruitInfo-detail";
			
 
				-import recruitInfoApi from "@/api/base/recruitInfo";
			
 
				-import companyInfoApi from "@/api/base/companyInfo";
			
 
				-import NProgress from "nprogress"; // progress bar
			
 
				-import "nprogress/nprogress.css"; // progress bar style
			
 
				-
			
 
				-export default {
			
 
				-  name: "BaseRecruitInfoList",
			
 
				-  data() {
			
 
				-    var self = this;
			
 
				-
			
 
				-    return {
			
 
				-      queryModel: {
			
 
				-        id: "",
			
 
				-        companyId: "",
			
 
				-        positionName: "",
			
 
				-        workRegion: "",
			
 
				-        workYear: "",
			
 
				-        education: "",
			
 
				-        salaryLevel: "",
			
 
				-        describe: "",
			
 
				-        contactPhone: "",
			
 
				-        status: "",
			
 
				-        createBy: "",
			
 
				-        createTime: "",
			
 
				-        updateBy: "",
			
 
				-        updateTime: "",
			
 
				-        delFlag: "",
			
 
				-        key: "",
			
 
				-      },
			
 
				-      loading: false,
			
 
				-      tableData: [],
			
 
				-      pageIndex: 1,
			
 
				-      pageSize: 10,
			
 
				-      totalPages: 0,
			
 
				-      totalElements: 0,
			
 
				-      field: "",
			
 
				-      direction: "",
			
 
				-      pageSizeList: [10, 20, 30],
			
 
				-      multipleSelection: [],
			
 
				-      showModal: false,
			
 
				-      modalTitle: "",
			
 
				-      businessKey: "",
			
 
				-      companyInfoList: [],
			
 
				-    };
			
 
				-  },
			
 
				-  methods: {
			
 
				-    indexMethod(index) {
			
 
				-      return (this.pageIndex - 1) * this.pageSize + (index + 1);
			
 
				-    },
			
 
				-    changePage(pageIndex) {
			
 
				-      var self = this;
			
 
				-
			
 
				-      self.loading = true;
			
 
				-
			
 
				-      self.pageIndex = pageIndex;
			
 
				-      var formData = new FormData();
			
 
				-
			
 
				-      formData.append("pageIndex", self.pageIndex);
			
 
				-      formData.append("pageSize", self.pageSize);
			
 
				-
			
 
				-      formData.append("id", self.queryModel.id);
			
 
				-      formData.append("companyId", self.queryModel.companyId);
			
 
				-      formData.append("positionName", self.queryModel.positionName);
			
 
				-      formData.append("workRegion", self.queryModel.workRegion);
			
 
				-      formData.append("workYear", self.queryModel.workYear);
			
 
				-      formData.append("education", self.queryModel.education);
			
 
				-      formData.append("salaryLevel", self.queryModel.salaryLevel);
			
 
				-      formData.append("describe", self.queryModel.describe);
			
 
				-      formData.append("contactPhone", self.queryModel.contactPhone);
			
 
				-      formData.append("status", self.queryModel.status);
			
 
				-      formData.append("createBy", self.queryModel.createBy);
			
 
				-      formData.append("createTime", self.queryModel.createTime);
			
 
				-      formData.append("updateBy", self.queryModel.updateBy);
			
 
				-      formData.append("updateTime", self.queryModel.updateTime);
			
 
				-      formData.append("delFlag", self.queryModel.delFlag);
			
 
				-      formData.append("key", self.queryModel.key);
			
 
				-
			
 
				-      if (this.field != null) {
			
 
				-        formData.append("field", this.field);
			
 
				-      }
			
 
				-
			
 
				-      if (this.direction != null) {
			
 
				-        formData.append("direction", this.direction);
			
 
				-      }
			
 
				-
			
 
				-      recruitInfoApi
			
 
				-        .pageList(formData)
			
 
				-        .then(function (response) {
			
 
				-          self.loading = false;
			
 
				-
			
 
				-          var jsonData = response.data.data;
			
 
				-
			
 
				-          self.tableData = jsonData.data;
			
 
				-          self.totalPages = jsonData.totalPages;
			
 
				-          self.totalElements = jsonData.recordsTotal;
			
 
				-        })
			
 
				-        .catch((error) => {
			
 
				-          self.loading = false;
			
 
				-          // self.$message.error(error + "");
			
 
				-        });
			
 
				-    },
			
 
				-    pageSizeChange(pageSize) {
			
 
				-      this.pageSize = pageSize;
			
 
				-
			
 
				-      this.$nextTick(() => {
			
 
				-        this.changePage(this.pageIndex);
			
 
				-      });
			
 
				-    },
			
 
				-    sortChange(data) {
			
 
				-      this.field = data.column.field;
			
 
				-      this.direction = data.order;
			
 
				-
			
 
				-      this.changePage(this.pageIndex);
			
 
				-    },
			
 
				-    handleSelectionChange(val) {
			
 
				-      this.multipleSelection = val;
			
 
				-    },
			
 
				-    handleReset(name) {
			
 
				-      this.$refs[name].resetFields();
			
 
				-    },
			
 
				-    handleAdd() {
			
 
				-      this.modalTitle = "新增";
			
 
				-      this.businessKey = "";
			
 
				-      this.showModal = true;
			
 
				-    },
			
 
				-    handleEdit(record) {
			
 
				-      this.modalTitle = "编辑";
			
 
				-      this.businessKey = record.id;
			
 
				-      this.showModal = true;
			
 
				-    },
			
 
				-    handleDelete(record) {
			
 
				-      var self = this;
			
 
				-
			
 
				-      self
			
 
				-        .$confirm("是否确认删除?", "提示", {
			
 
				-          confirmButtonText: "确定",
			
 
				-          cancelButtonText: "取消",
			
 
				-          type: "warning",
			
 
				-        })
			
 
				-        .then(() => {
			
 
				-          recruitInfoApi.remove(record.id).then(function (response) {
			
 
				-            var jsonData = response.data;
			
 
				-
			
 
				-            if (jsonData.result) {
			
 
				-              // var index = self.tableData.indexOf(record);
			
 
				-              // self.tableData.splice(index, 1);
			
 
				-              self.changePage(self.pageIndex);
			
 
				-
			
 
				-              self.$message({
			
 
				-                type: "success",
			
 
				-                message: "删除成功!",
			
 
				-              });
			
 
				-            }
			
 
				-          });
			
 
				-        });
			
 
				-    },
			
 
				-    handleBatchDelete() {
			
 
				-      var self = this;
			
 
				-
			
 
				-      var idList = this.multipleSelection.map((record) => {
			
 
				-        return record.id;
			
 
				-      });
			
 
				-
			
 
				-      this.$confirm("是否确认删除选中项？", "提示", {
			
 
				-        confirmButtonText: "确定",
			
 
				-        cancelButtonText: "取消",
			
 
				-        type: "warning",
			
 
				-      }).then(() => {
			
 
				-        recruitInfoApi.batchRemove(idList).then(function (response) {
			
 
				-          var jsonData = response.data;
			
 
				-
			
 
				-          if (jsonData.result) {
			
 
				-            self.changePage(self.pageIndex);
			
 
				-
			
 
				-            self.$message({
			
 
				-              type: "success",
			
 
				-              message: "删除成功!",
			
 
				-            });
			
 
				-          }
			
 
				-        });
			
 
				-      });
			
 
				-    },
			
 
				-    onDetailModalClose(refreshed) {
			
 
				-      //保存成功后回调
			
 
				-      this.showModal = false;
			
 
				-
			
 
				-      if (refreshed) {
			
 
				-        this.changePage(this.pageIndex);
			
 
				-      }
			
 
				-    },
			
 
				-    filterMethod(query, item) {
			
 
				-      var self = this;
			
 
				-      var formData = new FormData();
			
 
				-      formData.append("pageSize", 5);
			
 
				-      formData.append("companyName", query);
			
 
				-
			
 
				-      companyInfoApi.list(formData).then(function (response) {
			
 
				-        var jsonData = response.data;
			
 
				-        if (jsonData.result) {
			
 
				-          self.companyInfoList = jsonData.data;
			
 
				-        }
			
 
				-      });
			
 
				-    },
			
 
				-  },
			
 
				-  mounted: function () {
			
 
				-    this.changePage(1);
			
 
				-  },
			
 
				-  components: {
			
 
				-    "recruitInfo-detail": RecruitInfoDetail,
			
 
				-  },
			
 
				-};
			
 
				-</script>
			
 
				-<style lang="scss" scoped>
			
 
				-.el-breadcrumb {
			
 
				-  margin: 10px;
			
 
				-  line-height: 20px;
			
 
				-}
			
 
				-
			
 
				-.el-divider {
			
 
				-  margin: 5px 0;
			
 
				-}
			
 
				-
			
 
				-.demo-form-inline {
			
 
				-  margin-left: 10px;
			
 
				-  text-align: left;
			
 
				-}
			
 
				-
			
 
				-.button-group {
			
 
				-  margin-left: 10px;
			
 
				-  text-align: left;
			
 
				-}
			
 
				-</style>
			
--- a/src/views/base/whisperingWall-detail.vue
+++ b/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: 500px"
			
 
				-          ></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>
			
--- a/src/views/base/whisperingWall-list.vue
+++ b/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="typeName" label="类型" width="180"></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 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>