From 1c1000a93a88b5af5eabbf410aa264b0911dbee4 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期二, 29 七月 2025 14:18:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/UserList.vue | 56 +++++++++++++++++++++++---------------------------------
1 files changed, 23 insertions(+), 33 deletions(-)
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index 5a29723..917d8b8 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -14,48 +14,19 @@
</a-col>
<a-col :md="6" :sm="8">
- <a-form-item label="鎬у埆">
- <a-select v-model="queryParam.sex" placeholder="璇烽�夋嫨鎬у埆">
+ <a-form-item label="鐢ㄦ埛鐘舵��">
+ <a-select v-model="queryParam.status" placeholder="璇烽�夋嫨">
<a-select-option value="">璇烽�夋嫨</a-select-option>
- <a-select-option value="1">鐢�</a-select-option>
- <a-select-option value="2">濂�</a-select-option>
+ <a-select-option value="1">姝ｅ父</a-select-option>
+ <a-select-option value="2">鍐荤粨</a-select-option>
</a-select>
</a-form-item>
</a-col>
-
-
- <template v-if="toggleSearchStatus">
- <a-col :md="6" :sm="8">
- <a-form-item label="鐪熷疄鍚嶅瓧">
- <a-input placeholder="璇疯緭鍏ョ湡瀹炲悕瀛�" v-model="queryParam.realname"></a-input>
- </a-form-item>
- </a-col>
-
- <a-col :md="6" :sm="8">
- <a-form-item label="鎵嬫満鍙风爜">
- <a-input placeholder="璇疯緭鍏ユ墜鏈哄彿鐮佹煡璇�" v-model="queryParam.phone"></a-input>
- </a-form-item>
- </a-col>
-
- <a-col :md="6" :sm="8">
- <a-form-item label="鐢ㄦ埛鐘舵��">
- <a-select v-model="queryParam.status" placeholder="璇烽�夋嫨">
- <a-select-option value="">璇烽�夋嫨</a-select-option>
- <a-select-option value="1">姝ｅ父</a-select-option>
- <a-select-option value="2">鍐荤粨</a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- </template>
<a-col :md="6" :sm="8">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
- <a @click="handleToggleSearch" style="margin-left: 8px">
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
- </a>
</span>
</a-col>
@@ -260,6 +231,12 @@
// dataIndex: 'phone'
// },
{
+ title: '宀椾綅',
+ align: "center",
+ width: 80,
+ dataIndex: 'post_dictText'
+ },
+ {
title: '閮ㄩ棬',
align: "center",
width: 240,
@@ -278,6 +255,7 @@
width: 80,
dataIndex: 'status_dictText'
},
+
{
title: '鎿嶄綔',
dataIndex: 'action',
@@ -361,6 +339,12 @@
// dataIndex: 'phone'
// },
{
+ title: '宀椾綅',
+ align: "center",
+ width: 80,
+ dataIndex: 'post_dictText'
+ },
+ {
title: '杞﹂棿',
align: "center",
width: 240,
@@ -426,6 +410,12 @@
// dataIndex: 'phone'
// },
{
+ title: '宀椾綅',
+ align: "center",
+ width: 80,
+ dataIndex: 'post_dictText'
+ },
+ {
title: '閮ㄩ棬',
align: "center",
width: 240,
--
Gitblit v1.9.3