From 19f0eca493f7e17ab7b67d28cf77d80de364576c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 28 十月 2024 15:00:57 +0800
Subject: [PATCH] ll
---
admin/src/views/system/user.vue | 49 +++++++++++++++++++++++++++----------------------
1 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/admin/src/views/system/user.vue b/admin/src/views/system/user.vue
index 5e4d7f5..73d74f4 100644
--- a/admin/src/views/system/user.vue
+++ b/admin/src/views/system/user.vue
@@ -11,12 +11,15 @@
<el-form-item label="鎵嬫満鍙风爜" prop="mobile">
<el-input v-model="searchForm.mobile" v-trim placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" @keypress.enter.native="search"/>
</el-form-item>
- <el-form-item label="鎵�灞為儴闂�" prop="rootDeptId">
- <DepartmentSelect v-model="searchForm.rootDeptId" placeholder="璇烽�夋嫨鎵�灞為儴闂�" clearable/>
+ <el-form-item label="缁勭粐" prop="companyName">
+ <el-input v-model="searchForm.companyName" v-trim placeholder="璇疯緭鍏ョ粍缁�" @keypress.enter.native="search"/>
</el-form-item>
- <el-form-item label="宀椾綅" prop="positionId">
- <PositionSelect v-model="searchForm.positionId" placeholder="璇烽�夋嫨宀椾綅" clearable/>
- </el-form-item>
+<!-- <el-form-item label="鎵�灞為儴闂�" prop="rootDeptId">-->
+<!-- <DepartmentSelect v-model="searchForm.rootDeptId" placeholder="璇烽�夋嫨鎵�灞為儴闂�" clearable/>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="宀椾綅" prop="positionId">-->
+<!-- <PositionSelect v-model="searchForm.positionId" placeholder="璇烽�夋嫨宀椾綅" clearable/>-->
+<!-- </el-form-item>-->
<section>
<el-button type="primary" icon="el-icon-search" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -37,32 +40,33 @@
@sort-change="handleSortChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="avatar" label="澶村儚" width="80px" class-name="table-column-avatar" fixed="left">
- <template slot-scope="{row}">
- <img :src="row.avatar == null ? '/static/avatar/man.png' : row.avatar">
- </template>
- </el-table-column>
+<!-- <el-table-column prop="avatar" label="澶村儚" width="80px" class-name="table-column-avatar" fixed="left">-->
+<!-- <template slot-scope="{row}">-->
+<!-- <img :src="row.avatar == null ? '/static/avatar/man.png' : row.avatar">-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column prop="realname" label="濮撳悕" min-width="100px" fixed="left"></el-table-column>
<el-table-column prop="username" label="鐢ㄦ埛鍚�" min-width="120px"></el-table-column>
<el-table-column prop="empNo" label="宸ュ彿" sortable="custom" sort-by="EMP_NO" min-width="80px"></el-table-column>
- <el-table-column prop="department" label="閮ㄩ棬" min-width="120px">
- <template slot-scope="{row}">{{row.department == null ? '' : row.department.name}}</template>
- </el-table-column>
- <el-table-column prop="position" label="宀椾綅" min-width="160px" class-name="table-column-strings">
- <template slot-scope="{row}">
- <ul>
- <li v-for="position in row.positions" :key="position.id">{{position.name}}</li>
- </ul>
- </template>
- </el-table-column>
+ <el-table-column prop="companyName" label="鎵�灞炵粍缁�" min-width="250px"></el-table-column>
+<!-- <el-table-column prop="department" label="閮ㄩ棬" min-width="120px">-->
+<!-- <template slot-scope="{row}">{{row.department == null ? '' : row.department.name}}</template>-->
+<!-- </el-table-column>-->
+<!-- <el-table-column prop="position" label="宀椾綅" min-width="160px" class-name="table-column-strings">-->
+<!-- <template slot-scope="{row}">-->
+<!-- <ul>-->
+<!-- <li v-for="position in row.positions" :key="position.id">{{position.name}}</li>-->
+<!-- </ul>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column prop="sex" label="鎬у埆" sortable="custom" sort-by="SEX" min-width="80px">
<template slot-scope="{row}">
{{row.sex | sex}}
</template>
</el-table-column>
<el-table-column prop="mobile" label="鎵嬫満鍙风爜" min-width="100px"></el-table-column>
- <el-table-column prop="email" label="閭" min-width="180px"></el-table-column>
- <el-table-column prop="birthday" label="鐢熸棩" sortable="custom" sort-by="BIRTHDAY" min-width="100px"></el-table-column>
+<!-- <el-table-column prop="email" label="閭" min-width="180px"></el-table-column>-->
+<!-- <el-table-column prop="birthday" label="鐢熸棩" sortable="custom" sort-by="BIRTHDAY" min-width="100px"></el-table-column>-->
<el-table-column prop="roles" label="瑙掕壊" min-width="160px" class-name="table-column-strings">
<template slot-scope="{row}">
<ul>
@@ -129,6 +133,7 @@
realname: '', // 濮撳悕
rootDeptId: null, // 閮ㄩ棬ID
positionId: null, // 宀椾綅ID
+ companyName: null, // 浼佷笟鍚嶇О
mobile: '' // 鎵嬫満鍙风爜
}
}
--
Gitblit v1.9.3