From 51e18e190dafdec70dc1f4a3a9ecd76fb2116726 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 12 十月 2024 16:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/deviceRole_f.vue | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/business/deviceRole_f.vue b/admin/src/views/business/deviceRole_f.vue
index 97f58ab..dde4a02 100644
--- a/admin/src/views/business/deviceRole_f.vue
+++ b/admin/src/views/business/deviceRole_f.vue
@@ -2,7 +2,7 @@
<TableLayout :permissions="['business:devicerole:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="闂ㄧ缁勫悕绉�" prop="name">
+ <el-form-item title="闂ㄧ缁勫悕绉�" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ラ棬绂佺粍鍚嶇О" @keypress.enter.native="search"></el-input>
</el-form-item>
<section>
@@ -13,7 +13,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar">
- <li><el-button type="primary" @click="synchronousData">鍚屾</el-button></li>
+ <li><el-button type="primary" v-permissions="['business:hksync:privilege']" @click="synchronousData">鍚屾</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -30,7 +30,6 @@
<span v-if="row.type === '2'">鍐呴儴浜哄憳</span>
</template>
</el-table-column>
- <el-table-column prop="memberNum" label="浣跨敤浜烘暟" min-width="100px"></el-table-column>
<el-table-column prop="isDefault" label="鏄惁榛樿" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.isDefault === 0">鏄�</span>
@@ -97,7 +96,7 @@
}).then(() => {
syncPrivilege({})
.then(res => {
- this.$message({ type: 'success', message: '鍚屾鎴愬姛' })
+ this.$message({ type: 'success', message:res || '鍚屾鎴愬姛' })
this.search()
})
}).catch(() => {
--
Gitblit v1.9.3