From 4522ab3fe8bd45ee753ef187448c1e884bbc601f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 18 Apr 2024 11:09:27 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

---
 src/views/property/propertyCompany.vue |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/property/propertyCompany.vue b/src/views/property/propertyCompany.vue
index ef901fa..185c2b0 100644
--- a/src/views/property/propertyCompany.vue
+++ b/src/views/property/propertyCompany.vue
@@ -5,11 +5,11 @@
       v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
       @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
       @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
-      <template slot="menuLeft">
+      <!--   <template slot="menuLeft">
         <el-button size="small" icon="el-icon-delete" plain v-if="permission.propertyCompany_delete"
           @click="handleDelete">删 除
         </el-button>
-      </template>
+      </template> -->
 
       <template slot-scope="{row, size, index}" slot="menu">
         <el-button :size="size" v-if="permission.payInfo" type="text" icon="el-icon-circle-plus-outline"
@@ -199,6 +199,13 @@
               row: true,
               // width: 100,
             },
+            // {
+            //   width: 210,
+            //   overHidden: true,
+            //   label: "管理小区",
+            //   prop: "districtNames",
+            //   display: false
+            // },
             {
               label: "简介",
               prop: "remark",
@@ -236,7 +243,7 @@
               }, ],
             },
             {
-              label: "mch-id",
+              label: "商户号mch-id",
               labelWidth: labelWidth,
               prop: "mchId",
               span: 24,

--
Gitblit v1.9.3