Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

no commit message

Browse Source
This commit is contained in:
西城念云 2020-01-09 17:12:53 +08:00
parent 16e1eb7955
commit 2053c3ab5d
7 changed files with 1519 additions and 682 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
ruoyi-ui/src/api/base/calendar.js Normal file
View File

@ -0,0 +1,53 @@
import request from '@/utils/request'
// 查询考勤日历列表
export function listCalendar(query) {
return request({
url: '/base/calendar/list',
method: 'get',
params: query
})
}
// 查询考勤日历详细
export function getCalendar(id) {
return request({
url: '/base/calendar/' + id,
method: 'get'
})
}
// 新增考勤日历
export function addCalendar(data) {
return request({
url: '/base/calendar',
method: 'post',
data: data
})
}
// 修改考勤日历
export function updateCalendar(data) {
return request({
url: '/base/calendar',
method: 'put',
data: data
})
}
// 删除考勤日历
export function delCalendar(id) {
return request({
url: '/base/calendar/' + id,
method: 'delete'
})
}
// 导出考勤日历
export function exportCalendar(query) {
return request({
url: '/base/calendar/export',
method: 'get',
params: query
})
}

53
ruoyi-ui/src/api/base/calendarItem.js Normal file
View File

@ -0,0 +1,53 @@
import request from '@/utils/request'
// 查询考勤日历明细列表
export function listCalendarItem(query) {
return request({
url: '/base/calendarItem/list',
method: 'get',
params: query
})
}
// 查询考勤日历明细详细
export function getCalendarItem(id) {
return request({
url: '/base/calendarItem/' + id,
method: 'get'
})
}
// 新增考勤日历明细
export function addCalendarItem(data) {
return request({
url: '/base/calendarItem',
method: 'post',
data: data
})
}
// 修改考勤日历明细
export function updateCalendarItem(data) {
return request({
url: '/base/calendarItem',
method: 'put',
data: data
})
}
// 删除考勤日历明细
export function delCalendarItem(id) {
return request({
url: '/base/calendarItem/' + id,
method: 'delete'
})
}
// 导出考勤日历明细
export function exportCalendarItem(query) {
return request({
url: '/base/calendarItem/export',
method: 'get',
params: query
})
}

395
ruoyi-ui/src/views/base/calendar/index.vue Normal file
View File

