From f4e09a3f13bbf63b166c3a149497a93a9fd43bc5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 13 一月 2026 18:25:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/areas.vue | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/business/areas.vue b/admin/src/views/business/areas.vue
index 6151b4d..a266422 100644
--- a/admin/src/views/business/areas.vue
+++ b/admin/src/views/business/areas.vue
@@ -2,10 +2,6 @@
<TableLayout :permissions="['business:areas:query']">
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <!-- <ul class="toolbar" v-permissions="['business:areas:create', 'business:areas:delete']">
- <li><el-button type="primary" @click="$refs.operaAreasWindow.open('鏂板缓鐪�')" icon="el-icon-plus" v-permissions="['business:areas:create']">鏂板缓</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:areas:delete']">鍒犻櫎</el-button></li>
- </ul> -->
<el-table
ref="table"
v-loading="isWorking.search"
@@ -22,6 +18,7 @@
>
<el-table-column prop="name" label="鍦板尯鍚嶇О" min-width="100px">
<template slot-scope="{ row }">
+ {{row.name}}<span v-if="row.type ===0 && row.bigAreaName !=null && row.bigAreaName !=''" class="green">銆恵{row.bigAreaName}}銆�</span>
</template>
</el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" align="center" min-width="140px"></el-table-column>
--
Gitblit v1.9.3