Skip to content

A
attendance-performance-platform
Commit 767f6e95 authored by dll's avatar dll
Browse files
Options

'提交'

parent dddd0bca
Expand all Show whitespace changes
Inline Side-by-side
Showing with 460 additions and 294 deletions
attendance-performance-manager-ui/admin/src/router.js
View file @ 767f6e95
...@@ -21,7 +21,6 @@ const router = new Router({ ...@@ -21,7 +21,6 @@ const router = new Router({
builder('/authentication', 'login/authentication'), builder('/authentication', 'login/authentication'),
builder('/login', 'login/login'), builder('/login', 'login/login'),
builder('/sso', 'SSO'), builder('/sso', 'SSO'),
{ {
path: '/', path: '/',
name: 'layout', name: 'layout',
...@@ -38,6 +37,7 @@ const router = new Router({ ...@@ -38,6 +37,7 @@ const router = new Router({
...restBuilder('user', 'system/user'), // 用户管理 -- 管理用户 ...restBuilder('user', 'system/user'), // 用户管理 -- 管理用户
...restBuilder('param', 'system/param'), // 系统管理--参数管理 ...restBuilder('param', 'system/param'), // 系统管理--参数管理
...restBuilder('task', 'system/task'), // 系统管理--任务管理 ...restBuilder('task', 'system/task'), // 系统管理--任务管理
//部门 //部门
...restBuilder('dept', 'dept'),//部门 ...restBuilder('dept', 'dept'),//部门
...restBuilder('staff', 'staff'),//花名册 员工信息 ...restBuilder('staff', 'staff'),//花名册 员工信息
...@@ -64,6 +64,8 @@ const router = new Router({ ...@@ -64,6 +64,8 @@ const router = new Router({
...restBuilder('attendance/leave/record', 'attendance/leave/record'),// 请假记录信息 ...restBuilder('attendance/leave/record', 'attendance/leave/record'),// 请假记录信息
...restBuilder('attendance/vacation/balance', 'attendance/vacation/balance'),// 员工假期余额信息 ...restBuilder('attendance/vacation/balance', 'attendance/vacation/balance'),// 员工假期余额信息
// 绩效负责人
...restBuilder('attendance/group/responsible','attendance/group/responsible'),
//以下为基础路由配置 //以下为基础路由配置
builder('blank', 'blank'), builder('blank', 'blank'),
......
attendance-performance-manager-ui/admin/src/views/attendance/class/list.vue
View file @ 767f6e95
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
name: "AttendanceClassList", name: "AttendanceClassList",
components: { components: {
dialogShow dialogShow
}, },
mixins: [table], mixins: [table],
created() { created() {
}, },
...@@ -64,34 +64,41 @@ ...@@ -64,34 +64,41 @@
{prop:"className",label:"班次名称",width:100} ], {prop:"className",label:"班次名称",width:100} ],
config: { config: {
search: [ search: [
{
name: "className",
type: "text",
label: "班次名称",
fuzzy: true
}
], ],
isshowTabPane:true, isshowTabPane:true,
columns: [ columns: [
{type: "selection", width: 60}, {type: "selection", width: 60},
{type: "index",label: "序号",width: 50}, {type: "index",label: "序号",width: 50},
{label: "创建用户", prop: "createUserId", formatter: this.formatter}, {label: "班次名称", prop: "className"},
{label: "考勤班次详细信息", {label: "考勤时间", prop: "className"},
width: 120, // {label: "考勤班次详细信息",
prop: "subColumns", // width: 120,
formatter: (row) => { // prop: "subColumns",
let widthsize = this.columnSet.reduce((pre, cur) => { // formatter: (row) => {
return pre + Number(cur.width); // let widthsize = this.columnSet.reduce((pre, cur) => {
}, 50); // return pre + Number(cur.width);
return ( // }, 50);
<el-popover placement="right" width={widthsize} trigger="click"> // return (
{this.renderTable(row.attendanceClassDetailList)} // <el-popover placement="right" width={widthsize} trigger="click">
<el-button type="text" slot="reference">详细</el-button> // {this.renderTable(row.attendanceClassDetailList)}
</el-popover> // <el-button type="text" slot="reference">详细</el-button>
); // </el-popover>
}, // );
}, // },
// },
{ {
label: "操作", label: "操作",
width: 240, width: 240,
formatter: row => { formatter: row => {
return ( return (
<table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} /> <table-buttons noAdd noView row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
); );
} }
} }
......
attendance-performance-manager-ui/admin/src/views/attendance/group/responsible/list.vue
View file @ 767f6e95
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
data() { data() {
return { return {
config: { config: {
isshowTabPane:true,
search: [ search: [
{ {
name: "responsibleName", name: "responsibleName",
......
attendance-performance-manager-ui/admin/src/views/attendance/leave/record/list.vue
View file @ 767f6e95
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" :config="tableConfig"></LayoutTable> <LayoutTable :data="tableData" :config="tableConfig" notDel>
<el-button type="primary" @click="doExport" :disabled="isExport"
size="mini" slot="table-head-left2">导出</el-button>
</LayoutTable>
<drawer-show ref="drawerform" @ok="getData" /> <drawer-show ref="drawerform" @ok="getData" />
</div> </div>
</template> </template>
...@@ -32,17 +33,27 @@ ...@@ -32,17 +33,27 @@
toView(row) { toView(row) {
this.$refs.drawerform.view(row); this.$refs.drawerform.view(row);
}, },
doExport(){
this.isExport = true;
this.$download("/leave/record/exportExcel", {
"idList": this.selection,
'name': this.$route.query['name'],
}, { type: "excel" }).then(() => this.isExport = false).catch(error => {
this.isExport = false;
this.$message.error(error.message);
})
},
}, },
data() { data() {
return { return {
isExport:false,
config: { config: {
isshowTabPane:true, isshowTabPane:true,
search: [ search: [
{ {
name: "leavePersonId", name: "leavePerson",
type: "text", type: "text",
label: "请假人id", label: "请假人",
fuzzy: true fuzzy: true
}, },
{ {
...@@ -51,6 +62,12 @@ ...@@ -51,6 +62,12 @@
label: "电话号码", label: "电话号码",
fuzzy: true fuzzy: true
}, },
{
name: "leaveType",
type: "select",
label: "全部部门",
fuzzy: true
},
{ {
name: "leaveType", name: "leaveType",
type: "select", type: "select",
......
attendance-performance-manager-ui/admin/src/views/attendance/vacation/balance/drawershow.vue
View file @ 767f6e95
<template> <template>
<!-- 弹出框表单 --> <!-- 弹出框表单 -->
<el-drawer <el-drawer
:title="title" title="假期使用记录"
:visible.sync="open" :visible.sync="open"
:direction="direction" :direction="direction"
size="50%"> size="50%">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <div class="mt20">
<span>当前假期余额：20天</span>
<el-tag type="success" size="mini">修改余额</el-tag>
</div>
<div class="mt20">
<el-steps direction="vertical" :active="1">
<el-step title="步骤 1"></el-step>
<el-step title="步骤 2"></el-step>
<el-step title="步骤 3" description="这是一段很长很长很长的描述性文字"></el-step>
</el-steps>
</div>
<div class="tips mt20">
当前病假规则：每年1月1日自动发放 30天
</div>
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<Field label="员工id" prop="staffId" v-model="form.staffId" placeholder="请输入员工id"/> <Field label="员工id" prop="staffId" v-model="form.staffId" placeholder="请输入员工id"/>
<Field label="员工姓名" prop="staffName" v-model="form.staffName" type="textarea" placeholder="请输入员工姓名"/> <Field label="员工姓名" prop="staffName" v-model="form.staffName" type="textarea" placeholder="请输入员工姓名"/>
...@@ -18,12 +32,12 @@ ...@@ -18,12 +32,12 @@
<Field label="年假" prop="annualLeaveDays" v-model="form.annualLeaveDays" placeholder="请输入年假"/> <Field label="年假" prop="annualLeaveDays" v-model="form.annualLeaveDays" placeholder="请输入年假"/>
<Field label="婚假" prop="marriageLeaveDays" v-model="form.marriageLeaveDays" placeholder="请输入婚假"/> <Field label="婚假" prop="marriageLeaveDays" v-model="form.marriageLeaveDays" placeholder="请输入婚假"/>
<Field label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/> <Field label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/>
</el-row> </el-row>
<form-buttons @submit='submitForm' noCancelBtn /> <form-buttons @submit='submitForm' noCancelBtn />
</el-form> </el-form> -->
<div>
</div>
</el-drawer> </el-drawer>
</template> </template>
...@@ -124,3 +138,9 @@ ...@@ -124,3 +138,9 @@
}, },
}; };
</script> </script>
<style scoped>
.tips{
font-size: 14px;
color: #999;
}
</style>
attendance-performance-manager-ui/admin/src/views/attendance/vacation/balance/list.vue
View file @ 767f6e95
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" :config="tableConfig"> <LayoutTable :data="tableData" :config="tableConfig" notAdd notDel>
<el-button type="primary" @click="doExport" :disabled="isExport"
size="mini" slot="table-head-left2">导出</el-button>
</LayoutTable> </LayoutTable>
<drawer-show ref="drawerform" @ok="getData" /> <drawer-show ref="drawerform" @ok="getData" />
</div> </div>
</template> </template>
...@@ -33,58 +33,33 @@ ...@@ -33,58 +33,33 @@
toView(row) { toView(row) {
this.$refs.drawerform.view(row); this.$refs.drawerform.view(row);
}, },
doExport(){
this.isExport = true;
this.$download("/leave/record/exportExcel", {
"idList": this.selection,
'name': this.$route.query['name'],
}, { type: "excel" }).then(() => this.isExport = false).catch(error => {
this.isExport = false;
this.$message.error(error.message);
})
},
}, },
data() { data() {
return { return {
isExport:false,
config: { config: {
isshowTabPane:true,
search: [ search: [
{ {
name: "staffId", name: "staffId",
type: "text", type: "text",
label: "员工id", label: "员工",
fuzzy: true fuzzy: true
}, },
{ {
name: "deptId", name: "deptId",
type: "text", type: "select",
label: "部门id", label: "全部部门",
fuzzy: true
},
{
name: "entryTime",
type: "date",
label: "入职时间",
fuzzy: true
},
{
name: "personalLeaveDays",
type: "text",
label: "事假",
fuzzy: true
},
{
name: "compensatedLeaveDays",
type: "text",
label: "调休",
fuzzy: true
},
{
name: "sickLeaveDays",
type: "text",
label: "病假",
fuzzy: true
},
{
name: "annualLeaveDays",
type: "text",
label: "年假",
fuzzy: true
},
{
name: "marriageLeaveDays",
type: "text",
label: "婚假",
fuzzy: true fuzzy: true
}, },
], ],
...@@ -92,33 +67,34 @@ ...@@ -92,33 +67,34 @@
{type: "selection", width: 60}, {type: "selection", width: 60},
{type: "index",label: "序号",width: 50}, {type: "index",label: "序号",width: 50},
{label: "员工id", prop: "staffId", formatter: this.formatter}, // {label: "员工id", prop: "staffId", formatter: this.formatter},
{label: "员工姓名", prop: "staffName"}, {label: "员工姓名", prop: "staffName"},
{label: "部门id", prop: "deptId", formatter: this.formatter}, // {label: "部门id", prop: "deptId", formatter: this.formatter},
{label: "部门名称", prop: "deptName"}, {label: "部门名称", prop: "deptName"},
{label: "入职时间", prop: "entryTime", formatter: this.formatterDate}, {label: "入职时间", prop: "entryTime", formatter: this.formatterDate},
{label: "事假", prop: "personalLeaveDays", formatter: this.formatterMoney}, {label: "事假（天）", prop: "personalLeaveDays", formatter: this.formatterMoney},
{label: "调休", prop: "compensatedLeaveDays", formatter: this.formatterMoney}, {label: "调休（天）", prop: "compensatedLeaveDays", formatter: this.formatterMoney},
{label: "病假", prop: "sickLeaveDays", formatter: this.formatterMoney}, {label: "病假（天）", prop: "sickLeaveDays", formatter: this.formatterMoney},
{label: "年假", prop: "annualLeaveDays", formatter: this.formatterMoney}, {label: "年假（天）", prop: "annualLeaveDays", formatter: this.formatterMoney},
{label: "婚假", prop: "marriageLeaveDays", formatter: this.formatterMoney}, {label: "婚假（tian)", prop: "marriageLeaveDays", formatter: this.formatterMoney},
{label: "创建用户", prop: "createUserId", formatter: this.formatter}, // {label: "创建用户", prop: "createUserId", formatter: this.formatter},
{ {
label: "操作", label: "操作",
width: 240, width: 240,
formatter: row => { formatter: row => {
return ( return (
<table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} /> <table-buttons noAdd noEdit noView noDel row={row}
onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
); );
} }
} }
......
attendance-performance-manager-ui/admin/src/views/dept/list.vue
View file @ 767f6e95
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
// {label: "祖级列表", prop: "ancestors"}, // {label: "祖级列表", prop: "ancestors"},
{label: "部门名称", prop: "deptName"}, {label: "部门名称", prop: "deptName"},
{label: "成员数量", prop: "deptName"}, {label: "成员数量", prop: "deptName"},
{label: "负责人", prop: "deptName"}, {label: "负责人", prop: "workName"},
// {label: "部门状态", prop: "deptStatus",formatter: this.formatter}, // {label: "部门状态", prop: "deptStatus",formatter: this.formatter},
......
attendance-performance-manager-ui/admin/src/views/staff/drawershow.vue
View file @ 767f6e95
...@@ -24,12 +24,8 @@ ...@@ -24,12 +24,8 @@
<Field label="所属部门" prop="deptName" v-model="form.deptName" placeholder="请选择所属部门" @focus="ishowBumen = true"/> <Field label="所属部门" prop="deptName" v-model="form.deptName" placeholder="请选择所属部门" @focus="ishowBumen = true"/>
<!-- <Field label="职位" prop="positionId" v-model="form.positionId" :enumData="dict.politicalstatus" type="select" placeholder="请选择职位" /> --> <Field label="职位" prop="positionId" v-model="form.positionId" :enumData="dict.positionId" type="select" placeholder="请选择职位" />
<el-form-item label="职位" prop="positionId">
<el-select v-model="form.positionId" placeholder="请选择职位">
<el-option></el-option>
</el-select>
</el-form-item>
<Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/> <Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/>
<!-- <Field label="是否在政务大厅" prop="positionId" v-model="form.positionId" placeholder="请选择" type="select"/> --> <!-- <Field label="是否在政务大厅" prop="positionId" v-model="form.positionId" placeholder="请选择" type="select"/> -->
......
attendance-performance-manager-ui/admin/src/views/system/log/list.vue
View file @ 767f6e95
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" notAdd notDel :config="tableConfig" /> <LayoutTable :data="tableData" notSearch notAdd notDel :config="tableConfig" />
</div> </div>
</template> </template>
...@@ -13,17 +13,18 @@ export default { ...@@ -13,17 +13,18 @@ export default {
data() { data() {
return { return {
config: { config: {
isshowTabPane:true,
search: [ search: [
{ // {
name: "loginName", // name: "loginName",
type: "text", // type: "text",
label: "登录名", // label: "登录名",
}, // },
{ // {
name: "requestUrl", // name: "requestUrl",
type: "text", // type: "text",
label: "请求地址", // label: "请求地址",
}, // },
], ],
columns: [ columns: [
{ type: "index", label: "序号",align:"center", width: 50 }, { type: "index", label: "序号",align:"center", width: 50 },
...@@ -33,13 +34,27 @@ export default { ...@@ -33,13 +34,27 @@ export default {
label: "用户名称", label: "用户名称",
align: "center", align: "center",
}, },
{
prop: "logDate",
label: "操作日期",
align: "center",
formatter: this.formatterDate,
},
{ {
prop: "loginName", prop: "loginName",
label: "用户登录名", label: "用户登录名",
align: "center", align: "center",
}, },
{
prop: "loginName",
label: "日志类型",
align: "center",
},
{
prop: "loginName",
label: "操作类型",
align: "center",
},
{ {
prop: "requestUrl", prop: "requestUrl",
label: "请求地址", label: "请求地址",
...@@ -57,13 +72,6 @@ export default { ...@@ -57,13 +72,6 @@ export default {
label: "操作IP地址", label: "操作IP地址",
align: "center", align: "center",
}, },
{
prop: "logDate",
label: "操作时间",
align: "center",
formatter: this.formatterDate,
},
], ],
}, },
}; };
......
attendance-performance-manager-ui/admin/src/views/system/menu/list.vue
View file @ 767f6e95
...@@ -114,6 +114,7 @@ export default { ...@@ -114,6 +114,7 @@ export default {
data() { data() {
return { return {
config: { config: {
isshowTabPane:true,
/** 树表是否默认展开 */ /** 树表是否默认展开 */
expand: false, expand: false,
showType: "treetable", showType: "treetable",
......
attendance-performance-manager-ui/admin/src/views/system/role/list.vue
View file @ 767f6e95
...@@ -439,6 +439,7 @@ export default { ...@@ -439,6 +439,7 @@ export default {
form: this.initForm(), form: this.initForm(),
}, },
config: { config: {
isshowTabPane:true,
search: [ search: [
{ {
name: "name", name: "name",
......
attendance-performance-manager-ui/admin/src/views/system/user/list.vue
View file @ 767f6e95
...@@ -276,6 +276,7 @@ export default { ...@@ -276,6 +276,7 @@ export default {
visible: false, visible: false,
}, },
config: { config: {
isshowTabPane:true,
columns: [ columns: [
{ type: "selection",reserveSelection:true, width: 60 }, { type: "selection",reserveSelection:true, width: 60 },
{ type: "index", label: "序号",align:"center", width: 50 }, { type: "index", label: "序号",align:"center", width: 50 },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment