From 0af8d2525b8e58c3eb2c3eb30bb32ac482d20856 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 15 七月 2025 11:03:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/member.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/business/member.vue b/admin/src/views/business/member.vue
index 07e943a..d4a8b24 100644
--- a/admin/src/views/business/member.vue
+++ b/admin/src/views/business/member.vue
@@ -10,7 +10,7 @@
</el-form-item>
<el-form-item label="绫诲瀷" prop="type">
<el-select v-model="searchForm.type" clearable placeholder="璇烽�夋嫨绫诲瀷" @change="search">
- <el-option :value="0" label="鍙戝崟鏂�"></el-option>
+ <el-option :value="0" label="鍏ㄩ儴"></el-option>
<el-option :value="1" label="鎺ュ崟鏂�"></el-option>
</el-select>
</el-form-item>
@@ -22,10 +22,10 @@
</el-form-item>
<el-form-item label="娉ㄥ唽鏃堕棿" prop="eventType">
- <el-date-picker type="datetime" v-model="searchForm.startTime" clearable value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="璇烽�夋嫨寮�濮嬫椂闂�" />-
- <el-date-picker type="datetime" v-model="searchForm.endTime" clearable value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="璇烽�夋嫨缁撴潫鏃堕棿" />
+ <el-date-picker type="datetime" style="width: 120px" v-model="searchForm.startTime" clearable value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="寮�濮嬫椂闂�" />-
+ <el-date-picker type="datetime" style="width: 120px" v-model="searchForm.endTime" clearable value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="缁撴潫鏃堕棿" />
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -34,10 +34,10 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">
+<!-- <ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">
<li><el-button type="primary" @click="$refs.operaMemberWindow.open('鏂板缓浼氬憳淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:member:create']">鏂板缓</el-button></li>
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:member:delete']">鍒犻櫎</el-button></li>
- </ul>
+ </ul>-->
<el-table
:height="tableHeightNew"
v-loading="isWorking.search"
@@ -77,7 +77,7 @@
</el-switch>
</template>
</el-table-column>
- <el-table-column
+<!-- <el-table-column
v-if="containPermissions(['business:member:update', 'business:member:delete'])"
label="鎿嶄綔"
min-width="120"
@@ -87,7 +87,7 @@
<el-button type="text" @click="$refs.operaMemberWindow.open('缂栬緫浼氬憳淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:member:update']">缂栬緫</el-button>
<el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:member:delete']">鍒犻櫎</el-button>
</template>
- </el-table-column>
+ </el-table-column>-->
</el-table>
<pagination
@size-change="handleSizeChange"
--
Gitblit v1.9.3