Merge branch 'master' of http://47.105.205.210/property-platform/housing-estate

src/api/api.js

@@ -3,6 +3,8 @@ import Vue from 'vue'
 import {UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types"
 // 首页统计
 const homeDataStatistics = (params)=>getAction("/community/homepage/dataStatistics",params);
+const companyNoticeList = (params)=>getAction("/property-company/notice/companyNotice/list",params);
+
 //角色管理
 const addRole = (params)=>postAction("/sys/role/add",params);
 const editRole = (params)=>putAction("/sys/role/edit",params);
@@ -69,6 +71,7 @@ const getRoomListApi = (params)=>getAction("/property-community/building/communi
 const addCommunityOwner = (params)=>postAction("/property-community/info/communityOwner/add",params);
 const geCommunityOwnertInfoApi = (params)=>getAction("/property-community/info/communityOwner/queryById",params);
 const auditCommunityOwnerApi = (params)=>postAction("/property-community/info/communityOwner/audit",params);
+const downloadOwnerTemplate = (params)=>postAction("/property-community/info/communityOwner/downloadOwnerTemplate",params);
 
 // 生活缴费-费用规则
 const geCommunityRuleListApi = (params)=>getAction("/property-company/system/companyChargerule/communityRuleList",params);
@@ -132,6 +135,7 @@ export const transitRESTful = {
 
 export {
   homeDataStatistics,
+  companyNoticeList,
   addRole,
   editRole,
   checkRoleCode,
@@ -192,6 +196,7 @@ export {
   getBuildingListApi,
   getUnitListApi,
   getRoomListApi,
+  downloadOwnerTemplate,
   addCommunityOwner,
   geCommunityOwnertInfoApi,
   auditCommunityOwnerApi,

src/views/information/building/building.vue

@@ -30,7 +30,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('楼宇管理')">导出</a-button>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -162,7 +162,8 @@
         url: {
           list: "/property-community/building/communityBuilding/list",
           delete: '/property-community/building/communityBuilding/delete',
-          deleteBatch: '/property-community/building/communityBuilding/deleteBatch'
+          deleteBatch: '/property-community/building/communityBuilding/deleteBatch',
+          exportXlsUrl: "/property-community/building/communityBuilding/exportXls",
         }
       }
     },

src/views/information/capital/capital.vue

@@ -23,7 +23,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button>
+      <!-- <a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button> -->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>

src/views/information/house/house.vue

@@ -36,7 +36,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('房屋管理')">导出</a-button>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -177,7 +177,8 @@
         url: {
           list: "/property-community/building/communityRoom/list",
           delete: '/property-community/building/communityRoom/delete',
-          deleteBatch: '/property-community/building/communityRoom/deleteBatch'
+          deleteBatch: '/property-community/building/communityRoom/deleteBatch',
+          exportXlsUrl: "/property-community/building/communityRoom/exportXls"
         }
       }
     },

src/views/information/worker/worker.vue

@@ -23,7 +23,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button>
+      <!-- <a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button> -->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>

src/views/property/advertisement/advertisement.vue

@@ -23,7 +23,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button>
+      <!-- <a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button> -->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>

src/views/property/complaint/complaint.vue

@@ -30,7 +30,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
-      <a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button>
+      <!-- <a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button> -->
       <!-- <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>

src/views/property/maintenance/maintenance.vue

@@ -30,7 +30,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
-      <a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button>
+      <!-- <a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button> -->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>