冲突提交

package.json

@@ -13,6 +13,7 @@
     "core-js": "^3.3.2",
     "echarts": "^4.5.0",
     "element-ui": "^2.4.5",
+    "hls.js": "^1.0.2",
     "js-cookie": "^2.2.1",
     "nprogress": "0.2.0",
     "qrcodejs2": "^0.0.2",

src/api/base/activityInfo.js

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

src/api/base/alarmConfig.js

@@ -41,6 +41,11 @@ function batchRemove(idList){
   });
 }
 
+function exportXls(formData) {
+  //导出xls
+  return request.post(constant.serverUrl + "/base/alarmConfig/exportXls", formData);
+}
+
 export default {
-  pageList,create,edit,add,update,remove,batchRemove
+  pageList,create,edit,add,update,remove,batchRemove,exportXls
 }

src/api/base/applicationExamine.js

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

src/api/base/approvalConfig.js

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

src/api/base/businessOut.js

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

src/api/base/cameraInfo.js

@@ -0,0 +1,78 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/cameraInfo/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/base/cameraInfo/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/cameraInfo/edit/" + id);
+}
+
+function queryDeviceInfo(deviceSerial){
+  return request.get(constant.serverUrl + `/base/cameraInfo/queryDeviceInfo?deviceSerial=${deviceSerial}`);
+}
+
+function queryLiveAddressUrl(data){
+  var formData = new FormData();
+
+  for(var name in data){
+    formData.append(name, data[name]);
+  }
+
+  return request.post(constant.serverUrl + "/base/cameraInfo/queryLiveAddressUrl",formData);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/cameraInfo/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/cameraInfo/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function refresh(id){
+  return request.post(constant.serverUrl + "/base/cameraInfo/refresh/" + id);
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/cameraInfo/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/cameraInfo/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function bindClass(formModel){  
+  return request.post(constant.serverUrl + "/base/cameraInfo/bindClass", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function bindClassList(id){  
+  return request.get(constant.serverUrl + `/base/cameraInfo/bindClassList/${id}`);
+}
+
+export default {
+  pageList,create,edit,add,update,remove,
+  batchRemove,queryDeviceInfo,queryLiveAddressUrl,refresh,
+  bindClass,bindClassList
+}

src/api/base/checkinInfo.js

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

src/api/base/companyGoodsInfo.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function findByCheckinInfoId(formData) {
+  return request.post(constant.serverUrl + "/base/companyGoodsInfo/findByCheckinInfoId", formData);
+}
+
+export default {
+  findByCheckinInfoId
+}

src/api/base/companyInfo.js

@@ -74,12 +74,17 @@ function unbindDevice(formData) {
   return request.post(constant.serverUrl + "/base/companyInfo/unbindDevice", formData);
 }
 
-function getCompanyName(formData) {
-  return request.post(constant.serverUrl + "/base/companyInfo/getCompanyName", formData);
+function treeList() {
+  return request.post(constant.serverUrl + "/base/companyInfo/treeList");
 }
 
+function isOpenMobilePayment(formData) {
+  return request.post(constant.serverUrl + "/base/companyInfo/isOpenMobilePayment",formData);
+}
+
+
 
 export default {
   list, create, edit, add, update, remove, batchRemove, pageList, queryBindDeviceList,
-  bindDevice, unbindDevice,loadChildren,getCompanyName
+  bindDevice, unbindDevice,loadChildren,treeList,isOpenMobilePayment
 }

src/api/base/companyPayment.js

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

src/api/base/companyStructureInfo.js

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

src/api/base/ehome.js

@@ -0,0 +1,33 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+
+function getXMLConfig(deviceNo,url){
+  var encUrl = encodeURIComponent(url);
+
+  return request.get(constant.serverUrl + `/ehome/getXMLConfig?deviceNo=${deviceNo}&url=${encUrl}`);
+}
+
+function putXMLConfig(deviceNo,url,jsonData){  
+  var encUrl = encodeURIComponent(url);
+
+  return request.put(constant.serverUrl + `/ehome/setXMLConfig?deviceNo=${deviceNo}&url=${encUrl}`, jsonData,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function postXMLConfig(deviceNo,url,jsonData){
+    var encUrl = encodeURIComponent(url);
+
+    return request.post(constant.serverUrl + `/ehome/setXMLConfig?deviceNo=${deviceNo}&url=${encUrl}`, jsonData,{
+      headers: {
+        "Content-Type": "application/json"
+      }
+    });
+}
+
+export default {
+    getXMLConfig,putXMLConfig,postXMLConfig
+}

src/api/base/goodsInfo.js

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

src/api/base/holidayInfo.js

@@ -41,6 +41,11 @@ function batchRemove(idList){
   });
 }
 
+function exportXls(formData) {
+  //导出xls
+  return request.post(constant.serverUrl + "/base/holidayInfo/exportXls", formData);
+}
+
 export default {
-  pageList,create,edit,add,update,remove,batchRemove
+  pageList,create,edit,add,update,remove,batchRemove,exportXls
 }

src/api/base/iconInfo.js

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

src/api/base/informationInfo.js

@@ -29,6 +29,12 @@ function update(formModel){
   });
 }
 
+
+function finished(id){
+  return request.post(constant.serverUrl + "/base/informationInfo/finished/" + id);
+}
+
+
 function remove(id){
   return request.post(constant.serverUrl + "/base/informationInfo/delete/" + id);
 }
@@ -42,5 +48,5 @@ function batchRemove(idList){
 }
 
 export default {
-  pageList,create,edit,add,update,remove,batchRemove
+  pageList,create,edit,add,update,remove,batchRemove,finished
 }

src/api/base/messageInfo.js

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

src/api/base/messageNotice.js

@@ -45,6 +45,10 @@ function list() {
   return request.post(constant.serverUrl + "/messageNotice/list");
 }
 
+function sendWechat(formData) {
+  return request.post(constant.serverUrl + "/messageNotice/sendWechat", formData);
+}
+
 export default {
-  create, edit, add, update, remove, batchRemove, pageList, list
+  create, edit, add, update, remove, batchRemove, pageList, list, sendWechat
 }

src/api/base/messageReceiver.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/messageReceiver/pageList", formData);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/messageReceiver/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+export default {
+  pageList,batchRemove
+}

src/api/base/messageReport.js

@@ -2,19 +2,19 @@ import request from '@/utils/request'
 import constant from '@/constant'
 //异常上报messageReport
 function pageList(formData) {
-  return request.post(constant.serverUrl + "/base/messageReport/pageList", formData);
+  return request.post(constant.serverUrl + "/epidemicReport/list", formData);
 }
 
 function create() {
-  return request.get(constant.serverUrl + "/base/messageReport/create");
+  return request.get(constant.serverUrl + "/base/epidemicReport/create");
 }
 
 function edit(id) {
-  return request.get(constant.serverUrl + "/base/messageReport/edit/" + id);
+  return request.get(constant.serverUrl + "/base/epidemicReport/edit/" + id);
 }
 
 function add(formModel) {
-  return request.post(constant.serverUrl + "/base/messageReport/add", formModel, {
+  return request.post(constant.serverUrl + "/base/epidemicReport/add", formModel, {
     headers: {
       "Content-Type": "application/json"
     }
@@ -22,7 +22,7 @@ function add(formModel) {
 }
 
 function update(formModel) {
-  return request.post(constant.serverUrl + "/base/messageReport/update", formModel, {
+  return request.post(constant.serverUrl + "/base/epidemicReport/update", formModel, {
     headers: {
       "Content-Type": "application/json"
     }
@@ -30,11 +30,11 @@ function update(formModel) {
 }
 
 function remove(id) {
-  return request.post(constant.serverUrl + "/base/messageReport/delete/" + id);
+  return request.post(constant.serverUrl + "/base/epidemicReport/delete/" + id);
 }
 
 function batchRemove(idList) {
-  return request.post(constant.serverUrl + "/base/messageReport/batchDelete", idList, {
+  return request.post(constant.serverUrl + "/base/epidemicReport/batchDelete", idList, {
     headers: {
       "Content-Type": "application/json"
     }
@@ -42,7 +42,7 @@ function batchRemove(idList) {
 }
 
 function list() {
-  return request.post(constant.serverUrl + "/base/messageReport/list");
+  return request.post(constant.serverUrl + "/base/epidemicReport/list");
 }
 
 export default {

src/api/base/messageSendCondition.js

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

src/api/base/oldPersonInfo.js

@@ -0,0 +1,152 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+import { getToken } from "@/utils/auth"; // get token from cookie
+
+function pageList(formData) {
+  return request.post(constant.serverUrl + "/base/oldPersonInfo/pageList", formData);
+}
+
+function create() {
+  return request.get(constant.serverUrl + "/base/oldPersonInfo/create");
+}
+
+function edit(id) {
+  return request.get(constant.serverUrl + "/base/oldPersonInfo/edit/" + id);
+}
+
+function add(formModel) {
+  return request.post(constant.serverUrl + "/base/oldPersonInfo/add", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel) {
+  return request.post(constant.serverUrl + "/base/oldPersonInfo/update", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id) {
+  return request.post(constant.serverUrl + "/base/oldPersonInfo/delete/" + id);
+}
+
+function batchRemove(idList) {
+  return request.post(constant.serverUrl + "/base/oldPersonInfo/batchDelete", idList, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function exportXls(formData) {
+  //导出xls
+  return request.post(constant.serverUrl + "/base/oldPersonInfo/exportXls", formData);
+  //window.open(constant.serverUrl + "/base/oldPersonInfo/exportXls?token=" + getToken());
+}
+
+function enabledFace(formData) {
+  //人脸授权
+  return request.post(constant.serverUrl + "/base/oldPersonInfo/enabledFace", formData);
+}
+
+function enabledFaceList(ids) {
+  //批量人脸授权
+  return request.post(constant.serverUrl + "/base/oldPersonInfo/enabledFaceList", ids, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function enabledCard(formData) {
+  //刷卡授权
+  return request.post(constant.serverUrl + "/base/oldPersonInfo/enabledCard", formData);
+}
+
+function enabledApp(formData) {
+  //手机授权
+  return request.post(constant.serverUrl + "/base/oldPersonInfo/enabledApp", formData);
+}
+
+function enabledWechatNotice(formData) {
+  //接收微信通知
+  return request.post(constant.serverUrl + "/base/oldPersonInfo/enabledWechatNotice", formData);
+}
+
+function enabledGuest(formData) {
+  //访客授权
+  return request.post(constant.serverUrl + "/base/oldPersonInfo/enabledGuest", formData);
+}
+
+function dataSync(idList) {
+  //数据同步
+  return request.post(constant.serverUrl + "/base/oldPersonInfo/dataSync", idList, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function unbindWechat(id) {
+  return request.post(constant.serverUrl + "/base/oldPersonInfo/unbindWechat", id, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function lifeRecordList(formData) {
+  return request.post(constant.serverUrl + "/base/oldPersonInfo/lifeRecordList", formData);
+}
+
+function clearFaceImg(id) {
+  return request.post(constant.serverUrl + "/base/oldPersonInfo/clearFaceImg", id, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function batchClearFaceImg(idList) {
+  return request.post(constant.serverUrl + "/base/oldPersonInfo/batchClearFaceImg", idList, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+
+function enabledSync(formData) {
+  //开启自动同步
+  return request.post(constant.serverUrl + "/base/oldPersonInfo/enabledSync", formData);
+}
+
+function enabledSyncList(ids) {
+  //开启自动同步
+  return request.post(constant.serverUrl + "/base/oldPersonInfo/enabledSyncList", ids, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function bindWechat(userId) {
+  var formData = new FormData();
+
+  formData.append("expire_seconds", "3600");
+  formData.append("action_name", "QR_STR_SCENE");
+  formData.append("scene_str", process.env.VUE_APP_BIND_PERSON_WECHAT_CODE + "," + userId);
+
+  return request.post(constant.serverUrl + "/wechat/qrcode/create", formData);
+}
+
+export default {
+  pageList, create, edit, add, update, remove, batchRemove, exportXls,
+  enabledFace, enabledCard, enabledApp, enabledGuest, dataSync, enabledFaceList,
+  enabledWechatNotice, unbindWechat, lifeRecordList, clearFaceImg, batchClearFaceImg,
+  enabledSync, enabledSyncList, bindWechat
+}

src/api/base/order.js

@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData) {
+  return request.post(constant.serverUrl + "/base/order/pageList", formData);
+}
+
+function detail(id) {
+  return request.get(constant.serverUrl + "/base/order/detail/"+id);
+}
+
+function goodsList(id) {
+  return request.get(constant.serverUrl + "/base/order/goodsList/"+id);
+}
+
+function orderLog(id) {
+  return request.get(constant.serverUrl + "/base/order/orderLog/"+id);
+}
+
+function updateOrder(formData) {
+  return request.post(constant.serverUrl + "/base/order/updateOrder",formData);
+}
+
+export default {
+    pageList,detail,goodsList,orderLog,updateOrder
+}

src/api/base/parkingChannel.js

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

src/api/base/parkingCoupon.js

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

src/api/base/parkingInfo.js

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

src/api/base/parkingMerchant.js

@@ -0,0 +1,56 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData) {
+  return request.post(constant.serverUrl + "/base/parkingMerchant/pageList", formData);
+}
+
+function create() {
+  return request.get(constant.serverUrl + "/base/parkingMerchant/create");
+}
+
+function edit(id) {
+  return request.get(constant.serverUrl + "/base/parkingMerchant/edit/" + id);
+}
+
+function add(formModel) {
+  return request.post(constant.serverUrl + "/base/parkingMerchant/add", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel) {
+  return request.post(constant.serverUrl + "/base/parkingMerchant/update", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id) {
+  return request.post(constant.serverUrl + "/base/parkingMerchant/delete/" + id);
+}
+
+function batchRemove(idList) {
+  return request.post(constant.serverUrl + "/base/parkingMerchant/batchDelete", idList, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function bindChannelWechat(merchantId) {
+  var formData = new FormData();
+
+  formData.append("expire_seconds", "2592000");
+  formData.append("action_name", "QR_LIMIT_STR_SCENE");
+  formData.append("scene_str", process.env.VUE_APP_BIND_CHANNEL_WECHAT_CODE + "," + merchantId);
+
+  return request.post(constant.serverUrl + "/wechat/qrcode/create", formData);
+}
+
+export default {
+  pageList, create, edit, add, update, remove, batchRemove,bindChannelWechat
+}

src/api/base/parkingMerchantBinder.js

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

src/api/base/parkingRecord.js

@@ -0,0 +1,20 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData) {
+  return request.post(constant.serverUrl + "/base/parkingRecord/pageList", formData);
+}
+
+function inOutPageList(formData) {
+  return request.post(constant.serverUrl + "/base/parkingRecord/inOutPageList", formData);
+}
+
+function carTypeList() {
+  return request.post(constant.serverUrl + "/base/parkingRecord/carTypeList");
+}
+
+
+
+export default {
+  pageList,carTypeList,inOutPageList
+}

src/api/base/parkingWay.js

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

src/api/base/payService.js

@@ -0,0 +1,59 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function payServicePageList(formData) {
+  return request.post(constant.serverUrl + "/base/goodsInfo/payServicePageList", formData);
+}
+
+function goodsTypeList() {
+  return request.post(constant.serverUrl + "/base/goodsInfo/goodsTypeList");
+}
+
+function addPayService(formModel){
+  return request.post(constant.serverUrl + "/base/goodsInfo/addPayService", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function editPayService(id){
+  return request.get(constant.serverUrl + "/base/goodsInfo/editPayService/" + id);
+}
+
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/goodsInfo/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/base/goodsInfo/create");
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/goodsInfo/delete/" + id);
+}
+
+function payServiceList(formData) {
+  return request.post(constant.serverUrl + "/base/goodsInfo/payServiceList", formData, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function addList(formData) {
+  return request.post(constant.serverUrl + "/base/goodsInfo/addList", formData, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+export default {
+    payServicePageList,goodsTypeList,addPayService,update,editPayService,create,remove,payServiceList,addList
+  }

src/api/base/personApplication.js

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

src/api/base/personDeviceRelation.js

@@ -97,9 +97,15 @@ function devicesPersonSync(formData) {
 }
 
 
+function unbindSelectDevice(formData) {
+  //解除选择的设备绑定
+  return request.post(constant.serverUrl + "/personDeviceRelation/unbindSelectDevice", formData);
+}
+
+
 export default {
   create, edit, add, update, remove, batchRemove, pageList,
   isUnbindDeviceList, batchBindDevice, unbindDevice, batchBindPerson, batchUnBindPerson,
   devicePersonList, devicePersonSync, devicePersonsSync, updateIsWrite, updatePersonIsWrite,
-  devicesPersonSync
+  devicesPersonSync,unbindSelectDevice
 }

src/api/base/personHealthLedger.js

@@ -0,0 +1,86 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData) {
+  return request.post(constant.serverUrl + "/base/personHealthLedger/pageList", formData);
+}
+
+function create() {
+  return request.get(constant.serverUrl + "/base/personHealthLedger/create");
+}
+
+function edit(id) {
+  return request.get(constant.serverUrl + "/base/personHealthLedger/edit/" + id);
+}
+
+function add(formModel) {
+  return request.post(constant.serverUrl + "/base/personHealthLedger/add", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel) {
+  return request.post(constant.serverUrl + "/base/personHealthLedger/update", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id) {
+  return request.post(constant.serverUrl + "/base/personHealthLedger/delete/" + id);
+}
+
+function batchRemove(idList) {
+  return request.post(constant.serverUrl + "/base/personHealthLedger/batchDelete", idList, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function exportXls(formData) {
+  return request.post(constant.serverUrl + "/base/personHealthLedger/exportXls", formData);
+}
+
+function pageListAll(formData) {
+  //包含测温和健康上报
+  return request.post(constant.serverUrl + "/base/personHealthLedger/pageListAll", formData);
+}
+
+function exportXlsAll(formData) {
+  return request.post(constant.serverUrl + "/base/personHealthLedger/exportXlsAll", formData);
+}
+
+function gpsHistoryList(formData) {
+  return request.post(constant.serverUrl + "/base/personHealthLedger/gpsHistoryList", formData);
+}
+
+function healthLedgerDateExportXls(formData) {
+  return request.post(constant.serverUrl + "/base/personHealthLedger/healthLedgerDateExportXls", formData);
+}
+
+function exportXlsWC(formData) {
+  return request.post(constant.serverUrl + "/base/personHealthLedger/exportXlsWC", formData);
+}
+
+function exportXlsTWYC(formData) {
+  return request.post(constant.serverUrl + "/base/personHealthLedger/exportXlsTWYC", formData);
+}
+
+function exportXlsZZYC(formData) {
+  return request.post(constant.serverUrl + "/base/personHealthLedger/exportXlsZZYC", formData);
+}
+function healthLedgerDateCompanyNumExportXls() {
+  return request.post(constant.serverUrl + "/base/personHealthLedger/healthLedgerDateCompanyNumExportXls");
+}
+
+function pageListNew(formData) {
+  return request.post(constant.serverUrl + "/base/personHealthLedger/pageListNew", formData);
+}
+
+export default {
+  pageList, create, edit, add, update, remove, batchRemove, exportXls, pageListAll,exportXlsAll,gpsHistoryList,exportXlsWC,exportXlsTWYC,exportXlsZZYC,healthLedgerDateExportXls,pageListNew,healthLedgerDateCompanyNumExportXls
+}

src/api/base/personInfo.js

@@ -144,9 +144,21 @@ function bindWechat(userId) {
   return request.post(constant.serverUrl + "/wechat/qrcode/create", formData);
 }
 
+function findByCompanyId(formData) {
+  return request.post(constant.serverUrl + "/base/personInfo/findByCompanyId", formData);
+}
+
+function findByCompanyCode() {
+  return request.post(constant.serverUrl + "/base/personInfo/findByCompanyCode");
+}
+
+function updateHealthyCode(personId){
+  return request.get(constant.serverUrl + `/base/personInfo/updateHealthyCode?personId=${personId}`);
+}
+
 export default {
   pageList, create, edit, add, update, remove, batchRemove, exportXls,
   enabledFace, enabledCard, enabledApp, enabledGuest, dataSync, enabledFaceList,
   enabledWechatNotice, unbindWechat, lifeRecordList, clearFaceImg, batchClearFaceImg,
-  enabledSync, enabledSyncList, bindWechat
+  enabledSync, enabledSyncList, bindWechat,findByCompanyId,findByCompanyCode,updateHealthyCode
 }

src/api/base/personPopedom.js

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

src/api/base/personPopedomIcon.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function findRelatedIcon(personPopedomId){
+    return request.get(constant.serverUrl + `/base/personPopedomIcon/findRelatedIcon?personPopedomId=${personPopedomId}`);
+}
+
+function saveRelatedIcon(personPopedomId,idList){
+    var formData = new FormData();
+  
+    formData.append("personPopedomId",personPopedomId);
+    formData.append("idList",idList.join(","));
+  
+    return request.post(constant.serverUrl + "/base/personPopedomIcon/saveRelatedIcon",formData);
+}
+
+export default {
+    findRelatedIcon, saveRelatedIcon
+}

src/api/base/personRoleInfo.js

@@ -41,6 +41,41 @@ function batchRemove(idList){
   });
 }
 
+function listByCompanyId(formData){
+  return request.post(constant.serverUrl + "/base/personRoleInfo/listByCompanyId", formData);
+}
+
+function findBySceneId(formData){
+  return request.post(constant.serverUrl + "/base/personRoleInfo/findBySceneId", formData);
+}
+
+function findAll(){
+  return request.post(constant.serverUrl + "/base/personRoleInfo/findAll");
+}
+
+function findAllIcon(){
+  return request.get(constant.serverUrl + "/base/personRoleInfo/findAllIcon");
+}
+
+function findRelatedIcon(personRoleId,mode){
+  return request.get(constant.serverUrl + `/base/personRoleInfo/findRelatedIcon?personRoleId=${personRoleId}&mode=${mode}`);
+}
+
+function saveRelatedIcon(personRoleId,mode,idList){
+  var formData = new FormData();
+
+  formData.append("personRoleId",personRoleId);
+  formData.append("mode",mode);
+  formData.append("idList",idList.join(","));
+
+  return request.post(constant.serverUrl + "/base/personRoleInfo/saveRelatedIcon",formData);
+}
+
+function findHaveIcon(formData){
+  return request.post(constant.serverUrl + "/base/personRoleInfo/findHaveIcon", formData);
+}
+
 export default {
-  pageList,create,edit,add,update,remove,batchRemove
+  pageList,create,edit,add,update,remove,batchRemove,listByCompanyId,findAll,
+  findAllIcon,findRelatedIcon,saveRelatedIcon,findBySceneId,findHaveIcon
 }

src/api/base/problemFeedback.js

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

src/api/base/regionInfo.js

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

src/api/base/returnInfo.js

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

src/api/base/watchInfo.js

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

src/api/base/watchMeasure.js

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

src/api/base/workOver.js

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

src/api/base/workSchedule.js

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

src/api/business/billPush.js

@@ -0,0 +1,120 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/business/billPush/pageList", formData);
+}
+
+function payServiceList(formData){
+  return request.post(constant.serverUrl + "/business/billPush/payServiceList", formData);
+}
+
+function goodsPageList(formData){
+  return request.post(constant.serverUrl + "/business/billPush/goodsPageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/business/billPush/create");
+}
+
+function createGoods(){
+  return request.get(constant.serverUrl + "/business/billPush/createGoods");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/business/billPush/edit/" + id);
+}
+
+function detail(id){
+  return request.get(constant.serverUrl + "/business/billPush/detail/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/business/billPush/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/business/billPush/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/business/billPush/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/business/billPush/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function pushBill(formData){
+  return request.post(constant.serverUrl + "/business/billPush/pushBill", formData);
+}
+
+function closeBill(id){
+  return request.post(constant.serverUrl + "/business/billPush/closeBill/" + id);
+}
+
+function updateOrder(formData){
+  return request.post(constant.serverUrl + "/business/billPush/updateOrder", formData,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function createPayTime(id){
+  return request.get(constant.serverUrl + "/business/billPush/createPayTime"+ id);
+}
+
+
+function editPayTime(id){
+  return request.get(constant.serverUrl + "/business/billPush/editPayTime/" + id);
+}
+
+function updateIsOpenWechatOrAlipay(formData){
+  return request.post(constant.serverUrl + "/business/billPush/updateIsOpenWechatOrAlipay/",formData);
+}
+
+function checkInBillpageList(formData){
+  return request.post(constant.serverUrl + "/business/billPush/checkInBillpageList", formData);
+}
+
+function wxQucode(orderId){
+  return request.get(constant.serverUrl + "/wxPay/wxNativePay?orderId="+orderId);
+}
+
+function alipayCode(orderId){
+  return request.get(constant.serverUrl + "/aliPay/tradePrecreatePay?orderId="+orderId);
+}
+
+function invoiceTypeList(){
+  return request.post(constant.serverUrl + "/business/billPush/invoiceTypeList");
+}
+
+function billPushGoodStatisticsList(formData){
+  return request.post(constant.serverUrl + "/business/billPush/billPushGoodStatisticsList", formData);
+}
+
+function getInvoiceTypeList(){
+  return request.post(constant.serverUrl + "/business/billPush/getInvoiceTypeList");
+}
+
+
+
+
+
+export default {
+    pageList,create,edit,add,update,remove,batchRemove,payServiceList,createGoods,detail,goodsPageList,pushBill,closeBill,updateOrder,createPayTime,editPayTime
+    ,updateIsOpenWechatOrAlipay,checkInBillpageList,wxQucode,alipayCode,invoiceTypeList,billPushGoodStatisticsList,getInvoiceTypeList
+  }

src/api/business/billPushPerson.js

@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/business/billPushPerson/pageList", formData);
+}
+
+
+export default {
+    pageList
+}

src/api/business/fillAttendance.js

@@ -5,6 +5,10 @@ function pageList(formData){
   return request.post(constant.serverUrl + "/business/fillAttendance/pageList", formData);
 }
 
+function clockPageList(formData){
+  return request.post(constant.serverUrl + "/business/fillAttendance/clockPageList", formData);
+}
+
 function create(){
   return request.get(constant.serverUrl + "/business/fillAttendance/create");
 }
@@ -42,5 +46,5 @@ function batchRemove(idList){
 }
 
 export default {
-  pageList,create,edit,add,update,remove,batchRemove
+  pageList,create,edit,add,update,remove,batchRemove,clockPageList
 }

src/api/business/requestForLeave.js

@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/business/requestForLeave/pageList", formData);
+}
+
+export default {pageList}

src/api/business/workAttendance.js

@@ -17,8 +17,11 @@ function getFirstExcelData(){
   return request.get(constant.serverUrl + "/home/getFirstExcelData");
 }
 
+function batchUpdate(formData){
+  return request.post(constant.serverUrl + "/business/workAttendance/batchUpdate", formData);
+}
 
 
 export default {
-  statList,exportXls,getFirstData,getFirstExcelData
+  statList,exportXls,getFirstData,getFirstExcelData,batchUpdate
 }

src/api/business/workScheduleReport.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function statList(formData){
+  return request.post(constant.serverUrl + "/business/workScheduleReport/statList", formData);
+}
+
+function exportXls(formData){
+  return request.post(constant.serverUrl + "/business/workScheduleReport/exportXls", formData);
+}
+
+function batchUpdate(formData){
+  return request.post(constant.serverUrl + "/business/workScheduleReport/batchUpdate", formData);
+}
+
+export default {
+  statList,exportXls,batchUpdate
+}

src/routers/modules/business copy.js

@@ -0,0 +1,108 @@
+var routers = [
+        {
+                //考勤记录
+                path: '/business/workAttendance/list',
+                name: 'BusinessWorkAttendanceList',
+                // 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/business/workAttendance-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '考勤记录'
+                }
+        },
+        {
+                //补卡申请记录
+                path: '/business/fillAttendance/list',
+                name: 'BusinessFillAttendanceList',
+                // 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/business/fillAttendance-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '补卡申请记录'
+                }
+        },
+        {
+                //异地打卡记录
+                path: '/business/clockOut/list',
+                name: 'BusinessClockOutList',
+                // 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/business/clockOut-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '外勤打卡记录'
+                }
+        },
+        {
+                //请假记录
+                path: '/business/requestForLeave/list',
+                name: 'business-requestForLeave-list',
+                // 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/business/requestForLeave-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '请假记录'
+                }
+        },
+        {
+                //账单推送管理
+                path: '/business/billPush/list',
+                name: 'businessBillPushList',
+                // 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/business/billPush-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '账单推送管理'
+                }
+        },
+        {
+                //账单推送统计
+                path: '/business/billPush/statisticsList',
+                name: 'businessBillPushStatisticsList',
+                // 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/business/billPush-statistics-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '账单推送统计'
+                }
+        },
+        {
+                //租户账单管理
+                path: '/business/billPush/checkIn-list',
+                name: 'businessbillPushCheckInList',
+                // 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/business/billPush-checkIn-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '租户账单管理'
+                }
+        },
+        {
+                //班次考勤表
+                path: '/business/workScheduleReport/list',
+                name: 'BusinessWorkScheduleReport',
+                // 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/business/workScheduleReport.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '班次考勤表'
+                }
+        },
+]
+
+export default routers;

src/routers/modules/sys copy.js

@@ -0,0 +1,76 @@
+var routers = [
+        {
+                path: '/sys/user/list',
+                name: 'SysUserList',
+                // 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/sys/user-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '用户管理'
+                }
+        },
+        {
+                path: '/sys/role/list',
+                name: 'SysRoleList',
+                // 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/sys/role-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '角色管理'
+                }
+        },
+        {
+                path: '/sys/menu/list',
+                name: 'SysMenuList',
+                // 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/sys/menu-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '菜单管理'
+                }
+        },
+        {
+                path: '/sys/permission/list',
+                name: 'SysPermissionList',
+                // 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/sys/permission-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '接口权限管理'
+                }
+        },
+        {
+                path: '/sys/dataDictionary/list',
+                name: 'SysDataDictionaryList',
+                // 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/sys/dataDictionary-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '数据字典管理'
+                }
+        },
+        {
+                path: '/sys/log/list',
+                name: 'SysLogList',
+                // 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/sys/log-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '日志管理'
+                }
+        },
+]
+
+export default routers;

src/views/base/activityInfo-detail.vue

@@ -0,0 +1,257 @@
+
+<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="title">
+          <el-input
+            v-model="formModel.title"
+            placeholder="请输入标题"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="内容" prop="content">
+          <el-input
+            v-model="formModel.content"
+            placeholder="请输入内容"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="封面" prop="frontCover">
+          <el-input
+            v-model="formModel.frontCover"
+            placeholder="请输入封面"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="起始时间" prop="startTime">
+          <el-input
+            v-model="formModel.startTime"
+            placeholder="请输入起始时间"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="截止时间" prop="endTime">
+          <el-input
+            v-model="formModel.endTime"
+            placeholder="请输入截止时间"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="申请人" prop="applicant">
+          <el-input
+            v-model="formModel.applicant"
+            placeholder="请输入申请人"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="房号" prop="roomNumber">
+          <el-input
+            v-model="formModel.roomNumber"
+            placeholder="请输入房号"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="申请时间" prop="applicationTime">
+          <el-input
+            v-model="formModel.applicationTime"
+            placeholder="请输入申请时间"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          label="审核是否通过(0-待审核,1-已批准,2-未批准)"
+          prop="verify"
+        >
+          <el-input
+            v-model="formModel.verify"
+            placeholder="请输入审核是否通过(0-待审核,1-已批准,2-未批准)"
+            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-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>
+    </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";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        id: [{ required: true, message: "编号不能为空", trigger: "blur" }],
+        title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
+        content: [{ required: true, message: "内容不能为空", trigger: "blur" }],
+        frontCover: [
+          { required: true, message: "封面不能为空", trigger: "blur" },
+        ],
+        startTime: [
+          { required: true, message: "起始时间不能为空", trigger: "blur" },
+        ],
+        endTime: [
+          { required: true, message: "截止时间不能为空", trigger: "blur" },
+        ],
+        applicant: [
+          { required: true, message: "申请人不能为空", trigger: "blur" },
+        ],
+        roomNumber: [
+          { required: true, message: "房号不能为空", trigger: "blur" },
+        ],
+        applicationTime: [
+          { required: true, message: "申请时间不能为空", trigger: "blur" },
+        ],
+        verify: [
+          {
+            required: true,
+            message: "审核是否通过(0-待审核,1-已批准,2-未批准)不能为空",
+            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 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;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>

src/views/base/activityInfo-list.vue

@@ -0,0 +1,346 @@
+<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/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 label="申请人" prop="applicant">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.applicant"
+        ></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="title" label="标题" width="180"></el-table-column>
+      <el-table-column
+        prop="applicationTime"
+        label="申请时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="applicant"
+        label="申请人"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="roomNumber"
+        label="房号"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="startTime"
+        label="起始时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="endTime"
+        label="截止时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="verify"
+        label="审核状态"
+        width="180"
+      ></el-table-column>
+      <el-table-column label="操作" fixed="right" width="200">
+        <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 {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        title: "",
+        content: "",
+        frontCover: "",
+        startTime: "",
+        endTime: "",
+        applicant: "",
+        roomNumber: "",
+        applicationTime: "",
+        verify: "",
+        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("title", self.queryModel.title);
+      formData.append("content", self.queryModel.content);
+      formData.append("frontCover", self.queryModel.frontCover);
+      formData.append("startTime", self.queryModel.startTime);
+      formData.append("endTime", self.queryModel.endTime);
+      formData.append("applicant", self.queryModel.applicant);
+      formData.append("roomNumber", self.queryModel.roomNumber);
+      formData.append("applicationTime", self.queryModel.applicationTime);
+      formData.append("verify", self.queryModel.verify);
+      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);
+      }
+
+      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 == "ascending" ? "asc" : "desc";
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          activityInfoApi.remove(record.id).then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        activityInfoApi.batchRemove(idList).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "activityInfo-detail": ActivityInfoDetail,
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/alarmConfig-detail.vue

@@ -29,7 +29,8 @@
             :props="props"
             :options="companyResult"
             v-model="formModel.companyId"
-            height="200"
+            width="300px"
+            size="mediumn"
           ></el-select-tree>
         </el-form-item>
         <el-form-item label="是否包含下级单位" prop="subordinate">
@@ -66,7 +67,7 @@
                 }"
           ></el-time-picker>
         </el-form-item>
-        <el-form-item label="考勤时间" prop="endTime">
+        <el-form-item label="考勤时间" prop="attendanceTime">
           <el-time-picker
             v-model="formModel.attendanceTime"
             class="date-box"
@@ -85,14 +86,22 @@
                 }"
           ></el-time-picker>
         </el-form-item>
-        <el-form-item label="考勤类型" prop="classifier">
+        <el-form-item label="考勤类型" prop="attendanceType">
+          <el-radio v-model="formModel.attendanceType" :label="1">内勤</el-radio>
+          <el-radio v-model="formModel.attendanceType" :label="2">外勤</el-radio>
+        </el-form-item>
+        <el-form-item label="考勤类别" prop="classifier">
           <el-radio v-model="formModel.classifier" :label="1">上班时间</el-radio>
           <el-radio v-model="formModel.classifier" :label="2">下班时间</el-radio>
         </el-form-item>
-        <el-form-item label="要求测温" prop="needMeasureTemperature">
+        <el-form-item label="需要提醒" prop="needMeasureTemperature">
           <el-radio v-model="formModel.needMeasureTemperature" :label="true">是</el-radio>
           <el-radio v-model="formModel.needMeasureTemperature" :label="false">否</el-radio>
         </el-form-item>
+        <el-form-item label="纳入统计" prop="realTimeStat">
+          <el-radio v-model="formModel.realTimeStat" :label="1">是</el-radio>
+          <el-radio v-model="formModel.realTimeStat" :label="0">否</el-radio>
+        </el-form-item>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
@@ -113,7 +122,15 @@ export default {
   data() {
     return {
       ruleValidate: {
-        companyId: [{ required: true, message: "不能为空", trigger: "blur" }]
+        companyId: [{ required: true, message: "不能为空", trigger: "blur" }],
+        weekdays: [{ required: true, message: "不能为空", trigger: "blur" }],
+        startTime: [{ required: true, message: "不能为空", trigger: "blur" }],
+        attendanceTime: [{ required: true, message: "不能为空", trigger: "blur" }],
+        endTime: [{ required: true, message: "不能为空", trigger: "blur" }],
+        classifier: [{ required: true, message: "不能为空", trigger: "blur" }],
+        attendanceType: [{ required: true, message: "不能为空", trigger: "blur" }],
+        needMeasureTemperature: [{ required: true, message: "不能为空", trigger: "blur" }],
+        realTimeStat: [{ required: true, message: "不能为空", trigger: "blur" }]
       },
       showDialog: true,
       loading: false,
@@ -206,23 +223,26 @@ export default {
         if (valid) {
           (function() {
             var id = self.formModel.id;
-            self.loading = true;
-            if (self.formModel.weekdays != null) {
-                var weekdays = self.formModel.weekdays.join(",");
-                self.formModel.weekdays = weekdays;
+            self.submitting = true;
+
+            var requestModel = JSON.parse(JSON.stringify(self.formModel));
+
+            if (requestModel.weekdays != null) {
+              var weekdays = requestModel.weekdays.join(",");
+              requestModel.weekdays = weekdays;
             }
 
-            if (self.formModel.companyId == null) {
-              self.formModel.companyId = "";
+            if (requestModel.companyId == null) {
+              requestModel.companyId = "";
             }
 
             if (id == null || id.length == 0) {
-              return alarmConfigApi.add(self.formModel);
+              return alarmConfigApi.add(requestModel);
             } else {
-              return alarmConfigApi.update(self.formModel);
+              return alarmConfigApi.update(requestModel);
             }
           })().then(function(response) {
-            self.loading = false;
+            self.submitting = false;
 
             var jsonData = response.data;
 

src/views/base/alarmConfig-list.vue

@@ -13,7 +13,12 @@
     <!--
       要resetFields起作用，必须配置:model和prop
     -->
-    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
       <el-form-item label="单位" prop="companyId">
         <!-- <el-select
           v-model="queryModel.companyId"
@@ -44,20 +49,46 @@
           icon="ios-search"
           @click="changePage(1)"
           :loading="loading"
-        >查询</el-button>&nbsp;
+          >查询</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"
+        @click="handleAdd"
+        >新增</el-button
+      >
       <el-button
         type="primary"
         size="small"
         plain
         icon="el-icon-remove"
-        :disabled="multipleSelection.length==0"
+        :disabled="multipleSelection.length == 0"
         @click="handleBatchDelete"
-      >删除选中项</el-button>
+        >删除选中项</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-upload2"
+        @click="batchImportVisible = true"
+        >导入</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-download"
+        :loading="xlsLoading"
+        @click="downloadAll"
+        >导出数据</el-button
+      >
     </el-row>
     <el-table
       ref="formTable"
@@ -69,31 +100,67 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="companyName" label="单位" width="220" fixed="left"></el-table-column>
+      <el-table-column
+        prop="companyName"
+        label="单位"
+        width="220"
+        fixed="left"
+      ></el-table-column>
       <el-table-column prop="subordinate" label="是否包含下级单位" width="150">
-        <template slot-scope="{row}">
-          <span v-html="row.subordinate ? '是': '否'"></span>
+        <template slot-scope="{ row }">
+          <span v-html="row.subordinate ? '是' : '否'"></span>
         </template>
       </el-table-column>
-      <el-table-column prop="weekdays" label="周工作日" show-overflow-tooltip width="150"></el-table-column>
-      <el-table-column prop="startTime" label="开始时间" width="120"></el-table-column>
-      <el-table-column prop="attendanceTime" label="考勤时间" width="120"></el-table-column>
-      <el-table-column prop="endTime" label="结束时间" width="120"></el-table-column>
+      <el-table-column
+        prop="weekdays"
+        label="周工作日"
+        show-overflow-tooltip
+        width="150"
+      ></el-table-column>
       <el-table-column prop="classifier" label="考勤分类" width="120">
-        <template slot-scope="{row}">
-          <span v-html="row.classifier==1 ? '上班时间': ''"></span>
-          <span v-html="row.classifier==2 ? '下班时间': ''"></span>
+        <template slot-scope="{ row }">
+          <span v-html="row.classifier == 1 ? '上班时间' : ''"></span>
+          <span v-html="row.classifier == 2 ? '下班时间' : ''"></span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="startTime"
+        label="开始时间"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="attendanceTime"
+        label="考勤时间"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="endTime"
+        label="结束时间"
+        width="120"
+      ></el-table-column>
+      <el-table-column prop="attendanceType" label="考勤类型" width="120">
+        <template slot-scope="{ row }">
+          <span v-html="row.attendanceType == 1 ? '内勤' : ''"></span>
+          <span v-html="row.attendanceType == 2 ? '外勤' : ''"></span>
         </template>
       </el-table-column>
-      <el-table-column prop="needMeasureTemperature" label="是否要求测温" width="120">
-        <template slot-scope="{row}">
-          <span v-html="row.needMeasureTemperature ? '是': '否'"></span>
+      <el-table-column
+        prop="needMeasureTemperature"
+        label="是否需要提醒"
+        width="120"
+      >
+        <template slot-scope="{ row }">
+          <span v-html="row.needMeasureTemperature ? '是' : '否'"></span>
         </template>
       </el-table-column>
       <el-table-column label="操作" width="200" 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 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>
@@ -112,6 +179,67 @@
       :companyResult="companyResult"
       @close="onDetailModalClose"
     ></alarmConfig-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/smart/alarmConfig/2020/12/%E8%80%83%E5%8B%A4%E6%97%B6%E9%97%B4%E8%AE%BE%E7%BD%AE%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xls"
+            type="primary"
+            target="_blank"
+            >点击下载模板</el-link
+          >
+        </el-form-item>
+        <el-form-item label="单位">
+          <el-select-tree
+            size="large"
+            :props="props"
+            :options="companyResult"
+            v-model="uploadXlsData.companyId"
+            height="200"
+            width="300px"
+          ></el-select-tree>
+        </el-form-item>
+        <el-form-item label="上传文件">
+          <el-upload
+            class="upload-demo"
+            accept=".xls"
+            :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>
@@ -120,6 +248,8 @@ import alarmConfigDetail from "./alarmConfig-detail";
 import alarmConfigApi from "@/api/base/alarmConfig";
 import companyInfoApi from "@/api/base/companyInfo";
 import SelectTree from "@/components/SelectTree";
+import pageUtil from "@/utils/page";
+import { getToken } from "@/utils/auth"; // get token from cookie
 
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
@@ -131,7 +261,7 @@ export default {
 
     return {
       queryModel: {
-        companyId: ""
+        companyId: "",
       },
       loading: false,
       tableData: [],
@@ -153,8 +283,19 @@ export default {
         // 配置项（必选）
         value: "id",
         label: "name",
-        children: "children"
-      }
+        children: "children",
+      },
+      batchImportVisible: false,
+      batchImportFileList: [],
+      uploadUrlXls: Constant.serverUrl + "/base/alarmConfig/importXls",
+      uploadXlsData: {
+        subFolder: "company",
+        companyId: "",
+      },
+      headers: {
+        Authorization: getToken(),
+      },
+      xlsLoading: false,
     };
   },
   created() {
@@ -167,7 +308,7 @@ export default {
     loadTree() {
       var formData = new FormData();
 
-      companyInfoApi.loadChildren(formData).then(resp => {
+      companyInfoApi.loadChildren(formData).then((resp) => {
         var jsonData = resp.data;
 
         if (jsonData.result) {
@@ -183,7 +324,7 @@ export default {
       var formData = new FormData();
       formData.append("parentId", tree.id);
 
-      companyInfoApi.loadChildren(formData).then(resp => {
+      companyInfoApi.loadChildren(formData).then((resp) => {
         var jsonData = resp.data;
 
         if (jsonData.result) {
@@ -219,7 +360,7 @@ export default {
 
       alarmConfigApi
         .pageList(formData)
-        .then(function(response) {
+        .then(function (response) {
           self.loading = false;
 
           var jsonData = response.data.data;
@@ -227,13 +368,8 @@ export default {
           self.tableData = jsonData.data;
           self.totalPages = jsonData.totalPages;
           self.totalElements = jsonData.recordsTotal;
-
-          //45为分页栏的高度
-          //页面高度-列表上面的高度-分页栏高度
-          self.tableHeight =
-            window.innerHeight - self.$refs.formTable.$el.offsetTop - 45;
         })
-        .catch(error => {
+        .catch((error) => {
           self.loading = false;
           // self.$message.error(error + "");
         });
@@ -243,7 +379,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },
@@ -270,10 +406,10 @@ export default {
         .$confirm("是否确认删除?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
+          type: "warning",
         })
         .then(() => {
-          alarmConfigApi.remove(record.id).then(function(response) {
+          alarmConfigApi.remove(record.id).then(function (response) {
             var jsonData = response.data;
 
             if (jsonData.result) {
@@ -283,7 +419,7 @@ export default {
 
               self.$message({
                 type: "success",
-                message: "删除成功!"
+                message: "删除成功!",
               });
             }
           });
@@ -292,16 +428,16 @@ export default {
     handleBatchDelete() {
       var self = this;
 
-      var idList = this.multipleSelection.map(record => {
+      var idList = this.multipleSelection.map((record) => {
         return record.id;
       });
 
       this.$confirm("是否确认删除选中项？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       }).then(() => {
-        alarmConfigApi.batchRemove(idList).then(function(response) {
+        alarmConfigApi.batchRemove(idList).then(function (response) {
           var jsonData = response.data;
 
           if (jsonData.result) {
@@ -309,7 +445,7 @@ export default {
 
             self.$message({
               type: "success",
-              message: "删除成功!"
+              message: "删除成功!",
             });
           }
         });
@@ -322,23 +458,129 @@ export default {
       if (refreshed) {
         this.changePage(this.pageIndex);
       }
-    }
+    },
+    beforeUpload(file, fileList) {
+      //导入前判断
+      var self = this;
+      var companyId = self.uploadXlsData.companyId;
+
+      if (companyId == null || companyId.length == 0) {
+        self.$message({
+          type: "warning",
+          message: "请选择单位!",
+        });
+        self.xlsLoading = false;
+        return false;
+      } else {
+        self.xlsLoading = true;
+        return true;
+      }
+    },
+    //批量导入-上传成功
+    handleBatchImportSuccess(response, file, fileList) {
+      var self = this;
+      self.xlsLoading = false;
+      self.uploadXlsData.companyId = null;
+
+      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
+        } 个文件`
+      );
+    },
+    downloadAll() {
+      //导出
+      var self = this;
+      var formData = new FormData();
+
+      if (self.queryModel.companyId == null) {
+        self.queryModel.companyId = "";
+      }
+      formData.append("companyId", self.queryModel.companyId);
+
+      self.loading = true;
+      self.xlsLoading = true;
+
+      alarmConfigApi.exportXls(formData).then(function (response) {
+        self.loading = false;
+        self.xlsLoading = false;
+        var jsonData = response.data;
+        if (jsonData.result) {
+          if (jsonData.data != null) {
+            if (document.location.href.startsWith("https://")) {
+              jsonData.data = jsonData.data.replace("http://", "https://");
+            }
+
+            self.$message({
+              showClose: true,
+              type: "success",
+              dangerouslyUseHTMLString: true,
+              message: `报表已生成，<a href="${jsonData.data}" target="_blank">点击下载报表</a>&nbsp;`,
+              duration: 30000,
+            });
+          }
+        }
+      });
+    },
   },
-  mounted: function() {
+  mounted: function () {
     var self = this;
     this.changePage(1);
 
-    companyInfoApi.list().then(function(response) {
+    companyInfoApi.treeList().then(function (response) {
       var jsonData = response.data;
       if (jsonData.result) {
         self.companyResult = jsonData.data;
       }
     });
+
+    setTimeout(() => {
+      this.tableHeight = pageUtil.autoAdjustHeight(this.$refs.formTable.$el);
+    }, 1000);
   },
   components: {
     "alarmConfig-detail": alarmConfigDetail,
-    "el-select-tree": SelectTree
-  }
+    "el-select-tree": SelectTree,
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/base/alarmInfo-alert-list.vue

@@ -13,14 +13,23 @@
     <!--
       要resetFields起作用，必须配置:model和prop
     -->
-    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-      <el-form-item label="报警时间" prop="createTime">
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="报警时间" prop="queryTimeRange">
         <el-date-picker
-          v-model="queryModel.createTime"
+          v-model="queryModel.queryTimeRange"
           type="daterange"
           range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          placeholder="选择时间范围"
+          value-format="yyyy-MM-dd"
+          :clearable="false"
+          style="width: 300px"
         ></el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -30,27 +39,38 @@
           icon="ios-search"
           @click="changePage(1)"
           :loading="loading"
-        >查询</el-button>&nbsp;
+          >查询</el-button
+        >&nbsp;
         <el-button
           type="info"
           size="mini"
           style="margin-left: 8px"
           @click="handleReset('queryForm')"
-        >重置</el-button>&nbsp;
+          >重置</el-button
+        >&nbsp;
       </el-form-item>
     </el-form>
     <el-divider></el-divider>
     <el-row class="button-group"></el-row>
     <el-table
       :data="tableData"
-      style="min-height:400px;"
+      style="min-height: 400px"
       v-loading="loading"
       stripe
       @sort-change="sortChange"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column prop="createTime" sort-by="create_time" label="报警时间" width="180"></el-table-column>
-      <el-table-column prop="message" sort-by="message_" label="报警信息"></el-table-column>
+      <el-table-column
+        prop="createTime"
+        sort-by="create_time"
+        label="报警时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="message"
+        sort-by="message_"
+        label="报警信息"
+      ></el-table-column>
       <!-- <el-table-column label="操作">
         <template slot-scope="{row}">
           <el-button size="mini" disabled type="primary" icon="el-icon-video-camera" @click="handleOpenVideo(row)">查看回放</el-button>
@@ -88,15 +108,8 @@ export default {
     return {
       queryModel: {
         id: "",
-        createBy: "",
-        createTime: "",
-        updateBy: "",
-        updateTime: "",
-        delFlag: "",
-        deviceNo: "",
-        channelName: "",
-        alertType: "",
-        type: "2"
+        queryTimeRange: ["", ""],
+        type: "2",
       },
       loading: false,
       tableData: [],
@@ -110,7 +123,7 @@ export default {
       multipleSelection: [],
       showModal: false,
       modalTitle: "",
-      businessKey: ""
+      businessKey: "",
     };
   },
   methods: {
@@ -126,16 +139,17 @@ export default {
       formData.append("pageSize", self.pageSize);
 
       formData.append("id", self.queryModel.id);
-      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("deviceNo", self.queryModel.deviceNo);
-      formData.append("channelName", self.queryModel.channelName);
-      formData.append("alertType", self.queryModel.alertType);
       formData.append("type", self.queryModel.type);
 
+      if (self.queryModel.queryTimeRange[0] != null) {
+        formData.append("queryStartTime", self.queryModel.queryTimeRange[0]);
+      }
+
+      if (self.queryModel.queryTimeRange[1] != null) {
+        formData.append("queryEndTime", self.queryModel.queryTimeRange[1]);
+      }
+
       if (this.field != null) {
         formData.append("field", this.field);
       }
@@ -146,7 +160,7 @@ export default {
 
       alarmInfoApi
         .pageList(formData)
-        .then(function(response) {
+        .then(function (response) {
           self.loading = false;
 
           var jsonData = response.data.data;
@@ -155,7 +169,7 @@ export default {
           self.totalPages = jsonData.totalPages;
           self.totalElements = jsonData.recordsTotal;
         })
-        .catch(error => {
+        .catch((error) => {
           self.loading = false;
           // self.$message.error(error + "");
         });
@@ -165,7 +179,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },
@@ -192,10 +206,10 @@ export default {
         .$confirm("是否确认删除?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
+          type: "warning",
         })
         .then(() => {
-          alarmInfoApi.remove(record.id).then(function(response) {
+          alarmInfoApi.remove(record.id).then(function (response) {
             var jsonData = response.data;
 
             if (jsonData.result) {
@@ -205,7 +219,7 @@ export default {
 
               self.$message({
                 type: "success",
-                message: "删除成功!"
+                message: "删除成功!",
               });
             }
           });
@@ -214,16 +228,16 @@ export default {
     handleBatchDelete() {
       var self = this;
 
-      var idList = this.multipleSelection.map(record => {
+      var idList = this.multipleSelection.map((record) => {
         return record.id;
       });
 
       this.$confirm("是否确认删除选中项？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       }).then(() => {
-        alarmInfoApi.batchRemove(idList).then(function(response) {
+        alarmInfoApi.batchRemove(idList).then(function (response) {
           var jsonData = response.data;
 
           if (jsonData.result) {
@@ -231,7 +245,7 @@ export default {
 
             self.$message({
               type: "success",
-              message: "删除成功!"
+              message: "删除成功!",
             });
           }
         });
@@ -252,7 +266,7 @@ export default {
       var self = this;
       var formData = new FormData();
       formData.append("type", 2);
-      alarmInfoApi.queryNotify(formData).then(function(response) {
+      alarmInfoApi.queryNotify(formData).then(function (response) {
         var jsonData = response;
         if (jsonData.data.result) {
           self.$notify({
@@ -260,21 +274,21 @@ export default {
             message: jsonData.data.data,
             position: "bottom-right",
             type: "warning",
-            duration: 0
+            duration: 0,
           });
         }
       });
-    }
+    },
   },
-  mounted: function() {
+  mounted: function () {
     this.changePage(1);
-    window.setInterval(() => {
-      setTimeout(this.queryNotify(), 0);
-    }, 10000);
+    // window.setInterval(() => {
+    //   setTimeout(this.queryNotify(), 0);
+    // }, 10000);
   },
   components: {
-    "alarmInfo-detail": AlarmInfoDetail
-  }
+    "alarmInfo-detail": AlarmInfoDetail,
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/base/alarmInfo-fence-list.vue

@@ -165,7 +165,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/applicationExamine-detail.vue

@@ -0,0 +1,316 @@
+
+<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="'130px'"
+      >
+        <el-form-item label="申请者单位" prop="applicationCompanyId">
+          <el-select-tree
+            :props="props"
+            :options="companyResult"
+            v-model="formModel.applicationCompanyId"
+            size=""
+            height="200"
+          ></el-select-tree>
+        </el-form-item>
+        <el-form-item label="包括下级单位" prop="includeSubordinate">
+          <el-switch 
+            v-model="formModel.includeSubordinate"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+          >
+          </el-switch>
+        </el-form-item>                    
+        <el-form-item label="申请者身份" prop="applicationRoleId">
+          <el-select 
+            v-model="formModel.applicationRoleId"
+            filterable
+            multiple
+            placeholder="请选择"
+            style="width: 280px"
+          >
+            <el-option
+              v-for="role in applicationRoleResult"
+              :key="role.id"
+              :label="role.personRoleName"
+              :value="role.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审核人单位" prop="examineCompanyId">
+          <el-select-tree
+            :props="props"
+            :options="companyResult"
+            v-model="formModel.examineCompanyId"
+            size=""
+            height="200"
+          ></el-select-tree>
+        </el-form-item>
+        <el-form-item label="审核人身份" prop="examineRoleId">
+          <el-select
+            v-model="formModel.examineRoleId"
+            filterable
+            placeholder="请选择"
+            style="width: 280px"
+          >
+            <el-option
+              v-for="role in examineRoleResult"
+              :key="role.id"
+              :label="role.personRoleName"
+              :value="role.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审批类型" prop="type">
+          <el-select
+            v-model="formModel.type"
+            filterable
+            placeholder="请选择"
+            style="width: 280px"
+          >
+            <el-option
+              v-for="result in examineTypeResult"
+              :key="result.value"
+              :label="result.name"
+              :value="result.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审批等级" prop="level">
+          <el-input-number
+            v-model="formModel.level"
+            placeholder="请输入审批等级"
+            style="width: 300px"
+            :min="1"
+          ></el-input-number>
+          <span>&nbsp;表示第几轮审批</span>
+        </el-form-item>
+        <el-form-item label="请假超过天数" prop="days" v-if="formModel.type=='4'">
+          <el-input-number
+            v-model="formModel.days"
+            placeholder="请输入天数"
+            style="width: 300px"
+          ></el-input-number>
+        </el-form-item>
+        <el-form-item label="备注信息" prop="remark">
+          <el-input
+            v-model="formModel.remark"
+            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 applicationExamineApi from "@/api/base/applicationExamine";
+import companyInfoApi from "@/api/base/companyInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import personRoleInfoApi from "@/api/base/personRoleInfo";
+
+import SelectTree from "@/components/SelectTree";
+
+export default {
+  components: {
+    "el-select-tree": SelectTree,
+  },
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        applicationRoleId: [
+          { required: true, message: "申请者角色不能为空", trigger: "blur" },
+        ],
+        applicationCompanyId: [
+          { required: true, message: "申请者公司不能为空", trigger: "blur" },
+        ],
+        examineRoleId: [
+          { required: true, message: "审核人角色不能为空", trigger: "blur" },
+        ],
+        examineCompanyId: [
+          { required: true, message: "审核人公司不能为空", trigger: "blur" },
+        ],
+        type: [
+          { required: true, message: "请选择审批类型", trigger: "blur" },
+        ]
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+      applicationRoleResult: [],
+      examineRoleResult: [],
+      companyResult: [],
+      examineTypeResult: [],
+    };
+  },
+  created() {
+    var self = this;
+    companyInfoApi.treeList().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.companyResult = jsonData.data;
+        }
+      }
+    });
+
+    var formData = new FormData();
+    formData.append("catalogName", "审批类型");
+    dataDictionaryApi.findByCatalogName(formData).then((response) => {
+      var jsonData = response.data;
+      this.examineTypeResult = jsonData.data;
+    });
+  },
+  watch: {
+    "formModel.applicationCompanyId": function (val, oldval) {
+      if (val != null && val != "") {
+        var self = this;
+        var formData = new FormData();
+        formData.append("companyId", val);
+        personRoleInfoApi.listByCompanyId(formData).then(function (response) {
+          var jsonData = response.data;
+          if (jsonData.result) {
+            if (jsonData.data != null && jsonData.data != "") {
+              self.applicationRoleResult = jsonData.data;
+
+              // applicationCompanyId
+              // applicationRoleId
+              // examineCompanyId
+              // examineRoleId
+            }
+          }
+        });
+      }
+    },
+    "formModel.examineCompanyId": function (val, oldval) {
+      if (val != null && val != "") {
+        var self = this;
+        var formData = new FormData();
+        formData.append("companyId", val);
+        personRoleInfoApi.listByCompanyId(formData).then(function (response) {
+          var jsonData = response.data;
+          if (jsonData.result) {
+            if (jsonData.data != null && jsonData.data != "") {
+              self.examineRoleResult = jsonData.data;
+
+              // applicationCompanyId
+              // applicationRoleId
+              // examineCompanyId
+              // examineRoleId
+            }
+          }
+        });
+      }
+    },
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            var submitModel = JSON.parse(JSON.stringify(self.formModel));
+
+            if (submitModel.applicationRoleId != null) {
+              var applicationRoleId = submitModel.applicationRoleId.join(",");
+              submitModel.applicationRoleId = applicationRoleId;
+            }
+
+            if (id == null || id.length == 0) {
+              return applicationExamineApi.add(submitModel);
+            } else {
+              return applicationExamineApi.update(submitModel);
+            }
+          })().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 applicationExamineApi.create();
+      } else {
+        return applicationExamineApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          var applicationRoleId = jsonData.data.applicationRoleId;
+
+          if (applicationRoleId != null) {
+            jsonData.data.applicationRoleId = applicationRoleId.split(",");
+          }
+
+          self.formModel = jsonData.data;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>

src/views/base/applicationExamine-list.vue

@@ -0,0 +1,524 @@
+<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="/applicationExamine">审批角色管理</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-row>
+        <el-form-item label="申请者公司" prop="applicationCompanyId">
+          <el-select-tree
+            :props="props"
+            :options="companyResult"
+            v-model="queryModel.applicationCompanyId"
+            size="mini"
+            height="200"
+          ></el-select-tree
+          >&nbsp;
+          <el-checkbox v-model="queryModel.applicationSubordinate"
+            >是否包含下级单位</el-checkbox
+          >
+        </el-form-item>
+        <el-form-item label="申请者角色" prop="applicationRoleId">
+          <el-select
+            v-model="queryModel.applicationRoleId"
+            filterable
+            clearable
+            placeholder="请选择"
+            style="width: 200"
+            size="mini"
+          >
+            <el-option
+              v-for="role in applicationRoleResult"
+              :key="role.id"
+              :label="role.personRoleName"
+              :value="role.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审批类型" prop="type">
+          <el-select
+            v-model="queryModel.type"
+            filterable
+            size="mini"
+            clearable
+            placeholder="请选择"
+            style="width: 200px"
+          >
+            <el-option
+              v-for="result in examineTypeResult"
+              :key="result.value"
+              :label="result.name"
+              :value="result.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-form-item label="审核人公司" prop="examineCompanyId">
+          <el-select-tree
+            :props="props"
+            :options="companyResult"
+            v-model="queryModel.examineCompanyId"
+            size="mini"
+            height="200"
+          ></el-select-tree
+          >&nbsp;
+          <el-checkbox v-model="queryModel.examineSubordinate"
+            >是否包含下级单位</el-checkbox
+          >
+        </el-form-item>
+        <el-form-item label="审批等级" prop="level">
+          <el-input
+            size="mini"
+            v-model="queryModel.level"
+            style="width: 80px"
+          ></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-row>
+    </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="applicationCompanyName"
+        label="申请者单位"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="applicationRoleName"
+        label="申请者身份"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="includeSubordinate"
+        label="是否包括下级单位"
+        width="150"
+      >
+        <template slot-scope="{row}">
+            <el-switch 
+                v-model="row.includeSubordinate"
+                active-color="#13ce66"
+                inactive-color="#ff4949"
+                @change="handleUpdate(row)"
+              >
+            </el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="typeName"
+        label="审批类型"
+        width="100"
+      ></el-table-column>
+      <el-table-column prop="level" label="审批等级" width="100">
+        <template slot-scope="{ row }">
+          <span v-if="row.level != '' && row.level != null">lv.{{ row.level }}</span>
+          <span v-else>{{ row.level }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="examineCompanyName"
+        label="审核人单位"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="examineRoleName"
+        label="审核人身份"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="days"
+        label="请假超过天数"
+        width="100"
+      ></el-table-column>
+      <el-table-column
+        prop="remark"
+        label="备注信息"
+      ></el-table-column>
+      <el-table-column label="操作" width="130" fixed="right">
+        <template slot-scope="{ row }">
+          <el-row>
+            <el-col :span="12">
+              <el-link type="primary" @click="handleEdit(row)">编辑</el-link>
+            </el-col>
+            <el-col :span="12">
+              <el-link type="danger" @click="handleDelete(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>
+    <applicationExamine-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></applicationExamine-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import ApplicationExamineDetail from "./applicationExamine-detail";
+import applicationExamineApi from "@/api/base/applicationExamine";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import personRoleInfoApi from "@/api/base/personRoleInfo";
+import companyInfoApi from "@/api/base/companyInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+import SelectTree from "@/components/SelectTree";
+
+export default {
+  name: "baseApplicationExamineList",
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        applicationRoleId: "",
+        applicationCompanyId: "",
+        applicationSubordinate: false,
+        examineRoleId: "",
+        examineCompanyId: "",
+        examineSubordinate: false,
+        type:"",
+        level:""
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+      companyResult: [],
+      applicationRoleResult:[],
+      examineTypeResult:[]
+    };
+  },
+  watch: {
+    "queryModel.applicationCompanyId": function (val, oldval) {
+      if (val != null && val != "") {
+        var self = this;
+        var formData = new FormData();
+        formData.append("companyId", val);
+        personRoleInfoApi.listByCompanyId(formData).then(function (response) {
+          var jsonData = response.data;
+          if (jsonData.result) {
+            if (jsonData.data != null && jsonData.data != "") {
+              self.applicationRoleResult = jsonData.data;
+
+              // applicationCompanyId
+              // applicationRoleId
+              // examineCompanyId
+              // examineRoleId
+            }
+          }
+        });
+      }
+    }
+  },
+  created() {
+    var self = this;
+    companyInfoApi.treeList().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.companyResult = jsonData.data;
+        }
+      }
+    });
+
+    var formData = new FormData();
+    formData.append("catalogName", "审批类型");
+    dataDictionaryApi.findByCatalogName(formData).then((response) => {
+      var jsonData = response.data;
+      this.examineTypeResult = 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("applicationRoleId", self.queryModel.applicationRoleId);
+      if (self.queryModel.applicationCompanyId == null) {
+        self.queryModel.applicationCompanyId = "";
+      }
+      formData.append(
+        "applicationCompanyId",
+        self.queryModel.applicationCompanyId
+      );
+      formData.append(
+        "applicationSubordinate",
+        self.queryModel.applicationSubordinate
+      );
+      formData.append("examineRoleId", self.queryModel.examineRoleId);
+      if (self.queryModel.examineCompanyId == null) {
+        self.queryModel.examineCompanyId = "";
+      }
+      formData.append("examineCompanyId", self.queryModel.examineCompanyId);
+      formData.append("examineSubordinate", self.queryModel.examineSubordinate);
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      if (self.queryModel.type != null) {
+        formData.append("type", self.queryModel.type);
+      }
+      if (self.queryModel.level != null) {
+        formData.append("level",self.queryModel.level);
+      }
+      
+
+      applicationExamineApi
+        .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 == "ascending" ? "asc" : "desc";
+
+      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(() => {
+          applicationExamineApi.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(() => {
+        applicationExamineApi.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);
+      }
+    },
+    handleUpdate(row){
+        applicationExamineApi.update(row).then((response)=>{
+          var jsonData = response.data;
+
+          if(jsonData.result){
+            this.$message({
+              type: "success",
+              message: "修改成功!",
+            });
+          }
+          else{            
+            this.$message({
+              type: "error",
+              message: "修改失败!" + jsonData.data.message,
+            });
+          }
+        });
+    }
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "applicationExamine-detail": ApplicationExamineDetail,
+    "el-select-tree": SelectTree,
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/approvalConfig-detail.vue

@@ -0,0 +1,224 @@
+
+<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="'150px'"
+      >
+        <el-form-item label="公司" prop="companyId">
+          <el-select-tree
+          :props="props"
+          :options="companyResult"
+          v-model="formModel.companyId"
+          size=""
+          height="200"
+        ></el-select-tree>
+        </el-form-item>
+        <el-form-item
+          label="类型"
+          prop="type"
+        >
+          <el-select
+          v-model="formModel.type"
+          filterable
+          placeholder="请选择"
+          style="width: 200px"
+        >
+          <el-option
+            v-for="type in typeResult"
+            :key="type.value"
+            :label="type.name"
+            :value="type.value"
+          ></el-option>
+        </el-select>
+        </el-form-item>
+        <el-form-item label="审批层级" prop="level">
+          <el-input-number
+            v-model="formModel.level"
+            placeholder="请输入审批需要的层级"
+            style="width: 200px"
+            :min="0" :max="99"
+          ></el-input-number>
+        </el-form-item>
+        <el-form-item label="申请对应天数" prop="days">
+          <el-input-number
+            v-model="formModel.days"
+            placeholder="请输入申请时对应的天数"
+            style="width: 200px"
+            :min="0" :max="99"
+          ></el-input-number>
+        </el-form-item>
+        <el-form-item label="备注信息" prop="remark">
+          <el-input
+            v-model="formModel.remark"
+            placeholder="请输入备注信息"
+            style="width: 400px"
+          ></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 approvalConfigApi from "@/api/base/approvalConfig";
+import companyInfoApi from "@/api/base/companyInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import SelectTree from "@/components/SelectTree";
+
+export default {
+  props: ["businessKey", "title"],
+  components: {
+    "el-select-tree": SelectTree
+  },
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        companyId: [
+          { required: true, message: "请选择单位", trigger: "blur" },
+        ],
+        type: [
+          {
+            required: true,
+            message:
+              "请选择类型",
+            trigger: "blur",
+          },
+        ],
+        level: [
+          {
+            required: true,
+            message: "审批需要的层级不能为空",
+            trigger: "blur",
+          },
+        ],
+        days: [
+          {
+            required: true,
+            message: "申请时对应的天数不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      companyResult: [],
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+      typeResult: [],
+    };
+  },
+  created() {
+    var self = this;
+    companyInfoApi.treeList().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.companyResult = jsonData.data;
+        }
+      }
+    });
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "审批层级类型",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.typeResult = 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 approvalConfigApi.add(self.formModel);
+            } else {
+              return approvalConfigApi.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 approvalConfigApi.create();
+      } else {
+        return approvalConfigApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>

src/views/base/approvalConfig-list.vue

@@ -0,0 +1,373 @@
+<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="/approvalConfig">审批层级管理</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-tree
+          :props="props"
+          :options="companyResult"
+          v-model="queryModel.companyId"
+          height="200"
+          size="mini"
+        ></el-select-tree>
+        &nbsp;
+        <el-checkbox v-model="queryModel.subordinate"
+          >是否包含下级单位</el-checkbox
+        >
+      </el-form-item>
+      <el-form-item label="类型" prop="type">
+        <el-select
+          v-model="queryModel.type"
+          filterable
+          size="mini"
+          placeholder="请选择"
+          style="width: 180px"
+        >
+          <el-option
+            v-for="type in typeResult"
+            :key="type.value"
+            :label="type.name"
+            :value="type.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <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 label="序号" fixed="left" type="index" :index="indexMethod"></el-table-column>
+      <el-table-column
+        prop="companyName"
+        label="公司"
+        width="220"
+      ></el-table-column>
+      <el-table-column prop="typeN" label="类型" width="150"></el-table-column>
+      <el-table-column
+        prop="level"
+        label="审批需要的层级"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="days"
+        label="申请时对应的天数"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="remark"
+        label="备注信息"
+        show-overflow-tooltip
+        width="180"
+      ></el-table-column>
+      <el-table-column label="操作">
+        <template slot-scope="{ row }">
+          <el-button size="mini" type="warning" @click="handleEdit(row)"
+            >编辑</el-button
+          >
+          <el-button size="mini" type="danger" @click="handleDelete(row)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+    <approvalConfig-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></approvalConfig-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import ApprovalConfigDetail from "./approvalConfig-detail";
+import approvalConfigApi from "@/api/base/approvalConfig";
+import companyInfoApi from "@/api/base/companyInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import SelectTree from "@/components/SelectTree";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  name: "baseApprovalConfigList",
+  data() {
+    var self = this;
+    return {
+      queryModel: {
+        companyId: "",
+        type: "",
+        subordinate:false,
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      companyResult: [],
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+      typeResult: [],
+    };
+  },
+  created() {
+    var self = this;
+    companyInfoApi.treeList().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.companyResult = jsonData.data;
+        }
+      }
+    });
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "审批层级类型",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.typeResult = 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("type", self.queryModel.type);
+      formData.append("subordinate", self.queryModel.subordinate);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      approvalConfigApi
+        .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(() => {
+          approvalConfigApi.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(() => {
+        approvalConfigApi.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: {
+    "approvalConfig-detail": ApprovalConfigDetail,
+    "el-select-tree": SelectTree
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/businessOut-detail.vue

@@ -0,0 +1,303 @@
+
+<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="人员id" prop="personPopedomId">
+          <el-input
+            v-model="formModel.personPopedomId"
+            placeholder="请输入人员id"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="类型（1：外出，3：出差）" prop="type">
+          <el-input
+            v-model="formModel.type"
+            placeholder="请输入类型（1：外出，3：出差）"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="目的地" prop="destination">
+          <el-input
+            v-model="formModel.destination"
+            placeholder="请输入目的地"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-input
+            v-model="formModel.startTime"
+            placeholder="请输入开始时间"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="预估天数" prop="estimatedTime">
+          <el-input
+            v-model="formModel.estimatedTime"
+            placeholder="请输入预估天数"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="内容" prop="content">
+          <el-input
+            v-model="formModel.content"
+            placeholder="请输入内容"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="审批人id" prop="approvalPersonId">
+          <el-input
+            v-model="formModel.approvalPersonId"
+            placeholder="请输入审批人id"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          label="审批状态: 0：待处理，1：同意，2：拒绝"
+          prop="status"
+        >
+          <el-input
+            v-model="formModel.status"
+            placeholder="请输入审批状态: 0：待处理，1：同意，2：拒绝"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="审批编号" prop="approvalNo">
+          <el-input
+            v-model="formModel.approvalNo"
+            placeholder="请输入审批编号"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="审核时间" prop="approvalTime">
+          <el-input
+            v-model="formModel.approvalTime"
+            placeholder="请输入审核时间"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="审核意见" prop="approvalContent">
+          <el-input
+            v-model="formModel.approvalContent"
+            placeholder="请输入审核意见"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          label="审批人id（包含历史记录）"
+          prop="approvalPersonIdStr"
+        >
+          <el-input
+            v-model="formModel.approvalPersonIdStr"
+            placeholder="请输入审批人id（包含历史记录）"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="审批编号（包含历史记录）" prop="approvalNoStr">
+          <el-input
+            v-model="formModel.approvalNoStr"
+            placeholder="请输入审批编号（包含历史记录）"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="审核时间（包含历史记录）" prop="approvalTimeStr">
+          <el-input
+            v-model="formModel.approvalTimeStr"
+            placeholder="请输入审核时间（包含历史记录）"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          label="审核意见（包含历史记录）"
+          prop="approvalContentStr"
+        >
+          <el-input
+            v-model="formModel.approvalContentStr"
+            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 businessOutApi from "@/api/base/businessOut";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        id: [{ required: true, message: "不能为空", trigger: "blur" }],
+        personPopedomId: [
+          { required: true, message: "人员id不能为空", trigger: "blur" },
+        ],
+        type: [
+          {
+            required: true,
+            message: "类型（1：外出，3：出差）不能为空",
+            trigger: "blur",
+          },
+        ],
+        destination: [
+          { required: true, message: "目的地不能为空", trigger: "blur" },
+        ],
+        startTime: [
+          { required: true, message: "开始时间不能为空", trigger: "blur" },
+        ],
+        estimatedTime: [
+          { required: true, message: "预估天数不能为空", trigger: "blur" },
+        ],
+        content: [{ required: true, message: "内容不能为空", trigger: "blur" }],
+        approvalPersonId: [
+          { required: true, message: "审批人id不能为空", trigger: "blur" },
+        ],
+        status: [
+          {
+            required: true,
+            message: "审批状态: 0：待处理，1：同意，2：拒绝不能为空",
+            trigger: "blur",
+          },
+        ],
+        approvalNo: [
+          { required: true, message: "审批编号不能为空", trigger: "blur" },
+        ],
+        approvalTime: [
+          { required: true, message: "审核时间不能为空", trigger: "blur" },
+        ],
+        approvalContent: [
+          { required: true, message: "审核意见不能为空", trigger: "blur" },
+        ],
+        approvalPersonIdStr: [
+          {
+            required: true,
+            message: "审批人id（包含历史记录）不能为空",
+            trigger: "blur",
+          },
+        ],
+        approvalNoStr: [
+          {
+            required: true,
+            message: "审批编号（包含历史记录）不能为空",
+            trigger: "blur",
+          },
+        ],
+        approvalTimeStr: [
+          {
+            required: true,
+            message: "审核时间（包含历史记录）不能为空",
+            trigger: "blur",
+          },
+        ],
+        approvalContentStr: [
+          {
+            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 businessOutApi.add(self.formModel);
+            } else {
+              return businessOutApi.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 businessOutApi.create();
+      } else {
+        return businessOutApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>

src/views/base/businessOut-flow.vue

@@ -0,0 +1,137 @@
+
+<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-table
+      :data="tableData"
+      style="min-height: 400px"
+      v-loading="loading"
+      stripe
+    >
+      <el-table-column
+        type="index"
+        label="序号"
+        :index="indexMethod"
+        width="50"
+      ></el-table-column>
+      <el-table-column
+        prop="approvalPersonName"
+        label="审批人"
+        width="100"
+      ></el-table-column>
+      <el-table-column
+        prop="approvalPersonRoleName"
+        label="审批人角色"
+        width="100"
+      ></el-table-column>
+      <el-table-column prop="status" label="审批状态" width="100">
+        <template slot-scope="{ row }">
+          <span v-if="row.status == 1" style="color: green">同意</span>
+          <span v-else-if="row.status == 2" style="color: red">拒绝</span>
+          <span v-else>待处理</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="approvalContent"
+        label="审核意见"
+        width="150"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="approvalTime"
+        label="审核时间"
+        width="150"
+      ></el-table-column>
+    </el-table>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">关 闭</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import businessOutApi from "@/api/base/businessOut";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      showDialog: true,
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      submitting: 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;
+
+      businessOutApi
+        .flowList(self.businessKey)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return businessOutApi.create();
+      } else {
+        return businessOutApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        this.changePage(1);
+
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>

src/views/base/businessOut-list.vue

@@ -0,0 +1,482 @@
+<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/businessOut/list">外出申请记录</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="personName">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.personName"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="审批编号" prop="approvalNo">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.approvalNo"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="类型" prop="type">
+        <el-select size="mini" v-model="queryModel.type">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="外出" value="1"></el-option>
+          <el-option label="出差" value="3"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="审批状态" prop="status">
+        <el-select size="mini" v-model="queryModel.status">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="未审批" value="0"></el-option>
+          <el-option label="同意" value="1"></el-option>
+          <el-option label="拒绝" value="2"></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-item label="开始时间" prop="requestTimeRange">
+        <el-date-picker
+            v-model="queryModel.requestTimeRange"
+            type="daterange"
+            size="mini"
+            range-separator="至"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            placeholder="选择时间范围"
+            value-format="yyyy-MM-dd"
+            :clearable="false"
+           style="width:300px"
+            >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="审核时间" prop="auditTimeRange">
+        <el-date-picker
+            v-model="queryModel.auditTimeRange"
+            type="daterange"
+            size="mini"
+            range-separator="至"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            placeholder="选择时间范围"
+            value-format="yyyy-MM-dd"
+            :clearable="false"
+           style="width:300px"
+            >
+        </el-date-picker>
+      </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"
+        :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="approvalNo"
+        label="审批编号"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="type" label="类型" width="100">
+        <template slot-scope="{ row }">
+          <span v-if="row.type == 1">外出</span>
+          <span v-else-if="row.type == 3">出差</span>
+          <span v-else>1</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="status" label="状态" width="100">
+        <template slot-scope="{ row }">
+          <span v-if="row.status == 1" style="color: green">同意</span>
+          <span v-else-if="row.status == 2" style="color: red">拒绝</span>
+          <span v-else>待处理</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="personName"
+        label="申请人员"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="personRoleName"
+        label="申请人员角色"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="destination"
+        label="目的地"
+        width="150"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="startTime"
+        label="开始时间"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="estimatedTime"
+        label="预估天数"
+        width="100"
+      ></el-table-column>
+      <el-table-column
+        prop="endTime"
+        label="结束时间"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="content"
+        label="内容"
+        width="150"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="approvalPersonName"
+        label="审批人"
+        width="100"
+      ></el-table-column>
+      <el-table-column
+        prop="approvalPersonRoleName"
+        label="审批人角色"
+        width="100"
+      ></el-table-column>
+      <el-table-column
+        prop="approvalTime"
+        label="审核时间"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="approvalContent"
+        label="审核意见"
+        width="150"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column prop="remark" label="备注" width="120"></el-table-column>
+      <el-table-column label="操作" width="140" fixed="right">
+        <template slot-scope="{ row }">
+          <el-row>
+            <el-col :span="12">
+              <el-link v-if="row.type == 3" type="primary" @click="createWord(row)">下载</el-link>
+            </el-col>
+            <el-col :span="12">
+              <el-link v-if="row.type == 3" type="success" @click="handleFlow(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>
+    <businessOut-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></businessOut-detail>
+    <businessOut-flow
+      v-if="showModal1"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></businessOut-flow>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import BusinessOutDetail from "./businessOut-detail";
+import BusinessOutFlow from "./businessOut-flow";
+import businessOutApi from "@/api/base/businessOut";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  name: "baseBusinessOutList",
+  data() {
+    var self = this;
+    return {
+      queryModel: {
+        personName: "",
+        type: "",
+        status: "",
+        approvalNo: "",
+        requestTimeRange: ['',''],
+        auditTimeRange: ['','']
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      showModal1: false,
+      modalTitle: "",
+      businessKey: "",
+    };
+  },
+  methods: {
+    createWord(record) {
+      var self = this;
+      self.loading = true;
+      var formData = new FormData();
+      formData.append("id", record.id);
+      businessOutApi.createWord(formData).then(function (response) {
+        var jsonData = response.data;
+        self.loading = false;
+        if (jsonData.result) {
+          if (jsonData.data != null) {
+            self.$message({
+              showClose: true,
+              type: "success",
+              dangerouslyUseHTMLString: true,
+              message: `<a href="${jsonData.data}" target="_blank">点击下载</a>&nbsp;`,
+              duration: 30000,
+            });
+          }
+        }
+      });
+    },
+    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("personName", self.queryModel.personName);
+      formData.append("type", self.queryModel.type);
+      formData.append("status", self.queryModel.status);
+      formData.append("approvalNo", self.queryModel.approvalNo);
+
+      if(self.queryModel.requestTimeRange[0] != null){
+        formData.append("requestStartTime", self.queryModel.requestTimeRange[0]);
+      }
+
+      if(self.queryModel.requestTimeRange[1] != null){
+        formData.append("requestEndTime", self.queryModel.requestTimeRange[1]);
+      }
+
+      if(self.queryModel.auditTimeRange[0] != null){
+        formData.append("auditStartTime", self.queryModel.auditTimeRange[0]);
+      }
+
+      if(self.queryModel.auditTimeRange[1] != null){
+        formData.append("auditEndTime", self.queryModel.auditTimeRange[1]);
+      }
+
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      businessOutApi
+        .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 == "ascending" ? "asc" : "desc";
+
+      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;
+    },
+    handleFlow(record) {
+      this.modalTitle = "审核详情";
+      this.businessKey = record.id;
+      this.showModal1 = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          businessOutApi.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(() => {
+        businessOutApi.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;
+      this.showModal1 = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "businessOut-detail": BusinessOutDetail,
+    "businessOut-flow": BusinessOutFlow,
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/cameraInfo-bindClass.vue

@@ -0,0 +1,96 @@
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align:left;"
+    @close="closeDialog"
+  >
+    <div>
+        <el-input placeholder="输入查询班级名称" v-model="className" style="width:300px;">
+            <el-button slot="append" icon="el-icon-search"></el-button>
+        </el-input>
+    </div>
+    <el-table
+      :data="filterData"
+      v-loading="loading"
+      height="400"
+      stripe
+    >
+      <el-table-column prop="className" label="班级名称"></el-table-column>
+      <el-table-column prop="top" label="是否绑定" width="180">
+        <template slot-scope="{row}">
+            <el-switch  v-model="row.enabled" 
+            active-color="#13ce66" inactive-color="#ff4949"
+            @change="handleBindClass(row)"
+            ></el-switch>
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import cameraInfoApi from "@/api/base/cameraInfo";
+
+export default {
+    props: ["cameraInfo"],
+    data(){
+        return {
+            title: "绑定班级",
+            showDialog: true,
+            loading: false,
+            tableData: [],
+            className: ''
+        }
+    },
+    computed: {
+        filterData() {
+            if(this.className.length==0){
+                return this.tableData;
+            }
+            else{
+                return this.tableData.filter(item=>{
+                    return item.className.indexOf(this.className)!=-1;
+                });
+            }
+        }
+    },
+    methods: {
+        queryClass() {
+
+        },
+        closeDialog() {
+            this.$emit("close", false);
+        },
+        handleBindClass(row) {
+            cameraInfoApi.bindClass(row).then(response=>{
+                var jsonData = response.data;
+
+                if(!jsonData.result){
+                    this.$message.warning(jsonData.message + "");
+                }
+            });
+        }
+    },
+    mounted() {
+        this.loading = true;
+
+        cameraInfoApi.bindClassList(this.cameraInfo.id).then(response=>{
+            this.loading = false;
+
+            var jsonData = response.data;
+
+            if(jsonData.result){
+                this.tableData = jsonData.data;
+            }
+            else{
+                this.$message.warning(jsonData.message + "");
+            }
+        });
+    }
+}
+</script>
+<style>
+
+</style>

src/views/base/cameraInfo-detail.vue

@@ -0,0 +1,247 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="true"
+    append-to-body
+    style="text-align:left;"
+    width="1000px"
+    :close-on-click-modal="false"
+    @close="closeDialog"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form ref="form" :model="formModel" inline :rules="ruleValidate" :label-width="'150px'">
+        <el-form-item label="所属单位" prop="companyId">
+          <el-select-tree
+            :options="companyList"
+            v-model="formModel.companyId"
+            size="medium"
+            height="200"
+            width="300px"
+          ></el-select-tree>
+        </el-form-item>
+        <el-form-item label="所属平台" prop="platform">
+          <el-select v-model="formModel.platform" clearable width="300px">
+            <el-option v-for="(item,index) in platformList" 
+            :label="item.name" :value="item.value" :key="index"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="设备序列号" prop="deviceSerial">
+          <el-input placeholder="设备序列号" v-model="formModel.deviceSerial" style="width:300px;">
+            <!-- <el-button slot="append" icon="el-icon-search" @click="queryDeviceInfo">查询</el-button> -->
+          </el-input>
+        </el-form-item>
+        <el-form-item label="设备名称" prop="deviceName">
+          <el-input v-model="formModel.deviceName" placeholder="请输入设备名称" style="width:300px"></el-input>
+        </el-form-item>
+        <template v-if="formModel.platform=='ys'">
+          <el-form-item label="通道号" prop="channelNo">
+            <el-input v-model="formModel.channelNo" placeholder="请输入通道号" style="width:300px"></el-input>
+          </el-form-item>
+          <el-form-item label="验证码" prop="validCode">
+            <el-input v-model="formModel.validCode" placeholder="请输入验证码" style="width:300px"></el-input>
+          </el-form-item>
+          <el-form-item label="设备账户号" prop="account">
+            <el-input v-model="formModel.account" placeholder="请输入账户号" style="width:300px"></el-input>
+          </el-form-item>
+          <el-form-item label="设备密码" prop="password">
+            <el-input v-model="formModel.password" placeholder="请输入密码" style="width:300px"></el-input>
+          </el-form-item>
+        </template>
+        <el-form-item label="所在房间" prop="roomAddress">
+          <el-input v-model="formModel.roomAddress" placeholder="请输入所在房间" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="绑定人员编号" prop="personId">
+          <el-input v-model="formModel.personId" placeholder="请输入绑定人员编号" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话" prop="contactPhone">
+          <el-input v-model="formModel.contactPhone" 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 cameraInfoApi from "@/api/base/cameraInfo";
+import companyInfoApi from "@/api/base/companyInfo";
+import SelectTree from "@/components/SelectTree";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+
+export default {
+  props: ["businessKey", "title"],
+  computed: {
+      ruleValidate (){
+        var rules = null;
+
+        if(this.formModel.platform =='aliyun'){
+          rules = {
+            deviceSerial: [
+              { required: true, message: "设备序列号不能为空", trigger: "blur" }
+            ],
+            deviceName: [
+              { required: true, message: "设备名称不能为空", trigger: "blur" }
+            ],
+            companyId: [
+              { required: true, message: "单位不能为空", trigger: "blur" }
+            ]
+          };
+        }
+        else{
+          rules = {
+            deviceSerial: [
+              { required: true, message: "设备序列号不能为空", trigger: "blur" }
+            ],
+            deviceName: [
+              { required: true, message: "设备名称不能为空", trigger: "blur" }
+            ],
+            companyId: [
+              { required: true, message: "单位不能为空", trigger: "blur" }
+            ],
+            channelNo: [
+              { required: true, message: "通道号不能为空", trigger: "blur" }
+            ],
+            validCode: [
+              { required: true, message: "验证码不能为空", trigger: "blur" }
+            ],
+            account: [
+              { required: true, message: "账户不能为空", trigger: "blur" }
+            ],
+            password: [
+              { required: true, message: "密码不能为空", trigger: "blur" }
+            ]
+          };
+        }
+
+        return rules;
+      }
+  },
+  data() {
+    return {
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      formModel: {},
+      companyList: [],
+      platformList: []
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    queryDeviceInfo() {
+      this.loading = true;
+
+      
+      if(self.formModel.classify==null){
+        self.$message({
+          message: "清先选择设备分类!",
+          type: "warning",
+        });
+      }
+
+      cameraInfoApi
+        .queryDeviceInfo(this.formModel.deviceSerial,this.formModel.classify)
+        .then((response) => {
+          this.loading = false;
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            this.formModel.deviceName = jsonData.data.deviceName;
+            this.formModel.channelNo = 1;
+            this.formModel.status = jsonData.data.status;
+          }
+        });
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return cameraInfoApi.add(self.formModel);
+            } else {
+              return cameraInfoApi.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);
+            }
+          });
+        }
+      });
+    },
+  },
+  created() {
+    companyInfoApi.treeList().then((response)=>{
+      var jsonData = response.data;
+
+      if (jsonData.result) {
+        this.companyList = jsonData.data;
+      }
+    });
+
+    dataDictionaryApi.findByCatalogName({
+      "catalogName" : "摄像头云平台"
+    }).then(response => {
+      var jsonData = response.data;
+      this.platformList = jsonData.data;
+    });
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return cameraInfoApi.create();
+      } else {
+        return cameraInfoApi.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>

src/views/base/cameraInfo-list.vue

@@ -0,0 +1,536 @@
+<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/cameraInfo">摄像头管理</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="deviceSerial">
+        <el-input type="text" size="mini" v-model="queryModel.deviceSerial"></el-input>
+      </el-form-item>
+      <el-form-item label="设备名称" prop="deviceName">
+        <el-input type="text" size="mini" v-model="queryModel.deviceName"></el-input>
+      </el-form-item>
+      <el-form-item label="在线状态" prop="status">
+        <el-select size="mini" v-model="queryModel.status">
+          <el-option label="不在线" value="0"></el-option>
+          <el-option label="在线" value="1"></el-option>
+        </el-select>
+      </el-form-item>
+      <!-- <el-form-item label="设备分类" prop="classify">
+         <el-select size="mini" v-model="queryModel.classify">
+          <el-option label="试用" value="1"></el-option>
+          <el-option label="付费" value="2"></el-option>
+        </el-select>
+      </el-form-item> -->
+      <el-form-item label="所在单位" prop="companyId">
+        <el-select-tree
+          size="mini"
+          :options="companyList"
+          v-model="queryModel.companyId"
+          height="200"
+        ></el-select-tree>
+      </el-form-item>
+      <el-form-item label="所在房间" prop="roomAddress">
+        <el-input type="text" size="mini" v-model="queryModel.roomAddress"></el-input>
+      </el-form-item>
+      <el-form-item label="所属平台" prop="platform">
+        <el-select v-model="queryModel.platform" size="mini" style="width:100px;" clearable>
+          <el-option v-for="(item,index) in platformList" 
+          :label="item.name" :value="item.value" :key="index"></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="picUrl"
+        label="截图"
+        width="180"
+      >
+        <template slot-scope="{row}">
+          <a :href="row.picUrl+'?x-oss-process=image/resize,m_lfit,w_1024'" target="_blank" v-if="row.picUrl!=''">
+            <img :src="row.picUrl+'?x-oss-process=image/resize,m_fill,w_100'" class="capture-image"/>
+          </a>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="companyName"
+        sort-by="company_name"
+        label="所属单位"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="platformN"
+        label="所属平台"
+        width="100"
+      ></el-table-column>
+      <el-table-column
+        prop="deviceSerial"
+        sort-by="device_serial"
+        label="设备序列号"
+        sortable="custom"
+        width="150"
+      ></el-table-column>
+      <el-table-column prop="status" label="在线状态" width="100">
+        <template slot-scope="{row}">
+          <span v-if="row.status==1" style="color:green;">在线</span>
+          <span v-else>不在线</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column prop="classify" label="设备分类" width="100">
+        <template slot-scope="{row}">
+          <span v-if="row.classify=='1'">试用</span>
+          <span v-if="row.classify=='2'">付费</span>
+        </template>
+      </el-table-column> -->
+      <el-table-column
+        prop="channelNo"
+        label="通道号"
+        width="100"
+      ></el-table-column>
+      <el-table-column
+        prop="deviceName"
+        label="设备名称"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="roomAddress"
+        label="所在房间"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="validCode"
+        label="验证码"
+        width="100"
+      ></el-table-column>
+      <el-table-column
+        prop="personId"
+        label="人员ID"
+        width="100"
+      ></el-table-column>
+      <el-table-column
+        prop="contactPhone"
+        label="联系电话"
+        width="100"
+      ></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="操作" fixed="right" width="200">
+        <template slot-scope="{row}">
+          <el-link type="primary" :underline="false" @click="queryLiveAddressUrl(row)">直播地址</el-link>-
+          <el-link type="primary" :underline="false" @click="handleEdit(row)">编辑</el-link>-
+          <el-link type="primary" :underline="false" @click="handleRefresh(row)">刷新</el-link>-
+          <el-link type="primary" :underline="false" @click="handleDelete(row)">删除</el-link>
+        </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>
+    <cameraInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></cameraInfo-detail>
+    <el-dialog
+      :visible.sync="showLiveAddressDialog"
+      title="直播地址"
+      :modal-append-to-body="false"
+      style="text-align:left;"
+      width="850px"
+      @closed="handleCloseLive()"
+    >
+      <video 
+        ref="myPlayer"
+        autoplay
+        controls
+        playsInline 
+        webkit-playsinline
+        width="800" height="450"
+      >
+      </video>
+      <div>
+        <label>直播地址:</label>
+        <span v-html="liveAddressUrl"></span>
+      </div>
+      <template v-if="pushAddress!=null">
+      <div>
+        <label>推流地址:</label>
+        <span v-html="pushAddress"></span>
+      </div>
+      </template>
+    </el-dialog>
+    <cameraInfo-bindClass
+      v-if="showBindModal"
+      :cameraInfo="selectedRow"
+      @close="onBindModalClose"
+    ></cameraInfo-bindClass>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import CameraInfoDetail from "./cameraInfo-detail";
+import CameraInfoBindClass from "./cameraInfo-bindClass";
+import cameraInfoApi from "@/api/base/cameraInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+import SelectTree from "@/components/SelectTree";
+import companyInfoApi from "@/api/base/companyInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import Hls from "hls.js";
+
+export default {
+  name: "baseCameraInfoList",
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        deviceSerial: "",
+        deviceName: "",
+        status: "",
+        companyId: "",
+        classify: ""
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      companyList: [],
+      showLiveAddressDialog: false,
+      liveAddressUrl: "",
+      player: null,
+      selectedRow: {},
+      showBindModal: false,
+      platformList: [],
+      pushAddress: null
+    };
+  },
+  methods: {
+    handleBindClass(row) {
+      this.selectedRow = row;
+      this.showBindModal = true;
+    },
+    handleCloseLive() {
+      if(this.player!=null){
+        this.player.pause();
+      }
+    },
+    queryLiveAddressUrl(row) {
+      this.loading = true;
+
+      cameraInfoApi
+        .queryLiveAddressUrl({
+          id:row.id,
+          deviceSerial: row.deviceSerial,
+          channelNo: row.channelNo == null ? 0 : row.channelNo,
+          expireTime: 1800,
+        })
+        .then((response) => {
+          this.loading = false;
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            this.showLiveAddressDialog = true;
+            
+            this.liveAddressUrl = jsonData.data.hdAddress.replace("http:","https:");
+            this.pushAddress = jsonData.data.pushAddress;
+
+            this.$nextTick(()=>{
+              this.player = this.$refs["myPlayer"];
+
+              var hls = new Hls();
+              hls.loadSource(this.liveAddressUrl);
+              hls.attachMedia(this.player);
+
+              hls.on(Hls.Events.MANIFEST_PARSED,()=>{
+                  this.player.play();
+              });
+            //   this.player = new window.EZUIKit.EZUIPlayer('myPlayer');
+
+            //   // 日志
+            //   this.player.on('log', (str)=>{
+            //     console.log(str);
+            //   });
+            })
+          } else {
+            this.$message.error(jsonData.message + "");
+          }
+        });
+    },
+    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("deviceSerial", self.queryModel.deviceSerial);
+      formData.append("deviceName", self.queryModel.deviceName);
+      formData.append("status", self.queryModel.status);
+      formData.append("companyId", self.queryModel.companyId);
+      formData.append("classify", self.queryModel.classify);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      cameraInfoApi
+        .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.sortBy;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
+
+      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(() => {
+          cameraInfoApi.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(() => {
+        cameraInfoApi.batchRemove(idList).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+      });
+    },
+    handleRefresh(record) {
+      var self = this;
+
+      self.loading = true;
+
+      cameraInfoApi.refresh(record.id).then(function (response) {
+        self.loading = false;
+
+        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: "刷新成功!",
+            showClose: true
+          });
+        }
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+    onBindModalClose() {
+      this.showBindModal = false;
+    }
+  },
+  created() {
+    companyInfoApi.treeList().then((response)=>{
+      var jsonData = response.data;
+      if (jsonData.result) {
+        this.companyList = jsonData.data;
+      }
+    });
+
+    dataDictionaryApi.findByCatalogName({
+      "catalogName" : "摄像头云平台"
+    }).then(response => {
+      var jsonData = response.data;
+      this.platformList = jsonData.data;
+    });
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "cameraInfo-detail": CameraInfoDetail,
+    "el-select-tree": SelectTree,
+    "cameraInfo-bindClass": CameraInfoBindClass
+  },
+};
+</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;
+}
+
+.capture-image{
+  width:160px;
+  height: 90px;
+  object-fit: container;
+}
+</style>

src/views/base/checkinInfo-detail.vue

@@ -0,0 +1,269 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="true"
+    append-to-body
+    :close-on-click-modal="false"
+    style="text-align: left"
+    width="80%"
+    @close="closeDialog"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'150px'"
+        inline
+      >
+        <el-form-item label="楼栋" prop="building">
+          <el-input
+            v-model="formModel.building"
+            placeholder="请输入楼栋"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="房号" prop="room">
+          <el-input
+            v-model="formModel.room"
+            placeholder="请输入房号"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <!-- <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="companyId">
+          <el-select-tree
+            :props="companyProps"
+            :options="companyResult"
+            v-model="formModel.companyId"
+            style="width: 300px"
+            size="mediumn"
+          ></el-select-tree>
+        </el-form-item>
+        <el-form-item label="联系人" prop="artificialPerson">
+          <el-select
+            filterable
+            v-model="formModel.artificialPerson"
+            style="width: 300px"
+          >
+            <el-option v-for="person in personResult" 
+              :key="person.id" :value="person.id" :label="person.name">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="法人" prop="boss">
+          <el-input
+            v-model="formModel.boss"
+            placeholder="请输入法人"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="面积（㎡）" prop="area">
+          <el-input
+            v-model="formModel.area"
+            placeholder="请输入面积"
+            style="width: 300px"
+            oninput ="value=value.replace(/[^0-9.]/g,'')"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="入驻时间" prop="checkinTime">
+          <el-date-picker v-model="formModel.checkinTime" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width: 300px"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="费用到期时间" prop="feeExpirationTime">
+          <el-date-picker v-model="formModel.feeExpirationTime" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width: 300px"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="合同到期时间" prop="contractExpirationTime">
+          <el-date-picker v-model="formModel.contractExpirationTime" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width: 300px"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="租赁期限" prop="leaseTerm">
+          <el-input
+            v-model="formModel.leaseTerm"
+            placeholder="请输入租赁期限"
+            style="width: 300px"
+          ></el-input>
+      </el-form-item>
+        <!-- <el-form-item label="租金" prop="rent">
+          <el-input
+            v-model="formModel.rent"
+            placeholder="请输入租金"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item> -->
+        <!-- <el-form-item label="缴纳方式" prop="paymentMethod">
+          <el-select v-model="formModel.paymentMethod" style="width:300px;" clearable>
+          <el-option v-for="(item,index) in paymentMethodList" 
+          :label="item.name" :value="item.value" :key="index"></el-option>
+        </el-select>
+        </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 checkinInfoApi from "@/api/base/checkinInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import companyInfoApi from "@/api/base/companyInfo";
+import personInfoApi from "@/api/base/personInfo";
+import SelectTree from "@/components/SelectTree";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        id: [{ required: true, message: "编号不能为空", trigger: "blur" }],
+        building: [
+          { required: true, message: "楼栋不能为空", trigger: "blur" },
+        ],
+        companyId: [
+          { required: true, message: "企业不能为空", trigger: "blur" },
+        ],
+        artificialPerson: [
+          { required: true, message: "联系人不能为空", trigger: "blur" },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      paymentMethodList: [],
+      companyResult: [],
+      companyProps: {
+        value: "id",
+        label: "name",
+        children: "children"
+      },
+      personResult: [],
+      personProps: {
+        value: "id",
+        label: "name",
+        children: "children"
+      },
+    };
+  },
+  created() {
+    var self = this;
+
+    dataDictionaryApi.findByCatalogName({
+      "catalogName" : "缴纳方式"
+    }).then(response => {
+      var jsonData = response.data;
+      this.paymentMethodList = jsonData.data;
+    });
+
+    companyInfoApi.list({scope:"all"}).then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
+  },
+  watch:{
+    "formModel.companyId": function (val, oldval) {
+      if (val != null && val != "") {
+        var self = this;
+        var formData = new FormData();
+        formData.append("companyId", val);
+
+        personInfoApi.findByCompanyId(formData).then(function(response) {
+          var jsonData = response.data;
+          if (jsonData.result) {
+            self.personResult = 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 checkinInfoApi.add(self.formModel);
+            } else {
+              return checkinInfoApi.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 checkinInfoApi.create();
+      } else {
+        return checkinInfoApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+          
+          //var personId = self.formModel.artificialPerson;
+          //实际保存为personId，但数据库中是varchar类型
+          //self.formModel.artificialPerson = parseInt(personId);
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+  components: {
+    "el-select-tree": SelectTree
+  },
+};
+</script>

src/views/base/checkinInfo-list.vue

@@ -0,0 +1,531 @@
+<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/checkinInfo">租户管理</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="building">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.building"
+        ></el-input>
+      </el-form-item>
+      <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="feeExpirationTime">
+        <el-date-picker v-model="queryModel.feeExpirationTime" value-format="yyyy-MM-dd" type="date" size="mini" placeholder="选择日期"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="合同到期" prop="contractExpirationTime">
+        <el-date-picker v-model="queryModel.contractExpirationTime" value-format="yyyy-MM-dd" type="date" size="mini" placeholder="选择日期"></el-date-picker>
+      </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
+        prop="companyName"
+        label="企业名称"
+        width="180"
+        fixed="left"
+      ></el-table-column>
+      <el-table-column
+        prop="building"
+        label="楼栋"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="room" label="房号" width="180"></el-table-column>
+      <el-table-column
+        prop="boss"
+        label="法人"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="artificialPersonN"
+        label="联系人"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="artificialPersonPhone"
+        label="联系电话"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="area" label="面积（㎡）" width="180"></el-table-column>
+      <el-table-column
+        prop="checkinTime"
+        label="入驻时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="feeExpirationTime"
+        label="费用到期时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="contractExpirationTime"
+        label="合同到期时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="leaseTerm"
+        label="租赁期限"
+        width="180"
+      ></el-table-column>
+      <!-- <el-table-column prop="wechatPay" fixed="right" label="微信支付" width="80">
+          <template slot-scope="{row}">
+              <el-switch
+                  v-model="row.wechatPay"
+                  active-color="#13ce66"
+                  inactive-color="#ff4949"
+                  @change="handlChange(row)">
+              </el-switch>
+          </template>
+      </el-table-column>
+      <el-table-column prop="aliPay" fixed="right" label="支付宝支付" width="90">
+          <template slot-scope="{row}">
+              <el-switch
+                  v-model="row.aliPay"
+                  active-color="#13ce66"
+                  inactive-color="#ff4949"
+                  @change="handlChange(row)">
+              </el-switch>
+          </template>
+      </el-table-column> -->
+      <el-table-column label="操作" fixed="right" width="220">
+        <template slot-scope="{ row }">
+          <el-button size="mini" type="primary" @click="handlePayment(row)"
+            >收费项</el-button
+          >
+          <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>
+    <checkinInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></checkinInfo-detail>
+    <checkinInfo-payment
+      v-if="showModal1"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></checkinInfo-payment>
+    <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/smart_school/personInfo/2020/10/%E5%B0%8F%E9%B9%8F%E7%AE%A1%E5%AE%B6%E7%A7%9F%E6%88%B7%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xls"
+            type="primary"
+            target="_blank"
+            >点击下载模板</el-link
+          >
+        </el-form-item>
+        <el-form-item label="上传文件">
+          <el-upload
+            class="upload-demo"
+            accept=".xls"
+            :action="uploadUrlXls"
+            :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>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import CheckinInfoDetail from "./checkinInfo-detail";
+import CheckinInfoPayment from "./checkinInfo-payment";
+import checkinInfoApi from "@/api/base/checkinInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+import { getToken } from "@/utils/auth";
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        building: "",
+        name: "",
+        feeExpirationTime: "",
+        contractExpirationTime: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      showModal1: false,
+      modalTitle: "",
+      businessKey: "",
+      batchImportVisible: false,
+      uploadUrlXls: Constant.serverUrl + "/base/checkinInfo/importXls",
+      batchImportFileList: [],
+      xlsLoading: false,
+      headers: {
+        Authorization: getToken(),
+      },
+    };
+  },
+  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("building", self.queryModel.building);
+      formData.append("name", self.queryModel.name);
+      formData.append("feeExpirationTime", self.queryModel.feeExpirationTime);
+      formData.append("contractExpirationTime", self.queryModel.contractExpirationTime);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      checkinInfoApi
+        .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 == "ascending" ? "asc" : "desc";
+
+      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;
+    },
+    handlePayment(record) {
+      this.modalTitle = "收费项";
+      this.businessKey = record.id;
+      this.showModal1 = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          checkinInfoApi.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(() => {
+        checkinInfoApi.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;
+      this.showModal1 = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+    handlChange(record){
+      var self = this;
+      var formData = new FormData();
+      self.loading = true;
+
+      formData.append("id", record.id);
+      formData.append("wechatPay", !!record.wechatPay);
+      formData.append("aliPay", !!record.aliPay);
+
+      checkinInfoApi.updateWechatPayOrAliPay(formData).then(function (response) {
+          var jsonData = response.data;
+          self.loading = false;
+          if (jsonData.result) {
+              self.changePage(self.pageIndex);
+          }
+          else{
+              self.$message.error(jsonData.message + "");
+          }
+      });
+    },
+    beforeUpload(file, fileList) {
+      //导入前判断
+      var self = this;
+      self.xlsLoading = true;
+      return true;
+    },
+    //批量导入-上传成功
+    handleBatchImportSuccess(response, file, fileList) {
+      var self = this;
+      self.xlsLoading = false;
+      
+      if (response.result) {
+        self.$message.success(response.message);
+        this.batchImportFileList = [];
+        this.changePage(1);
+
+        this.batchImportVisible = false;
+      } else {
+        //this.$message.error(response.message);
+        this.batchImportFileList = [];
+        this.changePage(1);
+
+        if (response.data != null) {
+          //下载有错误信息提示的报表
+          //window.open(response.data);
+          self.$message({
+            showClose: true,
+            dangerouslyUseHTMLString: true,
+            message:
+              response.message +
+              `,<a href="${response.data}" target="_blank">点击下载未导入的数据报表</a>&nbsp;`,
+            duration: 30000,
+          });
+        }
+      }
+    },
+    //批量导入-预览
+    handleBatchImportPreview(file) {
+      console.log(file.url);
+    },
+    //批量导入-移除
+    handleBatchImportRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    //批量导入-移除前操作
+    beforeBatchImportRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    //批量导入-文件超出个数限制时的钩子
+    handleBatchImportExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "checkinInfo-detail": CheckinInfoDetail,
+    "checkinInfo-payment": CheckinInfoPayment,
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/checkinInfo-payment.vue

@@ -0,0 +1,122 @@
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="true"
+    append-to-body
+    :close-on-click-modal="false"
+    style="text-align: left"
+    width="80%"
+    @close="closeDialog"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form ref="form" :model="fromModel">
+        <el-table
+              ref="formTable"
+              :data="tableData"
+              v-loading="loading"
+              element-loading-text="拼命加载中"
+              stripe
+          >
+              <el-table-column prop="name" label="收费项目" ></el-table-column>
+              <el-table-column prop="desc" label="收费项目说明" ></el-table-column>
+              <el-table-column label="单价">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.unitPrice" oninput ="value=value.replace(/[^0-9.]/g,'')" />
+                </template>
+              </el-table-column>
+              <el-table-column prop="unit" label="单位" ></el-table-column>
+          </el-table>
+      </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 checkinInfoApi from "@/api/base/checkinInfo";
+import payServiceApi from "@/api/base/payService";
+import SelectTree from "@/components/SelectTree";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      fromModel:{},
+      tableData: [],
+      showDialog: true,
+      loading: false,
+      submitting: false,
+    };
+  },
+  created() {
+    var self = this;
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    changePage(pageIndex) {
+      var self = this;
+        this.loading = true;
+        var formData = new FormData();
+        formData.append("businessKey", self.businessKey);
+
+        payServiceApi.payServiceList(formData).then(response => {
+            this.loading = false;
+            var jsonData = response.data;
+
+            console.log(jsonData);
+
+            this.tableData = jsonData.data.data;
+            this.totalElements = jsonData.data.recordsTotal;
+        });
+    },
+    handleSubmit() {
+      var self = this;
+      
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            return payServiceApi.addList(self.tableData);
+          })().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 () {
+    this.changePage(1);
+  },
+  components: {
+    // "el-select-tree": SelectTree
+  },
+};
+</script>

src/views/base/companyDeviceRelation-list.vue

@@ -182,7 +182,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/companyInfo-detail.vue

@@ -9,58 +9,89 @@
     :visible.sync="showDialog"
     :title="title"
     :modal-append-to-body="false"
-    style="text-align:left;"
+    style="text-align: left"
+    width="80%"
     @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-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'130px'"
+      >
+        <el-row v-show="formModel.enableChangeParent">          
           <el-col :span="12">
-            <el-form-item label="单位名称" prop="name">
-              <el-input v-model="formModel.name" placeholder="请输入单位名称" style="width:80%"></el-input>
+            <el-form-item label="上级单位" prop="parentId">
+              <el-select-tree
+                :props="props"
+                :options="companyResult"
+                v-model="formModel.parentId"
+                size="mediumn"
+                width="400px"
+              ></el-select-tree>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="序号" prop="sortNo">
-              <el-input v-model="formModel.sortNo" placeholder="请输入序号" style="width:50%"></el-input>
+            <el-form-item label="本级序号" prop="sortNo">
+              <el-input
+                v-model="formModel.sortNo"
+                placeholder="请输入序号"
+                style="width: 400px"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="简称" prop="shortName">
-              <el-input v-model="formModel.shortName" placeholder="请输入单位名称" style="width:80%"></el-input>
+            <el-form-item label="单位名称" prop="name">
+              <el-input
+                v-model="formModel.name"
+                placeholder="请输入单位名称"
+                style="width: 400px"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="全称" prop="fullName">
+              <el-input
+                v-model="formModel.fullName"
+                placeholder="请输入单位全称"
+                style="width: 400px"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="上级单位" prop="parentId">
-              <!-- <el-select
-                v-model="formModel.parentId"
-                filterable
-                placeholder="请选择"
-                style="width:90%"
-              >
+            <el-form-item label="地区" prop="regionId">
+              <!-- <el-select v-model="formModel.regionId" filterable placeholder="请选择" style="width:50%">
                 <el-option
-                  v-for="company in companyResult"
-                  :key="company.id"
-                  :label="company.name"
-                  :value="company.id"
+                  v-for="region in regionData"
+                  :key="region.id"
+                  :label="region.name"
+                  :value="region.id"
                 ></el-option>
-              </el-select>-->
+              </el-select> -->
               <el-select-tree
                 :props="props"
-                :options="companyResult"
-                v-model="formModel.parentId"
-                height="200"
+                :options="regionData"
+                v-model="formModel.regionId"
+                size="mediumn"
+                width="400px"
               ></el-select-tree>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="单位性质" prop="type">
-              <el-select v-model="formModel.type" filterable placeholder="请选择" style="width:50%">
+            <el-form-item label="单位性质" prop="unitType">
+              <el-select
+                v-model="formModel.unitType"
+                filterable
+                clearable
+                placeholder="请选择"
+                style="width: 400px"
+              >
                 <el-option
                   v-for="result in typeData"
                   :key="result.id"
@@ -73,8 +104,14 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="场景值" prop="type">
-              <el-select v-model="formModel.sceneId" filterable placeholder="请选择" style="width:50%">
+            <el-form-item label="场景值" prop="sceneId">
+              <el-select
+                v-model="formModel.sceneId"
+                filterable
+                clearable
+                placeholder="请选择"
+                style="width: 400px"
+              >
                 <el-option
                   v-for="result in sceneData"
                   :key="result.id"
@@ -84,15 +121,85 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12" v-if="formModel.sceneId == '1'">
+            <el-form-item label="服务场景" prop="type">
+              <el-select
+                v-model="formModel.type"
+                filterable
+                clearable 
+                placeholder="请选择"
+                style="width: 400px"
+              >
+                <el-option
+                  v-for="result in sceneData"
+                  :key="result.id"
+                  :label="result.sceneName"
+                  :value="result.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="关联物业公司" prop="relationCompanyId">
+              <el-select-tree
+                :props="props"
+                :options="companyResult"
+                v-model="formModel.relationCompanyId"
+                size="mediumn"
+                width="400px"
+              ></el-select-tree>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="允许手机注册用户" prop="enableRegister">
+              <el-radio v-model="formModel.enableRegister" :label="true">允许</el-radio>
+              <el-radio v-model="formModel.enableRegister" :label="false">否</el-radio>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-show="formModel.unitType=='1'">
+          <el-col :span="12">
+            <el-form-item label="健康打卡提醒" prop="healthyReportNoticeEnable">
+              <el-switch v-model="formModel.healthyReportNoticeEnable"
+                active-color="#13ce66"
+                active-text="开"
+                inactive-text="关">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-show="formModel.unitType=='1'">
+          <el-col :span="12">
+            <el-form-item label="打卡提醒时间" prop="healthyReportNoticeTime">
+              <el-time-picker
+                v-model="formModel.healthyReportNoticeTime"
+                class="date-box"
+                format="HH:mm"
+                value-format="HH:mm"
+              ></el-time-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="通知打卡时间" prop="healthyReportSubmitTime">
+              <el-time-picker
+                v-model="formModel.healthyReportSubmitTime"
+                class="date-box"
+                format="HH:mm"
+                value-format="HH:mm"
+              ></el-time-picker>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="备注" prop="remark">
+            <el-form-item label="单位备注" prop="remark">
               <el-input
                 type="textarea"
                 v-model="formModel.remark"
                 :rows="2"
-                style="width:80%;"
+                style="width: 100%"
                 placeholder="请输入备注"
               ></el-input>
             </el-form-item>
@@ -101,41 +208,65 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="大屏网址" prop="wallUrl">
-              <el-input v-model="formModel.wallUrl" placeholder="请输入" style="width:100%"></el-input>
+              <el-input
+                v-model="formModel.wallUrl"
+                placeholder="请输入"
+                style="width: 100%"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <!-- <el-row>
           <el-col :span="12">
             <el-form-item label="一级位置" prop="position1Name">
-              <el-input v-model="formModel.position1Name" placeholder="请输入一级位置" style="width:80%"></el-input>
+              <el-input
+                v-model="formModel.position1Name"
+                placeholder="请输入一级位置"
+                style="width: 80%"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="二级位置" prop="position2Name">
-              <el-input v-model="formModel.position2Name" placeholder="请输入二级位置" style="width:80%"></el-input>
+              <el-input
+                v-model="formModel.position2Name"
+                placeholder="请输入二级位置"
+                style="width: 80%"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="三级位置" prop="position3Name">
-              <el-input v-model="formModel.position3Name" placeholder="请输入三级位置" style="width:80%"></el-input>
+              <el-input
+                v-model="formModel.position3Name"
+                placeholder="请输入三级位置"
+                style="width: 80%"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="四级位置" prop="position4Name">
-              <el-input v-model="formModel.position4Name" placeholder="请输入四级位置" style="width:80%"></el-input>
+              <el-input
+                v-model="formModel.position4Name"
+                placeholder="请输入四级位置"
+                style="width: 80%"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="五级位置" prop="position5Name">
-              <el-input v-model="formModel.position5Name" placeholder="请输入五级位置" style="width:80%"></el-input>
+              <el-input
+                v-model="formModel.position5Name"
+                placeholder="请输入五级位置"
+                style="width: 80%"
+              ></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row>
           <el-col :span="24">
             <el-form-item label="单位logo" prop="logo">
@@ -159,13 +290,17 @@
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button @click="closeDialog">取 消</el-button>
-      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting"
+        >确 定</el-button
+      >
     </span>
   </el-dialog>
 </template>
 <script>
 import Constant from "@/constant";
 import companyInfoApi from "@/api/base/companyInfo";
+import sceneInfoApi from "@/api/base/sceneInfo";
+import regionInfoApi from "@/api/base/regionInfo";
 import dataDictionaryApi from "@/api/sys/dataDictionary";
 import SelectTree from "@/components/SelectTree";
 
@@ -175,12 +310,29 @@ export default {
   props: ["businessKey", "title"],
   data() {
     return {
-      formModel: {},
+      formModel: {
+        enableChangeParent: false
+      },
       ruleValidate: {
         name: [
-          { required: true, message: "单位名称不能为空", trigger: "blur" }
+          { required: true, message: "单位名称不能为空", trigger: "blur" },
+        ],
+        regionId: [
+          { required: true, message: "地区不能为空", trigger: "blur" },
+        ],
+        sceneId: [
+          { required: true, message: "场景值不能为空", trigger: "blur" },
         ],
-        type: [{ required: true, message: "性质不能为空", trigger: "blur" }]
+        parentId : [
+          { required: true, message: "上级单位不能为空", trigger: "blur" },
+        ],
+        sortNo : [
+          { required: true, message: "序号不能为空", trigger: "blur" },
+        ],
+        unitType : [
+          { required: true, message: "单位性质不能为空", trigger: "blur" },
+        ]
+        // type: [{ required: true, message: "性质不能为空", trigger: "blur" }]
       },
       showDialog: true,
       loading: false,
@@ -188,11 +340,11 @@ export default {
       //上传地址
       uploadUrl: Constant.serverUrl + "/uploadPicture",
       uploadData: {
-        subFolder: "companyInfo"
+        subFolder: "companyInfo",
       },
       fileUrl: "",
       headers: {
-        Authorization: getToken()
+        Authorization: getToken(),
       },
       companyResult: [],
       typeData: [],
@@ -201,14 +353,15 @@ export default {
         // 配置项（必选）
         value: "id",
         label: "name",
-        children: "children"
+        children: "children",
       },
-      sceneData:[]
+      sceneData: [],
+      regionData: [],
     };
   },
   created() {
     var self = this;
-    companyInfoApi.list().then(function(response) {
+    companyInfoApi.treeList().then(function (response) {
       var jsonData = response.data;
       if (jsonData.result) {
         self.companyResult = jsonData.data;
@@ -217,77 +370,100 @@ export default {
 
     var formData = new FormData();
     formData.append("catalogName", "单位性质");
-    dataDictionaryApi.findByCatalogName(formData).then(response => {
+    dataDictionaryApi.findByCatalogName(formData).then((response) => {
       var jsonData = response.data;
       this.typeData = jsonData.data;
     });
-    
-    this.loadTree();
-  },
-  methods: {
-    getSelectedValue(value) {
-      this.formModel.parentId = value;
-    },
-    loadTree() {
-      var formData = new FormData();
-      companyInfoApi.loadChildren(formData).then(resp => {
-        var jsonData = resp.data;
 
-        if (jsonData.result) {
-          this.treeData = jsonData.data;
-        } else {
-          this.$message.error(jsonData.message + "");
-        }
-      });
-    },
-    loadChildren(tree, treeNode, resolve) {
-      var formData = new FormData();
-      formData.append("parentId", tree.id);
+    sceneInfoApi.list().then((response) => {
+      var jsonData = response.data;
+      this.sceneData = jsonData.data;
+    });
 
-      companyInfoApi.loadChildren(formData).then(resp => {
-        var jsonData = resp.data;
+    regionInfoApi.list().then((response) => {
+      var jsonData = response.data;
+      this.regionData = jsonData.data;
+    });
 
-        if (jsonData.result) {
-          resolve(jsonData.data);
-        } else {
-          this.$message.error(jsonData.message + "");
+    //this.loadTree();
+  },
+  watch: {
+    "formModel.sceneId": function (newVal, oldVal) {
+      if (newVal != null) {
+        if(newVal != '1'){
+          this.formModel.type = "";
         }
-      });
+      } 
     },
+  },
+  methods: {
+    // getSelectedValue(value) {
+    //   this.formModel.parentId = value;
+    // },
+    // loadTree() {
+    //   var formData = new FormData();
+    //   companyInfoApi.loadChildren(formData).then(resp => {
+    //     var jsonData = resp.data;
+
+    //     if (jsonData.result) {
+    //       this.treeData = jsonData.data;
+    //     } else {
+    //       this.$message.error(jsonData.message + "");
+    //     }
+    //   });
+    // },
+    // loadChildren(tree, treeNode, resolve) {
+    //   var formData = new FormData();
+    //   formData.append("parentId", tree.id);
+
+    //   companyInfoApi.loadChildren(formData).then(resp => {
+    //     var jsonData = resp.data;
+
+    //     if (jsonData.result) {
+    //       resolve(jsonData.data);
+    //     } else {
+    //       this.$message.error(jsonData.message + "");
+    //     }
+    //   });
+    // },
     closeDialog() {
       this.$emit("close", false);
     },
     handleSubmit() {
       var self = this;
 
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
-          (function() {
+          (function () {
             var id = self.formModel.id;
 
             if (self.formModel.parentId == null) {
               self.formModel.parentId = "";
             }
 
+            if (self.formModel.relationCompanyId == null) {
+              self.formModel.relationCompanyId = "";
+            }
+
             if (id == null || id.length == 0) {
               return companyInfoApi.add(self.formModel);
             } else {
               return companyInfoApi.update(self.formModel);
             }
-          })().then(function(response) {
+          })().then(function (response) {
             var jsonData = response.data;
 
             if (jsonData.result) {
               self.$message({
                 message: "保存成功!",
-                type: "success"
+                type: "success",
               });
 
               self.$emit("close", true);
             } else {
               self.$message({
                 message: jsonData.message + "",
-                type: "warning"
+                type: "warning",
               });
 
               self.$emit("close", false);
@@ -313,18 +489,18 @@ export default {
         this.$message.error("上传头像图片大小不能超过 2MB!");
       }
       return isJPG && isLt2M;
-    }
+    },
   },
-  mounted: function() {
+  mounted: function () {
     var self = this;
-    (function() {
+    (function () {
       if (self.businessKey.length == 0) {
         return companyInfoApi.create();
       } else {
         return companyInfoApi.edit(self.businessKey);
       }
     })()
-      .then(response => {
+      .then((response) => {
         var jsonData = response.data;
         self.loading = false;
 
@@ -339,13 +515,13 @@ export default {
           self.$message.error(jsonData.message + "");
         }
       })
-      .catch(error => {
+      .catch((error) => {
         self.$message.error(error + "");
       });
   },
   components: {
-    "el-select-tree": SelectTree
-  }
+    "el-select-tree": SelectTree,
+  },
 };
 </script>
 <style>

src/views/base/companyInfo-list.vue

@@ -1,16 +1,21 @@
 <template>
-  <div style="padding-left:5px;">
+  <div style="padding-left: 5px">
     <el-breadcrumb separator=">">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="#">系统管理</a>
+        <a href="#">基础信息管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
         <a href="/companyInfo">单位管理</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
-    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+    <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>
@@ -35,9 +40,61 @@
           :options="companyResult"
           v-model="queryModel.parentId"
           height="200"
-        ></el-select-tree>&nbsp;
-        <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>
+        ></el-select-tree
+        >&nbsp;
+        <el-checkbox v-model="queryModel.subordinate"
+          >是否包含下级单位</el-checkbox
+        >
       </el-form-item>
+      <el-form-item label="适用场景" prop="sceneId">
+        <el-select
+          v-model="queryModel.sceneId"
+          filterable
+          placeholder="请选择"
+          style="width: 110px"
+          size="mini"
+        >
+          <el-option
+            v-for="result in sceneData"
+            :key="result.id"
+            :label="result.sceneName"
+            :value="result.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="单位性质" prop="unitType">
+              <el-select
+                v-model="queryModel.unitType"
+                filterable
+                clearable
+                placeholder="请选择"
+                style="width: 110px"
+                size="mini"
+              >
+                <el-option
+                  v-for="result in typeData"
+                  :key="result.id"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+      <!-- <el-form-item label="服务场景" prop="type">
+        <el-select
+          v-model="queryModel.type"
+          filterable
+          placeholder="请选择"
+          style="width: 110px"
+          size="mini"
+        >
+          <el-option
+            v-for="result in sceneData"
+            :key="result.id"
+            :label="result.sceneName"
+            :value="result.id"
+          ></el-option>
+        </el-select>
+      </el-form-item> -->
       <el-form-item>
         <el-button
           type="primary"
@@ -45,33 +102,44 @@
           icon="ios-search"
           @click="changePage(1)"
           :loading="loading"
-        >查询</el-button>&nbsp;
+          >查询</el-button
+        >&nbsp;
         <el-button
           type="info"
           size="mini"
           style="margin-left: 8px"
           @click="handleReset('queryForm')"
-        >重置</el-button>&nbsp;
+          >重置</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"
+        @click="handleAdd"
+        >新增</el-button
+      >
       <el-button
         type="primary"
         size="small"
         plain
         icon="el-icon-remove"
-        :disabled="multipleSelection.length==0"
+        :disabled="multipleSelection.length == 0"
         @click="handleBatchDelete"
-      >删除选中项</el-button>
+        >删除选中项</el-button
+      >
       <el-button
         type="primary"
         size="small"
         plain
         icon="el-icon-upload2"
         @click="batchImportVisible = true"
-      >导入</el-button>
+        >导入</el-button
+      >
     </el-row>
     <el-table
       ref="formTable"
@@ -83,20 +151,86 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="sortNo" label="序号" width="120"></el-table-column>
-      <el-table-column prop="name" label="单位名称" width="230"></el-table-column>
-      <el-table-column prop="shortName" label="简称" width="120"></el-table-column>
-      <el-table-column prop="parentName" label="上级单位" width="230"></el-table-column>
-      <el-table-column prop="typeN" label="性质" width="80"></el-table-column>
-      <el-table-column prop="sceneName" label="场景值" width="90"></el-table-column>
-      <el-table-column prop="remark" sort-by="remark_" width="350" label="备注"></el-table-column>
-      <el-table-column label="操作" width="350" fixed="right">
+      <el-table-column
+        prop="parentName"
+        label="上级单位"
+        width="200"
+      ></el-table-column>
+      <el-table-column prop="sortNo" label="本级" width="100"></el-table-column>
+      <el-table-column
+        prop="name"
+        label="单位名称"
+        width="200"
+      ></el-table-column>
+      <el-table-column
+        prop="fullName"
+        label="全称"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="unitTypeName"
+        label="单位性质"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="sceneName"
+        label="场景值"
+        width="90"
+      ></el-table-column>
+      <el-table-column
+        prop="typeName"
+        label="服务场景"
+        width="90"
+      ></el-table-column>
+      <el-table-column
+        prop="regionName"
+        label="地区"
+        width="90"
+      ></el-table-column>
+      <el-table-column
+        prop="typeName"
+        label="单位类别"
+        width="90"
+      ></el-table-column>
+      <el-table-column
+        prop="remark"
+        sort-by="remark_"
+        width="350"
+        label="备注"
+      ></el-table-column>
+      <el-table-column prop="isMobilePayment"  label="手机支付" >
         <template slot-scope="{row}">
+            <el-switch
+                v-if="row.isAdmin"
+                v-model="row.isMobilePayment"
+                active-color="#13ce66"
+                inactive-color="#ff4949"
+                @change="handlChange(row)">
+            </el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="350" fixed="right">
+        <template slot-scope="{ row }">
           <el-row>
             <el-col>
-              <el-link type="primary" :underline="false" @click="handleEdit(row)">编辑</el-link>-
-              <el-link type="danger" :underline="false" @click="handleDelete(row)">删除</el-link>-
-              <el-link type="primary" :underline="false" @click="bindDevice(row)">绑定设备</el-link>-
+              <el-link
+                type="primary"
+                :underline="false"
+                @click="handleEdit(row)"
+                >编辑</el-link
+              >-
+              <el-link
+                type="danger"
+                :underline="false"
+                @click="handleDelete(row)"
+                >删除</el-link
+              >-
+              <el-link
+                type="primary"
+                :underline="false"
+                @click="bindDevice(row)"
+                >绑定设备</el-link
+              >-
               <el-popover
                 placement="left"
                 width="300"
@@ -104,11 +238,18 @@
                 @show="openQRCode(row)"
                 @hide="closeQRCode(row)"
               >
-                <div :ref="'qrcode_' + row.id" style="width:300px;height:300px;"></div>
-                <el-link type="primary" :underline="false" slot="reference">健康公示二维码</el-link>
-              </el-popover>-
+                <div
+                  :ref="'qrcode_' + row.id"
+                  style="width: 300px; height: 300px"
+                ></div>
+                <el-link type="primary" :underline="false" slot="reference"
+                  >健康公示二维码</el-link
+                > </el-popover
+              >-
               <span v-if="row.type != null && row.type != ''">
-                <el-link type="primary" :underline="false" @click="openDP(row)">大屏网址</el-link>
+                <el-link type="primary" :underline="false" @click="openDP(row)"
+                  >大屏网址</el-link
+                >
               </span>
             </el-col>
           </el-row>
@@ -138,7 +279,7 @@
       title="导入"
       :visible.sync="batchImportVisible"
       :modal-append-to-body="false"
-      style="text-align: left;"
+      style="text-align: left"
       :close-on-click-modal="false"
     >
       <el-form label-width="150px">
@@ -147,7 +288,8 @@
             href="http://rccs.oss-cn-hangzhou.aliyuncs.com/smart/companyInfo/2020/4/13111357680.xls"
             type="primary"
             target="_blank"
-          >点击下载模板</el-link>
+            >点击下载模板</el-link
+          >
         </el-form-item>
         <el-form-item label="上传文件">
           <el-upload
@@ -167,13 +309,19 @@
             :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-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>
+        <el-button type="primary" @click="batchImportVisible = false"
+          >关 闭</el-button
+        >
       </div>
     </el-dialog>
     <!--批量导入E-->
@@ -184,6 +332,8 @@ import Constant from "@/constant";
 import companyInfoDetail from "./companyInfo-detail";
 import companyDeviceRelationList from "./companyDeviceRelation-list";
 import companyInfoApi from "@/api/base/companyInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import sceneInfoApi from "@/api/base/sceneInfo";
 import SelectTree from "@/components/SelectTree";
 import QRCode from "qrcodejs2";
 
@@ -200,7 +350,10 @@ export default {
       queryModel: {
         name: "",
         parentId: "",
-        subordinate: false
+        subordinate: false,
+        sceneId: "",
+        type: "",
+        unitType:""
       },
       loading: false,
       tableData: [],
@@ -225,31 +378,45 @@ export default {
         // 配置项（必选）
         value: "id",
         label: "name",
-        children: "children"
+        children: "children",
       },
       batchImportVisible: false,
       batchImportFileList: [],
       uploadUrlXls: Constant.serverUrl + "/base/companyInfo/importXls",
       uploadXlsData: {
         subFolder: "company",
-        companyId: ""
+        companyId: "",
       },
       headers: {
-        Authorization: getToken()
+        Authorization: getToken(),
       },
-      xlsLoading: false
+      xlsLoading: false,
+      sceneData: [],
+      typeData:[]
     };
   },
   created() {
     var self = this;
 
-    companyInfoApi.list().then(function(response) {
+    sceneInfoApi.list().then((response) => {
+      var jsonData = response.data;
+      this.sceneData = jsonData.data;
+    });
+
+    companyInfoApi.treeList().then(function (response) {
       var jsonData = response.data;
       if (jsonData.result) {
         self.companyResult = jsonData.data;
       }
     });
 
+    var formData = new FormData();
+    formData.append("catalogName", "单位性质");
+    dataDictionaryApi.findByCatalogName(formData).then((response) => {
+      var jsonData = response.data;
+      this.typeData = jsonData.data;
+    });
+
     this.changePage(1);
     this.loadTree();
   },
@@ -258,9 +425,7 @@ export default {
       this.queryModel.parentId = value;
     },
     loadTree() {
-      var formData = new FormData();
-
-      companyInfoApi.loadChildren(formData).then(resp => {
+      companyInfoApi.treeList().then((resp) => {
         var jsonData = resp.data;
 
         if (jsonData.result) {
@@ -276,7 +441,7 @@ export default {
       var formData = new FormData();
       formData.append("parentId", tree.id);
 
-      companyInfoApi.loadChildren(formData).then(resp => {
+      companyInfoApi.loadChildren(formData).then((resp) => {
         var jsonData = resp.data;
 
         if (jsonData.result) {
@@ -297,10 +462,26 @@ export default {
       formData.append("pageIndex", self.pageIndex);
       formData.append("pageSize", self.pageSize);
 
-      formData.append("name", self.queryModel.name);
-      formData.append("parentId", self.queryModel.parentId);
+      if (self.queryModel.name != null) {
+        formData.append("name", self.queryModel.name);
+      }
+
+      if (self.queryModel.parentId != null) {
+        formData.append("parentId", self.queryModel.parentId);
+      }
+
       formData.append("subordinate", self.queryModel.subordinate);
 
+      if (self.queryModel.sceneId != null) {
+        formData.append("sceneId", self.queryModel.sceneId);
+      }
+
+      formData.append("unitType", self.queryModel.unitType);
+
+      // if (self.queryModel.type != null) {
+      //   formData.append("type", self.queryModel.type);
+      // }
+
       if (this.field != null) {
         formData.append("field", this.field);
       }
@@ -311,7 +492,7 @@ export default {
 
       companyInfoApi
         .pageList(formData)
-        .then(function(response) {
+        .then(function (response) {
           self.loading = false;
 
           var jsonData = response.data.data;
@@ -322,9 +503,9 @@ export default {
           //45为分页栏的高度
           //页面高度-列表上面的高度-分页栏高度
           self.tableHeight =
-            window.innerHeight - self.$refs.formTable.$el.offsetTop - 45;
+            window.innerHeight - self.$refs.formTable.$el.offsetTop - 100;
         })
-        .catch(error => {
+        .catch((error) => {
           self.loading = false;
           // self.$message.error(error + "");
         });
@@ -334,7 +515,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },
@@ -361,10 +542,10 @@ export default {
         .$confirm("是否确认删除?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
+          type: "warning",
         })
         .then(() => {
-          companyInfoApi.remove(record.id).then(function(response) {
+          companyInfoApi.remove(record.id).then(function (response) {
             var jsonData = response.data;
 
             if (jsonData.result) {
@@ -374,7 +555,7 @@ export default {
 
               self.$message({
                 type: "success",
-                message: "删除成功!"
+                message: "删除成功!",
               });
             }
           });
@@ -383,16 +564,16 @@ export default {
     handleBatchDelete() {
       var self = this;
 
-      var idList = this.multipleSelection.map(record => {
+      var idList = this.multipleSelection.map((record) => {
         return record.id;
       });
 
       this.$confirm("是否确认删除选中项？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       }).then(() => {
-        companyInfoApi.batchRemove(idList).then(function(response) {
+        companyInfoApi.batchRemove(idList).then(function (response) {
           var jsonData = response.data;
 
           if (jsonData.result) {
@@ -400,7 +581,7 @@ export default {
 
             self.$message({
               type: "success",
-              message: "删除成功!"
+              message: "删除成功!",
             });
           }
         });
@@ -452,7 +633,7 @@ export default {
         height: 300,
         colorDark: "#333333", //二维码颜色
         colorLight: "#ffffff", //二维码背景色
-        correctLevel: QRCode.CorrectLevel.L //容错率，L/M/H
+        correctLevel: QRCode.CorrectLevel.L, //容错率，L/M/H
       });
     },
     closeQRCode(record) {
@@ -518,7 +699,7 @@ export default {
             message:
               response.message +
               `,<a href="${response.data}" target="_blank">点击下载未导入的数据报表</a>&nbsp;`,
-            duration: 30000
+            duration: 30000,
           });
         }
       }
@@ -538,18 +719,40 @@ export default {
     //批量导入-文件超出个数限制时的钩子
     handleBatchImportExceed(files, fileList) {
       this.$message.warning(
-        `当前限制选择 3 个文件，本次选择了 ${
-          files.length
-        } 个文件，共选择了 ${files.length + fileList.length} 个文件`
+        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
       );
+    },
+
+    handlChange(record){
+
+      var self = this;
+      var formData = new FormData();
+      self.loading = true;
+
+      formData.append("id", record.id);
+      formData.append("isMobilePayment", record.isMobilePayment);
+
+      companyInfoApi.isOpenMobilePayment(formData).then(function (response) {
+          var jsonData = response.data;
+          self.loading = false;
+          if (jsonData.result) {
+              self.changePage(self.pageIndex);
+          }
+          else{
+              self.$message.error(jsonData.message + "");
+          }
+      });
+
     }
   },
-  mounted: function() {},
+  mounted: function () {},
   components: {
     "companyInfo-detail": companyInfoDetail,
     "companyDeviceRelation-list": companyDeviceRelationList,
-    "el-select-tree": SelectTree
-  }
+    "el-select-tree": SelectTree,
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/base/companyPayment-detail.vue

@@ -0,0 +1,271 @@
+<template>
+      <el-dialog
+        :visible.sync="showDialog"
+        :title="title"
+        :modal-append-to-body="false"
+        style="text-align: left"
+        @close="closeDialog"
+        width="1000px"
+        :close-on-click-modal="false"
+      >
+      <div class="user-panel" v-loading="loading">
+        <el-form
+            ref="form"
+            :model="formModel"
+            :rules="ruleValidate"
+            :label-width="'150px'"
+            inline
+        >
+            <el-form-item label="物业公司" prop="companyId">
+                <!-- <el-select v-model="formModel.companyId" filterable>
+                    <el-option
+                        v-for="result in companyList"
+                        :key="result.id"
+                        :label="result.name"
+                        :value="result.id"
+                    ></el-option>
+                </el-select> -->
+                <el-select-tree
+                    :props="props"
+                    :options="treeData"
+                    v-model="formModel.companyId"
+                    height="200"
+                    style="width: 300px"
+                ></el-select-tree>
+            </el-form-item>
+            <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="cycle">
+                <el-input
+                    v-model="formModel.cycle"
+                    placeholder="结算周期"
+                    style="width: 300px"
+                >
+                     <template slot="append">天以内</template>
+                </el-input>
+            </el-form-item>
+            <el-form-item label="微信商户号" prop="mchId">
+                <el-input
+                    v-model="formModel.mchId"
+                    placeholder="请输入微信mchId"
+                    style="width: 300px"
+                ></el-input>
+            </el-form-item>
+            <el-form-item label="微信子商户号" prop="subMchId">
+                <el-input
+                    v-model="formModel.subMchId"
+                    placeholder="请输入微信subMchId"
+                    style="width: 300px"
+                ></el-input>
+            </el-form-item>
+            <el-form-item label="支付宝令牌" prop="appAuthToken">
+                <el-input
+                    v-model="formModel.appAuthToken"
+                    placeholder="请输入支付宝appAuthToken"
+                    style="width: 300px"
+                ></el-input>
+            </el-form-item>
+            <el-form-item label="开户名称" prop="bankName">
+                <el-input
+                    v-model="formModel.bankName"
+                    placeholder="请输入开户名称"
+                    style="width: 300px"
+                ></el-input>
+            </el-form-item>
+                        <el-form-item label="开户银行" prop="bank">
+                <el-input
+                    v-model="formModel.bank"
+                    placeholder="请输入开户银行"
+                    style="width: 300px"
+                ></el-input>
+            </el-form-item>
+            <el-form-item label="账号" prop="account">
+                <el-input
+                    v-model="formModel.account"
+                    placeholder="请输入账号"
+                    style="width: 300px"
+                ></el-input>
+            </el-form-item>
+            <el-form-item label="财务人员手机账户" prop="financePersonId">
+                <el-select v-model="formModel.financePersonId" filterable style="width: 300px">
+                    <el-option
+                        v-for="result in personList"
+                        :key="result.id"
+                        :label="result.name + '(' + result.phone + ')'"
+                        :value="result.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="财务人员后台账户" prop="financeUserId">
+                <el-select v-model="formModel.financeUserId" filterable style="width: 300px">
+                    <el-option
+                        v-for="result in userList"
+                        :key="result.id"
+                        :label="result.realName + '(' + result.userName + ')'"
+                        :value="result.id"
+                    ></el-option>
+                </el-select>
+            </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 companyPaymentApi from "@/api/base/companyPayment";
+import companyInfoApi from "@/api/base/companyInfo";
+import pageUtil from "@/utils/page";
+import SelectTree from "@/components/SelectTree";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+import personInfoApi from "@/api/base/personInfo";
+export default {
+    props: ["businessKey", "title"],
+    data() {
+        return {
+            ruleValidate: {
+                companyId: [{ required: true, message: "物业公司不能为空", trigger: "change" }],
+                name: [{ required: true, message: "账户名称不能为空", trigger: "blur" }],
+                cycle: [{ required: true, message: "结算周期不能为空", trigger: "blur" }],
+
+            },
+            formModel:{
+                companyId:"", 
+                name:"",
+                mchId:"",
+                subMchId:"",
+                appAuthToken:"",
+                financePersonId:"",
+                financeUserId:"",
+            },
+            treeData: [],
+            personList:[],
+            userList:[],
+            companyList:[],
+            showDialog: true,
+            loading: false,
+            submitting: false,
+            props: {
+                // 配置项（必选）
+                value: "id",
+                label: "name",
+                children: "children"
+            },
+        }
+    },
+    created() {
+        this.loadTree();
+
+        companyPaymentApi.findPersonByCompanyId().then(response => {
+            var jsonData = response.data;
+            this.personList = jsonData.data;
+        });
+
+        companyPaymentApi.findUserByCompanyId().then(response => {
+            var jsonData = response.data;
+            this.userList = 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 companyPaymentApi.add(self.formModel);
+                    } else {
+                        return companyPaymentApi.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);
+                    }
+                });
+                }
+            });
+        },
+        loadTree() {
+            companyInfoApi.treeList().then(resp => {
+                var jsonData = resp.data;
+
+                if (jsonData.result) {
+                this.treeData = jsonData.data;
+                } else {
+                this.$message.error(jsonData.message + "");
+                }
+            });
+        },
+    },
+    mounted: function () {
+        var self = this;
+
+        companyInfoApi.treeList().then((resp) => {
+            var jsonData = resp.data;
+            this.companyList = jsonData.data;
+        });
+
+        (function () {
+        if (self.businessKey.length == 0) {
+            return companyPaymentApi.create();
+        } else {
+            return companyPaymentApi.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>
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>

src/views/base/companyPayment-list.vue

@@ -0,0 +1,347 @@
+<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="#">园区管理</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="companyId">
+                <!-- <el-select size="mini" v-model="queryModel.companyId" filterable>
+                    <el-option
+                        v-for="result in companyList"
+                        :key="result.id"
+                        :label="result.name"
+                        :value="result.id"
+                    ></el-option>
+                </el-select> -->
+                <el-select-tree
+                    :props="props"
+                    :options="treeData"
+                    v-model="queryModel.companyId"
+                    height="200"
+                ></el-select-tree>
+            </el-form-item>
+            <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(null)"
+        >新增</el-button>
+        </el-row>
+        <el-table
+            :data="tableData"
+            style="min-height:400px;"
+            row-key="id"
+            stripe
+            border
+            :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+            @selection-change="handleSelectionChange"
+            >
+            <el-table-column prop="companyName"  label="物业公司" ></el-table-column>
+            <el-table-column prop="name"  label="账户名称" ></el-table-column>
+            <el-table-column prop="cycle"  label="结算周期"  >
+                <template slot-scope="{row}">
+                    {{row.cycle}}天以内
+                </template>
+            </el-table-column>
+            <el-table-column prop="mchId"  label="微信mchId" ></el-table-column>
+            <el-table-column prop="subMchId"  label="微信subMchId" ></el-table-column>
+            <el-table-column prop="appAuthToken"  label="支付宝appAuthToken"  ></el-table-column>
+            <el-table-column prop="bankName"  label="开户名称"  ></el-table-column>
+            <el-table-column prop="bank"  label="开户银行"  ></el-table-column>
+            <el-table-column prop="account"  label="账号"  ></el-table-column>
+            <el-table-column prop="createTime"  label="创建时间"  ></el-table-column>
+            <el-table-column prop="isDefault"  label="默认账户">
+                <template slot-scope="{row}">
+                    <el-switch
+                        v-model="row.isDefault"
+                        active-color="#13ce66"
+                        inactive-color="#ff4949"
+                        @change="handlChange(row)">
+                    </el-switch>
+                </template>
+            </el-table-column>
+            <!-- <el-table-column prop="isOpenWechat"  label="支持微信支付"  >
+                <template slot-scope="{row}">
+                    <el-switch
+                        v-model="row.isOpenWechat"
+                        active-color="#13ce66"
+                        inactive-color="#ff4949"
+                        @change="handlChange(row)">
+                    </el-switch>
+                </template>
+            </el-table-column>
+            <el-table-column prop="isOpenAlipay"  label="支持支付宝支付"  >
+                <template slot-scope="{row}">
+                    <el-switch
+                        v-model="row.isOpenAlipay"
+                        active-color="#13ce66"
+                        inactive-color="#ff4949"
+                        @change="handlChange(row)">
+                    </el-switch>
+                </template>
+            </el-table-column> -->
+            <el-table-column label="操作" fixed="right" width="180px">
+                <template slot-scope="{row}">
+                <el-link size="mini" type="primary" @click="handleEdit(row)">编辑</el-link>-
+                <el-link size="mini" type="warning" @click="handleManagePayService(row)">收费项目</el-link>-
+                <el-link size="mini" type="danger" @click="handleDelete(row)">删除</el-link>
+                </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>
+        <companyPayment-detail
+            v-if="showModal"
+            :businessKey="businessKey"
+            :title="modalTitle"
+            @close="onDetailModalClose"
+        ></companyPayment-detail>
+    </div>
+</template>
+<script>
+import Constant from "@/constant";
+import companyPaymentApi from "@/api/base/companyPayment";
+import companyInfoApi from "@/api/base/companyInfo";
+import companyPaymentDetail from "./companyPayment-detail";
+import pageUtil from "@/utils/page";
+import SelectTree from "@/components/SelectTree";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+export default {
+     name: "baseCompanyPayment",
+     data() {
+         return{
+            queryModel:{
+                companyId:"",
+                name:"",
+            },
+            treeData: [],
+            companyList:[],
+            loading: false,
+            tableData: [],
+            pageIndex: 1,
+            pageSize: 10,
+            totalPages: 0,
+            totalElements: 0,
+            pageSizeList: [10, 20, 30],
+            multipleSelection: [],
+            showModal: false,
+            props: {
+                // 配置项（必选）
+                value: "id",
+                label: "name",
+                children: "children"
+            },
+         }
+    },
+    created() {
+
+        this.loadTree();
+    },
+    methods: {
+        changePage(pageIndex) {
+            var self = this;
+
+            self.loading = true;
+
+            var formData = new FormData();
+
+            formData.append("pageIndex", self.pageIndex);
+            formData.append("pageSize", self.pageSize);
+
+            formData.append("companyId", self.queryModel.companyId);
+            formData.append("name", self.queryModel.name);
+
+            companyPaymentApi.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;
+        },
+        handleReset(name) {
+            this.$refs[name].resetFields();
+        },
+        pageSizeChange(pageSize) {
+            this.pageSize = pageSize;
+        },
+        handleAdd() {
+            this.modalTitle = "新增";
+            this.businessKey = "";
+            this.showModal = true;
+        },
+        handleEdit(record) {
+            this.modalTitle = "编辑";
+            this.businessKey = record.id;
+            this.showModal = true;
+        },
+        handleManagePayService(record) {
+
+            var path = "/base/PayService/list";
+            
+
+            this.$store.dispatch('tagsView/delView', {
+                name: "basePayServiceList",
+                path: path
+            }).then(({ visitedViews }) => {
+                this.$router.push({ 
+                path: path,
+                query:{
+                    companyId: record.companyId
+                }
+                });
+            });
+        },
+        onDetailModalClose(refreshed) {
+            //保存成功后回调
+            this.showModal = false;
+
+            if (refreshed) {
+                this.changePage(this.pageIndex);
+            }
+        },
+        handleDelete(record) {
+            var self = this;
+
+            self.$confirm("是否确认删除?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+                })
+                .then(() => {
+                companyPaymentApi.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: "删除成功!",
+                    });
+                    }
+                });
+            });
+        },
+        loadTree() {
+            companyInfoApi.treeList().then(resp => {
+                var jsonData = resp.data;
+
+                if (jsonData.result) {
+                this.treeData = jsonData.data;
+                } else {
+                this.$message.error(jsonData.message + "");
+                }
+            });
+        },
+        handlChange(record){
+
+            var self = this;
+            var formData = new FormData();
+            self.loading = true;
+
+            formData.append("id", record.id);
+            formData.append("isDefault", record.isDefault);
+
+            companyPaymentApi.setIsDefault(formData).then(function (response) {
+                var jsonData = response.data;
+                self.loading = false;
+                if (jsonData.result) {
+                    self.changePage(self.pageIndex);
+                }
+                else{
+                    self.$message.error(jsonData.message + "");
+                }
+            });
+        }
+        
+    },
+    components: {
+        "companyPayment-detail": companyPaymentDetail,
+        "el-select-tree": SelectTree
+    },
+    mounted() {
+        this.changePage(1);
+
+        companyInfoApi.treeList().then((resp) => {
+            var jsonData = resp.data;
+            this.companyList = jsonData.data;
+        });
+    },
+}
+</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>

src/views/base/companyPosition-list.vue

@@ -271,7 +271,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/companyStructureInfo-detail.vue

@@ -0,0 +1,208 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="true"
+    append-to-body
+    :close-on-click-modal="false"
+    style="text-align: left"
+    width="80%"
+    @close="closeDialog"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'150px'"
+        inline
+      >
+        <el-form-item label="公司名称" prop="companyId">
+          <el-select-tree
+            size="mini"
+            :props="companyProps"
+            :options="companyResult"
+            v-model="formModel.companyId"
+            height="200"
+          ></el-select-tree>
+        </el-form-item>
+        <el-form-item label="结构名称" prop="structureName">
+          <el-input
+            v-model="formModel.structureName"
+            placeholder="请输入结构名称"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          label="位置名称"
+          prop="positionName"
+        >
+          <el-input
+            v-model="formModel.positionName"
+            placeholder="请输入位置名称"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="父级" prop="parentId">
+          <el-select-tree
+            size="mini"
+            :props="parentProps"
+            :options="parentResult"
+            v-model="formModel.parentId"
+            height="200"
+          ></el-select-tree>
+        </el-form-item>
+        <el-form-item label="备注信息" prop="remark">
+          <el-input
+            v-model="formModel.remark"
+            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 companyStructureInfoApi from "@/api/base/companyStructureInfo";
+import companyInfoApi from "@/api/base/companyInfo";
+import SelectTree from "@/components/SelectTree";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        companyId: [
+          { required: true, message: "公司id不能为空", trigger: "blur" },
+        ],
+        structureName: [
+          { required: true, message: "结构名称不能为空", trigger: "blur" },
+        ],
+        positionName: [
+          {
+            required: true,
+            message: "位置名称（如：楼栋、单元、部门、工号）不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      companyResult: [],
+      companyProps: {
+        value: "id",
+        label: "name",
+        children: "children"
+      },
+      parentResult: [],
+      parentProps: {
+        value: "id",
+        label: "structureName"
+      },
+    };
+  },
+  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 companyStructureInfoApi.add(self.formModel);
+            } else {
+              return companyStructureInfoApi.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);
+            }
+          });
+        }
+      });
+    },
+  },
+  created() {
+    var self = this;
+
+    companyInfoApi.treeList().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
+
+    companyStructureInfoApi.query().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.parentResult = jsonData.data;
+      }
+    });
+
+    // this.changePage(1);
+    // this.loadTree();
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return companyStructureInfoApi.create();
+      } else {
+        return companyStructureInfoApi.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>

src/views/base/companyStructureInfo-list.vue

@@ -0,0 +1,377 @@
+<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/companyStructureInfo">单位机构管理</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-tree
+          size="mini"
+          :props="companyProps"
+          :options="companyResult"
+          v-model="queryModel.companyId"
+          height="200"
+        ></el-select-tree>
+      </el-form-item>
+      <el-form-item label="结构名称" prop="structureName">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.structureName"
+        ></el-input>
+      </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 label="父级" prop="parentId">
+        <el-select-tree
+          size="mini"
+          :props="parentProps"
+          :options="parentResult"
+          v-model="queryModel.parentId"
+          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
+        prop="companyName"
+        label="公司名称"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="structureName"
+        label="结构名称"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="positionName"
+        label="位置名称"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="parentName"
+        label="父级名称"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="remark"
+        label="备注信息"
+        width="180"
+      ></el-table-column>
+      <el-table-column label="操作">
+        <template slot-scope="{ row }">
+          <el-button size="mini" type="warning" @click="handleEdit(row)"
+            >编辑</el-button
+          >
+          <el-button size="mini" type="danger" @click="handleDelete(row)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+    <companyStructureInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></companyStructureInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import CompanyStructureInfoDetail from "./companyStructureInfo-detail";
+import companyStructureInfoApi from "@/api/base/companyStructureInfo";
+import companyInfoApi from "@/api/base/companyInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+import SelectTree from "@/components/SelectTree";
+
+export default {
+  name: 'baseCompanyStructureInfoList',
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        companyId: "",
+        structureName: "",
+        positionName: "",
+        parentId: ""
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      companyResult: [],
+      companyProps: {
+        value: "id",
+        label: "name",
+        children: "children"
+      },
+      parentResult: [],
+      parentProps: {
+        value: "id",
+        label: "structureName"
+      },
+    };
+  },
+  created() {
+    var self = this;
+
+    companyInfoApi.treeList().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
+
+    companyStructureInfoApi.query().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.parentResult = jsonData.data;
+      }
+    });
+
+    // this.changePage(1);
+    // this.loadTree();
+  },
+  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("companyId", self.queryModel.companyId);
+      formData.append("structureName", self.queryModel.structureName);
+      formData.append("positionName", self.queryModel.positionName);
+      formData.append("parentId", self.queryModel.parentId);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      companyStructureInfoApi
+        .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 == "ascending" ? "asc" : "desc";
+
+      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(() => {
+          companyStructureInfoApi.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(() => {
+        companyStructureInfoApi.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: {
+    "companyStructureInfo-detail": CompanyStructureInfoDetail,
+    "el-select-tree": SelectTree
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/deviceInfo-detail.vue

@@ -129,6 +129,23 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="开门时间" prop="remoteOpenRangeTime">
+                <el-time-picker
+                    is-range
+                    v-model="formModel.remoteOpenRangeTime"
+                    arrow-control
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
+                    placeholder="选择时间范围"
+                    format='HH:mm'
+                    value-format="HH:mm">
+                </el-time-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
         </el-row>
           <!-- <el-col :span="12">
@@ -174,7 +191,9 @@ export default {
   props: ["businessKey", "title", "companyResult"],
   data() {
     return {
-      formModel: {},
+      formModel: {
+        remoteOpenRangeTime: null,
+      },
       ruleValidate: {
         aliasName: [
           { required: true, message: "设备别名不能为空", trigger: "blur" }
@@ -306,14 +325,27 @@ export default {
 
             self.loading = true;
 
-            if (self.formModel.companyId == null) {
-              self.formModel.companyId = "";
+            // if (self.formModel.companyId == null) {
+            //   self.formModel.companyId = "";
+            // }
+
+            // if(self.formModel.remoteOpenRangeTime!=null&&self.formModel.remoteOpenRangeTime!=""){
+            //   var remoteOpenRangeTime = self.formModel.remoteOpenRangeTime.toString();
+            //   self.formModel.remoteOpenRangeTime = remoteOpenRangeTime;
+            // }
+            // else{
+            //   self.formModel.remoteOpenRangeTime = "";
+            // }
+            var requestModel = JSON.parse(JSON.stringify(self.formModel));
+
+            if(self.formModel.remoteOpenRangeTime!=null){
+              requestModel.remoteOpenRangeTime = self.formModel.remoteOpenRangeTime.join(",");
             }
 
             if (id == null || id.length == 0) {
-              return deviceInfoApi.add(self.formModel);
+              return deviceInfoApi.add(requestModel);
             } else {
-              return deviceInfoApi.update(self.formModel);
+              return deviceInfoApi.update(requestModel);
             }
           })().then(function(response) {
             self.loading = false;
@@ -379,6 +411,20 @@ export default {
         if (jsonData.result) {
           self.formModel = jsonData.data;
 
+          var rangeTime = [];
+
+          if(self.formModel.remoteOpenStartTime!=null){
+            rangeTime.push(self.formModel.remoteOpenStartTime);
+          }
+          
+          if(self.formModel.remoteOpenEndTime!=null){
+            rangeTime.push(self.formModel.remoteOpenEndTime);
+          }
+
+          if(rangeTime.length>0){
+            self.formModel.remoteOpenRangeTime = rangeTime;
+          }
+
           if (self.businessKey.length == 0){
             self.formModel.columnColor="1";
             // self.formModel.columnHeight="";

src/views/base/deviceInfo-ehome.vue

@@ -0,0 +1,272 @@
+
+<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="'150px'">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="显示抓拍图片" prop="deviceNo">
+              <el-switch
+                v-model="formModel.showCapPic"
+                active-color="#13ce66"
+                active-text="是"
+                inactive-color="#ff4949"
+                inactive-text="否"
+                ></el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="显示用户信息" prop="deviceNo">
+              <el-switch
+                v-model="formModel.showUserInfo"
+                active-color="#13ce66"
+                active-text="是"
+                inactive-color="#ff4949"
+                inactive-text="否"
+                ></el-switch>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="叠加用户信息" prop="deviceNo">
+              <el-switch
+                v-model="formModel.overlayUserInfo"
+                active-color="#13ce66"
+                active-text="是"
+                inactive-color="#ff4949"
+                inactive-text="否"
+                ></el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="启用语音提示" prop="deviceNo">
+              <el-switch
+                v-model="formModel.voicePrompt"
+                active-color="#13ce66"
+                active-text="是"
+                inactive-color="#ff4949"
+                inactive-text="否"
+                ></el-switch>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="保存抓拍图片" prop="deviceNo">
+              <el-switch
+                v-model="formModel.saveCapPic"
+                active-color="#13ce66"
+                active-text="是"
+                inactive-color="#ff4949"
+                inactive-text="否"
+                ></el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="测温开关使能" prop="deviceNo">
+              <el-switch
+                v-model="formModel.thermalEnabled"
+                active-color="#13ce66"
+                active-text="开"
+                inactive-color="#ff4949"
+                inactive-text="关"
+                ></el-switch>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="温度阈值上限" prop="deviceNo">
+                <el-input
+                    v-model.number="formModel.highestThermalThreshold"
+                    style="width: 100px"
+                >
+                <template slot="append">度</template>
+                </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="温度阈值下限" prop="deviceNo">
+                <el-input
+                    v-model.number="formModel.lowestThermalThreshold"
+                    style="width: 100px"
+                >
+                <template slot="append">度</template>
+                </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="体温超标允许开门" prop="deviceNo">
+                <el-switch
+                    v-model="formModel.thermalDoorEnabled"
+                    active-color="#13ce66"
+                    active-text="是"
+                    inactive-color="#ff4949"
+                    inactive-text="否"
+                ></el-switch>
+            </el-form-item>
+          </el-col>
+        </el-row>        
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="是否开启口罩检测">
+                <el-switch
+                    v-model="maskDetection.enable"
+                    active-color="#13ce66"
+                    active-text="是"
+                    inactive-color="#ff4949"
+                    inactive-text="否"
+                ></el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="检测未带口罩策略">
+              <el-select v-model="maskDetection.noMaskStrategy">
+                <el-option label="提示且开门" value="tipsAndOpenDoor"></el-option>
+                <el-option label="不提示且开门" value="noTipsAndOpenDoor"></el-option>
+                <el-option label="提示且不开门" value="tipsAndNotOpenDoor"></el-option>
+              </el-select>
+            </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 ehomeApi from "@/api/base/ehome";
+
+export default {
+  props: ["deviceNo", "title", "companyResult"],
+  data() {
+    return {
+      formModel: {},
+      maskDetection: {
+        "enable": true,          
+        "noMaskStrategy": ""
+      },
+      ruleValidate: {},
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      cfgUrl: "/ISAPI/AccessControl/AcsCfg?format=json",
+      maskDetectionUrl: "/ISAPI/AccessControl/maskDetection?format=json"
+    }
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate(valid => {
+        self.loading = true;
+
+        //保存测温策略
+        ehomeApi.putXMLConfig(
+            self.deviceNo,self.cfgUrl,{
+                "AcsCfg": self.formModel
+            },
+        ).then(response=>{
+          var jsonData = response.data;
+
+          if(!jsonData.success){
+            self.$message({
+              message: jsonData.message + "",
+              type: "warning"
+            });
+          }
+
+          //保存口罩设置
+          return  ehomeApi.putXMLConfig(
+            self.deviceNo,
+            self.maskDetectionUrl,
+            {
+                "MaskDetection": self.maskDetection
+            }
+          )
+        }).then(response=>{
+          self.loading = false;
+          var jsonData = response.data;
+
+          if (jsonData.success) {
+            self.$message({
+              message: "保存成功!",
+              type: "success"
+            });
+
+            self.$emit("close", true);
+          } else {
+            self.$message({
+              message: jsonData.message + "",
+              type: "warning"
+            });
+          }
+        });
+      });
+    },
+  },
+  mounted: function() {
+    var self = this;
+    
+    self.loading = true;
+
+    //获取测温策略
+    ehomeApi.getXMLConfig(self.deviceNo,self.cfgUrl)
+    .then(response => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.success) {
+            var data = eval('(' + jsonData.data + ')');
+
+            self.formModel = data.AcsCfg;
+        } else {
+            self.$message.error(jsonData.message + "");
+        }
+    })
+    .catch(error => {
+        self.$message.error(error + "");
+    });
+
+    //获取口罩设置
+    ehomeApi.getXMLConfig(self.deviceNo,self.maskDetectionUrl)
+    .then(response => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.success) {
+            var data = eval('(' + jsonData.data + ')');
+
+            self.maskDetection = data.MaskDetection;
+        } else {
+            self.$message.error(jsonData.message + "");
+        }
+    })
+    .catch(error => {
+        self.$message.error(error + "");
+    });
+  }
+};
+</script>

src/views/base/deviceInfo-list.vue

@@ -158,6 +158,9 @@
       <el-table-column prop="manufacturerN" label="设备厂家"></el-table-column>
       <el-table-column prop="heartbeatUpdateTime" sort-by="a.heartbeat_update_time"
         sortable="custom" label="心跳更新时间" width="160"></el-table-column>
+      <el-table-column prop="updateTime" label="记录更新时间" width="160"></el-table-column>
+      <el-table-column prop="remoteOpenStartTime" label="远程开门开始时间"></el-table-column>
+      <el-table-column prop="remoteOpenEndTime" label="远程开门结束时间"></el-table-column>
       <el-table-column label="照片库" width="120">
         <template slot-scope="{row}">
           <el-link 
@@ -184,12 +187,15 @@
             </el-col> -->
           </el-row>
           <el-row>
-            <!-- <el-col :span="8">
+            <el-col :span="8">
               <el-link type="primary" @click="handleBindPerson(row)">用户关联</el-link>
-            </el-col> -->
+            </el-col>
             <el-col :span="8" v-if="row.manufacturer=='1'">
               <el-link type="primary" @click="handleEditRule(row)">验证规则</el-link>
             </el-col>
+            <el-col :span="8" v-if="row.manufacturer=='2'">
+              <el-link type="primary" @click="handleAcsCfg(row)">参数设置</el-link>
+            </el-col>
             <el-col :span="8">
               <el-link type="primary" @click="handleReboot(row)">重启设备</el-link>
             </el-col>
@@ -348,6 +354,12 @@
       </span>
     </el-dialog>
     <!-------------设备验证规则end------------------>
+    <deviceInfo-ehome
+      v-if="showEhomeModal"
+      :deviceNo="selectedDevice.deviceNo"
+      title="海康设备设置"
+      @close="onEhomeModalClose"
+    ></deviceInfo-ehome>
     <deviceInfo-map
       v-if="showMapModal"
       :businessKey="businessKey"
@@ -370,6 +382,7 @@
 <script>
 import Constant from "@/constant";
 import DeviceInfoDetail from "./deviceInfo-detail";
+import DeviceInfoEhome from "./deviceInfo-ehome";
 import DeviceInfoChannelList from "./deviceInfo-channelList";
 import DevicePhotoList from "./devicePhoto-list";
 import DeviceInfoMap from "./deviceInfo-amap";
@@ -444,6 +457,7 @@ export default {
       showMapModal: false,
       showChannelListModal: false,
       showPhotoListModal: false,
+      showEhomeModal: false,
       selectedDevice: {},
       columnColorList: [],
       columnHeightList: [],
@@ -488,7 +502,7 @@ export default {
     });
 
     var self = this;
-    companyInfoApi.list().then(function(response) {
+    companyInfoApi.treeList().then(function(response) {
       var jsonData = response.data;
       if (jsonData.result) {
         self.companyResult = jsonData.data;
@@ -601,6 +615,10 @@ export default {
           
           if(jsonData.result) {
             if(exportFlag){
+              if(document.location.href.startsWith("https://")){
+                  jsonData.data = jsonData.data.replace("http://","https://");
+              }
+
               //导出
               self.$message({
                 showClose: true,
@@ -924,6 +942,13 @@ export default {
     onDevicePhotoListClose (){
       this.showPhotoListModal = false;
     },
+    handleAcsCfg(device) {
+      this.selectedDevice = device;
+      this.showEhomeModal = true;
+    },
+    onEhomeModalClose() {
+      this.showEhomeModal = false;
+    },
     exportXls() {
       this.changePage(1,true);
     }
@@ -941,7 +966,8 @@ export default {
     "deviceInfo-channelList": DeviceInfoChannelList,
     "deviceInfo-map": DeviceInfoMap,
     "el-select-tree": SelectTree,
-    "devicePhoto-list": DevicePhotoList
+    "devicePhoto-list": DevicePhotoList,
+    "deviceInfo-ehome": DeviceInfoEhome
   }
 };
 </script>

src/views/base/devicePerson-list.vue

@@ -3,7 +3,7 @@
     <el-breadcrumb separator=">">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="#">系统管理</a>
+        <a href="#">基础信息管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
         <a href="#">设备人员管理</a>
@@ -21,25 +21,6 @@
       class="demo-form-inline"
     >
       <div>
-        <el-form-item label="绑定设备名称" prop="deviceId">
-          <el-select
-            v-model="queryModel.deviceId"
-            size="mini"
-            filterable
-            clearable
-            remote
-            style="width:220px;"
-            placeholder="请输入关键词"
-            :remote-method="queryDevice"
-          >
-            <el-option
-              v-for="device in deviceResult"
-              :key="device.id"
-              :label="device.aliasName"
-              :value="device.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="姓名" prop="name">
           <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
         </el-form-item>
@@ -76,6 +57,25 @@
           ></el-select-tree>&nbsp;
           <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>
         </el-form-item>
+        <el-form-item label="绑定设备名称" prop="deviceId">
+          <el-select
+            v-model="queryModel.deviceId"
+            size="mini"
+            filterable
+            clearable
+            remote
+            style="width:220px;"
+            placeholder="请输入关键词"
+            :remote-method="queryDevice"
+          >
+            <el-option
+              v-for="device in deviceResult"
+              :key="device.id"
+              :label="device.aliasName"
+              :value="device.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="是否上传照片" prop="isUploadPhoto">
           <el-select
             v-model="queryModel.isUploadPhoto"
@@ -103,7 +103,7 @@
           </el-select>
         </el-form-item>
       </div>
-      <div>
+      <!-- <div>
         <el-form-item v-if="position1Show" :label="position1" prop="position1">
           <el-input type="text" size="mini" v-model="queryModel.position1"></el-input>
         </el-form-item>
@@ -119,7 +119,7 @@
         <el-form-item v-if="position5Show" :label="position5" prop="position5">
           <el-input type="text" size="mini" v-model="queryModel.position5"></el-input>
         </el-form-item>
-      </div>
+      </div> -->
     </el-form>
     <el-divider></el-divider>
     <el-row class="button-group">
@@ -314,7 +314,8 @@ export default {
 
     return {
       ruleValidate: {
-        deviceId: [{ required: true, message: "不能为空", trigger: "blur" }]
+        parentId: [{ required: true, message: "请选择单位", trigger: "blur" }],
+        deviceId: [{ required: true, message: "请选择设备", trigger: "blur" }]
       },
       queryModel: {
         companyCode: "",
@@ -379,7 +380,7 @@ export default {
   created() {
     var self = this;
 
-    companyInfoApi.list().then(function(response) {
+    companyInfoApi.treeList().then(function(response) {
       var jsonData = response.data;
       if (jsonData.result) {
         if (jsonData.data != null && jsonData.data != "") {
@@ -419,6 +420,7 @@ export default {
     queryDevice(aliasName) {
       var self = this;
       var formData = new FormData();
+      formData.append("companyId", self.queryModel.parentId);
       formData.append("aliasName", aliasName);
       formData.append("limit", 10);
 

src/views/base/devicePhoto-list.vue

@@ -45,8 +45,7 @@
                 </el-table-column>
                 <el-table-column
                     prop="Remarks"
-                    label="备注"
-                    width="150">
+                    label="备注">
                 </el-table-column>
                 <el-table-column label="操作" width="100" fixed="right">
                     <template slot-scope="{row}">

src/views/base/electricClientInfo-list.vue

@@ -230,7 +230,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
       this.changePage(this.pageIndex);
     },
     handleSelectionChange(val) {

src/views/base/electricMeterInfo-list.vue

@@ -206,7 +206,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/employeeInfo-list.vue

@@ -224,7 +224,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },

src/views/base/holidayInfo-detail.vue

@@ -13,16 +13,24 @@
     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="'150px'">
+        <el-form-item label="单位名称" prop="companyId">
+          <el-select-tree
+            :props="props"
+            :options="companyResult"
+            v-model="formModel.companyId"
+            height="200"
+            size="mediumn"
+          ></el-select-tree>
+        </el-form-item>
         <el-form-item label="节假日名称" prop="holidayName">
           <el-input v-model="formModel.holidayName" placeholder="请输入电表名称" style="width:300px"></el-input>
         </el-form-item>
         <el-form-item label="开始时间" prop="beginDate">
           <el-date-picker v-model="formModel.beginDate" value-format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
         </el-form-item>
-
         <el-form-item label="结束时间" prop="endDate">
           <el-date-picker v-model="formModel.endDate" value-format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
         </el-form-item>
@@ -56,13 +64,17 @@
 import Constant from "@/constant";
 import holidayInfoApi from "@/api/base/holidayInfo";
 import { quillEditor } from "vue-quill-editor";
+import SelectTree from "@/components/SelectTree";
 
 export default {
   props: ["businessKey", "title", "companyResult"],
   data() {
     return {
       ruleValidate: {
-        companyId: [{ required: true, message: "不能为空", trigger: "blur" }]
+        companyId: [{ required: true, message: "不能为空", trigger: "blur" }],
+        holidayName: [{ required: true, message: "不能为空", trigger: "blur" }],
+        beginDate: [{ required: true, message: "不能为空", trigger: "blur" }],
+        endDate: [{ required: true, message: "不能为空", trigger: "blur" }]
       },
       showDialog: true,
       loading: false,
@@ -71,35 +83,35 @@ export default {
       rangeTime: "",
       options: [
         {
-          value: "",
+          value: 0,
           label: "无"
         },
         {
-          value: "1",
+          value: 1,
           label: "周一"
         },
         {
-          value: "2",
+          value: 2,
           label: "周二"
         },
         {
-          value: "3",
+          value: 3,
           label: "周三"
         },
         {
-          value: "4",
+          value: 4,
           label: "周四"
         },
         {
-          value: "5",
+          value: 5,
           label: "周五"
         },
         {
-          value: "6",
+          value: 6,
           label: "周六"
         },
         {
-          value: "7",
+          value: 7,
           label: "星期天"
         }
       ],
@@ -191,6 +203,9 @@ export default {
       .catch(error => {
         self.$message.error(error + "");
       });
+  },
+  components: {
+    "el-select-tree": SelectTree
   }
 };
 </script>

src/views/base/holidayInfo-list.vue

@@ -13,20 +13,98 @@
     <!--
       要resetFields起作用，必须配置:model和prop
     -->
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="单位" prop="companyId">
+        <el-select-tree
+          :props="props"
+          aria-setsize="mini"
+          :options="companyResult"
+          v-model="queryModel.companyId"
+          size="mini"
+          height="200"
+        ></el-select-tree>
+      </el-form-item>
+      <el-form-item label="假日名称" prop="companyId">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.holidayName"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="假日区间" prop="timeRanges">
+        <el-date-picker
+          v-model="queryModel.timeRanges"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          :default-time="timeRangesDefaultTime"
+          size="mini"
+        ></el-date-picker>
+      </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
+        >
+      </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"
+        @click="handleAdd"
+        >新增</el-button
+      >
       <el-button
         type="primary"
         size="small"
         plain
         icon="el-icon-remove"
-        :disabled="multipleSelection.length==0"
+        :disabled="multipleSelection.length == 0"
         @click="handleBatchDelete"
-      >删除选中项</el-button>
+        >删除选中项</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-upload2"
+        @click="batchImportVisible = true"
+        >导入</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-download"
+        :loading="xlsLoading"
+        @click="downloadAll"
+        >导出数据</el-button
+      >
     </el-row>
     <el-table
-    ref="formTable"
+      ref="formTable"
       :data="tableData"
       v-loading="loading"
       stripe
@@ -34,20 +112,44 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="holidayName" label="节假日名称" width="220" fixed="left"></el-table-column>
-      <el-table-column prop="beginDate" label="开始日期" show-overflow-tooltip width="150"></el-table-column>
-      <el-table-column prop="endDate" label="结束日期" width="150"></el-table-column>
+      <el-table-column
+        prop="companyName"
+        label="单位名称"
+        width="220"
+      ></el-table-column>
+      <el-table-column
+        prop="holidayName"
+        label="节假日名称"
+        width="220"
+      ></el-table-column>
+      <el-table-column
+        prop="beginDate"
+        label="开始日期"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="endDate"
+        label="结束日期"
+        width="150"
+      ></el-table-column>
       <el-table-column prop="working" label="是否需要上班" width="120">
         <template slot-scope="{row}">
-          <span v-html="row.working ? '是': '否'"></span>
+          <span v-html="row.working ? '是' : '否'"></span>
         </template>
       </el-table-column>
-      <el-table-column prop="refWeekday" label="参考上班日" ></el-table-column>
-      <el-table-column label="操作" width="300" fixed="right">
-        <template slot-scope="{row}">
-          <el-button size="mini" type="warning" @click="handleEdit(row)">修改</el-button>
-          <el-button size="mini" type="primary" @click="bindCompany(row)">关联部门</el-button>
-          <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+      <el-table-column
+        prop="refWeekdayN"
+        label="参考上班日"
+        width="120"
+      ></el-table-column>
+      <el-table-column label="操作" width="200" 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>
@@ -66,21 +168,77 @@
       :companyResult="companyResult"
       @close="onDetailModalClose"
     ></holidayInfo-detail>
-    <holidayCompany-list
-      v-if="showModal2"
-      :businessKey="businessKey"
-      :title="modalTitle2"
-      @close="onDetailModalClose2"
-    ></holidayCompany-list>
+    <!--批量导入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/smart/personInfo/2020/10/%E8%8A%82%E5%81%87%E6%97%A5%E8%AE%BE%E7%BD%AE%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xls"
+            type="primary"
+            target="_blank"
+            >点击下载模板</el-link
+          >
+        </el-form-item>
+        <el-form-item label="单位">
+          <el-select-tree
+            size="large"
+            :props="props"
+            :options="companyResult"
+            v-model="uploadXlsData.companyId"
+            height="200"
+            width="300px"
+          ></el-select-tree>
+        </el-form-item>
+        <el-form-item label="上传文件">
+          <el-upload
+            class="upload-demo"
+            accept=".xls"
+            :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 holidayInfoDetail from "./holidayInfo-detail";
-import holidayCompanyList from "./holidayCompany-list";
 import holidayInfoApi from "@/api/base/holidayInfo";
 import companyInfoApi from "@/api/base/companyInfo";
+import SelectTree from "@/components/SelectTree";
 
+import { getToken } from "@/utils/auth"; // get token from cookie
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
@@ -100,13 +258,45 @@ export default {
       direction: "",
       pageSizeList: [10, 20, 30],
       multipleSelection: [],
+      timeRangesDefaultTime: [],
       showModal: false,
-      showModal2: false,
       modalTitle: "",
-      modalTitle2: "",
-      businessKey: ""
+      businessKey: "",
+      queryModel: {
+        companyId: "",
+        holidayName: "",
+        timeRanges: "",
+      },
+      companyResult: [],
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+      batchImportVisible: false,
+      batchImportFileList: [],
+      uploadUrlXls: Constant.serverUrl + "/base/holidayInfo/importXls",
+      uploadXlsData: {
+        subFolder: "company",
+        companyId: "",
+      },
+      headers: {
+        Authorization: getToken(),
+      },
+      xlsLoading: false,
     };
   },
+  created() {
+    var self = this;
+    companyInfoApi.treeList().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
+  },
   methods: {
     changePage(pageIndex) {
       var self = this;
@@ -115,9 +305,29 @@ export default {
       self.pageIndex = pageIndex;
       var formData = new FormData();
 
+      var startDate = "";
+      var endDate = "";
+      var timeRanges = self.queryModel.timeRanges + "";
+
+      if (timeRanges != "" && timeRanges != null) {
+        timeRanges = timeRanges.split(",");
+        startDate = timeRanges[0];
+        endDate = timeRanges[1];
+      }
+
+      formData.append("startDate", startDate);
+      formData.append("endDate", endDate);
       formData.append("pageIndex", self.pageIndex);
       formData.append("pageSize", self.pageSize);
 
+      if (self.queryModel.companyId != null) {
+        formData.append("companyId", self.queryModel.companyId);
+      }
+
+      if (self.queryModel.holidayName) {
+        formData.append("holidayName", self.queryModel.holidayName);
+      }
+
       if (this.field != null) {
         formData.append("field", this.field);
       }
@@ -127,7 +337,7 @@ export default {
       }
       holidayInfoApi
         .pageList(formData)
-        .then(function(response) {
+        .then(function (response) {
           self.loading = false;
 
           var jsonData = response.data.data;
@@ -141,7 +351,7 @@ export default {
           self.tableHeight =
             window.innerHeight - self.$refs.formTable.$el.offsetTop - 45;
         })
-        .catch(error => {
+        .catch((error) => {
           self.loading = false;
           // self.$message.error(error + "");
         });
@@ -151,7 +361,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },
@@ -171,11 +381,6 @@ export default {
       this.businessKey = record.id;
       this.showModal = true;
     },
-    bindCompany(record) {
-      this.modalTitle2 = "关联部门";
-      this.businessKey = record.id;
-      this.showModal2 = true;
-    },
     handleDelete(record) {
       var self = this;
 
@@ -183,10 +388,10 @@ export default {
         .$confirm("是否确认删除?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
+          type: "warning",
         })
         .then(() => {
-          holidayInfoApi.remove(record.id).then(function(response) {
+          holidayInfoApi.remove(record.id).then(function (response) {
             var jsonData = response.data;
 
             if (jsonData.result) {
@@ -196,7 +401,7 @@ export default {
 
               self.$message({
                 type: "success",
-                message: "删除成功!"
+                message: "删除成功!",
               });
             }
           });
@@ -205,16 +410,16 @@ export default {
     handleBatchDelete() {
       var self = this;
 
-      var idList = this.multipleSelection.map(record => {
+      var idList = this.multipleSelection.map((record) => {
         return record.id;
       });
 
       this.$confirm("是否确认删除选中项？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       }).then(() => {
-        holidayInfoApi.batchRemove(idList).then(function(response) {
+        holidayInfoApi.batchRemove(idList).then(function (response) {
           var jsonData = response.data;
 
           if (jsonData.result) {
@@ -222,7 +427,7 @@ export default {
 
             self.$message({
               type: "success",
-              message: "删除成功!"
+              message: "删除成功!",
             });
           }
         });
@@ -235,29 +440,133 @@ export default {
         this.changePage(this.pageIndex);
       }
     },
-    onDetailModalClose2(refreshed) {
-      //保存成功后回调
-      this.showModal2 = false;
-      if (refreshed) {
-        this.changePage(this.pageIndex);
+    beforeUpload(file, fileList) {
+      //导入前判断
+      var self = this;
+      var companyId = self.uploadXlsData.companyId;
+
+      if (companyId == null || companyId.length == 0) {
+        self.$message({
+          type: "warning",
+          message: "请选择单位!",
+        });
+        self.xlsLoading = false;
+        return false;
+      } else {
+        self.xlsLoading = true;
+        return true;
+      }
+    },
+    //批量导入-上传成功
+    handleBatchImportSuccess(response, file, fileList) {
+      var self = this;
+      self.xlsLoading = false;
+      self.uploadXlsData.companyId = null;
+
+      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
+        } 个文件`
+      );
+    },
+    downloadAll() {
+      //导出
+      var self = this;
+      var formData = new FormData();
+
+      var startDate = "";
+      var endDate = "";
+      var timeRanges = self.queryModel.timeRanges + "";
+
+      if (timeRanges != "" && timeRanges != null) {
+        timeRanges = timeRanges.split(",");
+        startDate = timeRanges[0];
+        endDate = timeRanges[1];
       }
-    }
+
+      formData.append("startDate", startDate);
+      formData.append("endDate", endDate);
+
+      if (self.queryModel.companyId != null) {
+        formData.append("companyId", self.queryModel.companyId);
+      }
+
+      if (self.queryModel.holidayName) {
+        formData.append("holidayName", self.queryModel.holidayName);
+      }
+
+      self.loading = true;
+      self.xlsLoading = true;
+
+      holidayInfoApi.exportXls(formData).then(function (response) {
+        self.loading = false;
+        self.xlsLoading = false;
+        var jsonData = response.data;
+        if (jsonData.result) {
+          if (jsonData.data != null) {
+            if (document.location.href.startsWith("https://")) {
+              jsonData.data = jsonData.data.replace("http://", "https://");
+            }
+
+            self.$message({
+              showClose: true,
+              type: "success",
+              dangerouslyUseHTMLString: true,
+              message: `报表已生成，<a href="${jsonData.data}" target="_blank">点击下载报表</a>&nbsp;`,
+              duration: 30000,
+            });
+          }
+        }
+      });
+    },
   },
-  mounted: function() {
+  mounted: function () {
     var self = this;
     this.changePage(1);
-
-    companyInfoApi.list().then(function(response) {
-      var jsonData = response.data;
-      if (jsonData.result) {
-        self.companyResult = jsonData.data;
-      }
-    });
   },
   components: {
     "holidayInfo-detail": holidayInfoDetail,
-    "holidayCompany-list":holidayCompanyList
-  }
+    "el-select-tree": SelectTree,
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/base/iconInfo-detail.vue

@@ -0,0 +1,215 @@
+
+<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="80%"
+    @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'"
+        inline
+      >
+        <el-form-item label="图标名称" prop="iconName">
+          <el-input
+            v-model="formModel.iconName"
+            placeholder="请输入图标名称"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="图标路由" prop="iconRoute">
+          <el-input
+            v-model="formModel.iconRoute"
+            placeholder="请输入图标路由"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="图标的子页面路由" prop="iconSubRoute">
+          <el-input
+            v-model="formModel.iconSubRoute"
+            placeholder="请输入图标的子页面路由"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="图标url" prop="iconUrl">
+          <el-input
+            v-model="formModel.iconUrl"
+            placeholder="请输入图标url"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="参数" prop="iconParam">
+          <el-input
+            v-model="formModel.iconParam"
+            placeholder="请输入参数"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="图标图片" prop="iconPic">
+          <el-input
+            v-model="formModel.iconPic"
+            placeholder="请输入图标图片"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="通用功能展示的图片" prop="iconCommonPic">
+          <el-input
+            v-model="formModel.iconCommonPic"
+            placeholder="请输入通用功能展示的图片"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <!-- <el-form-item label="图标类型" prop="iconTypeId">
+          <el-input
+            v-model="formModel.iconTypeId"
+            placeholder="请输入图标类型"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item> -->
+        <el-form-item label="图标类型" prop="iconTypeId">
+          <el-select v-model="formModel.iconTypeId" style="width:80%">
+            <el-option v-for="(item,index) in iconTypeList" 
+            :label="item.typeName" :value="item.id" :key="index"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注信息" prop="remark">
+          <el-input
+            v-model="formModel.remark"
+            placeholder="请输入备注信息"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="是否启用" prop="useEnable">
+           <el-switch
+            v-model="formModel.useEnable"
+            active-color="#13ce66"
+            active-text="是"
+            inactive-color="#ff4949"
+            inactive-text="否"
+          ></el-switch>
+        </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 iconInfoApi from "@/api/base/iconInfo";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      iconTypeList: [],
+      formModel: {},
+      ruleValidate: {
+        iconName: [
+          { required: true, message: "图标名称不能为空", trigger: "blur" },
+        ],
+        iconRoute: [
+          { required: true, message: "图标路由不能为空", trigger: "blur" },
+        ],
+        iconPic: [
+          { required: true, message: "图标图片不能为空", trigger: "blur" },
+        ],
+        iconTypeId: [
+          { required: true, message: "图标类型id不能为空", trigger: "blur" },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+    };
+  },
+  created() {
+    // this.loadTree();
+
+    iconInfoApi.getIconTypeList().then(response => {
+      var jsonData = response.data;
+      this.iconTypeList = 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 iconInfoApi.add(self.formModel);
+            } else {
+              return iconInfoApi.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 iconInfoApi.create();
+      } else {
+        return iconInfoApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>

src/views/base/iconInfo-list.vue

@@ -0,0 +1,421 @@
+<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="/iconInfo">图标管理</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="iconName">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.iconName"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="备注信息" prop="remark">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.remark"
+        ></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="iconName"
+        label="图标名称"
+        width="130"
+      ></el-table-column>
+      <el-table-column
+        prop="iconRoute"
+        label="图标路由"
+        show-overflow-tooltip
+        width="220"
+      ></el-table-column>
+      <el-table-column
+        prop="iconSubRoute"
+        label="子页面路由"
+        width="200"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="iconUrl"
+        label="图标url"
+        show-overflow-tooltip
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="iconParam"
+        label="参数"
+        width="150"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="useEnable"
+        label="是否启用"
+        width="120"
+      >
+      <template slot-scope="{ row }">
+          <el-switch
+            v-model="row.useEnable"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            @change="updateEnabled(row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="iconPic"
+        label="图标图片"
+        width="80"
+      >
+      <template slot-scope="{ row }">
+          <a :href="row.iconPic" target="_blank">
+            <el-avatar
+              :size="48"
+              shape="circle"
+              :src="
+                row.iconPic +
+                '?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="iconCommonPic"
+        label="通用功能展示的图片"
+        width="150"
+      >
+      <template slot-scope="{ row }">
+          <a :href="row.iconCommonPic" target="_blank">
+            <el-avatar
+              :size="48"
+              shape="circle"
+              :src="
+                row.iconCommonPic +
+                '?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="iconTypeName"
+        label="图标类型"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="remark"
+        label="备注信息"
+        width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column label="操作" fixed="right" 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>
+    <iconInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></iconInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import IconInfoDetail from "./iconInfo-detail";
+import iconInfoApi from "@/api/base/iconInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  name: "baseIconInfoList",
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        iconName: "",
+        iconRoute: "",
+        iconSubRoute: "",
+        iconUrl: "",
+        iconParam: "",
+        useEnable: "",
+        iconPic: "",
+        iconCommonPic: "",
+        iconTypeId: "",
+        delFlag: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: "",
+        remark: "",
+      },
+      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("iconName", self.queryModel.iconName);
+      formData.append("iconRoute", self.queryModel.iconRoute);
+      formData.append("iconSubRoute", self.queryModel.iconSubRoute);
+      formData.append("iconUrl", self.queryModel.iconUrl);
+      formData.append("iconParam", self.queryModel.iconParam);
+      formData.append("useEnable", self.queryModel.useEnable);
+      formData.append("iconPic", self.queryModel.iconPic);
+      formData.append("iconCommonPic", self.queryModel.iconCommonPic);
+      formData.append("iconTypeId", self.queryModel.iconTypeId);
+      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);
+      formData.append("remark", self.queryModel.remark);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      iconInfoApi
+        .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 == "ascending" ? "asc" : "desc";
+
+      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(() => {
+          iconInfoApi.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(() => {
+        iconInfoApi.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);
+      }
+    },
+    updateEnabled(row) {
+      iconInfoApi.update(row);
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "iconInfo-detail": IconInfoDetail,
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/informationInfo-complaint-list.vue

@@ -14,23 +14,23 @@
       要resetFields起作用，必须配置:model和prop
     -->
     <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-      <el-form-item label="投诉人" prop="name">
-        <el-input type="text" v-model="queryModel.ownerName"></el-input>
+      <el-form-item label="投诉人" prop="ownerName">
+        <el-input type="text" v-model="queryModel.ownerName" size="mini"></el-input>
       </el-form-item>
-      <el-form-item label="提交时间" prop="createTime">
+      <el-form-item label="提交时间" prop="createTimeRanges">
         <el-date-picker
-          v-model="queryModel.createTime"
+          size="mini"
+          v-model="queryModel.createTimeRanges"
           type="daterange"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
         ></el-date-picker>
       </el-form-item>
       <el-form-item label="投诉状态" prop="status">
-        <el-select v-model="queryModel.status">
-          <el-option value="0">待回复</el-option>
-          <el-option value="1">已回复</el-option>
-          <el-option value="2">已结束</el-option>
+        <el-select v-model="queryModel.status" size="mini">
+          <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -59,8 +59,8 @@
       @sort-change="sortChange"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column prop="owner.name" sort-by="name_" label="业主名称" width="100"></el-table-column>
-      <el-table-column prop="owner.tel" sort-by="tel_" label="手机号码" width="130"></el-table-column>
+      <el-table-column prop="name" sort-by="name_" label="业主名称" width="100"></el-table-column>
+      <el-table-column prop="phone" sort-by="phone_" label="手机号码" width="130"></el-table-column>
       <el-table-column prop="community" sort-by="community_" label="报修人房号" width="120"></el-table-column>
       <el-table-column prop="content" sort-by="content_" label="投诉内容" width="220"></el-table-column>
       <el-table-column prop="createTime" sort-by="create_time" label="提交时间" width="150"></el-table-column>
@@ -73,10 +73,13 @@
       </el-table-column>
       <el-table-column prop="returnContent" sort-by="return_content" label="回复方案" width="220"></el-table-column>
       <el-table-column prop="returnTime" sort-by="return_time" label="回复时间" width="150"></el-table-column>
-      <el-table-column label="操作" width="180">
-        <template slot-scope>
-          <el-button size="mini" type="success" disabled>已解决</el-button>
-          <el-button size="mini" type="danger" disabled>结束</el-button>
+      <el-table-column label="操作" width="180" fixed="right">
+        <template slot-scope="{row}">
+          <el-button v-if="row.status=='2'" size="mini" type="success" disabled>已解决</el-button>
+          <el-button v-else-if="row.status=='1'" size="mini" type="success" @click="handleEdit(row)">已回复</el-button>
+          <el-button v-else size="mini" type="success" @click="handleEdit(row)">解决方案</el-button>
+          <el-button v-if="row.status=='2'" size="mini" type="danger" disabled>结束</el-button>
+          <el-button v-else size="mini" type="danger" @click="handleFinished(row)">结束</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -111,21 +114,27 @@ export default {
     return {
       queryModel: {
         id: "",
-        createBy: "",
-        createTime: "",
-        updateBy: "",
-        updateTime: "",
-        delFlag: "",
-        ownerId: "",
-        community: "",
-        content: "",
         status: "",
-        returnContent: "",
-        returnTime: "",
-        type: "1"
+        type: "1",
+        ownerName:"",
+        createTimeRanges:[],
       },
       loading: false,
       tableData: [],
+      statusList:[
+        {
+        value:"0",
+        name:"待回复"
+        },
+        {        
+        value:"1",
+        name:"已回复"
+        },
+        {        
+        value:"2",
+        name:"已结束"
+        }
+      ],
       pageIndex: 1,
       pageSize: 10,
       totalPages: 0,
@@ -151,27 +160,12 @@ export default {
       formData.append("pageIndex", self.pageIndex);
       formData.append("pageSize", self.pageSize);
 
-      formData.append("id", self.queryModel.id);
-      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("ownerId", self.queryModel.ownerId);
-      formData.append("community", self.queryModel.community);
-      formData.append("content", self.queryModel.content);
-      formData.append("status", self.queryModel.status);
-      formData.append("returnContent", self.queryModel.returnContent);
-      formData.append("returnTime", self.queryModel.returnTime);
-      formData.append("type", self.queryModel.type);
-
-      if (this.field != null) {
-        formData.append("field", this.field);
-      }
-
-      if (this.direction != null) {
-        formData.append("direction", this.direction);
+      formData.append("type", "1");
+      formData.append("name", self.queryModel.ownerName);
+      if(self.queryModel.createTimeRanges!=null&&self.queryModel.createTimeRanges!=""){
+        formData.append("createTimeRanges", self.queryModel.createTimeRanges.toString());
       }
+      formData.append("status", self.queryModel.status);
 
       informationInfoApi
         .pageList(formData)
@@ -194,7 +188,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },
@@ -210,10 +204,34 @@ export default {
       this.showModal = true;
     },
     handleEdit(record) {
-      this.modalTitle = "编辑";
+      this.modalTitle = "填写解决方案";
       this.businessKey = record.id;
       this.showModal = true;
     },
+    handleFinished(record){
+      var self = this;
+      self
+        .$confirm("是否结束投诉?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+        .then(() => {
+          informationInfoApi.finished(record.id).then(function(response){
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "投诉已结束!"
+              });
+            }
+          })
+        })
+
+    },
     handleDelete(record) {
       var self = this;
 

src/views/base/informationInfo-detail.vue

@@ -12,47 +12,15 @@
     style="text-align:left;"
     @close="closeDialog"
     :close-on-click-modal="false"
+    width="35%"
   >
     <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="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-item label="提交人ID" prop="ownerId">
-          <el-input v-model="formModel.ownerId" placeholder="请输入提交人ID" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="所在小区" prop="community">
-          <el-input v-model="formModel.community" placeholder="请输入所在小区" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="提交内容" prop="content">
-          <el-input v-model="formModel.content" placeholder="请输入提交内容" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="提交状态" prop="status">
-          <el-input v-model="formModel.status" placeholder="请输入提交状态" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="回复内容" prop="returnContent">
-          <el-input v-model="formModel.returnContent" placeholder="请输入回复内容" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="回复时间" prop="returnTime">
-          <el-input v-model="formModel.returnTime" placeholder="请输入回复时间" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="状态/1投诉/2报修" prop="type">
-          <el-input v-model="formModel.type" placeholder="请输入状态/1投诉/2报修" style="width:300px"></el-input>
+        <el-form-item label="解决方案" prop="returnContent">
+          <el-input type="textarea"
+                    :rows="10" 
+                    v-model="formModel.returnContent" placeholder="请输入解决方案" style="width:300px">
+          </el-input>
         </el-form-item>
       </el-form>
     </div>
@@ -71,44 +39,17 @@ export default {
   data() {
     return {
       ruleValidate: {
-        id: [{ 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" }
-        ],
-        ownerId: [
-          { required: true, message: "提交人ID不能为空", trigger: "blur" }
-        ],
-        community: [
-          { required: true, message: "所在小区不能为空", trigger: "blur" }
-        ],
-        content: [
-          { required: true, message: "提交内容不能为空", trigger: "blur" }
-        ],
-        status: [
-          { required: true, message: "提交状态不能为空", trigger: "blur" }
-        ],
         returnContent: [
-          { required: true, message: "回复内容不能为空", trigger: "blur" }
-        ],
-        returnTime: [
-          { required: true, message: "回复时间不能为空", trigger: "blur" }
+          { required: true, message: "解决方案不能为空", trigger: "blur" }
         ],
-        type: [
-          {
-            required: true,
-            message: "状态/1投诉/2报修不能为空",
-            trigger: "blur"
-          }
-        ]
+      },
+      formModel: {
+        id:"",
+        returnContent:"",
       },
       showDialog: true,
       loading: false,
       submitting: false,
-      formModel: {}
     };
   },
   methods: {
@@ -122,7 +63,6 @@ export default {
         if (valid) {
           (function() {
             var id = self.formModel.id;
-
             if (id == null || id.length == 0) {
               return informationInfoApi.add(self.formModel);
             } else {
@@ -137,14 +77,14 @@ export default {
                 type: "success"
               });
 
-              this.$emit("close", true);
+              self.$emit("close", true);
             } else {
               self.$message({
                 message: jsonData.message + "",
                 type: "warning"
               });
 
-              this.$emit("close", false);
+              self.$emit("close", false);
             }
           });
         }
@@ -158,7 +98,7 @@ export default {
       if (self.businessKey.length == 0) {
         return informationInfoApi.create();
       } else {
-        return informationInfoApi.edit(self.menuId);
+        return informationInfoApi.edit(self.businessKey);
       }
     })()
       .then(response => {

src/views/base/informationInfo-warranty-list.vue

@@ -14,23 +14,23 @@
       要resetFields起作用，必须配置:model和prop
     -->
     <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-      <el-form-item label="报修人" prop="name">
+      <el-form-item label="报修人" prop="ownerName">
         <el-input type="text" size="mini" v-model="queryModel.ownerName"></el-input>
       </el-form-item>
-      <el-form-item label="提交时间" prop="createTime">
+      <el-form-item label="提交时间" prop="createTimeRanges">
         <el-date-picker
-          v-model="queryModel.createTime"
+          size="mini"
+          v-model="queryModel.createTimeRanges"
           type="daterange"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
         ></el-date-picker>
       </el-form-item>
       <el-form-item label="报修状态" prop="status">
-        <el-select v-model="queryModel.status">
-          <el-option value="0">待解决</el-option>
-          <el-option value="1">已解决</el-option>
-          <el-option value="2">已结束</el-option>
+        <el-select v-model="queryModel.status" size="mini">
+          <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -59,8 +59,8 @@
       @sort-change="sortChange"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column prop="owner.name" sort-by="name_" label="业主名称" width="100"></el-table-column>
-      <el-table-column prop="owner.tel" sort-by="tel_" label="手机号码" width="130"></el-table-column>
+      <el-table-column prop="name" sort-by="name_" label="业主名称" width="100"></el-table-column>
+      <el-table-column prop="phone" sort-by="phone" label="手机号码" width="130"></el-table-column>
       <el-table-column prop="community" sort-by="community_" label="报修人房号" width="120"></el-table-column>
       <el-table-column prop="content" sort-by="content_" label="报修内容" width="220"></el-table-column>
       <el-table-column prop="createTime" sort-by="create_time" label="提交时间" width="150"></el-table-column>
@@ -73,17 +73,14 @@
       </el-table-column>
       <el-table-column prop="returnContent" sort-by="return_content" label="解决方案" width="220"></el-table-column>
       <el-table-column prop="returnTime" sort-by="return_time" label="解决时间" width="150"></el-table-column>
-      <el-table-column label="操作" width="220">
-        <template slot-scope="scope">
-          <span v-if="scope.row.status=='0'">
-            <el-button size="mini" type="success" disabled>提交解决方案</el-button>
-          </span>
-          &nbsp;
-          <span v-if="scope.row.status=='2'">
-            <el-button size="mini" type="success" disabled>已解决</el-button>
-          </span>
-          &nbsp;
-          <el-button size="mini" type="danger" disabled>结束</el-button>
+
+      <el-table-column label="操作" width="220" fixed="right">
+        <template slot-scope="{row}">
+          <el-button v-if="row.status=='2'" size="mini" type="success" disabled>已解决</el-button>
+          <el-button v-else-if="row.status=='1'" size="mini" type="success" @click="handleEdit(row)">已回复</el-button>
+          <el-button v-else size="mini" type="success" @click="handleEdit(row)">提交解决方案</el-button>
+          <el-button v-if="row.status=='2'" size="mini" type="danger" disabled>结束</el-button>
+          <el-button v-else size="mini" type="danger" @click="handleFinished(row)">结束</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -123,16 +120,31 @@ export default {
         updateBy: "",
         updateTime: "",
         delFlag: "",
-        ownerId: "",
+        ownerName: "",
         community: "",
         content: "",
         status: "",
         returnContent: "",
         returnTime: "",
-        type: "2"
+        type: "2",
+        createTimeRanges:[],
       },
       loading: false,
       tableData: [],
+      statusList:[
+        {
+        value:"0",
+        name:"待解决"
+        },
+        {        
+        value:"1",
+        name:"已解决"
+        },
+        {        
+        value:"2",
+        name:"已结束"
+        }
+      ],
       pageIndex: 1,
       pageSize: 10,
       totalPages: 0,
@@ -158,27 +170,13 @@ export default {
       formData.append("pageIndex", self.pageIndex);
       formData.append("pageSize", self.pageSize);
 
-      formData.append("id", self.queryModel.id);
-      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("ownerId", self.queryModel.ownerId);
-      formData.append("community", self.queryModel.community);
-      formData.append("content", self.queryModel.content);
-      formData.append("status", self.queryModel.status);
-      formData.append("returnContent", self.queryModel.returnContent);
-      formData.append("returnTime", self.queryModel.returnTime);
-      formData.append("type", self.queryModel.type);
-
-      if (this.field != null) {
-        formData.append("field", this.field);
-      }
-
-      if (this.direction != null) {
-        formData.append("direction", this.direction);
+      
+      formData.append("type", "2");
+      formData.append("name", self.queryModel.ownerName);
+      if(self.queryModel.createTimeRanges!=null&&self.queryModel.createTimeRanges!=""){
+        formData.append("createTimeRanges", self.queryModel.createTimeRanges.toString());
       }
+      formData.append("status", self.queryModel.status);
 
       informationInfoApi
         .pageList(formData)
@@ -201,7 +199,7 @@ export default {
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
 
       this.changePage(this.pageIndex);
     },
@@ -221,6 +219,30 @@ export default {
       this.businessKey = record.id;
       this.showModal = true;
     },
+    handleFinished(record){
+      var self = this;
+      self
+        .$confirm("是否结束报修?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+        .then(() => {
+          informationInfoApi.finished(record.id).then(function(response){
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "投诉已结束!"
+              });
+            }
+          })
+        })
+
+    },
     handleDelete(record) {
       var self = this;
 

src/views/base/messageInfo-detail.vue

@@ -0,0 +1,185 @@
+
+<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"
+    width="800px"
+  >
+    <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: 100%"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="消息类型" prop="type">
+          <el-select
+            v-model="formModel.type"
+            placeholder="请选择"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in typeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </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-switch
+            v-model="formModel.status"
+            active-color="#13ce66"
+            active-text="已审核"
+            inactive-color="#ff4949"
+            inactive-text="未审核"
+          ></el-switch>
+        </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 messageInfoApi from "@/api/base/messageInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import { getToken } from "@/utils/auth";
+import MceEditor from "@/components/Tinymce";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      ruleValidate: {
+        title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
+        type: [
+          { required: true, message: "通知类型不能为空", trigger: "blur" },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      formModel: {},
+      typeList: [],
+      editorConfig: {
+        height: 300,
+        width: 660,
+      },
+      uploadUrl: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
+    };
+  },
+  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 messageInfoApi.add(self.formModel);
+            } else {
+              return messageInfoApi.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;
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "消息类型",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.typeList = jsonData.data;
+      });
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return messageInfoApi.create();
+      } else {
+        return messageInfoApi.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);
+          }
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+  components: {
+    "mce-editor": MceEditor,
+  },
+};
+</script>

src/views/base/messageInfo-list.vue

@@ -0,0 +1,420 @@
+<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/message/list">消息管理</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="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" placeholder="请选择">
+          <el-option value="0">未审核</el-option>
+          <el-option value="1">已审核</el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="消息类型" prop="type">
+        <el-select v-model="queryModel.type" size="mini" placeholder="请选择">
+          <el-option
+            v-for="item in typeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+          >查询</el-button
+        >&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+          >重置</el-button
+        >&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        @click="handleAdd"
+        >新增</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-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="title"
+        sort-by="title_"
+        label="标题"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="status"
+        sort-by="status_"
+        label="审核状态"
+        sortable="custom"
+        width="180"
+      >
+        <template slot-scope="{row}">
+            <el-switch
+            disabled
+            v-model="row.status"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+          ></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="typeN"
+        sort-by="type_"
+        label="消息类型"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="createTime"
+        sort-by="create_time"
+        label="创建时间"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="updateTime"
+        sort-by="update_time"
+        label="更新时间"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column label="操作" fixed="right" width="300">
+        <template slot-scope="{ row }">
+          <el-link size="mini" type="primary" @click="handleEdit(row)">编辑</el-link>-
+          <el-link size="mini" type="primary" @click="handleSendCondition(row)">发送范围</el-link>-
+          <el-link size="mini" type="primary" @click="handleSendMsg(row)">发送消息</el-link>-
+          <el-link size="mini" type="primary" @click="handleRecvList(row)">接收列表</el-link>-
+          <el-link size="mini" type="primary" @click="handleDelete(row)">删除</el-link>
+        </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>
+
+    <messageInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></messageInfo-detail>
+
+    <el-dialog
+      :visible.sync="showSendModal"
+      title="选择发送对象"
+      :modal-append-to-body="true"
+      append-to-body
+      :close-on-click-modal="false"
+      style="text-align: left"
+      width="1000px"
+    >
+      <messageInfo-send
+        v-if="showSendModal"
+        :messageId="businessKey"
+      ></messageInfo-send>
+    </el-dialog>
+
+    <el-dialog
+      :visible.sync="showSendCondModal"
+      title="发送范围"
+      :modal-append-to-body="true"
+      append-to-body
+      :close-on-click-modal="false"
+      style="text-align: left"
+      width="1000px"
+    >
+      <messageSendCondition-list
+        v-if="showSendCondModal"
+        :messageId="businessKey"
+      ></messageSendCondition-list>
+    </el-dialog>
+
+    <el-dialog
+      :visible.sync="showRecvModal"
+      title="接收人列表"
+      :modal-append-to-body="true"
+      append-to-body
+      style="text-align: left"
+      width="1000px"
+    >
+      <messageReceiver-list
+        v-if="showRecvModal"
+        :messageId="businessKey"
+      ></messageReceiver-list>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import MessageInfoDetail from "./messageInfo-detail";
+import MessageInfoSend from "./messageInfo-send";
+import MessageReceiverList from "./messageReceiver-list";
+import MessageSendConditionList from './messageSendCondition-list';
+import messageInfoApi from "@/api/base/messageInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        title: "",
+        status: "",
+        type: "",
+      },
+      typeList: [],
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      showSendModal: false,
+      showRecvModal: false,
+      showSendCondModal: false
+    };
+  },
+  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("title", self.queryModel.title);
+      formData.append("status", self.queryModel.status);
+      formData.append("type", self.queryModel.type);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      messageInfoApi
+        .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 == "ascending" ? "asc" : "desc";
+
+      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(() => {
+          messageInfoApi.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(() => {
+        messageInfoApi.batchRemove(idList).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+      });
+    },
+    handleSendMsg(row) {
+      this.businessKey = row.id;      
+      this.showSendModal = true;
+    },
+    handleSendCondition(row) {
+      this.businessKey = row.id;      
+      this.showSendCondModal = true;
+    },
+    handleRecvList(row) {
+      this.businessKey = row.id;      
+      this.showRecvModal = true;
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+  },
+  mounted: function () {
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "消息类型",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.typeList = jsonData.data;
+      });
+
+    this.changePage(1);
+  },
+  components: {
+    "messageInfo-detail": MessageInfoDetail,
+    "messageInfo-send" : MessageInfoSend,
+    "messageReceiver-list": MessageReceiverList,
+    "messageSendCondition-list": MessageSendConditionList
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/messageInfo-send.vue

@@ -0,0 +1,398 @@
+<template>
+  <div>
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      :rules="ruleValidate"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="所属单位" prop="companyId">
+        <el-select-tree
+          size="mini"
+          :options="companyList"
+          v-model="queryModel.companyId"
+          height="200"
+        ></el-select-tree>
+      </el-form-item>
+      <el-form-item label="所属机构" prop="structureId">
+          <el-select-tree
+            size="mini"
+            :props="structProps"
+            :options="structureList"
+            v-model="queryModel.companyStructureId"
+            height="200"
+          ></el-select-tree>
+      </el-form-item>
+      <el-form-item label="所属角色" prop="roleId">
+        <el-select v-model="queryModel.roleId" placeholder="请选择" clearable size="mini">
+          <el-option :value="item.id" v-for="item in roleList" :key="item.key" 
+          :label="item.sceneName + '-' + item.personRoleName"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="姓名" prop="personName">
+        <el-input v-model="queryModel.personName" size="mini"></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="handleSendAll"
+        >全部发送</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchSend"
+        >对选中人发送</el-button
+      >
+    </el-row>
+    <el-table
+      :data="tableData"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column
+        prop="receiverId"
+        label="消息状态"
+        width="100"
+      >
+        <template slot-scope="{row}">
+            <span v-html="'已发送'" v-if="row.receiverId!=null " style="color:green;"></span>
+            <span v-html="'未发送'" v-else style="color:gray;"></span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="name"
+        label="姓名"
+        width="100"
+      ></el-table-column>
+      <el-table-column
+        prop="sex"
+        label="性别"
+        width="100"
+      >
+        <template slot-scope="{row}">
+          {{row.sex=='1' ? '男' : '女'}}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="phone"
+        label="电话"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="companyName"
+        label="单位名称"
+        width="200"
+      ></el-table-column>
+      <el-table-column
+        prop="companyStructName"
+        label="机构名称"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="roleName"
+        label="角色名称"
+        width="150"
+      ></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>
+  </div>
+</template>
+<script>
+import SelectTree from "@/components/SelectTree";
+import Constant from "@/constant";
+import messageInfoApi from "@/api/base/messageInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import companyInfoApi from "@/api/base/companyInfo";
+import companyStructureInfoApi from "@/api/base/companyStructureInfo";
+import personRoleInfoApi from "@/api/base/personRoleInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  props:{
+    messageId: {
+      default: "",
+      type: String
+    }
+  },
+  watch: {
+    "queryModel.companyId":function(newVal,oldVal){
+      var self = this;
+
+      var formData = new FormData();
+      formData.append("companyId", newVal);
+
+      //查询单位下机构
+      companyStructureInfoApi.list(formData)
+      .then(response=>{
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.structureList = jsonData.data;
+          }
+      })
+
+      //查询单位下角色
+      // personRoleInfoApi.listByCompanyId(formData)
+      // .then(response=>{
+      //     var jsonData = response.data;
+
+      //     if (jsonData.result) {
+      //       self.roleList = jsonData.data;
+      //     }
+      // })
+    }
+  },
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        companyId: "",
+        companyStructureId: "",
+        roleId: "",
+        personName: ""
+      },
+      ruleValidate: {
+        companyId: [{ required: true, message: "单位不能为空", trigger: "blur" }],
+      },
+      companyList: [],
+      structureList: [],
+      roleList: [],
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      structProps: {
+        // 配置项（必选）
+        value: "id",
+        label: "structureName",
+        children: "children"
+      }
+    };
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+      this.$refs["queryForm"].validate((valid) => {
+        if (valid) {
+          self.loading = true;
+
+          self.pageIndex = pageIndex;
+          var formData = new FormData();
+
+          formData.append("pageIndex", self.pageIndex);
+          formData.append("pageSize", self.pageSize);
+
+          formData.append("messageId", self.messageId);
+          formData.append("companyId", self.queryModel.companyId);
+
+          if(self.queryModel.companyStructureId!=null){
+            formData.append("companyStructureId", self.queryModel.companyStructureId);
+          }
+
+          if(self.queryModel.roleId!=null){
+          formData.append("roleId", self.queryModel.roleId);
+          }
+
+          if(self.queryModel.personName!=null){
+            formData.append("personName", self.queryModel.personName);
+          }
+
+          messageInfoApi
+            .recvPageSearch(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;
+            });
+        }
+      });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleSendAll(record) {
+      var self = this;
+      var formData = new FormData();
+
+      formData.append("messageId", self.messageId);
+      formData.append("companyId", self.queryModel.companyId);
+      formData.append("structureId", self.queryModel.structureId);
+      formData.append("roleId", self.queryModel.roleId);
+      formData.append("name", self.queryModel.name);
+
+      self.$confirm("是否确认全部发送消息?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          messageInfoApi.sendAll(formData).then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "发送成功!",
+              });
+            }
+          });
+        });
+    },
+    handleBatchSend() {
+      var self = this;
+
+      var idList = this.multipleSelection
+      .filter((record)=>{
+        return record.receiverId==null
+      })
+      .map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认对选中人发送消息？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        var formData = new FormData();
+
+        formData.append("messageId", self.messageId);
+        formData.append("personIds", idList.join(","));
+
+        messageInfoApi.batchSend(formData).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "发送成功!",
+            });
+          }
+        });
+      });
+    }
+  },
+  created() {
+    var self = this;
+
+    companyInfoApi.treeList().then(function(response) {
+      var jsonData = response.data;
+
+      if (jsonData.result) {
+        self.companyList = jsonData.data;
+      }
+    });
+
+    //查询角色
+    personRoleInfoApi.findAll()
+    .then(response=>{
+        var jsonData = response.data;
+
+        if (jsonData.result) {
+          self.roleList = jsonData.data;
+        }
+    });
+  },
+  mounted() {
+    // this.changePage(1);
+  },
+  components: {
+    "el-select-tree": SelectTree
+  }
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/messageNotice-detail.vue

@@ -9,15 +9,34 @@
     :visible.sync="showDialog"
     :title="title"
     :modal-append-to-body="false"
-    style="text-align:left;"
+    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'">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'100px'"
+      >
+        <el-form-item label="类型" prop="title">
+          <el-select
+            v-model="formModel.type"
+            placeholder="请选择"
+            height="200"
+          >
+            <el-option label="站内消息" value="1"></el-option>
+            <el-option label="微信消息" value="2"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="标题" prop="title">
-          <el-input v-model="formModel.title" placeholder="请输入" style="width:100%"></el-input>
+          <el-input
+            v-model="formModel.title"
+            placeholder="请输入"
+            style="width: 100%"
+          ></el-input>
         </el-form-item>
         <el-form-item label="发送单位" prop="noticeCompany">
           <el-select-tree
@@ -28,7 +47,12 @@
           ></el-select-tree>
         </el-form-item>
         <el-form-item label="接受者类型" prop="noticeType">
-          <el-select v-model="formModel.noticeType" multiple placeholder="请选择" style="width:90%">
+          <el-select
+            v-model="formModel.noticeType"
+            multiple
+            placeholder="请选择"
+            style="width: 90%"
+          >
             <el-option
               v-for="result in popedomData"
               :key="result.id"
@@ -37,6 +61,20 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="微信模板ID" prop="wechatCode" v-if="formModel.type == '2'">
+          <el-input
+            v-model="formModel.wechatCode"
+            placeholder="请输入"
+            style="width: 100%"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="链接地址" prop="noticeLink" v-if="formModel.type == '2'">
+          <el-input
+            v-model="formModel.noticeLink"
+            placeholder="请输入"
+            style="width: 100%"
+          ></el-input>
+        </el-form-item>
         <el-form-item label="内容" prop="content">
           <mce-editor
             ref="editor"
@@ -59,7 +97,11 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="积分" prop="point">
-          <el-input v-model="formModel.point" placeholder="请输入" style="width:100%"></el-input>
+          <el-input
+            v-model="formModel.point"
+            placeholder="请输入"
+            style="width: 100%"
+          ></el-input>
         </el-form-item>
         <el-form-item label="审核状态" prop="status">
           <el-radio-group v-model="formModel.status">
@@ -67,11 +109,19 @@
             <el-radio :label="false">未审核</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="微信消息推送" prop="sendWechat" v-if="formModel.type == '2'">
+          <el-radio-group v-model="formModel.sendWechat">
+            <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>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting"
+        >确 定</el-button
+      >
     </span>
   </el-dialog>
 </template>
@@ -89,10 +139,13 @@ export default {
   data() {
     return {
       ruleValidate: {
+        type:[{ required: true, message: "请选择消息类型", trigger: "blur" }],
         title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
         noticeCompany: [
           { required: true, message: "发送单位不能为空", trigger: "blur" },
         ],
+        wechatCode:[{ required: true, message: "模板ID不能为空", trigger: "blur" }],
+        noticeLink:[{ required: true, message: "链接不能为空", trigger: "blur" }],
         noticeType: [{ required: true, message: "不能为空", trigger: "blur" }],
       },
       showDialog: true,
@@ -113,13 +166,13 @@ export default {
         // 配置项（必选）
         value: "id",
         label: "name",
-        children: "children"
-      }
+        children: "children",
+      },
     };
   },
   created() {
     var self = this;
-    companyInfoApi.list().then(function (response) {
+    companyInfoApi.treeList().then(function (response) {
       var jsonData = response.data;
       if (jsonData.result) {
         self.companyResult = jsonData.data;
@@ -208,7 +261,7 @@ export default {
 
     var self = this;
 
-    companyInfoApi.list().then(function (response) {
+    companyInfoApi.treeList().then(function (response) {
       var jsonData = response.data;
       if (jsonData.result) {
         self.companyResult = jsonData.data;