From 22a00c47589ded6699a563690ee5545b73eaca01 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 十二月 2023 09:30:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/deviceRole_f.vue | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/admin/src/views/business/deviceRole_f.vue b/admin/src/views/business/deviceRole_f.vue
index f1c14f0..97f58ab 100644
--- a/admin/src/views/business/deviceRole_f.vue
+++ b/admin/src/views/business/deviceRole_f.vue
@@ -1,5 +1,5 @@
<template>
- <TableLayout :permissions="['business:company:query']">
+ <TableLayout :permissions="['business:devicerole:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<el-form-item label="闂ㄧ缁勫悕绉�" prop="name">
@@ -13,32 +13,38 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar">
- <li><el-button type="primary">鍚屾</el-button></li>
+ <li><el-button type="primary" @click="synchronousData">鍚屾</el-button></li>
</ul>
<el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
+ v-loading="isWorking.search"
+ :data="tableData.list"
+ stripe
+ @selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="闂ㄧ缁勫悕绉�" min-width="100px"></el-table-column>
- <el-table-column prop="name" label="閫傜敤鐢ㄦ埛绫诲瀷" min-width="100px"></el-table-column>
- <el-table-column prop="name" label="浣跨敤浜烘暟" min-width="100px"></el-table-column>
+ <el-table-column label="閫傜敤鐢ㄦ埛绫诲瀷" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.type === '0'">鍔冲姟璁垮</span>
+ <span v-if="row.type === '1'">鏅�氳瀹�</span>
+ <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 === 1">鏄�</span>
- <span v-if="row.isDefault === 0">鍚�</span>
+ <span v-if="row.isDefault === 0">鏄�</span>
+ <span v-if="row.isDefault === 1">鍚�</span>
</template>
</el-table-column>
<el-table-column
- v-if="containPermissions(['business:company:update', 'business:company:delete'])"
+ v-if="containPermissions(['business:devicerole:update'])"
label="鎿嶄綔"
min-width="120"
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaDeviceRoleWindow.open('缂栬緫闂ㄧ瑙掕壊淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:company:update']">缂栬緫</el-button>
+ <el-button type="text" @click="$refs.operaDeviceRoleWindow.open('缂栬緫闂ㄧ瑙掕壊淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:devicerole:update']">缂栬緫</el-button>
</template>
</el-table-column>
</el-table>
@@ -59,6 +65,7 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaDeviceRoleWindow from '@/components/business/OperaDeviceRoleFWindow'
+import { syncPrivilege } from '@/api/business/deviceRole'
export default {
name: 'DeviceRole',
extends: BaseTable,
@@ -68,7 +75,7 @@
// 鎼滅储
searchForm: {
name: '',
- type: '1'
+ type: '0,1'
}
}
},
@@ -80,6 +87,23 @@
'field.main': 'id'
})
this.search()
+ },
+ methods: {
+ synchronousData () {
+ this.$confirm('纭鍚屾鍚�?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ syncPrivilege({})
+ .then(res => {
+ this.$message({ type: 'success', message: '鍚屾鎴愬姛' })
+ this.search()
+ })
+ }).catch(() => {
+
+ })
+ }
}
}
</script>
--
Gitblit v1.9.3