projects/mes-zjl #383

Merged
juzi merged 2 commits from projects/mes-zjl into projects/mes-test 2024-07-19 15:30:28 +08:00
3 changed files with 471 additions and 305 deletions
Showing only changes of commit 506f12d405 - Show all commits

View File

@ -59,6 +59,33 @@ export default {
type: "warning", type: "warning",
}) })
}, },
// 删除确认窗体UI规范
delConfirm(title) {
return MessageBox.confirm("确定删除后不可恢复该数据", `是否确认删除 【${title}】 数据项?`, {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: "warning",
showClose:false
})
},
// 关闭页面确认窗体UI规范
closeConfirm() {
return MessageBox.confirm("确定关闭将不保留编辑内容", "是否确认要关闭页面?", {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: "warning",
showClose:false
})
},
// 确认窗体UI规范
newConfirm(content,title) {
return MessageBox.confirm(content, title, {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: "warning",
showClose:false
})
},
// 提交内容 // 提交内容
prompt(content) { prompt(content) {
return MessageBox.prompt(content, "系统提示", { return MessageBox.prompt(content, "系统提示", {

View File

@ -200,4 +200,35 @@ input, textarea{
// 弹出框上下分布去掉label的padding-bottom // 弹出框上下分布去掉label的padding-bottom
.el-form--label-top .el-form-item__label { .el-form--label-top .el-form-item__label {
padding: 0; padding: 0;
} }
// 确认弹窗(UI样式修改和原样式有区别--start)
.el-message-box__status+.el-message-box__message {
padding-left: 58px;
}
.el-message-box {
width: auto;
min-width: 424px;
.el-message-box__header {
padding:32px 32px 0px 72px;
.el-message-box__title {
font-size: 16px;
font-weight: 600;
color: rgba(0,0,0,0.85);
}
}
.el-message-box__content {
padding-bottom: 24px;
.el-message-box__status {
top:-72%;
left:20px;
font-size:21px !important
}
}
.el-message-box__btns {
padding-right: 32px;
padding-bottom:14px;
}
}
// 确认弹窗(UI样式修改和原样式有区别--end)

View File

@ -1,317 +1,425 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"> <el-form
<el-form-item label="部门名称" prop="name"> :model="queryParams"
<el-input v-model="queryParams.name" placeholder="请输入部门名称" clearable @keyup.enter.native="handleQuery"/> ref="queryForm"
</el-form-item> size="small"
<el-form-item label="状态" prop="status"> :inline="true"
<el-select v-model="queryParams.status" placeholder="菜单状态" clearable> v-show="showSearch">
<el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/> <el-form-item label="部门名称" prop="name">
</el-select> <el-input
</el-form-item> v-model="queryParams.name"
<el-form-item> placeholder="请输入部门名称"
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> clearable
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-form> <el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="菜单状态"
clearable>
<el-option
v-for="dict in statusDictDatas"
:key="parseInt(dict.value)"
:label="dict.label"
:value="parseInt(dict.value)" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">
搜索
</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button
v-hasPermi="['system:dept:create']">新增</el-button> type="primary"
</el-col> plain
<el-col :span="1.5"> icon="el-icon-plus"
<el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button> size="mini"
</el-col> @click="handleAdd"
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> v-hasPermi="['system:dept:create']">
</el-row> 新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="info"
plain
icon="el-icon-sort"
size="mini"
@click="toggleExpandAll">
展开/折叠
</el-button>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"></right-toolbar>
</el-row>
<el-table v-if="refreshTable" v-loading="loading" :data="deptList" row-key="id" :default-expand-all="isExpandAll" <el-table
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"> v-if="refreshTable"
<el-table-column prop="name" label="部门名称" width="260"></el-table-column> v-loading="loading"
<el-table-column prop="leader" label="负责人" :formatter="userNicknameFormat" width="120"/> :data="deptList"
<el-table-column prop="sort" label="排序" width="200"></el-table-column> row-key="id"
<el-table-column prop="status" label="状态" width="100"> :default-expand-all="isExpandAll"
<template v-slot="scope"> :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/> <el-table-column
</template> prop="name"
</el-table-column> label="部门名称"
<el-table-column label="创建时间" align="center" prop="createTime" width="200"> width="260"></el-table-column>
<template v-slot="scope"> <el-table-column
<span>{{ parseTime(scope.row.createTime) }}</span> prop="leader"
</template> label="负责人"
</el-table-column> :formatter="userNicknameFormat"
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> width="120" />
<template v-slot="scope"> <el-table-column prop="sort" label="排序" width="200"></el-table-column>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-table-column prop="status" label="状态" width="100">
v-hasPermi="['system:dept:update']">修改</el-button> <template v-slot="scope">
<el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)" <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
v-hasPermi="['system:dept:create']">新增</el-button> </template>
<el-button v-if="scope.row.parentId !== 0" size="mini" type="text" icon="el-icon-delete" </el-table-column>
@click="handleDelete(scope.row)" v-hasPermi="['system:dept:delete']">删除</el-button> <el-table-column
</template> label="创建时间"
</el-table-column> align="center"
</el-table> prop="createTime"
width="200">
<template v-slot="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width">
<template v-slot="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:dept:update']">
修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-plus"
@click="handleAdd(scope.row)"
v-hasPermi="['system:dept:create']">
新增
</el-button>
<el-button
v-if="scope.row.parentId !== 0"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:dept:delete']">
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 添加或修改部门对话框 --> <!-- 添加或修改部门对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="上级部门" prop="parentId"> <el-form-item label="上级部门" prop="parentId">
<treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" /> <treeselect
</el-form-item> v-model="form.parentId"
</el-col> :options="deptOptions"
<el-col :span="12"> :normalizer="normalizer"
<el-form-item label="部门名称" prop="name"> placeholder="选择上级部门" />
<el-input v-model="form.name" placeholder="请输入部门名称" /> </el-form-item>
</el-form-item> </el-col>
</el-col> <el-col :span="12">
<el-col :span="12"> <el-form-item label="部门名称" prop="name">
<el-form-item label="显示排序" prop="sort"> <el-input v-model="form.name" placeholder="请输入部门名称" />
<el-input-number v-model="form.sort" controls-position="right" :min="0" /> </el-form-item>
</el-form-item> </el-col>
</el-col> <el-col :span="12">
<el-col :span="12"> <el-form-item label="显示排序" prop="sort">
<el-form-item label="负责人" prop="leaderUserId"> <el-input-number
<el-select v-model="form.leaderUserId" placeholder="请输入负责人" clearable style="width: 100%"> v-model="form.sort"
<el-option v-for="item in users" :key="parseInt(item.id)" :label="item.nickname" :value="parseInt(item.id)" /> controls-position="right"
</el-select> :min="0" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="联系电话" prop="phone"> <el-form-item label="负责人" prop="leaderUserId">
<el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" /> <el-select
</el-form-item> v-model="form.leaderUserId"
</el-col> placeholder="请输入负责人"
<el-col :span="12"> clearable
<el-form-item label="邮箱" prop="email"> style="width: 100%">
<el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" /> <el-option
</el-form-item> v-for="item in users"
</el-col> :key="parseInt(item.id)"
<el-col :span="12"> :label="item.nickname"
<el-form-item label="部门状态" prop="status"> :value="parseInt(item.id)" />
<el-radio-group v-model="form.status"> </el-select>
<el-radio v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="parseInt(dict.value)"> </el-form-item>
{{dict.label}}</el-radio> </el-col>
</el-radio-group> <el-col :span="12">
</el-form-item> <el-form-item label="联系电话" prop="phone">
</el-col> <el-input
</el-row> v-model="form.phone"
</el-form> placeholder="请输入联系电话"
<div slot="footer" class="dialog-footer"> maxlength="11" />
<el-button type="primary" @click="submitForm"> </el-button> </el-form-item>
<el-button @click="cancel"> </el-button> </el-col>
</div> <el-col :span="12">
</el-dialog> <el-form-item label="邮箱" prop="email">
</div> <el-input
v-model="form.email"
placeholder="请输入邮箱"
maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="部门状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in statusDictDatas"
:key="parseInt(dict.value)"
:label="parseInt(dict.value)">
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template> </template>
<script> <script>
import { listDept, getDept, delDept, addDept, updateDept } from "@/api/system/dept"; import {
import Treeselect from "@riophae/vue-treeselect"; listDept,
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; getDept,
delDept,
addDept,
updateDept,
} from '@/api/system/dept';
import Treeselect from '@riophae/vue-treeselect';
import '@riophae/vue-treeselect/dist/vue-treeselect.css';
import {CommonStatusEnum} from '@/utils/constants' import { CommonStatusEnum } from '@/utils/constants';
import { getDictDatas, DICT_TYPE } from '@/utils/dict' import { getDictDatas, DICT_TYPE } from '@/utils/dict';
import {listSimpleUsers} from "@/api/system/user"; import { listSimpleUsers } from '@/api/system/user';
export default { export default {
name: "SystemDept", name: 'SystemDept',
components: { Treeselect }, components: { Treeselect },
data() { data() {
return { return {
// //
loading: true, loading: true,
// //
showSearch: true, showSearch: true,
// //
deptList: [], deptList: [],
// //
deptOptions: [], deptOptions: [],
// //
users: [], users: [],
// //
title: "", title: '',
// //
open: false, open: false,
// //
isExpandAll: true, isExpandAll: true,
// //
refreshTable: true, refreshTable: true,
// //
expand: false, expand: false,
// //
queryParams: { queryParams: {
name: undefined, name: undefined,
status: undefined status: undefined,
}, },
// //
form: {}, form: {},
// //
rules: { rules: {
name: [ name: [
{ required: true, message: "部门名称不能为空", trigger: "blur" } { required: true, message: '部门名称不能为空', trigger: 'blur' },
], ],
sort: [ sort: [
{ required: true, message: "显示排序不能为空", trigger: "blur" } { required: true, message: '显示排序不能为空', trigger: 'blur' },
], ],
email: [ email: [
{ {
type: "email", type: 'email',
message: "'请输入正确的邮箱地址", message: "'请输入正确的邮箱地址",
trigger: ["blur", "change"] trigger: ['blur', 'change'],
} },
], ],
phone: [ phone: [
{ {
pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/, pattern:
message: "请输入正确的手机号码", /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
trigger: "blur" message: '请输入正确的手机号码',
} trigger: 'blur',
], },
status: [ ],
{ required: true, message: "状态不能为空", trigger: "blur" } status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
] },
},
// //
CommonStatusEnum: CommonStatusEnum, CommonStatusEnum: CommonStatusEnum,
// //
statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS) statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
}; };
}, },
created() { created() {
this.getList(); this.getList();
// //
listSimpleUsers().then(response => { listSimpleUsers().then((response) => {
this.users = response.data; this.users = response.data;
}); });
}, },
methods: { methods: {
/** 查询部门列表 */ /** 查询部门列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listDept(this.queryParams).then(response => { listDept(this.queryParams).then((response) => {
this.deptList = this.handleTree(response.data, "id"); this.deptList = this.handleTree(response.data, 'id');
this.loading = false; this.loading = false;
}); });
}, },
/** 转换部门数据结构 */ /** 转换部门数据结构 */
normalizer(node) { normalizer(node) {
if (node.children && !node.children.length) { if (node.children && !node.children.length) {
delete node.children; delete node.children;
} }
return { return {
id: node.id, id: node.id,
label: node.name, label: node.name,
children: node.children children: node.children,
}; };
}, },
// //
userNicknameFormat(row, column) { userNicknameFormat(row, column) {
if (!row.leaderUserId) { if (!row.leaderUserId) {
return '未设置'; return '未设置';
} }
for (const user of this.users) { for (const user of this.users) {
if (row.leaderUserId === user.id) { if (row.leaderUserId === user.id) {
return user.nickname; return user.nickname;
} }
} }
return '未知【' + row.leaderUserId + '】'; return '未知【' + row.leaderUserId + '】';
}, },
// //
cancel() { cancel() {
this.open = false; this.open = false;
this.reset(); this.reset();
}, },
// //
reset() { reset() {
this.form = { this.form = {
id: undefined, id: undefined,
parentId: undefined, parentId: undefined,
name: undefined, name: undefined,
sort: undefined, sort: undefined,
leaderUserId: undefined, leaderUserId: undefined,
phone: undefined, phone: undefined,
email: undefined, email: undefined,
status: CommonStatusEnum.ENABLE, status: CommonStatusEnum.ENABLE,
}; };
this.resetForm("form"); this.resetForm('form');
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm('queryForm');
this.handleQuery(); this.handleQuery();
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd(row) { handleAdd(row) {
this.reset(); this.reset();
if (row !== undefined) { if (row !== undefined) {
this.form.parentId = row.id; this.form.parentId = row.id;
} }
this.open = true; this.open = true;
this.title = "添加部门"; this.title = '添加部门';
listDept().then(response => { listDept().then((response) => {
this.deptOptions = this.handleTree(response.data, "id"); this.deptOptions = this.handleTree(response.data, 'id');
}); });
}, },
/** 展开/折叠操作 */ /** 展开/折叠操作 */
toggleExpandAll() { toggleExpandAll() {
this.refreshTable = false; this.refreshTable = false;
this.isExpandAll = !this.isExpandAll; this.isExpandAll = !this.isExpandAll;
this.$nextTick(() => { this.$nextTick(() => {
this.refreshTable = true; this.refreshTable = true;
}); });
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
getDept(row.id).then(response => { getDept(row.id).then((response) => {
this.form = response.data; this.form = response.data;
if (this.form.parentId === 0) { // undefined Unknown if (this.form.parentId === 0) {
this.form.parentId = undefined; // undefined Unknown
} this.form.parentId = undefined;
this.open = true; }
this.title = "修改部门"; this.open = true;
}); this.title = '修改部门';
listDept(row.id).then(response => { });
this.deptOptions = this.handleTree(response.data, "id"); listDept(row.id).then((response) => {
}); this.deptOptions = this.handleTree(response.data, 'id');
}, });
/** 提交按钮 */ },
submitForm: function() { /** 提交按钮 */
this.$refs["form"].validate(valid => { submitForm: function () {
if (valid) { this.$refs['form'].validate((valid) => {
if (this.form.id !== undefined) { if (valid) {
updateDept(this.form).then(response => { if (this.form.id !== undefined) {
this.$modal.msgSuccess("修改成功"); updateDept(this.form).then((response) => {
this.open = false; this.$modal.msgSuccess('修改成功');
this.getList(); this.open = false;
}); this.getList();
} else { });
addDept(this.form).then(response => { } else {
this.$modal.msgSuccess("新增成功"); addDept(this.form).then((response) => {
this.open = false; this.$modal.msgSuccess('新增成功');
this.getList(); this.open = false;
}); this.getList();
} });
} }
}); }
}, });
/** 删除按钮操作 */ },
handleDelete(row) { /** 删除按钮操作 */
this.$modal.confirm('是否确认删除名称为"' + row.name + '"的数据项?').then(function() { handleDelete(row) {
return delDept(row.id); this.$modal
}).then(() => { .delConfirm(row.name)
this.getList(); .closeConfirm()
this.$modal.msgSuccess("删除成功"); .then(function () {
}).catch(() => {}); return delDept(row.id);
} })
} .then(() => {
this.getList();
this.$modal.msgSuccess('删除成功');
})
.catch(() => {});
},
},
}; };
</script> </script>