@ -0,0 +1,395 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
<el-form-item label="日历简称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入日历简称"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="enabled">
<el-select v-model="queryParams.enabled" placeholder="请选择状态" clearable size="small">
<el-option
v-for="dict in enabledOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['base:calendar:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['base:calendar:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['base:calendar:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['base:calendar:export']"
>导出</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" stripe border fit highlight-current-row :data="calendarList" @selection-change="handleSelectionChange" @sort-change='tableSortChange' @row-dblclick="handleUpdate">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="行号" width="80" align="center">
<template slot-scope="scope">{{scope.$index + 1}}</template>
</el-table-column>
<el-table-column label="UUID" align="center" prop="id" v-if = "false" />
<el-table-column label="日历代码" align="center" prop="codeid" sortable='custom' :sort-orders="['ascending', 'descending']" />
<el-table-column label="日历简称" align="center" prop="name" sortable='custom' :sort-orders="['ascending', 'descending']" />
<el-table-column label="状态" align="center" prop="enabled" :formatter="enabledFormat" />
<el-table-column label="备注" align="center" prop="remark" sortable='custom' :sort-orders="['ascending', 'descending']" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
type="primary"
icon="el-icon-plus"
size="small"
@click="handleAddCalendar(scope.row)"
v-hasPermi="['base:calendar:edit']"
>考勤</el-button>
<el-button
plain
size="small"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['base:calendar:edit']"
>修改</el-button>
<el-button
plain
size="small"
type="primary"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['base:calendar:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改考勤日历对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="日历代码" prop="codeid">
<el-input v-model="form.codeid" placeholder="请输入日历代码" />
</el-form-item>
<el-form-item label="日历简称" prop="name">
<el-input v-model="form.name" placeholder="请输入日历简称" />
</el-form-item>
<el-form-item label="状态">
<el-select v-model="form.enabled" placeholder="请选择状态">
<el-option
v-for="dict in enabledOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item>
</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>
<!-- 添加或修改日历对话框 -->
<el-dialog :title="calendar" :visible.sync="calendarOpen" width="800px" >
<el-calendar >
<template
slot="dateCell"
slot-scope="{date, data}">
<p :class="data.isSelected ? 'is-selected' : ''">
{{ data.day.split('-').slice(2).join('-') }} {{ data.isSelected ? '休息' : '上班'}}
</p>
</template>
</el-calendar>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitCalendarForm">确 定</el-button>
<el-button @click="cancelCalendar">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listCalendar, getCalendar, delCalendar, addCalendar, updateCalendar, exportCalendar } from "@/api/base/calendar";
import { listCalendarItem, getCalendarItem, addCalendarItem, updateCalendarItem } from "@/api/base/calendarItem";
export default {
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 总条数
total: 0,
// 考勤日历表格数据
calendarList: [],
// 弹出层标题
title: "",
// 弹出日历框标题
calendar: "",
// 是否显示弹出层
open: false,
// 是否显示弹出层
calendarOpen: false,
// 状态字典
enabledOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
orderByColumn: undefined,
isAsc: undefined,
name: undefined,
enabled: undefined,
},
// 日历表单参数
calendarForm: {
id: undefined,
parentId: undefined,
work: undefined,
workDay: undefined,
createBy: undefined,
createTime: undefined,
updateBy: undefined,
updateTime: undefined
},
// 表单参数
form: {},
// 表单校验
rules: {
codeid: [
{ required: true, message: "日历代码不能为空", trigger: "blur" }
],
name: [
{ required: true, message: "日历简称不能为空", trigger: "blur" }
],
enabled: [
{ required: true, message: "状态（0正常 1停用）不能为空", trigger: "blur" }
],
createBy: [
{ required: true, message: "创建者不能为空", trigger: "blur" }
],
createTime: [
{ required: true, message: "创建时间不能为空", trigger: "blur" }
],
}
};
},
created() {
this.getList();
this.getDicts("sys_enable").then(response => {
this.enabledOptions = response.data;
});
},
methods: {
/** 通用考勤日历排序 */
tableSortChange(column) {
this.queryParams.pageNum = 1;
if (column.order === 'descending') {
this.queryParams.orderByColumn = column.prop;
this.queryParams.isAsc = 'desc';
} else {
this.queryParams.orderByColumn = column.prop;
this.queryParams.isAsc = 'asc';
}
this.getList();
},
/** 查询考勤日历列表 */
getList() {
this.loading = true;
listCalendar(this.queryParams).then(response => {
this.calendarList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 状态字典翻译
enabledFormat(row, column) {
return this.selectDictLabel(this.enabledOptions, row.enabled);
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 日历取消按钮
cancelCalendar() {
this.calendarOpen = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: undefined,
codeid: undefined,
name: undefined,
enabled: undefined,
createBy: undefined,
createTime: undefined,
updateBy: undefined,
updateTime: undefined,
remark: undefined
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!=1
this.multiple = !selection.length
},
handleSelected(day) {
console.log(day);
},
/** 新增日历操作 */
handleAddCalendar(row) {
this.reset();
const id = row.id || this.ids;
getCalendarItem(id).then(response => {
this.calendarForm = response.data;
this.calendarOpen = true;
this.calendar = "考勤日历";
});
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加考勤日历";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getCalendar(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改考勤日历";
});
},
/** 提交按钮 */
submitForm: function() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != undefined) {
updateCalendar(this.form).then(response => {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
} else {
this.msgError(response.msg);
}
});
} else {
addCalendar(this.form).then(response => {
if (response.code === 200) {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
} else {
this.msgError(response.msg);
}
});
}
}
});
},
/** 提交日历明细按钮 */
submitCalendarForm: function() {
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm('是否确认删除考勤日历编号为"' + ids + '"的数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return delCalendar(ids);
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(function() {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有考勤日历数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return exportCalendar(queryParams);
}).then(response => {
this.download(response.msg);
}).catch(function() {});
}
}
};
</script>

