From 7ad3d376d3ccb029bb8077725aa70747b0ebb2ad Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 14 三月 2024 16:15:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/views/system/permission.vue | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/company/src/views/system/permission.vue b/company/src/views/system/permission.vue
index 76f35b3..30d455c 100644
--- a/company/src/views/system/permission.vue
+++ b/company/src/views/system/permission.vue
@@ -8,6 +8,14 @@
<el-form-item label="鏉冮檺鍚嶇О" prop="name">
<el-input v-model="searchForm.name" v-trim placeholder="璇疯緭鍏ユ潈闄愬悕绉�" @keypress.enter.native="search"/>
</el-form-item>
+ <el-form-item label="骞冲彴绫诲瀷" prop="type">
+ <el-select v-model="searchForm.type" placeholder="璇烽�夋嫨" @change="search">
+ <el-option label="閫氱敤" value="0"></el-option>
+ <el-option label="骞冲彴绔�" value="1"></el-option>
+ <el-option label="浼佷笟绔�" value="2"></el-option>
+ <el-option label="鍟嗘埛绔�" value="3"></el-option>
+ </el-select>
+ </el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -30,6 +38,14 @@
<el-table-column type="selection" fixed="left" width="55"></el-table-column>
<el-table-column prop="code" label="鏉冮檺缂栫爜" fixed="left" min-width="200px"></el-table-column>
<el-table-column prop="name" label="鏉冮檺鍚嶇О" fixed="left" min-width="120px"></el-table-column>
+ <el-table-column prop="name" label="骞冲彴绫诲瀷" fixed="left" min-width="120px">
+ <template slot-scope="{row}">
+ <span v-if="row.type == null || row.type ===0">閫氱敤</span>
+ <span v-if="row.type === 1">骞冲彴绔�</span>
+ <span v-if="row.type === 2">浼佷笟绔�</span>
+ <span v-if="row.type === 3">鍟嗘埛绔�</span>
+ </template>
+ </el-table-column>
<el-table-column prop="remark" label="鏉冮檺澶囨敞" min-width="120px"></el-table-column>
<el-table-column prop="createUser" label="鍒涘缓浜�" min-width="100px">
<template slot-scope="{row}">{{row.createUserInfo == null ? '' : row.createUserInfo.username}}</template>
@@ -77,6 +93,7 @@
searchForm: {
code: '',
name: '',
+ type: '',
remark: ''
}
}
--
Gitblit v1.9.3