|
@@ -24,6 +24,9 @@
|
24
|
24
|
<div v-show="showSearch" class="mb-[5px]">
|
25
|
25
|
<el-card shadow="hover">
|
26
|
26
|
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto" class="-mb-25px -mt-5px">
|
|
27
|
+ <el-form-item label="学/工号" prop="userNumb">
|
|
28
|
+ <el-input v-model="queryParams.userNumb" placeholder="请输入学/工号" clearable @keyup.enter="handleQuery" />
|
|
29
|
+ </el-form-item>
|
27
|
30
|
<el-form-item label="用户姓名" prop="realName">
|
28
|
31
|
<el-input v-model="queryParams.realName" placeholder="请输入用户姓名" clearable @keyup.enter="handleQuery" />
|
29
|
32
|
</el-form-item>
|
|
@@ -54,23 +57,6 @@
|
54
|
57
|
删除
|
55
|
58
|
</el-button>
|
56
|
59
|
</el-col>
|
57
|
|
-<!-- <el-col :span="1.5">-->
|
58
|
|
-<!-- <el-dropdown class="mt-[1px]">-->
|
59
|
|
-<!-- <el-button plain type="info">-->
|
60
|
|
-<!-- 更多-->
|
61
|
|
-<!-- <el-icon class="el-icon--right">-->
|
62
|
|
-<!-- <arrow-down />-->
|
63
|
|
-<!-- </el-icon>-->
|
64
|
|
-<!-- </el-button>-->
|
65
|
|
-<!-- <template #dropdown>-->
|
66
|
|
-<!-- <el-dropdown-menu>-->
|
67
|
|
-<!-- <el-dropdown-item icon="Download" @click="importTemplate">下载模板</el-dropdown-item>-->
|
68
|
|
-<!-- <el-dropdown-item icon="Top" @click="handleImport"> 导入数据</el-dropdown-item>-->
|
69
|
|
-<!-- <el-dropdown-item icon="Download" @click="handleExport"> 导出数据</el-dropdown-item>-->
|
70
|
|
-<!-- </el-dropdown-menu>-->
|
71
|
|
-<!-- </template>-->
|
72
|
|
-<!-- </el-dropdown>-->
|
73
|
|
-<!-- </el-col>-->
|
74
|
60
|
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @query-table="getList"></right-toolbar>
|
75
|
61
|
</el-row>
|
76
|
62
|
</template>
|
|
@@ -126,7 +112,7 @@
|
126
|
112
|
<dict-tag :options="CATEGORY" :value="scope.row.category" />
|
127
|
113
|
</template>
|
128
|
114
|
</el-table-column>
|
129
|
|
- <el-table-column v-if="columns[5].visible" key="status" label="状态" align="center" width="100">
|
|
115
|
+ <el-table-column v-if="columns[6].visible" key="status" label="状态" align="center" width="100">
|
130
|
116
|
<template #default="scope">
|
131
|
117
|
<el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
|
132
|
118
|
</template>
|
|
@@ -168,42 +154,6 @@
|
168
|
154
|
</el-row>
|
169
|
155
|
<!-- 添加或修改用户对话框 -->
|
170
|
156
|
<user-detail-form ref="userDetailFormRef" apped-to-body @success="getList" />
|
171
|
|
- <!-- 用户导入对话框 -->
|
172
|
|
- <el-dialog v-model="upload.open" :title="upload.title" width="400px" append-to-body>
|
173
|
|
- <el-upload
|
174
|
|
- ref="uploadRef"
|
175
|
|
- :limit="1"
|
176
|
|
- accept=".xlsx, .xls"
|
177
|
|
- :headers="upload.headers"
|
178
|
|
- :action="upload.url + '?updateSupport=' + upload.updateSupport"
|
179
|
|
- :disabled="upload.isUploading"
|
180
|
|
- :on-progress="handleFileUploadProgress"
|
181
|
|
- :on-success="handleFileSuccess"
|
182
|
|
- :auto-upload="false"
|
183
|
|
- drag
|
184
|
|
- >
|
185
|
|
- <el-icon class="el-icon--upload">
|
186
|
|
- <i-ep-upload-filled />
|
187
|
|
- </el-icon>
|
188
|
|
- <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
|
189
|
|
- <template #tip>
|
190
|
|
- <div class="text-center el-upload__tip">
|
191
|
|
- <div class="el-upload__tip">
|
192
|
|
- <el-checkbox v-model="upload.updateSupport" />
|
193
|
|
- 是否更新已经存在的用户数据
|
194
|
|
- </div>
|
195
|
|
- <span>仅允许导入xls、xlsx格式文件。</span>
|
196
|
|
- <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板 </el-link>
|
197
|
|
- </div>
|
198
|
|
- </template>
|
199
|
|
- </el-upload>
|
200
|
|
- <template #footer>
|
201
|
|
- <div class="dialog-footer">
|
202
|
|
- <el-button type="primary" @click="submitFileForm">确 定</el-button>
|
203
|
|
- <el-button @click="upload.open = false">取 消</el-button>
|
204
|
|
- </div>
|
205
|
|
- </template>
|
206
|
|
- </el-dialog>
|
207
|
157
|
</div>
|
208
|
158
|
</template>
|
209
|
159
|
|
|
@@ -214,7 +164,6 @@ import { DeptVO } from '@/api/system/dept/types';
|
214
|
164
|
import { globalHeaders } from '@/utils/request';
|
215
|
165
|
import { to } from 'await-to-js';
|
216
|
166
|
import UserDetailForm from '@/views/system/right/user/UserDetailForm.vue';
|
217
|
|
-import { ArrowDown } from '@element-plus/icons-vue';
|
218
|
167
|
|
219
|
168
|
const router = useRouter();
|
220
|
169
|
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
|
@@ -249,17 +198,18 @@ const upload = reactive<ImportOption>({
|
249
|
198
|
// 列显隐信息
|
250
|
199
|
const columns = ref<FieldOption[]>([
|
251
|
200
|
{ key: 0, label: `学/工号`, visible: true, children: [] },
|
252
|
|
- { key: 1, label: `用户名称`, visible: true, children: [] },
|
253
|
|
- { key: 2, label: `用户昵称`, visible: true, children: [] },
|
|
201
|
+ { key: 1, label: `用户名`, visible: true, children: [] },
|
|
202
|
+ { key: 2, label: `用户姓名`, visible: true, children: [] },
|
254
|
203
|
{ key: 3, label: `部门`, visible: true, children: [] },
|
255
|
204
|
{ key: 4, label: `手机号码`, visible: true, children: [] },
|
256
|
|
- { key: 5, label: `状态`, visible: true, children: [] },
|
257
|
|
- { key: 6, label: `创建时间`, visible: true, children: [] }
|
|
205
|
+ { key: 5, label: `用户类型`, visible: true, children: [] },
|
|
206
|
+ { key: 6, label: `状态`, visible: true, children: [] }
|
258
|
207
|
]);
|
259
|
208
|
const queryParams = reactive<UserQuery>({
|
260
|
209
|
pageNum: 1,
|
261
|
210
|
pageSize: 10,
|
262
|
|
- userName: '',
|
|
211
|
+ realName: '',
|
|
212
|
+ userNumb: '',
|
263
|
213
|
phone: '',
|
264
|
214
|
status: '',
|
265
|
215
|
deptId: '',
|
|
@@ -426,9 +376,6 @@ const handleOpenDetail = async (cmd: string, row?: UserVO) => {
|
426
|
376
|
onMounted(() => {
|
427
|
377
|
getTreeSelect(); // 初始化部门数据
|
428
|
378
|
getList(); // 初始化列表数据
|
429
|
|
- proxy?.getConfigKey('sys.user.initPassword').then((response) => {
|
430
|
|
- initPassword.value = response.data;
|
431
|
|
- });
|
432
|
379
|
});
|
433
|
380
|
</script>
|
434
|
381
|
|