308
ruoyi-ui/src/views/base/calendarItem/index.vue Normal file
View File

@ -0,0 +1,308 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['base:calendarItem:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['base:calendarItem:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['base:calendarItem:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['base:calendarItem:export']"
>导出</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" stripe border fit highlight-current-row :data="calendarItemList" @selection-change="handleSelectionChange" @sort-change='tableSortChange' @row-dblclick="handleUpdate">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="行号" width="80" align="center">
<template slot-scope="scope">{{scope.$index + 1}}</template>
</el-table-column>
<el-table-column label="UUID" align="center" prop="id" />
<el-table-column label="日历id" align="center" prop="parentId" sortable='custom' :sort-orders="['ascending', 'descending']" />
<el-table-column label="状态" align="center" prop="work" :formatter="workFormat" />
<el-table-column label="上班时间" align="center" prop="workDay" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.workDay) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
plain
size="small"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['base:calendarItem:edit']"
>修改</el-button>
<el-button
plain
size="small"
type="primary"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['base:calendarItem:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改考勤日历明细对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="日历id" prop="parentId">
<el-input v-model="form.parentId" placeholder="请输入日历id" />
</el-form-item>
<el-form-item label="状态" prop="work">
<el-input v-model="form.work" placeholder="请输入状态" />
</el-form-item>
<el-form-item label="上班时间" prop="workDay">
<el-date-picker clearable size="small" style="width: 200px"
v-model="form.workDay"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择上班时间">
</el-date-picker>
</el-form-item>
</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>
<script>
import { listCalendarItem, getCalendarItem, delCalendarItem, addCalendarItem, updateCalendarItem, exportCalendarItem } from "@/api/base/calendarItem";
export default {
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 总条数
total: 0,
// 考勤日历明细表格数据
calendarItemList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 状态字典
workOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
orderByColumn: undefined,
isAsc: undefined,
},
// 表单参数
form: {},
// 表单校验
rules: {
parentId: [
{ required: true, message: "日历id不能为空", trigger: "blur" }
], work: [
{ required: true, message: "状态（Y正常 N休息）不能为空", trigger: "blur" }
], workDay: [
{ required: true, message: "上班时间不能为空", trigger: "blur" }
], createBy: [
{ required: true, message: "创建者不能为空", trigger: "blur" }
], createTime: [
{ required: true, message: "创建时间不能为空", trigger: "blur" }
], }
};
},
created() {
this.getList();
this.getDicts("sys_yes_no").then(response => {
this.workOptions = response.data;
});
},
methods: {
/** 通用考勤日历明细排序 */
tableSortChange(column) {
this.queryParams.pageNum = 1;
if (column.order === 'descending') {
this.queryParams.orderByColumn = column.prop;
this.queryParams.isAsc = 'desc';
} else {
this.queryParams.orderByColumn = column.prop;
this.queryParams.isAsc = 'asc';
}
this.getList();
},
/** 查询考勤日历明细列表 */
getList() {
this.loading = true;
listCalendarItem(this.queryParams).then(response => {
this.calendarItemList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 状态字典翻译
workFormat(row, column) {
return this.selectDictLabel(this.workOptions, row.work);
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: undefined,
parentId: undefined,
work: undefined,
workDay: undefined,
createBy: undefined,
createTime: undefined,
updateBy: undefined,
updateTime: undefined
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!=1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加考勤日历明细";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getCalendarItem(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改考勤日历明细";
});
},
/** 提交按钮 */
submitForm: function() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != undefined) {
updateCalendarItem(this.form).then(response => {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
} else {
this.msgError(response.msg);
}
});
} else {
addCalendarItem(this.form).then(response => {
if (response.code === 200) {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
} else {
this.msgError(response.msg);
}
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm('是否确认删除考勤日历明细编号为"' + ids + '"的数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return delCalendarItem(ids);
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(function() {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有考勤日历明细数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return exportCalendarItem(queryParams);
}).then(response => {
this.download(response.msg);
}).catch(function() {});
}
}
};
</script>

64
ruoyi-ui/src/views/base/company/index.vue
View File

@ -84,7 +84,7 @@
</el-col>
</el-row>
<el-table v-loading="loading" stripe border fit highlight-current-row :data="companyList" @selection-change="handleSelectionChange" @sort-change='tableSortChange' @row-dblclick="rowdblclick">
<el-table v-loading="loading" stripe border fit highlight-current-row :data="companyList" @selection-change="handleSelectionChange" @sort-change='tableSortChange' @row-dblclick="handleUpdate">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="行号" width="80" align="center">
<template slot-scope="scope">{{scope.$index + 1}}</template>
@ -92,7 +92,7 @@
<el-table-column label="UUID" align="center" prop="id" v-if = "false" />
<el-table-column label="排序" align="center" prop="sort" sortable='custom' :sort-orders="['ascending', 'descending']" />
<el-table-column label="公司代码" align="center" prop="codeid" sortable='custom' :sort-orders="['ascending', 'descending']" />
<el-table-column label="公司简称" align="center" prop="name" sortable='custom' :sort-orders="['ascending', 'descending']" />
<el-table-column label="公司简称" align="center" prop="name" sortable='custom' :sort-orders="['ascending', 'descending']" />
<el-table-column label="状态" align="center">
<template slot-scope="scope">
<el-switch
@ -104,18 +104,27 @@
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" width="300">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
type="primary"
icon="el-icon-plus"
size="small"
@click="handleAddCalendar(scope.row)"
v-hasPermi="['base:company:add']"
>考勤</el-button>
<el-button
plain
size="small"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['base:company:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
plain
size="small"
type="primary"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['base:company:remove']"
@ -160,6 +169,16 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 添加或修改日历对话框 -->
<el-dialog :title="calendar" :visible.sync="copen" width="800px" >
<el-calendar >
</el-calendar>
<div slot="footer" class="dialog-footer">
<el-button type="primary" >确 定</el-button>
<el-button @click="cancelcalendar">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
@ -177,6 +196,8 @@ export default {
single: true,
// 非多个禁用
multiple: true,
// 弹出日历框标题
calendar: "",
// 总条数
total: 0,
// 公司管理表格数据
@ -185,6 +206,8 @@ export default {
title: "",
// 是否显示弹出层
open: false,
// 是否显示弹出层(日历)
copen: false,
// 状态字典
enabledOptions: [],
// 查询参数
@ -224,16 +247,6 @@ export default {
});
},
methods: {
// 双击行编辑
rowdblclick(row) {
this.reset();
const id = row.id || this.ids
getCompany(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改公司管理";
});
},
/** 公司管理排序 */
tableSortChange(column) {
this.queryParams.pageNum = 1;
@ -256,7 +269,7 @@ export default {
});
},
// 状态字典翻译
enabledFormat(row, column) {
enabledFormat(row) {
return this.selectDictLabel(this.enabledOptions, row.enabled);
},
// 取消按钮
@ -264,6 +277,11 @@ export default {
this.open = false;
this.reset();
},
// 取消按钮
cancelcalendar() {
this.copen = false;
this.reset();
},
// 用户状态修改
handleStatusChange(row) {
let text = row.enabled === "0" ? "启用" : "停用";
@ -311,6 +329,16 @@ export default {
this.single = selection.length!=1
this.multiple = !selection.length
},
/** 新增日历操作 */
handleAddCalendar(row) {
this.reset();
const id = row.id || this.ids
getCompany(id).then(response => {
this.form = response.data;
this.copen = true;
this.calendar = "考勤日历";
});
},
/** 新增按钮操作 */
handleAdd() {
this.reset();

1326
ruoyi-ui/src/views/system/user/index.vue
View File

File diff suppressed because it is too large Load Diff

2
ruoyi-ui/vue.config.js
View File

@ -17,7 +17,7 @@ module.exports = {
// 部署生产环境和开发环境下的URL。
// 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
// 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
publicPath: process.env.NODE_ENV === "production" ? "./" : "/",
// 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
outputDir: 'dist',
// 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）