From b62c6c9ab29e933fd0333ac183ef837d00aba5d2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 12 七月 2024 18:09:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/tag/list.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/user/tag/list.vue b/src/views/user/tag/list.vue
index 1968043..6437e8e 100644
--- a/src/views/user/tag/list.vue
+++ b/src/views/user/tag/list.vue
@@ -2,11 +2,11 @@
<div class="app-container">
<el-form :model="queryParam" ref="queryForm" :inline="true">
<el-form-item label="鏍囩鍚嶏細">
- <el-input v-model="queryParam.name"></el-input>
+ <el-input v-model="queryParam.name" clearable></el-input>
</el-form-item>
<el-form-item>
<div style="display: flex">
- <el-button type="primary" @click="submitForm">鏌ヨ</el-button>
+ <el-button type="primary" size="small" @click="submitForm">鏌ヨ</el-button>
<router-link :to="{ path: '/user/tag/edit' }" class="link-left">
<el-button type="primary">娣诲姞</el-button>
</router-link>
@@ -16,12 +16,13 @@
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
<el-table-column prop="name" label="鏍囩鍚�" />
+ <el-table-column prop="deptName" label="閮ㄩ棬" />
<el-table-column width="270px" label="鎿嶄綔" align="center">
<template slot-scope="{row}">
<router-link :to="{ path: '/user/tag/edit', query: { id: row.id } }" class="link-left">
- <el-button size="mini">缂栬緫</el-button>
+ <el-button size="small" type="primary">缂栬緫</el-button>
</router-link>
- <el-button size="mini" type="danger" @click="deleteUser(row)" class="link-left">鍒犻櫎</el-button>
+ <el-button size="small" type="danger" @click="deleteUser(row)" class="link-left">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
--
Gitblit v1.8.0