diff --git a/src/views/manage/company/companyList.vue b/src/views/manage/company/companyList.vue
index 07d38cf..bf604c6 100644
--- a/src/views/manage/company/companyList.vue
+++ b/src/views/manage/company/companyList.vue
@@ -1,13 +1,13 @@
 <template>
   <basic-container>
     <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form"
-      :permission="permissionList" :before-open="beforeOpen" :before-close="beforeClose" :page.sync="page"
-      @row-update="rowUpdate" @row-save="rowSave" @search-change="searchChange" @search-reset="searchReset"
-      @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-      @refresh-change="refreshChange" @on-load="onLoad" :upload-before="uploadBefore">
+               :permission="permissionList" :before-open="beforeOpen" :before-close="beforeClose" :page.sync="page"
+               @row-update="rowUpdate" @row-save="rowSave" @search-change="searchChange" @search-reset="searchReset"
+               @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+               @refresh-change="refreshChange" @on-load="onLoad" :upload-before="uploadBefore">
       <template slot="menuLeft">
-<!--        <el-button v-if="vaildData(permission.manage_compan_companyList_addUser, false)" size="small"-->
-<!--          @click.stop="handleAddUser" type="primary" :disabled="selectionList.length === 0">关联账号</el-button>-->
+        <!--        <el-button v-if="vaildData(permission.manage_compan_companyList_addUser, false)" size="small"-->
+        <!--          @click.stop="handleAddUser" type="primary" :disabled="selectionList.length === 0">关联账号</el-button>-->
         <!-- <el-button v-if="vaildData(permission.manage_compan_companyList_config, false)" size="small"
           @click.stop="handleConfig" type="primary" :disabled="selectionList.length === 0">服务设置</el-button> -->
         <!-- <el-button v-if="vaildData(permission.manage_compan_companyList_check, false)" size="small"
@@ -16,11 +16,14 @@
       <template slot="cityIdForm" slot-scope="{ disabled }">
         <jl-city-cascader :disabled="disabled" v-model="form.cityId"></jl-city-cascader>
       </template>
+      <template slot="cityId" slot-scope="{ row }">
+        {{ row.cityId === -1 ? '' : row.cityId }}
+      </template>
       <template slot="companyAddressForm" slot-scope="{ disabled }">
         <select-map
           ref="selectMap"
           @addAddress="addAddress"
-          @addressDel = "addressDel"
+          @addressDel="addressDel"
           :isCanEdit="!disabled"
           :lng="obj.lon"
           :lat="obj.lat"
@@ -34,20 +37,20 @@
       </template>
       <template slot="identityUrl4IdImgForm">
         <el-image style="width: 100px; height: 100px" :src="form.identityUrl4Id"
-          :preview-src-list="[form.identityUrl4Id]"></el-image>
+                  :preview-src-list="[form.identityUrl4Id]"></el-image>
       </template>
       <template slot="identityUrl5IdImgForm">
         <el-image style="width: 100px; height: 100px" :src="form.identityUrl5Id"
-          :preview-src-list="[form.identityUrl5Id]"></el-image>
+                  :preview-src-list="[form.identityUrl5Id]"></el-image>
       </template>
 
       <template slot="signSrcUrlForm">
         <el-image style="width: 100px; height: 100px" :src="form.signSrcUrl"
-          :preview-src-list="[form.signSrcUrl]"></el-image>
+                  :preview-src-list="[form.signSrcUrl]"></el-image>
       </template>
       <template slot="letterOfAttorneyUrlForm">
         <el-image style="width: 100px; height: 100px" :src="form.letterOfAttorneyUrl"
-          :preview-src-list="[form.letterOfAttorneyUrl]"></el-image>
+                  :preview-src-list="[form.letterOfAttorneyUrl]"></el-image>
       </template>
       <template slot="motoleyUrlImgForm">
         <div v-if="imgList.length > 0">
@@ -62,18 +65,19 @@
         <company-record :data="row"></company-record>
       </template>
       <template slot="motoleyUrlForm">
-        <el-upload class="companyList-upload" list-type="picture-card" :auto-upload="true" :file-list="imgList" :limit="5"
-          :action="mutiPutFile" :on-preview="handlePictureCardPreview" :on-exceed="handleImgLimit"
-          :on-success="handleImgSuccess" :on-remove="handleImgRemove" :before-remove="beforeRemove"
-          :before-upload="beforeAvatarUpload">
+        <el-upload class="companyList-upload" list-type="picture-card" :auto-upload="true" :file-list="imgList"
+                   :limit="5"
+                   :action="mutiPutFile" :on-preview="handlePictureCardPreview" :on-exceed="handleImgLimit"
+                   :on-success="handleImgSuccess" :on-remove="handleImgRemove" :before-remove="beforeRemove"
+                   :before-upload="beforeAvatarUpload">
           <i slot="default" class="el-icon-plus avue-upload__icon"></i>
         </el-upload>
       </template>
       <!--服务费-->
       <template slot="serveCost" slot-scope="{ row }">
         <span v-if="row.serveCost != -1 && row.serveCost">{{
-          moneyFormat(row.serveCost)
-        }}</span>
+            moneyFormat(row.serveCost)
+          }}</span>
         <span v-else>-</span>
       </template>
 
@@ -95,12 +99,13 @@
       </template> -->
 
 
-
       <!--保证金状态搜索栏trialOn-->
       <template slot="trialOnSearch">
         <el-select v-model="query.trialOn" placeholder="保证金" @change="selectTrailTyepChange">
