diff --git a/.env.production b/.env.production
index 17eebff32..6592f042f 100644
--- a/.env.production
+++ b/.env.production
@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_API_SERVER =  https://epdc-shibei.elinkservice.cn/api
+VUE_APP_API_SERVER =  https://epmet-cloud.elinkservice.cn/api
 VUE_APP_NODE_ENV=prod
 VUE_APP_PUBLIC_PATH=epmet-oper
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 6b33435ea..1fcf32181 100644
--- a/public/index.html
+++ b/public/index.html
@@ -64,7 +64,7 @@
               <!-- 生产环境 -->
               <% if (process.env.VUE_APP_NODE_ENV==='prod' ) { %>
                 <script>
-                  window.SITE_CONFIG['apiURL'] = 'https://epdc-shibei.elinkservice.cn/api'
+                  window.SITE_CONFIG['apiURL'] = 'https://epmet-cloud.elinkservice.cn/api'
                 </script>
                 <% } %>
 </head>
diff --git a/src/assets/scss/modules/search.scss b/src/assets/scss/modules/search.scss
index d0222b5ca..7b4cb925b 100644
--- a/src/assets/scss/modules/search.scss
+++ b/src/assets/scss/modules/search.scss
@@ -26,13 +26,15 @@
 
             .input {
                 position: relative;
-                select {
+                .select-show {
                     border: none;
+                    display: block;
                     font-size: 16px;
                     width: 90px;
                     line-height: 32px;
                     text-align: center;
                     color: #0082fb;
+                    cursor: default;
                 }
 
                 input {
diff --git a/src/js/dai/request.js b/src/js/dai/request.js
index 0d62217a1..8365bd3ee 100644
--- a/src/js/dai/request.js
+++ b/src/js/dai/request.js
@@ -2,7 +2,6 @@
  |                           请求接口封装                           |
  ---------------------------------------------------------------*/
 import axios from "axios";
-
 import curry from "dai-js/tools/curry";
 import { Message } from "element-ui";
 
@@ -37,12 +36,7 @@ const request = curry(
         // 	retData = Vue.$afterRequestHook(retData);
         // }
         if (res.data.code > 8000 && res.data.code < 10000) {
-          // message.error(res.data.msg);
-         Message({
-            showClose: true,
-            message: res.data.msg,
-            duration: 0
-          })
+          // Message.error(res.data.msg);
         }
 
         reslove(retData);
diff --git a/src/views/main-shuju/main.vue b/src/views/main-shuju/main.vue
index e587a366f..ae869f5a6 100644
--- a/src/views/main-shuju/main.vue
+++ b/src/views/main-shuju/main.vue
@@ -1,22 +1,18 @@
 <template>
-  <div
-    v-loading.fullscreen.lock="loading"
-    :element-loading-text="$t('loading')"
-    :class="[
+  <div v-loading.fullscreen.lock="loading"
+       :element-loading-text="$t('loading')"
+       :class="[
       'g-bd',
       { 'z-sidebar--fold': $store.state.sidebarFold },
       {
         'z-sidebar--noside': true,
       },
-    ]"
-  >
+    ]">
     <template v-if="!loading">
       <main-navbar ref="ref_navbar" />
       <div class="g-cnt">
-        <main-content
-          v-if="!$store.state.contentIsNeedRefresh"
-          @changeCustomerName="changeCustomerName"
-        />
+        <main-content v-if="!$store.state.contentIsNeedRefresh"
+                      @changeCustomerName="changeCustomerName" />
       </div>
     </template>
   </div>
@@ -31,10 +27,10 @@ import nextTick from "dai-js/tools/nextTick";
 import { requestPost } from "@/js/dai/request";
 
 export default {
-  provide() {
+  provide () {
     return {
       // 刷新
-      refresh() {
+      refresh () {
         this.$store.state.contentIsNeedRefresh = true;
         this.$nextTick(() => {
           this.$store.state.contentIsNeedRefresh = false;
@@ -42,7 +38,7 @@ export default {
       },
     };
   },
-  data() {
+  data () {
     return {
       loading: true,
       userType: localStorage.getItem("userType"),
@@ -56,7 +52,7 @@ export default {
   watch: {
     $route: "routeHandle",
   },
-  async created() {
+  async created () {
     this.windowResizeHandle();
     this.routeHandle(this.$route);
     Promise.all([this.getWorkUserInfo()]).then(() => {
@@ -65,11 +61,11 @@ export default {
   },
   computed: {},
   methods: {
-    changeCustomerName(customerName) {
+    changeCustomerName (customerName) {
       this.$refs["ref_navbar"].changeCustomerName(customerName);
     },
     // 窗口改变大小
-    windowResizeHandle() {
+    windowResizeHandle () {
       this.$store.state.sidebarFold =
         document.documentElement["clientWidth"] <= 992 || false;
       window.addEventListener(
@@ -81,7 +77,7 @@ export default {
       );
     },
     // 路由, 监听
-    routeHandle(route) {
+    routeHandle (route) {
       if (!route.meta.isTab) {
         return false;
       }
@@ -105,7 +101,7 @@ export default {
     },
 
     // 获取当前管理员信息
-    async getWorkUserInfo() {
+    async getWorkUserInfo () {
       const url = "/epmetuser/customerstaff/staffbasicinfo";
       let params = {};
       const { data, code, msg } = await requestPost(url, params);
@@ -115,6 +111,7 @@ export default {
         localStorage.setItem("roleList", data.roleList);
         localStorage.setItem("customerId", data.customerId);
         localStorage.setItem("staffId", data.id);
+        localStorage.setItem("agencyId", data.agencyId);
         if (!localStorage.getItem("customerName")) {
           localStorage.setItem("customerName", data.customerName || "");
         }
diff --git a/src/views/main.vue b/src/views/main.vue
index 2a5bc71ef..9ecf523ea 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -1,8 +1,7 @@
 <template>
-  <div
-    v-loading.fullscreen.lock="loading"
-    :element-loading-text="$t('loading')"
-    :class="[
+  <div v-loading.fullscreen.lock="loading"
+       :element-loading-text="$t('loading')"
+       :class="[
       'aui-wrapper',
       { 'aui-sidebar--fold': $store.state.sidebarFold },
       {
@@ -10,16 +9,14 @@
           $store.state.sidebarActiveSubMenuList.length == 0 || $store.state.inIframe,
       },
       { 'z-iframe': $store.state.inIframe },
-    ]"
-  >
+    ]">
     <template v-if="!loading">
-      <main-navbar ref="ref_navbar" v-if="!$store.state.inIframe" />
+      <main-navbar ref="ref_navbar"
+                   v-if="!$store.state.inIframe" />
       <main-sidebar v-if="!$store.state.inIframe" />
       <div class="aui-content__wrapper">
-        <main-content
-          v-if="!$store.state.contentIsNeedRefresh"
-          @changeCustomerName="changeCustomerName"
-        />
+        <main-content v-if="!$store.state.contentIsNeedRefresh"
+                      @changeCustomerName="changeCustomerName" />
       </div>
       <main-theme-tools v-if="!$store.state.inIframe" />
     </template>
@@ -37,10 +34,10 @@ import nextTick from "dai-js/tools/nextTick";
 import { requestPost } from "@/js/dai/request";
 
 export default {
-  provide() {
+  provide () {
     return {
       // 刷新
-      refresh() {
+      refresh () {
         this.$store.state.contentIsNeedRefresh = true;
         this.$nextTick(() => {
           this.$store.state.contentIsNeedRefresh = false;
@@ -48,7 +45,7 @@ export default {
       },
     };
   },
-  data() {
+  data () {
     return {
       loading: true,
       userType: localStorage.getItem("userType"),
@@ -64,7 +61,7 @@ export default {
   watch: {
     $route: "routeHandle",
   },
-  async created() {
+  async created () {
     this.$store.state.sidebarMenuList = window.SITE_CONFIG["menuList"];
     console.log(this.$store.state.sidebarMenuList);
 
@@ -76,11 +73,11 @@ export default {
   },
   computed: {},
   methods: {
-    changeCustomerName(customerName) {
+    changeCustomerName (customerName) {
       this.$refs["ref_navbar"].changeCustomerName(customerName);
     },
     // 窗口改变大小
-    windowResizeHandle() {
+    windowResizeHandle () {
       this.$store.state.sidebarFold =
         document.documentElement["clientWidth"] <= 992 || false;
       window.addEventListener(
@@ -92,7 +89,7 @@ export default {
       );
     },
     // 路由, 监听
-    routeHandle(route) {
+    routeHandle (route) {
       if (!route.meta.isTab) {
         return false;
       }
@@ -115,7 +112,7 @@ export default {
       this.$store.state.contentTabsActiveName = tab.name;
       this.syncLevelOneMenuActive(tab.menuId);
     },
-    async syncLevelOneMenuActive(menuId) {
+    async syncLevelOneMenuActive (menuId) {
       await nextTick();
       console.log(
         "*******************************",
@@ -138,7 +135,7 @@ export default {
         idx !== -1 ? this.$store.state.sidebarMenuList[idx].children : [];
     },
     // 获取当前管理员信息
-    async getWorkUserInfo() {
+    async getWorkUserInfo () {
       const url = "/epmetuser/customerstaff/staffbasicinfo";
       let params = {};
       const { data, code, msg } = await requestPost(url, params);
@@ -148,6 +145,7 @@ export default {
         localStorage.setItem("roleList", data.roleList);
         localStorage.setItem("customerId", data.customerId);
         localStorage.setItem("staffId", data.id);
+        localStorage.setItem("agencyId", data.agencyId);
         if (!localStorage.getItem("customerName")) {
           localStorage.setItem("customerName", data.customerName || "");
         }
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 9066cd7db..fdc6d0efa 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -41,47 +41,49 @@
                  size="small"
                  icon="el-icon-plus"
                  @click="handleAdd">新增楼宇</el-button>
-
-      <el-button style=";margin-left:10px"
-                 type="blue"
-                 size="small"
-                 icon="el-icon-download"
-                 @click="handleExportModule('building')">下载楼宇模板</el-button>
-
-      <el-upload style=""
-                 ref="upload_building"
-                 :multiple='false'
-                 :show-file-list='false'
-                 :before-upload="((file)=>{beforeUpload(file, 'building')})"
-                 action=""
-                 accept=".xls,.xlsx"
-                 :http-request="(()=>{uploadFile( 'building')})">
-        <el-button style="margin-left:10px"
+      <div class="btn_upload"
+           v-if="showImportBtn">
+        <el-button style=";margin-left:10px"
+                   type="blue"
                    size="small"
-                   icon="el-icon-upload2"
-                   :loading="importBuildingLoading"
-                   type="red">导入楼宇数据</el-button>
-      </el-upload>
-      <el-button style=";margin-left:10px"
-                 type="blue"
-                 size="small"
-                 icon="el-icon-download"
-                 @click="handleExportModule('room')">下载房屋模板</el-button>
-
-      <el-upload style=""
-                 ref="upload_room"
-                 :multiple='false'
-                 :show-file-list='false'
-                 :before-upload="((file)=>{beforeUpload(file, 'room')})"
-                 action=""
-                 accept=".xls,.xlsx"
-                 :http-request="(()=>{uploadFile( 'room')})">
-        <el-button style="margin-left:10px"
+                   icon="el-icon-download"
+                   @click="handleExportModule('building')">下载楼宇模板</el-button>
+
+        <el-upload style=""
+                   ref="upload_building"
+                   :multiple='false'
+                   :show-file-list='false'
+                   :before-upload="((file)=>{beforeUpload(file, 'building')})"
+                   action=""
+                   accept=".xls,.xlsx"
+                   :http-request="(()=>{uploadFile( 'building')})">
+          <el-button style="margin-left:10px"
+                     size="small"
+                     icon="el-icon-upload2"
+                     :loading="importBuildingLoading"
+                     type="red">导入楼宇数据</el-button>
+        </el-upload>
+        <el-button style=";margin-left:10px"
+                   type="blue"
                    size="small"
-                   icon="el-icon-upload2"
-                   :loading="importRoomLoading"
-                   type="red">导入房屋数据</el-button>
-      </el-upload>
+                   icon="el-icon-download"
+                   @click="handleExportModule('room')">下载房屋模板</el-button>
+
+        <el-upload style=""
+                   ref="upload_room"
+                   :multiple='false'
+                   :show-file-list='false'
+                   :before-upload="((file)=>{beforeUpload(file, 'room')})"
+                   action=""
+                   accept=".xls,.xlsx"
+                   :http-request="(()=>{uploadFile( 'room')})">
+          <el-button style="margin-left:10px"
+                     size="small"
+                     icon="el-icon-upload2"
+                     :loading="importRoomLoading"
+                     type="red">导入房屋数据</el-button>
+        </el-upload>
+      </div>
     </div>
 
     <div class="div_table">
@@ -134,12 +136,14 @@
                        style="color:#1C6AFD;text-decoration: underline;"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
-            <el-button type="text"
+            <el-button v-if="scope.row.showBtn"
+                       type="text"
                        style="color:#00A7A9;text-decoration: underline;"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
 
-            <el-button type="text"
+            <el-button v-if="scope.row.showBtn"
+                       type="text"
                        style="color:#D51010;text-decoration: underline;"
                        size="small"
                        @click="handleDelete(scope.row)">删除</el-button>
@@ -206,6 +210,7 @@ export default {
       tableLoading: true,
       selAllFlag: false,
       isIndeterminate: false,//复选框的不确定状态
+      // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
 
       agencyObj: {},//树所选的小区对象
       ownerName: '',
@@ -242,8 +247,17 @@ export default {
     async loadTable (fromTree, treeObj) {
       this.tableLoading = true
       if (fromTree) {
+
         this.agencyObj = treeObj
+
+        // if (this.agencyObj.pid === this.staffAgencyId) {//如果所选树的父级组织id和登录人员id相同，有权限
+        //   this.showImportBtn = true
+        // } else {
+        //   this.showImportBtn = false
+        // }
       }
+
+
       console.log(this.agencyObj)
       const url = "/gov/org/building/buildinglist"
       let params = {
@@ -258,6 +272,14 @@ export default {
 
       if (code === 0) {
         this.total = data.total
+        data.list.forEach(item => {
+          if (item.agencyId === this.staffAgencyId) {
+            item.showBtn = true
+          } else {
+            item.showBtn = false
+          }
+
+        });
         this.tableData = data.list
       } else {
         this.$message.error(msg)
@@ -410,10 +432,11 @@ export default {
         this.$emit('refreshTree')
         this.loadTable()
       } else if (code > 8000) {
-        // this.$message({
-        //   type: "success",
-        //   message: msg
-        // });
+        this.$message({
+          showClose: true,
+          message: msg,
+          duration: 0
+        })
         this.$emit('refreshTree')
         this.loadTable()
       } else {
@@ -590,12 +613,12 @@ export default {
           if (data.code === 0 && data.msg == 'success') {
             // this.$message.success('导入成功')
           } else {
-            this.$message({
-              showClose: true,
-              message: rspMsg,
-              duration: 0,
-              type: "error"
-            })
+            // this.$message({
+            //   showClose: true,
+            //   message: rspMsg,
+            //   duration: 0,
+            //   type: "error"
+            // })
             // this.$message.error(rspMsg)
           }
           this.$emit('refreshTree')
@@ -660,7 +683,14 @@ export default {
     }
   },
   props: {
-
+    staffAgencyId: {
+      type: String,
+      default: '',
+    },
+    showImportBtn: {
+      type: Boolean,
+      default: false,
+    },
   }
 }
 </script>
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 1c15672c8..2800a96b4 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -29,13 +29,18 @@
 
       <build-table v-if="selTreeObj.level==='neighborHood'"
                    ref="ref_neighTable"
+                   :staffAgencyId="staffAgencyId"
+                   :showImportBtn="showImportBtn"
                    @toNextLevel="toNextLevel"
                    @refreshTree="refreshTree"></build-table>
       <room-table v-else-if="selTreeObj.level==='building'"
+                  :staffAgencyId="staffAgencyId"
+                  :showImportBtn="showImportBtn"
                   ref="ref_buildingTable"
                   @refreshTree="refreshTree"></room-table>
       <community-table v-else
                        @toNextLevel="toNextLevel"
+                       :staffAgencyId="staffAgencyId"
                        ref="ref_communityTable"
                        @refreshTree="refreshTree"></community-table>
 
@@ -67,7 +72,9 @@ export default {
 
       selTreeObj: {},
 
-      centerPoint: []
+      centerPoint: [],
+      staffAgencyId: localStorage.getItem("agencyId"),
+      showImportBtn: false
 
     }
   },
@@ -78,6 +85,7 @@ export default {
     this.treeLoading = true
     await this.loadOrgData()
     await this.loadTree()
+
     await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
     if (this.treeData.length > 0) {
       this.$nextTick(() => {
@@ -147,7 +155,12 @@ export default {
     handleNodeClick (obj) {
       this.getTreeObj(obj)
 
+
+
       this.$nextTick(() => {
+
+
+
         if (obj.level === 'building') {//点击楼栋
           this.$refs['ref_buildingTable'].loadTable(true, this.selTreeObj)
 
@@ -196,18 +209,31 @@ export default {
       // 小区：小区id、小区名称、type、所属网格id、所属网格名称、所属组织id、所属组织名称、经度、纬度
       // 楼：楼id、楼名称、type、所属小区id、所属小区名称
       if (obj.level === 'building') {//点击楼栋
-        let communityNode = this.$refs.ref_tree.getNode(obj.pid)
-        obj.communityId = communityNode.data.id
-        obj.communityName = communityNode.data.label
+        let neighborHoodNode = this.$refs.ref_tree.getNode(obj.pid)//所属小区
 
-      } else if (obj.level === 'neighborHood') {//点击小区
+        let gridNode = this.$refs.ref_tree.getNode(neighborHoodNode.data.pid)//所属网格
+        let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid)//所属社区
+        obj.agencyId = agencyNode.data.id
+        obj.agencyName = agencyNode.data.label
+        if (obj.agencyId === this.staffAgencyId) {
+          this.showImportBtn = true
+        } else {
+          this.showImportBtn = false
+        }
 
+      } else if (obj.level === 'neighborHood') {//点击小区
         let gridNode = this.$refs.ref_tree.getNode(obj.pid)
         let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid)
         obj.gridId = gridNode.data.id
         obj.gridName = gridNode.data.label
         obj.agencyId = agencyNode.data.id
         obj.agencyName = agencyNode.data.label
+        if (obj.agencyId === this.staffAgencyId) {
+          this.showImportBtn = true
+        } else {
+          this.showImportBtn = false
+        }
+
       } else {
 
       }
@@ -276,8 +302,8 @@ export default {
 
 .div_table {
   margin-left: 15px;
-  flex: 1;
-  // width: calc(100vw - 550px);
+  // flex: 1;
+  width: calc(100vw - 550px);
   background-color: #ffffff;
   border-radius: 5px;
   padding: 10px;
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index e4e504cb3..491288f08 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -42,7 +42,7 @@
                  icon="el-icon-plus"
                  @click="handleAdd">新增小区</el-button>
       <div class="btn_upload"
-           v-if="agencyObj.level==='community'||agencyObj.level==='grid'">
+           v-if="showImportBtn">
         <el-button style=""
                    type="blue"
                    size="small"
@@ -157,12 +157,14 @@
                        style="color:#1C6AFD;text-decoration: underline;"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
-            <el-button type="text"
+            <el-button v-if="scope.row.showBtn"
+                       type="text"
                        style="color:#00A7A9;text-decoration: underline;"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
 
-            <el-button type="text"
+            <el-button v-if="scope.row.showBtn"
+                       type="text"
                        style="color:#D51010;text-decoration: underline;"
                        size="small"
                        @click="handleDelete(scope.row)">删除</el-button>
@@ -229,6 +231,7 @@ export default {
       tableLoading: true,
       selAllFlag: false,
       isIndeterminate: false,//复选框的不确定状态
+      showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
 
       agencyObj: {},//树所选的组织对象
       ownerName: '',
@@ -236,6 +239,7 @@ export default {
       tableData: [],
       selection: [],
 
+
       //form相关
       formShow: false,
       formTitle: '新增小区',
@@ -254,7 +258,6 @@ export default {
   },
   computed: {
     tableHeight () {
-
       return (this.clientHeight - 300)
 
     },
@@ -269,9 +272,26 @@ export default {
       this.loadTable()
     },
     async loadTable (fromTree, treeObj) {
+      console.log(111, this.staffAgencyId)
+
       this.tableLoading = true
       if (fromTree) {
         this.agencyObj = treeObj
+        if (this.agencyObj.level === 'community') {//只有社区和网格显示操作按钮
+          if (this.agencyObj.id === this.staffAgencyId) {//如果所选树的组织id和登录人员id相同，有权限
+            this.showImportBtn = true
+          } else {
+            this.showImportBtn = false
+          }
+        } else if (this.agencyObj.level === 'grid') {//网格下
+          if (this.agencyObj.pid === this.staffAgencyId) {//如果所选树的父级组织id和登录人员id相同，有权限
+            this.showImportBtn = true
+          } else {
+            this.showImportBtn = false
+          }
+        } else {
+          this.showImportBtn = false
+        }
       }
 
       const url = "/gov/org/neighborhood/neighborhoodlist"
@@ -289,6 +309,14 @@ export default {
 
       if (code === 0) {
         this.total = data.total
+        data.list.forEach(item => {
+          if (item.agencyId === this.staffAgencyId) {
+            item.showBtn = true
+          } else {
+            item.showBtn = false
+          }
+
+        });
         this.tableData = data.list
       } else {
         this.$message.error(msg)
@@ -440,11 +468,11 @@ export default {
         this.$emit('refreshTree')
         this.loadTable()
       } else if (code > 8000) {
-        // this.$message({
-        //   showClose: true,
-        //   message: msg,
-        //   duration: 0
-        // })
+        this.$message({
+          showClose: true,
+          message: msg,
+          duration: 0
+        })
         this.$emit('refreshTree')
         this.loadTable()
       } else {
@@ -624,12 +652,12 @@ export default {
           if (data.code === 0 && data.msg == 'success') {
             // this.$message.success('导入成功')
           } else {
-            this.$message({
-              showClose: true,
-              message: rspMsg,
-              duration: 0,
-              type: "error"
-            })
+            // this.$message({
+            //   showClose: true,
+            //   message: rspMsg,
+            //   duration: 0,
+            //   type: "error"
+            // })
             // this.$message.error(rspMsg)
           }
           this.$emit('refreshTree')
@@ -702,6 +730,10 @@ export default {
     }
   },
   props: {
+    staffAgencyId: {
+      type: String,
+      default: '',
+    },
 
   }
 }
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index d17e7a9bd..1de9a5748 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -41,26 +41,29 @@
                  icon="el-icon-plus"
                  size="small"
                  @click="handleAdd">新增房屋</el-button>
-      <el-button style="float:left"
-                 type="blue"
-                 size="small"
-                 icon="el-icon-download"
-                 @click="handleExportModule">下载房屋模板</el-button>
-      <el-upload ref="upload"
-                 :multiple='false'
-                 :show-file-list='false'
-                 :before-upload="beforeUpload"
-                 action=""
-                 accept=".xls,.xlsx"
-                 :limit="1"
-                 :on-exceed="handleExceed"
-                 :http-request="uploadFile">
-        <el-button style="margin-left:10px"
+      <div class="btn_upload"
+           v-if="showImportBtn">
+        <el-button style="float:left"
+                   type="blue"
                    size="small"
-                   icon="el-icon-upload2"
-                   :loading="importRoomLoading"
-                   type="red">导入房屋数据</el-button>
-      </el-upload>
+                   icon="el-icon-download"
+                   @click="handleExportModule">下载房屋模板</el-button>
+        <el-upload ref="upload"
+                   :multiple='false'
+                   :show-file-list='false'
+                   :before-upload="beforeUpload"
+                   action=""
+                   accept=".xls,.xlsx"
+                   :limit="1"
+                   :on-exceed="handleExceed"
+                   :http-request="uploadFile">
+          <el-button style="margin-left:10px"
+                     size="small"
+                     icon="el-icon-upload2"
+                     :loading="importRoomLoading"
+                     type="red">导入房屋数据</el-button>
+        </el-upload>
+      </div>
     </div>
 
     <div class="div_table">
@@ -125,12 +128,14 @@
                        style="color:#1C6AFD;text-decoration: underline;"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
-            <el-button type="text"
+            <el-button v-if="scope.row.showBtn"
+                       type="text"
                        style="color:#00A7A9;text-decoration: underline;"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
 
-            <el-button type="text"
+            <el-button v-if="scope.row.showBtn"
+                       type="text"
                        style="color:#D51010;text-decoration: underline;"
                        size="small"
                        @click="handleDelete(scope.row)">删除</el-button>
@@ -195,6 +200,7 @@ export default {
       tableLoading: true,
       selAllFlag: false,
       isIndeterminate: false,//复选框的不确定状态
+      // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
 
       agencyObj: {},//树所选的小区对象
       ownerName: '',
@@ -234,6 +240,21 @@ export default {
       this.tableLoading = true
       if (fromTree) {
         this.agencyObj = treeObj
+        // if (this.agencyObj.level === 'community') {//只有社区和网格显示操作按钮
+        //   if (this.agencyObj.id === this.staffAgencyId) {//如果所选树的组织id和登录人员id相同，有权限
+        //     this.showImportBtn = true
+        //   } else {
+        //     this.showImportBtn = false
+        //   }
+        // } else if (this.agencyObj.level === 'grid') {//网格下
+        //   if (this.agencyObj.pid === this.staffAgencyId) {//如果所选树的父级组织id和登录人员id相同，有权限
+        //     this.showImportBtn = true
+        //   } else {
+        //     this.showImportBtn = false
+        //   }
+        // } else {
+        //   this.showImportBtn = false
+        // }
       }
 
       const url = "/gov/org/house/houselist"
@@ -250,6 +271,14 @@ export default {
 
       if (code === 0) {
         this.total = data.total
+        data.list.forEach(item => {
+          if (item.agencyId === this.staffAgencyId) {
+            item.showBtn = true
+          } else {
+            item.showBtn = false
+          }
+
+        });
         this.tableData = data.list
       } else {
         this.$message.error(msg)
@@ -397,10 +426,11 @@ export default {
         this.$emit('refreshTree')
         this.loadTable()
       } else if (code > 8000) {
-        // this.$message({
-        //   type: "success",
-        //   message: msg
-        // });
+        this.$message({
+          showClose: true,
+          message: msg,
+          duration: 0
+        })
         this.$emit('refreshTree')
         this.loadTable()
       } else {
@@ -553,12 +583,12 @@ export default {
           if (data.code === 0 && data.msg == 'success') {
             // this.$message.success('导入成功')
           } else {
-            this.$message({
-              showClose: true,
-              message: rspMsg,
-              duration: 0,
-              type: "error"
-            })
+            // this.$message({
+            //   showClose: true,
+            //   message: rspMsg,
+            //   duration: 0,
+            //   type: "error"
+            // })
             // this.$message.error(rspMsg)
           }
           this.$emit('refreshTree')
@@ -615,7 +645,14 @@ export default {
     }
   },
   props: {
-
+    staffAgencyId: {
+      type: String,
+      default: '',
+    },
+    showImportBtn: {
+      type: Boolean,
+      default: false,
+    },
   }
 }
 </script>
diff --git a/src/views/modules/importRecord/index.vue b/src/views/modules/importRecord/index.vue
index d0ae9e9ad..bd98184cb 100644
--- a/src/views/modules/importRecord/index.vue
+++ b/src/views/modules/importRecord/index.vue
@@ -22,15 +22,19 @@
               >导入中</span
             >
             <span
-              v-else-if="scope.row.processStatus == 'finished'"
+              v-else-if="scope.row.processStatus == 'finished_success'"
               >已完成</span
             >
             <a target="_blank"
               :href="scope.row.resultDescFile"
-              style="color: #00a7a9"
-              v-else-if="scope.row.processStatus == 'finished_fail'"
+              style="color: #00a7a9;cursor:pointer;"
+              v-else-if="scope.row.processStatus == 'finished_fail' && scope.row.resultDescFile"
               >下载失败说明</a
             >
+            <span
+              v-else-if="scope.row.processStatus == 'finished_fail' && !scope.row.resultDescFile"
+              >导入失败，未知错误</span
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -81,7 +85,7 @@ export default {
   },
   computed: {
     maxTableHeight() {
-      return this.clientHeight - 450;
+      return this.clientHeight - 300;
     },
     ...mapGetters(["clientHeight"]),
   },
diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue
index c0f09f698..7469479e7 100644
--- a/src/views/modules/shequ/index.vue
+++ b/src/views/modules/shequ/index.vue
@@ -9,11 +9,17 @@
 
           <div class="search">
             <div class="input">
-              <select v-model="searchData.type">
-                <option value="jumin">居民</option>
-                <option value="fangwu">房屋</option>
-                <option value="xuqiu">需求</option>
-              </select>
+              <el-dropdown class="select" 
+                placement="bottom" v-model="searchData.type" @command="type => searchData.type = type">
+                <span class="select-show">
+                  {{{jumin:'居民', fangwu: '房屋', xuqiu:'需求'}[searchData.type]}}<i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="jumin">居民</el-dropdown-item>
+                  <el-dropdown-item command="fangwu">房屋</el-dropdown-item>
+                  <el-dropdown-item command="xuqiu">需求</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
 
               <input
                 type="text"
diff --git a/src/views/modules/workSys/elegantCate.vue b/src/views/modules/workSys/elegantCate.vue
new file mode 100644
index 000000000..8dfa0a9b7
--- /dev/null
+++ b/src/views/modules/workSys/elegantCate.vue
@@ -0,0 +1,286 @@
+<template>
+  <div class="resi-container">
+    <el-card class="resi-card-table">
+      <div class="mod-sys__menu">
+        <div class="resi-row-btn">
+          <el-button class=""
+                    type="success"
+                    @click="addShow()">新增</el-button>
+        </div>
+        <el-table v-loading="dataListLoading"
+                  :data="dataList"
+                  :default-expand-all="false"
+                  row-key="categoryId"
+                  :cell-style="cellStyle"
+                  border
+                  style="width: 100%;" class="resi-table">
+          <el-table-column prop="categoryName"
+                          label="分类名称"
+                          header-align="center"
+                          min-width="150"></el-table-column>
+          <el-table-column prop="stateShow"
+                          label="状态"
+                          header-align="center"
+                          min-width="150"></el-table-column>
+
+          <!-- <el-table-column prop="sort"
+                            :label="$t('menu.sort')"
+                            header-align="center"
+                            align="center"></el-table-column> -->
+
+          <el-table-column label="操作"
+                          fixed="right"
+                          header-align="center"
+                          align="left"
+                          width="350">
+            <template slot-scope="scope">
+
+              <el-button type="text"
+                        size="small"
+                         class="btn-color-look"
+                        @click="disableCategory(scope.row)">{{ scope.row.btnShow}}</el-button>
+              <el-button type="text"
+                        size="small"
+                        class="btn-color-edit"
+                        @click="editShow(scope.row)">修改</el-button>
+              <el-button type="text"
+                        size="small"
+                        class="btn-color-del"
+                        @click="deleteCategory(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+      </div>
+    </el-card>
+    
+
+    <elegant-edit ref="ref_edit"
+                   @editDiaOK="editDiaOK">
+
+    </elegant-edit>
+
+  </div>
+</template>
+
+<script>
+
+import { requestPost } from '@/js/dai/request'
+import elegantEdit from './elegantEdit.vue'
+export default {
+
+  data () {
+    return {
+      customerId: '', // 客户id，父组件传
+      customerName: '', // 客户名称，父组件传
+
+      tableParams: {
+        customerId: ''
+      },
+      search: '',
+      dataList: [],
+
+      dataListLoading: false
+
+    }
+  },
+
+  computed: {
+    tables () {
+      const search = this.search
+      if (search) {
+        console.log('this.dataList', this.dataList)
+        return this.dataList.filter(dataNews => {
+          return Object.keys(dataNews).some(key => {
+            return String(dataNews[key]).toLowerCase().indexOf(search) > -1
+          })
+        })
+      }
+      console.log('this.dataList', this.dataList)
+      return this.dataList
+    }
+  },
+  components: {
+    elegantEdit
+  },
+  created() {
+    const { user } = this.$store.state
+    console.log('user----', user)
+    this.initData(user.customerId, user.customerName)
+  },
+  methods: {
+    cellStyle ({ row, column, rowIndex, columnIndex }) {
+      // 状态列字体颜色
+      if (row.state === 'enable' && columnIndex === 1) {
+        return 'color: #EA1B29'
+      } else if (row.state === 'disable' && columnIndex === 1) {
+        return 'color: #0CB618'
+      } else {
+        return 'color: #1a1a1b'
+      }
+    },
+    initData (customerId, customerName) {
+      this.customerId = customerId
+      this.customerName = customerName
+
+      this.loadData()
+    },
+
+    // 加载列表数据
+    async loadData () {
+      this.dataListLoading = true
+      // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/issue/issueprojectcategorydict/customercategorylist'
+      const url = '/resi/partymember/stylecategorydict/list'
+
+      this.tableParams.customerId = this.customerId
+
+      const { data, code, msg } = await requestPost(url, this.tableParams)
+      this.dataListLoading = false
+      if (code === 0) {
+        this.dataList = data
+        this.dataList.forEach(element => {
+          element.state = element.beDisabled ? 'enable' : 'disable'
+          element.btnShow = element.beDisabled ? '启用' : '禁用'
+          element.stateShow = element.beDisabled ? '禁用' : '启用'
+          element.level = 'l1'
+
+          // if (element.children.length > 0) {
+          //   element.children.forEach(child => {
+          //     child.state = child.isDisable === 'enable' ? 'disable' : 'enable'
+          //     child.btnShow = child.isDisable === 'enable' ? '禁用' : '启用'
+          //     child.stateShow = child.isDisable === 'enable' ? '启用' : '禁用'
+          //     child.level = 'l2'
+          //     child.parentCategoryId = element.categoryId
+          //   })
+          // }
+        })
+      } else {
+        // this.$message.error(msg )
+      }
+    },
+
+    // 开启/启用
+    disableCategory (row) {
+      this.$confirm('确认' + row.btnShow + '当前分类?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const url = '/resi/partymember/stylecategorydict/updatestatus'
+        // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/issue/issueprojectcategorydict/isdisablecategory'
+        const param = {
+          customerId: this.customerId,
+          categoryId: row.categoryId,
+          beDisabled: row.state !== 'enable'
+        }
+        window.app.ajax.post(url, param,
+          (data, rspMsg) => {
+            this.$message.success('操作成功')
+            this.loadData()
+          },
+          (rspMsg, data) => {
+            this.$message.error(rspMsg)
+          })
+      }).catch(() => {
+
+      })
+    },
+    // 删除
+    deleteCategory (row) {
+      this.$confirm('确认删除当前分类?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const url = '/resi/partymember/stylecategorydict/delete'
+        // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/issue/issueprojectcategorydict/delcategory'
+        const param = {
+          customerId: this.customerId,
+          categoryId: row.categoryId
+        }
+        window.app.ajax.post(url, param,
+          (data, rspMsg) => {
+            this.$message.success('操作成功')
+            this.loadData()
+          },
+          (rspMsg, data) => {
+            this.$message.error(rspMsg)
+          })
+      }).catch(() => {
+
+      })
+    },
+
+    // 新增  customerId,parentCategoryId,categoryId,type,level,num
+    addShow () {
+      const sort = this.dataList.length + 1
+      this.$refs['ref_edit'].initAdd(this.customerId, '', 'l1', sort)
+    },
+    // 新增二级分类  customerId,parentCategoryId,categoryId,type,level，num
+    showAddLevel2 (row) {
+      const sort = row.children.length + 1
+      this.$refs['ref_edit'].initAdd(this.customerId, row.categoryId, 'l2', sort)
+    },
+    // 编辑 customerId,parentCategoryId,dateform
+    editShow (row) {
+      this.$refs['ref_edit'].initEdit(this.customerId, row.categoryId, row)
+    },
+
+    // 取消
+    diaCancel () {
+      this.$emit('cancleBack')
+    },
+
+    editDiaOK () {
+      this.loadData()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+.resi-container .resi-card-table {
+  ::v-deep .el-table {
+    th  {
+      color: #fff;
+      background-color: rgba(33, 149, 254, 1);
+    }
+    
+    .cell {
+      
+      span:nth-of-type(3) {
+        display: inline-block;
+        width: 90%;
+        word-break: break-all;
+      }
+    }
+  }
+}
+.resi-row-btn {
+  display: flex;
+  margin-bottom: 13px;
+  ::v-deep .el-button {
+    // margin-left: 10px;
+    border: 0;
+  }
+  ::v-deep .el-select {
+    margin-right: 10px;
+  }
+  .el-button--success {
+    background: rgba(34, 193, 195, 1);
+  }
+}
+.resi-table {
+  ::v-deep .el-button--text {
+    text-decoration: underline;
+  }
+  ::v-deep .btn-color-del {
+    margin-left: 10px;
+    color: rgba(213, 16, 16, 1);
+  }
+  ::v-deep .btn-color-edit {
+    color: rgba(0, 167, 169, 1);
+  }
+}
+</style>
diff --git a/src/views/modules/workSys/elegantEdit.vue b/src/views/modules/workSys/elegantEdit.vue
new file mode 100644
index 000000000..356bdee70
--- /dev/null
+++ b/src/views/modules/workSys/elegantEdit.vue
@@ -0,0 +1,169 @@
+<template>
+  <el-dialog :visible.sync="visible"
+             :title="title"
+             :width="diaWidth+'%'"
+             :close-on-click-modal="false"
+             :before-close="handleClose"
+             :close-on-press-escape="false">
+    <el-form :inline="false"
+             :model="dataForm"
+             :rules="dataRule"
+             ref="dataForm"
+             :label-width="'120px'">
+      <div style="margin-top:20px">
+
+        <el-form-item label="分类名称"
+                      prop="categoryName">
+          <el-tooltip class="item"
+                      effect="dark"
+                      content="请输入1-10个字"
+                      placement="bottom-start">
+            <el-input class="item_width_1"
+                      :maxlength="10"
+                      :minlength="1"
+                      v-model="dataForm.categoryName"
+                      placeholder="分类名称"></el-input>
+          </el-tooltip>
+        </el-form-item>
+        <!-- <el-form-item label="排序"
+                      prop="sort">
+          <el-input-number v-model="dataForm.sort"
+                           :min="1"
+                           label="描述文字"></el-input-number>
+        </el-form-item> -->
+      </div>
+
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false;resetData()">{{ $t('cancel') }}</el-button>
+      <el-button type="primary"
+                 @click="saveForm()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { requestPost } from '@/js/dai/request'
+export default {
+  data () {
+    return {
+      visible: false,
+      title: '分类信息',
+
+      customerId: '',
+      parentCategoryId: '', // 父级分类Id
+      categoryId: '', // 当前操作分类Id
+      type: '', // 操作类型(add:新增  edit:编辑)
+
+      dataForm: {
+        categoryName: '', // 分类名称
+        sort: 0,
+        type: '', // 操作类型(add:新增  edit:编辑)
+        level: ''
+      },
+
+      url: ''
+
+    }
+  },
+  created () {
+    // this.queryFunctionList()
+  },
+  computed: {
+
+    dataRule () {
+      return {
+        categoryName: [
+          { required: true, message: '分类名称不能为空', trigger: 'blur' },
+          { min: 2, max: 20, message: '分类名称长度在 2 到 20 个字符', trigger: 'blur' }
+        ]
+      }
+    },
+    diaWidth () {
+      console.log(this.resolution)
+      return this.resolution === 'small' ? 70 : 50
+    },
+
+    ...mapGetters(['clientHeight', 'resolution'])
+  },
+  methods: {
+    // 初始化  customerId,parentCategoryId ,level,排序
+    initAdd (customerId, parentCategoryId, level, sort) {
+      this.visible = true
+      this.customerId = customerId
+      this.parentCategoryId = parentCategoryId
+      this.type = 'add'
+      this.dataForm.level = level
+      this.dataForm.sort = sort
+      this.url = '/resi/partymember/stylecategorydict/addorupdate'
+    },
+
+    // 初始化  customerId,parentCategoryId,dateform,level
+    initEdit (customerId, parentCategoryId, dataForm) {
+      this.visible = true
+      this.customerId = customerId
+      this.parentCategoryId = parentCategoryId
+      this.type = 'edit'
+      this.dataForm = dataForm
+
+      this.url = '/resi/partymember/stylecategorydict/addorupdate'
+    },
+
+    async saveForm () {
+      await this.$refs['dataForm'].validate((valid, messageObj) => {
+        if (!valid) {
+          window.app.util.validateRule(messageObj)
+          return false
+        }
+      })
+
+      let params = {
+        customerId: this.customerId,
+        categoryId: this.dataForm.categoryId,
+        categoryName: this.dataForm.categoryName
+      }
+
+      const { data, code, msg } = await requestPost(this.url, params)
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '保存成功'
+        })
+        this.resetData()
+        this.visible = false
+        this.$emit('editDiaOK')
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    handleClose () {
+      this.visible = false
+    },
+    resetData () {
+      this.dataForm = {
+        categoryName: '', // 分类名称
+        sort: 0,
+        type: ''// 操作类型(add:新增  edit:编辑)
+      }
+    }
+
+  }
+}
+</script>
+
+<style scoped>
+.item_width_1 {
+  width: 400px;
+}
+.item_width_2 {
+  width: 700px;
+}
+.block {
+  display: block;
+}
+.btn_reset {
+  vertical-align: bottom;
+  margin-left: 10px;
+}
+</style>