From cec75849fc7db84a681b398f544e4d3e40d7d0f7 Mon Sep 17 00:00:00 2001
From: hejianhao <15708179461@qq.com>
Date: 星期四, 15 五月 2025 17:59:18 +0800
Subject: [PATCH] 菌种评定、项目管理
---
culture/src/views/system/user/index.vue | 53 +++++++++++++++++++++++------------------------------
1 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/culture/src/views/system/user/index.vue b/culture/src/views/system/user/index.vue
index 2a06bf3..49fabfd 100644
--- a/culture/src/views/system/user/index.vue
+++ b/culture/src/views/system/user/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="list">
<TableCustom :queryForm="pagination" :tableData="data" :total="pagination.total"
- @currentChange="handleCurrentChange" @sizeChange="handleSizeChange">
+ @handleCurrentChange="handleCurrentChange" @handleSizeChange="handleSizeChange">
<template #search>
<el-form label-width="100px" inline>
<el-form-item label="人员搜索">
@@ -24,7 +24,7 @@
</el-form-item>
<el-form-item style="margin-left: 63px;">
<el-button @click="reset">重置</el-button>
- <el-button type="primary" @click="onSubmit">查询</el-button>
+ <el-button type="primary" @click="onSubmit" style="margin-left: 10px;">查询</el-button>
</el-form-item>
</el-form>
</template>
@@ -45,10 +45,6 @@
<div class="status_class">
<div :class="row.status == 0 ? 'green' : 'red'"></div>
<div>{{ row.status == 0 ? '正常' : '禁用' }}</div>
- <div v-if="row.status == 1" style="cursor: pointer"
- @click="; (dialogVisibleView = true), (rowView = row), $forceUpdate()">
- <i class="el-icon-warning"></i>
- </div>
</div>
</template>
</el-table-column>
@@ -56,28 +52,26 @@
<el-table-column label="操作" width="300">
<template slot-scope="{ row }">
<div>
- <el-button type="text" @click="edit(row)">编辑</el-button>
- <el-button type="text" @click="edit(row)">账号继承</el-button>
- <el-button v-if="row.status != 0" type="text" @click="updateStatus(row, true)">
+ <el-button type="text" @click="edit(row)" class="action-button">编辑</el-button>
+ <el-button type="text" @click="inherit(row)" class="action-button">账号继承</el-button>
+ <el-button v-if="row.status != 0" type="text" @click="updateStatus(row, true)" class="action-button">
启用
</el-button>
- <el-button v-if="row.status == 0" type="text" @click="updateStatus(row, false)">
+ <el-button v-if="row.status == 0" type="text" @click="updateStatus(row, false)" class="action-button">
禁用
</el-button>
- <el-button type="text" @click="detail(row)">重置密码</el-button>
- <el-button type="text" @click="del(row)">删除</el-button>
+ <el-button type="text" @click="detail(row)" class="action-button">重置密码</el-button>
+ <el-button type="text" @click="del(row)" class="action-button">删除</el-button>
</div>
</template>
</el-table-column>
</template>
</TableCustom>
- <AddEdit v-if="dialogVisible" :row="row" :deptList="deptList" :deptType="deptTypeList" :roleList="roleList"
+ <AddEdit v-if="dialogVisible" :row="row" :deptType="deptTypeList" :roleList="roleList"
:dialogVisible="dialogVisible" @close="dialogVisible = false, row = {}" @confirm="confirm" />
<ResetPassword v-if="passwordVisible" :row="row" :dialogVisible="passwordVisible"
@close="passwordVisible = false, row = {}" @confirm="passwordConfirm" />
- <ViewData v-if="dialogVisibleView" :row="rowView" :dialogVisible="dialogVisibleView"
- @close="dialogVisibleView = false, rowView = {}" />
<Disb v-if="disbDialogVisible" :row="disbRow" :dialogVisible="disbDialogVisible"
@close="disbDialogVisible = false, disbRow = {}" @confirm="disbConfirm" />
<ShowDelConfirm :show="delShow" @close="delShow = false" @confirm="delConfirm" title="确认要删除该人员吗？"
@@ -90,7 +84,6 @@
<script>
import { getList, add, edit, delDept, roleList, updatePwd, changeStatus, typeList } from './service'
import AddEdit from './components/add-edit.vue'
-import ViewData from './components/view-data.vue'
import Disb from './components/disb.vue'
import ResetPassword from './components/reset-password.vue'
import Inherit from './components/inherit.vue'
@@ -98,7 +91,6 @@
name: 'User',
components: {
AddEdit,
- ViewData,
Disb,
ResetPassword,
Inherit,
@@ -113,7 +105,6 @@
inheritDialogVisible: false,//账号继承
data: [],//列表数据
nickNameOrPhone: '',//人员搜索
- deptId: [],//部门
roleId: [],//角色
status: '',//状态
roleList: [],//角色列表
@@ -137,9 +128,8 @@
},
watch: {},
created() {
- // this.getRoleList()
- // this.getListData()
- // this.getTypeList()
+ this.getRoleList()
+ this.getListData()
},
mounted() { },
methods: {
@@ -150,7 +140,7 @@
},
getRoleList() {
roleList().then((res) => {
- this.roleList = res.data.data
+ this.roleList = res
})
},
delConfirm() {
@@ -201,6 +191,10 @@
this.row = row
this.dialogVisible = true
},
+ inherit(row) {
+ this.inheritRow = row
+ this.inheritDialogVisible = true
+ },
updateStatus(row, type) {
if (type) {
changeStatus({ ...row, status: 0 }).then(() => {
@@ -220,18 +214,14 @@
},
async getListData() {
let obj = {
- ...this.pagination,
+ pageNum: this.pagination.pageNum,
+ pageSize: this.pagination.pageSize,
nickNameOrPhone: this.nickNameOrPhone,
- deptIds: this.deptId,
roleIds: this.roleId,
status: this.status,
}
this.listLoading = true
- const {
- data: {
- data: { records, total },
- },
- } = await getList(obj)
+ const { records,total } = await getList(obj)
this.data = records
this.pagination.total = total
this.timeOutID = setTimeout(() => {
@@ -241,7 +231,6 @@
reset() {
this.nickNameOrPhone = ''
this.roleId = []
- this.deptId = []
this.status = ''
this.pagination.pageNum = 1
this.getListData()
@@ -267,6 +256,10 @@
height: 100%;
}
+.action-button {
+ margin-right: 8px;
+}
+
.green {
background-color: green;
}
--
Gitblit v1.7.1