-          <el-option v-for="(item, index) in bondList" :key="index" :label="item.label" :value="item.value">{{ item.label
-          }}</el-option>
+          <el-option v-for="(item, index) in bondList" :key="index" :label="item.label" :value="item.value">{{
+              item.label
+            }}
+          </el-option>
         </el-select>
       </template>
     </avue-crud>
@@ -119,18 +124,19 @@ import {
   stop,
   start,
 } from "@/api/manage/company";
-import { getStationDic } from "@/api/manage/station";
-import { getTradeDic } from "@/api/manage/trade";
-import { mapGetters } from "vuex";
+import {getStationDic} from "@/api/manage/station";
+import {getTradeDic} from "@/api/manage/trade";
+import {mapGetters} from "vuex";
 import addAccount from "./addAccount";
 import companyConfig from "./companyConfig";
 import companyCheck from "./companyCheck";
-import { putFile } from "@/api/resource/oss";
-import { check18IdCardNo } from "@/util/validate";
-import { moneyFormat } from "@/util/money";
+import {putFile} from "@/api/resource/oss";
+import {check18IdCardNo} from "@/util/validate";
+import {moneyFormat} from "@/util/money";
 import companyRecord from "./companyRecord";
-import { companyStatus } from "@/const/company";
+import {companyStatus} from "@/const/company";
 import SelectMap from "@/components/map/selectLocation";
+
 const accept = [
   "image/png",
   "image/jpeg",
@@ -140,7 +146,7 @@ const accept = [
 ];
 
 function getPath(path) {
-  if(path) {
+  if (path) {
     const arr = path.split(",");
     return arr[arr.length - 1];
   }
@@ -148,7 +154,7 @@ function getPath(path) {
 }
 
 export default {
-  components: { addAccount, companyConfig, companyCheck, companyRecord, SelectMap },
+  components: {addAccount, companyConfig, companyCheck, companyRecord, SelectMap},
   name: "manage_compan_companyList",
   data() {
     const validateTradeId = (rule, value, callback) => {
@@ -234,7 +240,7 @@ export default {
         indexLabel: "序号",
         selection: true,
         viewBtn: true,
-        addBtn: true,
+        addBtn: false,
         editBtn: true,
         addBtnText: "社区街道登记",
         addTitle: "新增机构名称",
@@ -254,17 +260,15 @@ export default {
             display: false,
           },
           {
-            type: "tree",
             label: "联系人姓名",
             display: false,
             prop: "masterName",
           },
           {
-            label: "创建日期",
-            prop: "createTime",
-            type: "datetime",
-            format: "yyyy-MM-dd",
+            label: "地区",
             display: false,
+            prop: "cityId",
+            slot: true,
           },
         ],
         group: [
@@ -346,7 +350,7 @@ export default {
       this.obj.lon = form.lng;
       this.form.companyAddress = form.address + (form.title || "");
     },
-    addressDel(){
+    addressDel() {
       this.form.companyAddress = this.obj.address = "";
     },
     // uploadBefore(file, done, loading) {
@@ -436,7 +440,7 @@ export default {
       row.identityUrl4Id = getPath(row.identityUrl4Id);
       row.identityUrl5Id = getPath(row.identityUrl5Id);
       const copyRow = {...row}
-      if(this.obj.address) {
+      if (this.obj.address) {
         copyRow.companyAddress = this.obj.address
       }
       update(copyRow).then(
@@ -458,7 +462,7 @@ export default {
     rowStop(id) {
       let h = this.$createElement;
       this.$confirm(
-        h("p", { style: "color: #F56C6C" }, "一旦终止合作社区街道将无法操作系统"),
+        h("p", {style: "color: #F56C6C"}, "一旦终止合作社区街道将无法操作系统"),
         "您确定要终止与此公司的合作吗？",
         {
           confirmButtonText: "确定",
@@ -481,12 +485,13 @@ export default {
               this.loading = false;
             });
         })
-        .catch(() => { });
+        .catch(() => {
+        });
     },
     rowStart(id) {
       let h = this.$createElement;
       this.$confirm(
-        h("p", { style: "color: #F56C6C" }, "一旦恢复合作社区街道所有账号均可使用"),
+        h("p", {style: "color: #F56C6C"}, "一旦恢复合作社区街道所有账号均可使用"),
         "您确定要恢复与此公司的合作吗？",
         {
           confirmButtonText: "确定",
@@ -509,7 +514,8 @@ export default {
               this.loading = false;
             });
         })
-        .catch(() => { });
+        .catch(() => {
+        });
     },
     searchReset() {
       this.query = {};
@@ -544,7 +550,7 @@ export default {
           if (this.form.motoleyUrl) {
             var strList = this.form.motoleyUrl.split(',');
             for (var i in strList) {
-              this.imgList.push({ url: strList[i] })
+              this.imgList.push({url: strList[i]})
             }
           }
           if (this.form.tradeId == 1) {
@@ -588,7 +594,7 @@ export default {
     },
     handleImgSuccess(res) {
       if (res.code == 200) {
-        this.imgList.push({ url: res.data.link });
+        this.imgList.push({url: res.data.link});
 
         var str = "";
         for (var i = 0; i < this.imgList.length; i++) {
@@ -598,8 +604,7 @@ export default {
           str = str.substr(0, str.length - 1);
         }
         this.form.motoleyUrl = str;
-      }
-      else {
+      } else {
         this.$message.error('上传失败');
       }