Skip to content

A
attendance-performance-platform
Commit 6782c2eb authored by 赵啸非's avatar 赵啸非
Browse files
Options

绩效核查

parent 4b5f92de
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6776 additions and 6962 deletions
attendance-performance-manager-ui/admin/src/views/check/attend/record/drawershow.vue
View file @ 6782c2eb
...@@ -13,27 +13,26 @@ ...@@ -13,27 +13,26 @@
<Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/> <Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/>
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/> <Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/> <Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
<Field label="职位ID" prop="positionId" v-model="form.positionId" placeholder="请输入职位ID"/>
<Field label="职位名称" prop="positionName" v-model="form.positionName" placeholder="请输入职位名称"/>
<Field label="所属考勤组ID" prop="attendanceGroupId" v-model="form.attendanceGroupId" placeholder="请输入所属考勤组ID"/> <Field label="所属考勤组ID" prop="attendanceGroupId" v-model="form.attendanceGroupId" placeholder="请输入所属考勤组ID"/>
<Field label="所属考勤组名称" prop="attendanceGroupName" v-model="form.attendanceGroupName" placeholder="请输入所属考勤组名称"/> <Field label="所属考勤组名称" prop="attendanceGroupName" v-model="form.attendanceGroupName" placeholder="请输入所属考勤组名称"/>
<Field label="班次ID" prop="shiftsId" v-model="form.shiftsId" placeholder="请输入班次ID"/>
<Field label="班次名称" prop="shiftsName" v-model="form.shiftsName" placeholder="请输入班次名称"/>
<Field label="考勤时间" prop="attendanceDate" v-model="form.attendanceDate" type="date" /> <Field label="考勤时间" prop="attendanceDate" v-model="form.attendanceDate" type="date" />
<Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/> <Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/>
<Field label="规则名称" prop="ruleName" v-model="form.ruleName" placeholder="请输入规则名称"/> <Field label="规则名称" prop="ruleName" v-model="form.ruleName" placeholder="请输入规则名称"/>
<Field label="增减类型" prop="subAddType" v-model="form.subAddType" type="select" :enumData="dict.subAddType" placeholder="请选择增减类型"/> <Field label="增减类型" prop="subAddType" v-model="form.subAddType" type="select" :enumData="dict.subAddType" placeholder="请选择增减类型"/>
<Field label="扣分或增加分值" prop="score" v-model="form.score" placeholder="请输入扣分或增加分值"/> <Field label="扣分或增加分值" prop="score" v-model="form.score" placeholder="请输入扣分或增加分值"/>
<Field label="上下班时间" prop="goOffTime" v-model="form.goOffTime" type="date" /> <Field label="上下班时间" prop="goOffTimeStr" v-model="form.goOffTimeStr" placeholder="请输入上下班时间"/>
<Field label="异常时间" prop="errorTime" v-model="form.errorTime" type="date" /> <Field label="异常时间" prop="errorTime" v-model="form.errorTime" type="date" />
<Field label="实际打卡时间" prop="actualAttendTime" v-model="form.actualAttendTime" type="date" /> <Field label="实际打卡时间" prop="actualAttendTime" v-model="form.actualAttendTime" type="date" />
<Field label="异常处理结果" prop="errorResult" v-model="form.errorResult" placeholder="请输入异常处理结果"/> <Field label="异常处理结果" prop="errorResult" v-model="form.errorResult" placeholder="请输入异常处理结果"/>
<Field label="核查人员" prop="checkPerson" v-model="form.checkPerson" placeholder="请输入核查人员"/>
<Field label="核查时间" prop="checkTime" v-model="form.checkTime" type="date" />
<Field label="核查说明" prop="checkDesc" v-model="form.checkDesc" type="textarea" placeholder="请输入核查说明"/>
<Field label="核查结果" prop="checkResult" v-model="form.checkResult" placeholder="请输入核查结果"/>
<Field label="处理状态" prop="checkStatus" v-model="form.checkStatus" type="select" :enumData="dict.checkStatus" placeholder="请选择处理状态"/> <Field label="处理状态" prop="checkStatus" v-model="form.checkStatus" type="select" :enumData="dict.checkStatus" 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' v-if="pageInfo.type!='view'" noCancelBtn />
</el-form> </el-form>
</el-drawer> </el-drawer>
...@@ -65,9 +64,9 @@ ...@@ -65,9 +64,9 @@
], ],
toDate:[ toDate:[
"attendanceDate", "attendanceDate",
"goOffTime",
"errorTime", "errorTime",
"actualAttendTime", "actualAttendTime",
"checkTime",
], ],
// 表单校验 // 表单校验
rules: { rules: {
...@@ -132,23 +131,22 @@ ...@@ -132,23 +131,22 @@
workNum : "", workNum : "",
deptId : null, deptId : null,
deptName : "", deptName : "",
positionId : null,
positionName : "",
attendanceGroupId : null, attendanceGroupId : null,
attendanceGroupName : "", attendanceGroupName : "",
shiftsId : null,
shiftsName : "",
attendanceDate : null, attendanceDate : null,
ruleId : null, ruleId : null,
ruleName : "", ruleName : "",
subAddType : 1, subAddType : 1,
score : 0.00, score : 0.00,
goOffTime : null, goOffTimeStr : "",
errorTime : null, errorTime : null,
actualAttendTime : null, actualAttendTime : null,
errorResult : "", errorResult : "",
checkPerson : "",
checkTime : null,
checkDesc : "",
checkResult : "",
checkStatus : 1, checkStatus : 1,
remark : "",
}; };
this.resetForm("form"); this.resetForm("form");
}, },
......
attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue
View file @ 6782c2eb
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" notAdd notDel :config="tableConfig"> <LayoutTable :data="tableData" :config="tableConfig">
<el-button <el-button
slot="table-head-left2" slot="table-head-left2"
style="margin-left: 10px" style="margin-left: 10px"
...@@ -123,10 +124,6 @@ ...@@ -123,10 +124,6 @@
toView(row) { toView(row) {
this.$refs.drawerform.view(row); this.$refs.drawerform.view(row);
}, },
toProcess(row) {
//todo
this.$refs.drawerform.edit(row);
},
}, },
data() { data() {
...@@ -142,36 +139,12 @@ ...@@ -142,36 +139,12 @@
// 是否更新已经存在的数据 // 是否更新已经存在的数据
updateSupport: 0, updateSupport: 0,
// 上传的地址 // 上传的地址
url: "/attendance/check/attend/record/importData", url: "/m/check/attend/record/importData",
}, },
isExport: false, isExport: false,
config: { config: {
isshowTabPane:true, isshowTabPane:true,
search: [ search: [
{
name: "checkStatus",
type: "select",
},
{
name: "deptId",
type: "select",
},
{
name: "checkTime",
type: "date",
label: "核查时间"
},
{
name: "staffName",
type: "text",
label: "员工名称",
fuzzy: true
},
], ],
columns: [ columns: [
{type: "selection", width: 60}, {type: "selection", width: 60},
...@@ -179,44 +152,44 @@ ...@@ -179,44 +152,44 @@
{label: "员工姓名", prop: "staffName"}, {label: "员工姓名", prop: "staffName"},
{label: "工号", prop: "workNum"},
{label: "所属部门名称", prop: "deptName"},
{label: "所属考勤组名称", prop: "attendanceGroupName"},
{label: "考勤时间", prop: "attendanceDate", formatter: this.formatterDate}, {label: "考勤时间", prop: "attendanceDate", formatter: this.formatterDate},
{label: "规则名称", prop: "ruleName"},
{label: "增减类型", prop: "subAddType",formatter: this.formatter}, {label: "增减类型", prop: "subAddType",formatter: this.formatter},
{label: "扣分或增加分值", prop: "score", formatter: this.formatter}, {label: "扣分或增加分值",fixed:"right", prop: "score", formatter: this.formatter},
{label: "上下班时间", prop: "goOffTime", formatter: this.formatterDate}, {label: "上下班时间", prop: "goOffTimeStr"},
{label: "异常时间", prop: "errorTime", formatter: this.formatterDate}, {label: "异常时间", prop: "errorTime", formatter: this.formatterDate},
{label: "实际打卡时间", prop: "actualAttendTime", formatter: this.formatterDate}, {label: "实际打卡时间", prop: "actualAttendTime", formatter: this.formatterDate},
{label: "处理状态", prop: "checkStatus",formatter: this.formatter}, {label: "异常处理结果", prop: "errorResult"},
{label: "核查时间", prop: "checkTime", formatter: this.formatterDate},
{label: "核查说明", prop: "checkDesc"},
{label: "核查结果", prop: "checkResult"},
{label: "处理状态",fixed:"right", prop: "checkStatus",formatter: this.formatter},
{label: "创建用户", prop: "createUserId", formatter: this.formatter}, {label: "创建用户", prop: "createUserId", formatter: this.formatter},
{ {
label: "操作", label: "操作",
fixed:"right",
width: 240, width: 240,
formatter: row => { formatter: row => {
return ( return (
<div> <table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
<table-buttons noAdd noEdit noDel row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
<span> </span>
{row.deviceStatus === 0 ? (
<el-button
size="mini"
type="text"
icon="el-icon-open"
onClick={() => {
this.toProcess(row);
}}
>
处理
</el-button>
) : (
""
)}
</div>
); );
} }
} }
......
attendance-performance-manager-ui/admin/src/views/check/attend/record/view.vue
View file @ 6782c2eb
...@@ -26,24 +26,12 @@ ...@@ -26,24 +26,12 @@
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}} {{form.deptName}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="职位ID" label-class-name="labelClass" content-class-name="contentClass">
{{form.positionId}}
</el-descriptions-item>
<el-descriptions-item label="职位名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.positionName}}
</el-descriptions-item>
<el-descriptions-item label="所属考勤组ID" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="所属考勤组ID" label-class-name="labelClass" content-class-name="contentClass">
{{form.attendanceGroupId}} {{form.attendanceGroupId}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所属考勤组名称" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="所属考勤组名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.attendanceGroupName}} {{form.attendanceGroupName}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="班次ID" label-class-name="labelClass" content-class-name="contentClass">
{{form.shiftsId}}
</el-descriptions-item>
<el-descriptions-item label="班次名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.shiftsName}}
</el-descriptions-item>
<el-descriptions-item label="考勤时间" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="考勤时间" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatterDate(form.attendanceDate)}} {{ util_formatterDate(form.attendanceDate)}}
</el-descriptions-item> </el-descriptions-item>
...@@ -60,7 +48,7 @@ ...@@ -60,7 +48,7 @@
{{form.score}} {{form.score}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="上下班时间" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="上下班时间" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatterDate(form.goOffTime)}} {{form.goOffTimeStr}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="异常时间" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="异常时间" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatterDate(form.errorTime)}} {{ util_formatterDate(form.errorTime)}}
...@@ -71,12 +59,21 @@ ...@@ -71,12 +59,21 @@
<el-descriptions-item label="异常处理结果" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="异常处理结果" label-class-name="labelClass" content-class-name="contentClass">
{{form.errorResult}} {{form.errorResult}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="核查人员" label-class-name="labelClass" content-class-name="contentClass">
{{form.checkPerson}}
</el-descriptions-item>
<el-descriptions-item label="核查时间" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatterDate(form.checkTime)}}
</el-descriptions-item>
<el-descriptions-item label="核查说明" label-class-name="labelClass" content-class-name="contentClass">
{{form.checkDesc}}
</el-descriptions-item>
<el-descriptions-item label="核查结果" label-class-name="labelClass" content-class-name="contentClass">
{{form.checkResult}}
</el-descriptions-item>
<el-descriptions-item label="处理状态" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="处理状态" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("checkStatus", form.checkStatus) }} {{ util_formatters("checkStatus", form.checkStatus) }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="备注" label-class-name="labelClass" content-class-name="contentClass">
{{form.remark}}
</el-descriptions-item>
</el-descriptions> </el-descriptions>
</layout-view> </layout-view>
......
attendance-performance-manager-ui/admin/src/views/check/complain/record/drawershow.vue
View file @ 6782c2eb
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
<Field label="员工姓名" prop="staffName" v-model="form.staffName" placeholder="请输入员工姓名"/> <Field label="员工姓名" prop="staffName" v-model="form.staffName" placeholder="请输入员工姓名"/>
<Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/> <Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/>
<Field label="窗口编号" prop="windowNum" v-model="form.windowNum" placeholder="请输入窗口编号"/> <Field label="窗口编号" prop="windowNum" v-model="form.windowNum" placeholder="请输入窗口编号"/>
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
<Field label="投诉标题" prop="complainTitle" v-model="form.complainTitle" placeholder="请输入投诉标题"/> <Field label="投诉标题" prop="complainTitle" v-model="form.complainTitle" placeholder="请输入投诉标题"/>
<Field label="投诉内容"><editor v-model="form.complainContent" :min-height="256"/></Field> <Field label="投诉内容"><editor v-model="form.complainContent" :min-height="256"/></Field>
<Field label="投诉人真实姓名" prop="complainRealName" v-model="form.complainRealName" placeholder="请输入投诉人真实姓名"/> <Field label="投诉人真实姓名" prop="complainRealName" v-model="form.complainRealName" placeholder="请输入投诉人真实姓名"/>
...@@ -21,8 +23,6 @@ ...@@ -21,8 +23,6 @@
<Field label="投诉设备" prop="complainDevice" v-model="form.complainDevice" placeholder="请输入投诉设备"/> <Field label="投诉设备" prop="complainDevice" v-model="form.complainDevice" placeholder="请输入投诉设备"/>
<Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/> <Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/>
<Field label="规则名称" prop="ruleName" v-model="form.ruleName" placeholder="请输入规则名称"/> <Field label="规则名称" prop="ruleName" v-model="form.ruleName" placeholder="请输入规则名称"/>
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
<Field label="扣分方式" prop="subMethod" v-model="form.subMethod" type="select" :enumData="dict.subMethod" placeholder="请选择扣分方式"/> <Field label="扣分方式" prop="subMethod" v-model="form.subMethod" type="select" :enumData="dict.subMethod" placeholder="请选择扣分方式"/>
<Field label="扣分人员" prop="deductPerson" v-model="form.deductPerson" placeholder="请输入扣分人员"/> <Field label="扣分人员" prop="deductPerson" v-model="form.deductPerson" placeholder="请输入扣分人员"/>
<Field label="扣分时间" prop="deductTime" v-model="form.deductTime" type="date" /> <Field label="扣分时间" prop="deductTime" v-model="form.deductTime" type="date" />
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</el-row> </el-row>
<form-buttons @submit='submitForm' noCancelBtn /> <form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn />
</el-form> </el-form>
</el-drawer> </el-drawer>
...@@ -133,6 +133,8 @@ ...@@ -133,6 +133,8 @@
staffName : "", staffName : "",
workNum : "", workNum : "",
windowNum : "", windowNum : "",
deptId : null,
deptName : "",
complainTitle : "", complainTitle : "",
complainContent : "", complainContent : "",
complainRealName : "", complainRealName : "",
...@@ -142,8 +144,6 @@ ...@@ -142,8 +144,6 @@
complainDevice : "", complainDevice : "",
ruleId : null, ruleId : null,
ruleName : "", ruleName : "",
deptId : null,
deptName : "",
subMethod : 1, subMethod : 1,
deductPerson : "", deductPerson : "",
deductTime : null, deductTime : null,
......
attendance-performance-manager-ui/admin/src/views/check/complain/record/list.vue
View file @ 6782c2eb
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" notAdd notDel :config="tableConfig"> <LayoutTable :data="tableData" :config="tableConfig">
<el-button <el-button
slot="table-head-left2" slot="table-head-left2"
...@@ -124,10 +124,6 @@ ...@@ -124,10 +124,6 @@
toView(row) { toView(row) {
this.$refs.drawerform.view(row); this.$refs.drawerform.view(row);
}, },
toProcess(row) {
//todo
this.$refs.drawerform.edit(row);
},
}, },
data() { data() {
...@@ -143,35 +139,13 @@ ...@@ -143,35 +139,13 @@
// 是否更新已经存在的数据 // 是否更新已经存在的数据
updateSupport: 0, updateSupport: 0,
// 上传的地址 // 上传的地址
url: "/attendance/check/complain/record/importData", url: "/m/check/complain/record/importData",
}, },
isExport: false, isExport: false,
config: { config: {
isshowTabPane:true, isshowTabPane:true,
search: [ search: [
{
name: "checkStatus",
type: "select",
},
{
name: "deptId",
type: "select",
},
{
name: "checkTime",
type: "date",
label: "核查时间"
},
{
name: "staffName",
type: "text",
label: "员工名称",
fuzzy: true
},
], ],
columns: [ columns: [
{type: "selection", width: 60}, {type: "selection", width: 60},
...@@ -179,10 +153,10 @@ ...@@ -179,10 +153,10 @@
{label: "员工姓名", prop: "staffName"}, {label: "员工姓名", prop: "staffName"},
{label: "投诉时间", prop: "complainTime", formatter: this.formatterDate},
{label: "所属部门名称", prop: "deptName"}, {label: "所属部门名称", prop: "deptName"},
{label: "投诉时间", prop: "complainTime", formatter: this.formatterDate},
{label: "扣分方式", prop: "subMethod",formatter: this.formatter}, {label: "扣分方式", prop: "subMethod",formatter: this.formatter},
{label: "扣分时间", prop: "deductTime", formatter: this.formatterDate}, {label: "扣分时间", prop: "deductTime", formatter: this.formatterDate},
...@@ -199,24 +173,7 @@ ...@@ -199,24 +173,7 @@
width: 240, width: 240,
formatter: row => { formatter: row => {
return ( return (
<div> <table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
<table-buttons noAdd noEdit noDel row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
<span> </span>
{row.deviceStatus === 0 ? (
<el-button
size="mini"
type="text"
icon="el-icon-open"
onClick={() => {
this.toProcess(row);
}}
>
处理
</el-button>
) : (
""
)}
</div>
); );
} }
} }
......
attendance-performance-manager-ui/admin/src/views/check/complain/record/view.vue
View file @ 6782c2eb
...@@ -23,6 +23,12 @@ ...@@ -23,6 +23,12 @@
<el-descriptions-item label="窗口编号" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="窗口编号" label-class-name="labelClass" content-class-name="contentClass">
{{form.windowNum}} {{form.windowNum}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所属部门" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="投诉标题" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="投诉标题" label-class-name="labelClass" content-class-name="contentClass">
{{form.complainTitle}} {{form.complainTitle}}
</el-descriptions-item> </el-descriptions-item>
...@@ -50,12 +56,6 @@ ...@@ -50,12 +56,6 @@
<el-descriptions-item label="规则名称" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="规则名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.ruleName}} {{form.ruleName}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所属部门" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="扣分方式" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="扣分方式" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("subMethod", form.subMethod) }} {{ util_formatters("subMethod", form.subMethod) }}
</el-descriptions-item> </el-descriptions-item>
......
attendance-performance-manager-ui/admin/src/views/check/effect/record/drawershow.vue
View file @ 6782c2eb
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
<Field label="员工姓名" prop="staffName" v-model="form.staffName" placeholder="请输入员工姓名"/> <Field label="员工姓名" prop="staffName" v-model="form.staffName" placeholder="请输入员工姓名"/>
<Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/> <Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/>
<Field label="窗口编号" prop="windowNum" v-model="form.windowNum" placeholder="请输入窗口编号"/> <Field label="窗口编号" prop="windowNum" v-model="form.windowNum" placeholder="请输入窗口编号"/>
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
<Field label="违规类型" prop="irregularType" v-model="form.irregularType" type="select" :enumData="dict.irregularType" placeholder="请选择违规类型"/> <Field label="违规类型" prop="irregularType" v-model="form.irregularType" type="select" :enumData="dict.irregularType" placeholder="请选择违规类型"/>
<Field label="发生时间" prop="happenTime" v-model="form.happenTime" type="date" /> <Field label="发生时间" prop="happenTime" v-model="form.happenTime" type="date" />
<Field label="持续时间，秒" prop="duration" v-model="form.duration" placeholder="请输入持续时间，秒"/> <Field label="持续时间，秒" prop="duration" v-model="form.duration" placeholder="请输入持续时间，秒"/>
...@@ -19,8 +21,6 @@ ...@@ -19,8 +21,6 @@
<Field label="图片凭证地址" prop="snapPath" v-model="form.snapPath" type="textarea" placeholder="请输入图片凭证地址"/> <Field label="图片凭证地址" prop="snapPath" v-model="form.snapPath" type="textarea" placeholder="请输入图片凭证地址"/>
<Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/> <Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/>
<Field label="规则名称" prop="ruleName" v-model="form.ruleName" placeholder="请输入规则名称"/> <Field label="规则名称" prop="ruleName" v-model="form.ruleName" placeholder="请输入规则名称"/>
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
<Field label="扣分方式" prop="subMethod" v-model="form.subMethod" type="select" :enumData="dict.subMethod" placeholder="请选择扣分方式"/> <Field label="扣分方式" prop="subMethod" v-model="form.subMethod" type="select" :enumData="dict.subMethod" placeholder="请选择扣分方式"/>
<Field label="扣分人员" prop="deductPerson" v-model="form.deductPerson" placeholder="请输入扣分人员"/> <Field label="扣分人员" prop="deductPerson" v-model="form.deductPerson" placeholder="请输入扣分人员"/>
<Field label="扣分时间" prop="deductTime" v-model="form.deductTime" type="date" /> <Field label="扣分时间" prop="deductTime" v-model="form.deductTime" type="date" />
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</el-row> </el-row>
<form-buttons @submit='submitForm' noCancelBtn /> <form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn />
</el-form> </el-form>
</el-drawer> </el-drawer>
...@@ -133,6 +133,8 @@ ...@@ -133,6 +133,8 @@
staffName : "", staffName : "",
workNum : "", workNum : "",
windowNum : "", windowNum : "",
deptId : null,
deptName : "",
irregularType : null, irregularType : null,
happenTime : null, happenTime : null,
duration : 0, duration : 0,
...@@ -140,8 +142,6 @@ ...@@ -140,8 +142,6 @@
snapPath : "", snapPath : "",
ruleId : null, ruleId : null,
ruleName : "", ruleName : "",
deptId : null,
deptName : "",
subMethod : 1, subMethod : 1,
deductPerson : "", deductPerson : "",
deductTime : null, deductTime : null,
......
attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue
View file @ 6782c2eb
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" notAdd notDel :config="tableConfig"> <LayoutTable :data="tableData" :config="tableConfig">
<el-button <el-button
slot="table-head-left2" slot="table-head-left2"
...@@ -124,10 +124,6 @@ ...@@ -124,10 +124,6 @@
toView(row) { toView(row) {
this.$refs.drawerform.view(row); this.$refs.drawerform.view(row);
}, },
toProcess(row) {
//todo
this.$refs.drawerform.edit(row);
},
}, },
data() { data() {
...@@ -143,35 +139,12 @@ ...@@ -143,35 +139,12 @@
// 是否更新已经存在的数据 // 是否更新已经存在的数据
updateSupport: 0, updateSupport: 0,
// 上传的地址 // 上传的地址
url: "/attendance/check/effect/record/importData", url: "/m/check/effect/record/importData",
}, },
isExport: false, isExport: false,
config: { config: {
isshowTabPane:true, isshowTabPane:true,
search: [ search: [
{
name: "checkStatus",
type: "select",
},
{
name: "deptId",
type: "select",
},
{
name: "checkTime",
type: "date",
label: "核查时间"
},
{
name: "staffName",
type: "text",
label: "员工名称",
fuzzy: true
},
], ],
columns: [ columns: [
{type: "selection", width: 60}, {type: "selection", width: 60},
...@@ -179,18 +152,44 @@ ...@@ -179,18 +152,44 @@
{label: "员工姓名", prop: "staffName"}, {label: "员工姓名", prop: "staffName"},
{label: "工号", prop: "workNum"},
{label: "窗口编号", prop: "windowNum"},
{label: "所属部门", prop: "deptId", formatter: this.formatter},
{label: "所属部门名称", prop: "deptName"},
{label: "违规类型", prop: "irregularType",formatter: this.formatter},
{label: "发生时间", prop: "happenTime", formatter: this.formatterDate}, {label: "发生时间", prop: "happenTime", formatter: this.formatterDate},
{label: "持续时间，秒", prop: "duration",formatter: this.formatter},
{label: "报警时间", prop: "alarmTime", formatter: this.formatterDate}, {label: "报警时间", prop: "alarmTime", formatter: this.formatterDate},
{label: "图片凭证地址", prop: "snapPath"},
{label: "绩效规则id", prop: "ruleId", formatter: this.formatter},
{label: "规则名称", prop: "ruleName"},
{label: "扣分方式", prop: "subMethod",formatter: this.formatter}, {label: "扣分方式", prop: "subMethod",formatter: this.formatter},
{label: "扣分人员", prop: "deductPerson"},
{label: "扣分时间", prop: "deductTime", formatter: this.formatterDate}, {label: "扣分时间", prop: "deductTime", formatter: this.formatterDate},
{label: "扣分或增加分值", prop: "score", formatter: this.formatter}, {label: "扣分或增加分值", prop: "score", formatter: this.formatter},
{label: "核查人员", prop: "checkPerson"},
{label: "核查时间", prop: "checkTime", formatter: this.formatterDate}, {label: "核查时间", prop: "checkTime", formatter: this.formatterDate},
{label: "核查说明", prop: "checkDesc"},
{label: "核查结果", prop: "checkResult"},
{label: "处理状态", prop: "checkStatus",formatter: this.formatter}, {label: "处理状态", prop: "checkStatus",formatter: this.formatter},
{label: "创建用户", prop: "createUserId", formatter: this.formatter}, {label: "创建用户", prop: "createUserId", formatter: this.formatter},
...@@ -199,24 +198,7 @@ ...@@ -199,24 +198,7 @@
width: 240, width: 240,
formatter: row => { formatter: row => {
return ( return (
<div> <table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
<table-buttons noAdd noEdit noDel row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
<span> </span>
{row.deviceStatus === 0 ? (
<el-button
size="mini"
type="text"
icon="el-icon-open"
onClick={() => {
this.toProcess(row);
}}
>
处理
</el-button>
) : (
""
)}
</div>
); );
} }
} }
...@@ -225,4 +207,4 @@ ...@@ -225,4 +207,4 @@
}; };
} }
}; };
</script> </script>
\ No newline at end of file
attendance-performance-manager-ui/admin/src/views/check/effect/record/view.vue
View file @ 6782c2eb
...@@ -23,6 +23,12 @@ ...@@ -23,6 +23,12 @@
<el-descriptions-item label="窗口编号" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="窗口编号" label-class-name="labelClass" content-class-name="contentClass">
{{form.windowNum}} {{form.windowNum}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所属部门" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="违规类型" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="违规类型" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("irregularType", form.irregularType) }} {{ util_formatters("irregularType", form.irregularType) }}
</el-descriptions-item> </el-descriptions-item>
...@@ -44,12 +50,6 @@ ...@@ -44,12 +50,6 @@
<el-descriptions-item label="规则名称" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="规则名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.ruleName}} {{form.ruleName}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所属部门" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="扣分方式" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="扣分方式" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("subMethod", form.subMethod) }} {{ util_formatters("subMethod", form.subMethod) }}
</el-descriptions-item> </el-descriptions-item>
......
attendance-performance-manager-ui/admin/src/views/check/gowork/record/drawershow.vue
View file @ 6782c2eb
...@@ -12,14 +12,14 @@ ...@@ -12,14 +12,14 @@
<Field label="员工姓名" prop="staffName" v-model="form.staffName" placeholder="请输入员工姓名"/> <Field label="员工姓名" prop="staffName" v-model="form.staffName" placeholder="请输入员工姓名"/>
<Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/> <Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/>
<Field label="窗口编号" prop="windowNum" v-model="form.windowNum" placeholder="请输入窗口编号"/> <Field label="窗口编号" prop="windowNum" v-model="form.windowNum" placeholder="请输入窗口编号"/>
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
<Field label="办件编码" prop="goworkCode" v-model="form.goworkCode" placeholder="请输入办件编码"/> <Field label="办件编码" prop="goworkCode" v-model="form.goworkCode" placeholder="请输入办件编码"/>
<Field label="办件所属部门" prop="goworkDepts" v-model="form.goworkDepts" type="textarea" placeholder="请输入办件所属部门"/> <Field label="办件所属部门" prop="goworkDepts" v-model="form.goworkDepts" type="textarea" placeholder="请输入办件所属部门"/>
<Field label="事项名称" prop="matterlName" v-model="form.matterlName" type="textarea" placeholder="请输入事项名称"/> <Field label="事项名称" prop="matterlName" v-model="form.matterlName" type="textarea" placeholder="请输入事项名称"/>
<Field label="办理时间" prop="goworkTime" v-model="form.goworkTime" type="date" /> <Field label="办理时间" prop="goworkTime" v-model="form.goworkTime" type="date" />
<Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/> <Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/>
<Field label="规则名称" prop="ruleName" v-model="form.ruleName" placeholder="请输入规则名称"/> <Field label="规则名称" prop="ruleName" v-model="form.ruleName" placeholder="请输入规则名称"/>
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
<Field label="扣分方式" prop="subMethod" v-model="form.subMethod" type="select" :enumData="dict.subMethod" placeholder="请选择扣分方式"/> <Field label="扣分方式" prop="subMethod" v-model="form.subMethod" type="select" :enumData="dict.subMethod" placeholder="请选择扣分方式"/>
<Field label="扣分人员" prop="deductPerson" v-model="form.deductPerson" placeholder="请输入扣分人员"/> <Field label="扣分人员" prop="deductPerson" v-model="form.deductPerson" placeholder="请输入扣分人员"/>
<Field label="扣分时间" prop="deductTime" v-model="form.deductTime" type="date" /> <Field label="扣分时间" prop="deductTime" v-model="form.deductTime" type="date" />
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</el-row> </el-row>
<form-buttons @submit='submitForm' noCancelBtn /> <form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn />
</el-form> </el-form>
</el-drawer> </el-drawer>
...@@ -130,14 +130,14 @@ ...@@ -130,14 +130,14 @@
staffName : "", staffName : "",
workNum : "", workNum : "",
windowNum : "", windowNum : "",
deptId : null,
deptName : "",
goworkCode : "", goworkCode : "",
goworkDepts : "", goworkDepts : "",
matterlName : "", matterlName : "",
goworkTime : null, goworkTime : null,
ruleId : null, ruleId : null,
ruleName : "", ruleName : "",
deptId : null,
deptName : "",
subMethod : 1, subMethod : 1,
deductPerson : "", deductPerson : "",
deductTime : null, deductTime : null,
......
attendance-performance-manager-ui/admin/src/views/check/gowork/record/list.vue
View file @ 6782c2eb
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" notAdd notDel :config="tableConfig"> <LayoutTable :data="tableData" :config="tableConfig">
<el-button
slot="table-head-left2"
style="margin-left: 10px"
icon="el-icon-tickets"
size="mini"
@click="handleImport"
>导入</el-button>
<el-button <el-button
slot="table-head-left2" slot="table-head-left2"
style="margin-left: 10px" style="margin-left: 10px"
...@@ -124,10 +130,6 @@ ...@@ -124,10 +130,6 @@
toView(row) { toView(row) {
this.$refs.drawerform.view(row); this.$refs.drawerform.view(row);
}, },
toProcess(row) {
//todo
this.$refs.drawerform.edit(row);
},
}, },
data() { data() {
...@@ -143,35 +145,13 @@ ...@@ -143,35 +145,13 @@
// 是否更新已经存在的数据 // 是否更新已经存在的数据
updateSupport: 0, updateSupport: 0,
// 上传的地址 // 上传的地址
url: "/attendance/check/gowork/record/importData", url: "/m/check/gowork/record/importData",
}, },
isExport: false, isExport: false,
config: { config: {
isshowTabPane:true, isshowTabPane:true,
search: [ search: [
{
name: "checkStatus",
type: "select",
},
{
name: "deptId",
type: "select",
},
{
name: "checkTime",
type: "date",
label: "核查时间"
},
{
name: "staffName",
type: "text",
label: "员工名称",
fuzzy: true
},
], ],
columns: [ columns: [
{type: "selection", width: 60}, {type: "selection", width: 60},
...@@ -179,16 +159,42 @@ ...@@ -179,16 +159,42 @@
{label: "员工姓名", prop: "staffName"}, {label: "员工姓名", prop: "staffName"},
{label: "工号", prop: "workNum"},
{label: "窗口编号", prop: "windowNum"},
{label: "所属部门", prop: "deptId", formatter: this.formatter},
{label: "所属部门名称", prop: "deptName"},
{label: "办件编码", prop: "goworkCode"},
{label: "办件所属部门", prop: "goworkDepts"},
{label: "事项名称", prop: "matterlName"},
{label: "办理时间", prop: "goworkTime", formatter: this.formatterDate}, {label: "办理时间", prop: "goworkTime", formatter: this.formatterDate},
{label: "绩效规则id", prop: "ruleId", formatter: this.formatter},
{label: "规则名称", prop: "ruleName"},
{label: "扣分方式", prop: "subMethod",formatter: this.formatter}, {label: "扣分方式", prop: "subMethod",formatter: this.formatter},
{label: "扣分人员", prop: "deductPerson"},
{label: "扣分时间", prop: "deductTime", formatter: this.formatterDate}, {label: "扣分时间", prop: "deductTime", formatter: this.formatterDate},
{label: "扣分或增加分值", prop: "score", formatter: this.formatter}, {label: "扣分或增加分值", prop: "score", formatter: this.formatter},
{label: "核查人员", prop: "checkPerson"},
{label: "核查时间", prop: "checkTime", formatter: this.formatterDate}, {label: "核查时间", prop: "checkTime", formatter: this.formatterDate},
{label: "核查说明", prop: "checkDesc"},
{label: "核查结果", prop: "checkResult"},
{label: "处理状态", prop: "checkStatus",formatter: this.formatter}, {label: "处理状态", prop: "checkStatus",formatter: this.formatter},
{label: "创建用户", prop: "createUserId", formatter: this.formatter}, {label: "创建用户", prop: "createUserId", formatter: this.formatter},
...@@ -197,24 +203,7 @@ ...@@ -197,24 +203,7 @@
width: 240, width: 240,
formatter: row => { formatter: row => {
return ( return (
<div> <table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
<table-buttons noAdd noEdit noDel row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
<span> </span>
{row.deviceStatus === 0 ? (
<el-button
size="mini"
type="text"
icon="el-icon-open"
onClick={() => {
this.toProcess(row);
}}
>
处理
</el-button>
) : (
""
)}
</div>
); );
} }
} }
...@@ -223,4 +212,4 @@ ...@@ -223,4 +212,4 @@
}; };
} }
}; };
</script> </script>
\ No newline at end of file
attendance-performance-manager-ui/admin/src/views/check/gowork/record/view.vue
View file @ 6782c2eb
...@@ -23,6 +23,12 @@ ...@@ -23,6 +23,12 @@
<el-descriptions-item label="窗口编号" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="窗口编号" label-class-name="labelClass" content-class-name="contentClass">
{{form.windowNum}} {{form.windowNum}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所属部门" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="办件编码" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="办件编码" label-class-name="labelClass" content-class-name="contentClass">
{{form.goworkCode}} {{form.goworkCode}}
</el-descriptions-item> </el-descriptions-item>
...@@ -41,12 +47,6 @@ ...@@ -41,12 +47,6 @@
<el-descriptions-item label="规则名称" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="规则名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.ruleName}} {{form.ruleName}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所属部门" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="扣分方式" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="扣分方式" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("subMethod", form.subMethod) }} {{ util_formatters("subMethod", form.subMethod) }}
</el-descriptions-item> </el-descriptions-item>
......
attendance-performance-manager-ui/admin/src/views/check/other/record/drawershow.vue
View file @ 6782c2eb
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
<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" placeholder="请输入员工姓名"/> <Field label="员工姓名" prop="staffName" v-model="form.staffName" placeholder="请输入员工姓名"/>
<Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/> <Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/>
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
<Field label="窗口编号" prop="windowNum" v-model="form.windowNum" placeholder="请输入窗口编号"/> <Field label="窗口编号" prop="windowNum" v-model="form.windowNum" placeholder="请输入窗口编号"/>
<Field label="违规类型" prop="irregularOtherType" v-model="form.irregularOtherType" type="select" :enumData="dict.irregularOtherType" placeholder="请选择违规类型"/> <Field label="违规类型" prop="irregularOtherType" v-model="form.irregularOtherType" type="select" :enumData="dict.irregularOtherType" placeholder="请选择违规类型"/>
<Field label="发生时间" prop="happenTime" v-model="form.happenTime" type="date" /> <Field label="发生时间" prop="happenTime" v-model="form.happenTime" type="date" />
...@@ -18,8 +20,6 @@ ...@@ -18,8 +20,6 @@
<Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/> <Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/>
<Field label="规则名称" prop="ruleName" v-model="form.ruleName" placeholder="请输入规则名称"/> <Field label="规则名称" prop="ruleName" v-model="form.ruleName" placeholder="请输入规则名称"/>
<Field label="评分标准" prop="ruleDesc" v-model="form.ruleDesc" type="textarea" placeholder="请输入评分标准"/> <Field label="评分标准" prop="ruleDesc" v-model="form.ruleDesc" type="textarea" placeholder="请输入评分标准"/>
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
<Field label="扣分方式" prop="subMethod" v-model="form.subMethod" type="select" :enumData="dict.subMethod" placeholder="请选择扣分方式"/> <Field label="扣分方式" prop="subMethod" v-model="form.subMethod" type="select" :enumData="dict.subMethod" placeholder="请选择扣分方式"/>
<Field label="扣分人员" prop="deductPerson" v-model="form.deductPerson" placeholder="请输入扣分人员"/> <Field label="扣分人员" prop="deductPerson" v-model="form.deductPerson" placeholder="请输入扣分人员"/>
<Field label="扣分时间" prop="deductTime" v-model="form.deductTime" type="date" /> <Field label="扣分时间" prop="deductTime" v-model="form.deductTime" type="date" />
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</el-row> </el-row>
<form-buttons @submit='submitForm' noCancelBtn /> <form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn />
</el-form> </el-form>
</el-drawer> </el-drawer>
...@@ -130,6 +130,8 @@ ...@@ -130,6 +130,8 @@
staffId : null, staffId : null,
staffName : "", staffName : "",
workNum : "", workNum : "",
deptId : null,
deptName : "",
windowNum : "", windowNum : "",
irregularOtherType : null, irregularOtherType : null,
happenTime : null, happenTime : null,
...@@ -137,8 +139,6 @@ ...@@ -137,8 +139,6 @@
ruleId : null, ruleId : null,
ruleName : "", ruleName : "",
ruleDesc : "", ruleDesc : "",
deptId : null,
deptName : "",
subMethod : 1, subMethod : 1,
deductPerson : "", deductPerson : "",
deductTime : null, deductTime : null,
......
attendance-performance-manager-ui/admin/src/views/check/other/record/list.vue
View file @ 6782c2eb
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" notAdd notDel :config="tableConfig"> <LayoutTable :data="tableData" :config="tableConfig">
<el-button <el-button
slot="table-head-left2" slot="table-head-left2"
...@@ -124,10 +124,6 @@ ...@@ -124,10 +124,6 @@
toView(row) { toView(row) {
this.$refs.drawerform.view(row); this.$refs.drawerform.view(row);
}, },
toProcess(row) {
//todo
this.$refs.drawerform.edit(row);
},
}, },
data() { data() {
...@@ -143,35 +139,12 @@ ...@@ -143,35 +139,12 @@
// 是否更新已经存在的数据 // 是否更新已经存在的数据
updateSupport: 0, updateSupport: 0,
// 上传的地址 // 上传的地址
url: "/attendance/check/other/record/importData", url: "/m/check/other/record/importData",
}, },
isExport: false, isExport: false,
config: { config: {
isshowTabPane:true, isshowTabPane:true,
search: [ search: [
{
name: "checkStatus",
type: "select",
},
{
name: "deptId",
type: "select",
},
{
name: "checkTime",
type: "date",
label: "核查时间"
},
{
name: "staffName",
type: "text",
label: "员工名称",
fuzzy: true
},
], ],
columns: [ columns: [
{type: "selection", width: 60}, {type: "selection", width: 60},
...@@ -197,24 +170,7 @@ ...@@ -197,24 +170,7 @@
width: 240, width: 240,
formatter: row => { formatter: row => {
return ( return (
<div> <table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
<table-buttons noAdd noEdit noDel row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
<span> </span>
{row.deviceStatus === 0 ? (
<el-button
size="mini"
type="text"
icon="el-icon-open"
onClick={() => {
this.toProcess(row);
}}
>
处理
</el-button>
) : (
""
)}
</div>
); );
} }
} }
...@@ -223,4 +179,4 @@ ...@@ -223,4 +179,4 @@
}; };
} }
}; };
</script> </script>
\ No newline at end of file
attendance-performance-manager-ui/admin/src/views/check/other/record/view.vue
View file @ 6782c2eb
...@@ -20,6 +20,12 @@ ...@@ -20,6 +20,12 @@
<el-descriptions-item label="工号" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="工号" label-class-name="labelClass" content-class-name="contentClass">
{{form.workNum}} {{form.workNum}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所属部门" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="窗口编号" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="窗口编号" label-class-name="labelClass" content-class-name="contentClass">
{{form.windowNum}} {{form.windowNum}}
</el-descriptions-item> </el-descriptions-item>
...@@ -41,12 +47,6 @@ ...@@ -41,12 +47,6 @@
<el-descriptions-item label="评分标准" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="评分标准" label-class-name="labelClass" content-class-name="contentClass">
{{form.ruleDesc}} {{form.ruleDesc}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所属部门" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="扣分方式" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="扣分方式" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("subMethod", form.subMethod) }} {{ util_formatters("subMethod", form.subMethod) }}
</el-descriptions-item> </el-descriptions-item>
......
attendance-performance-manager-ui/admin/src/views/check/review/record/drawershow.vue
View file @ 6782c2eb
...@@ -12,14 +12,14 @@ ...@@ -12,14 +12,14 @@
<Field label="员工姓名" prop="staffName" v-model="form.staffName" placeholder="请输入员工姓名"/> <Field label="员工姓名" prop="staffName" v-model="form.staffName" placeholder="请输入员工姓名"/>
<Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/> <Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/>
<Field label="窗口编号" prop="windowNum" v-model="form.windowNum" placeholder="请输入窗口编号"/> <Field label="窗口编号" prop="windowNum" v-model="form.windowNum" placeholder="请输入窗口编号"/>
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
<Field label="评价结果" prop="reviewResult" v-model="form.reviewResult" type="select" :enumData="dict.reviewResult" placeholder="请选择评价结果"/> <Field label="评价结果" prop="reviewResult" v-model="form.reviewResult" type="select" :enumData="dict.reviewResult" placeholder="请选择评价结果"/>
<Field label="评价时间" prop="reviewTime" v-model="form.reviewTime" type="date" /> <Field label="评价时间" prop="reviewTime" v-model="form.reviewTime" type="date" />
<Field label="评价来源" prop="reviewSource" v-model="form.reviewSource" type="select" :enumData="dict.reviewSource" placeholder="请选择评价来源"/> <Field label="评价来源" prop="reviewSource" v-model="form.reviewSource" type="select" :enumData="dict.reviewSource" placeholder="请选择评价来源"/>
<Field label="评价设备" prop="reviewDevice" v-model="form.reviewDevice" placeholder="请输入评价设备"/> <Field label="评价设备" prop="reviewDevice" v-model="form.reviewDevice" placeholder="请输入评价设备"/>
<Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/> <Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/>
<Field label="规则名称" prop="ruleName" v-model="form.ruleName" placeholder="请输入规则名称"/> <Field label="规则名称" prop="ruleName" v-model="form.ruleName" placeholder="请输入规则名称"/>
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
<Field label="扣分方式" prop="subMethod" v-model="form.subMethod" type="select" :enumData="dict.subMethod" placeholder="请选择扣分方式"/> <Field label="扣分方式" prop="subMethod" v-model="form.subMethod" type="select" :enumData="dict.subMethod" placeholder="请选择扣分方式"/>
<Field label="扣分人员" prop="deductPerson" v-model="form.deductPerson" placeholder="请输入扣分人员"/> <Field label="扣分人员" prop="deductPerson" v-model="form.deductPerson" placeholder="请输入扣分人员"/>
<Field label="扣分时间" prop="deductTime" v-model="form.deductTime" type="date" /> <Field label="扣分时间" prop="deductTime" v-model="form.deductTime" type="date" />
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</el-row> </el-row>
<form-buttons @submit='submitForm' noCancelBtn /> <form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn />
</el-form> </el-form>
</el-drawer> </el-drawer>
...@@ -131,14 +131,14 @@ ...@@ -131,14 +131,14 @@
staffName : "", staffName : "",
workNum : "", workNum : "",
windowNum : "", windowNum : "",
deptId : null,
deptName : "",
reviewResult : null, reviewResult : null,
reviewTime : null, reviewTime : null,
reviewSource : "", reviewSource : "",
reviewDevice : "", reviewDevice : "",
ruleId : null, ruleId : null,
ruleName : "", ruleName : "",
deptId : null,
deptName : "",
subMethod : 1, subMethod : 1,
deductPerson : "", deductPerson : "",
deductTime : null, deductTime : null,
......
attendance-performance-manager-ui/admin/src/views/check/review/record/list.vue
View file @ 6782c2eb
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" notAdd notDel :config="tableConfig"> <LayoutTable :data="tableData" :config="tableConfig">
<el-button <el-button
slot="table-head-left2" slot="table-head-left2"
...@@ -125,11 +125,6 @@ ...@@ -125,11 +125,6 @@
this.$refs.drawerform.view(row); this.$refs.drawerform.view(row);
}, },
toProcess(row) {
//todo
this.$refs.drawerform.edit(row);
},
}, },
data() { data() {
return { return {
...@@ -144,35 +139,12 @@ ...@@ -144,35 +139,12 @@
// 是否更新已经存在的数据 // 是否更新已经存在的数据
updateSupport: 0, updateSupport: 0,
// 上传的地址 // 上传的地址
url: "/attendance/check/review/record/importData", url: "/m/check/review/record/importData",
}, },
isExport: false, isExport: false,
config: { config: {
isshowTabPane:true, isshowTabPane:true,
search: [ search: [
{
name: "checkStatus",
type: "select",
},
{
name: "deptId",
type: "select",
},
{
name: "checkTime",
type: "date",
label: "核查时间"
},
{
name: "staffName",
type: "text",
label: "员工名称",
fuzzy: true
},
], ],
columns: [ columns: [
{type: "selection", width: 60}, {type: "selection", width: 60},
...@@ -180,16 +152,42 @@ ...@@ -180,16 +152,42 @@
{label: "员工姓名", prop: "staffName"}, {label: "员工姓名", prop: "staffName"},
{label: "工号", prop: "workNum"},
{label: "窗口编号", prop: "windowNum"},
{label: "所属部门", prop: "deptId", formatter: this.formatter},
{label: "所属部门名称", prop: "deptName"},
{label: "评价结果", prop: "reviewResult",formatter: this.formatter},
{label: "评价时间", prop: "reviewTime", formatter: this.formatterDate}, {label: "评价时间", prop: "reviewTime", formatter: this.formatterDate},
{label: "评价来源", prop: "reviewSource"},
{label: "评价设备", prop: "reviewDevice"},
{label: "绩效规则id", prop: "ruleId", formatter: this.formatter},
{label: "规则名称", prop: "ruleName"},
{label: "扣分方式", prop: "subMethod",formatter: this.formatter}, {label: "扣分方式", prop: "subMethod",formatter: this.formatter},
{label: "扣分人员", prop: "deductPerson"},
{label: "扣分时间", prop: "deductTime", formatter: this.formatterDate}, {label: "扣分时间", prop: "deductTime", formatter: this.formatterDate},
{label: "扣分或增加分值", prop: "score", formatter: this.formatter}, {label: "扣分或增加分值", prop: "score", formatter: this.formatter},
{label: "核查人员", prop: "checkPerson"},
{label: "核查时间", prop: "checkTime", formatter: this.formatterDate}, {label: "核查时间", prop: "checkTime", formatter: this.formatterDate},
{label: "核查说明", prop: "checkDesc"},
{label: "核查结果", prop: "checkResult"},
{label: "处理状态", prop: "checkStatus",formatter: this.formatter}, {label: "处理状态", prop: "checkStatus",formatter: this.formatter},
{label: "创建用户", prop: "createUserId", formatter: this.formatter}, {label: "创建用户", prop: "createUserId", formatter: this.formatter},
...@@ -198,24 +196,7 @@ ...@@ -198,24 +196,7 @@
width: 240, width: 240,
formatter: row => { formatter: row => {
return ( return (
<div> <table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
<table-buttons noAdd noEdit noDel row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
<span> </span>
{row.deviceStatus === 0 ? (
<el-button
size="mini"
type="text"
icon="el-icon-open"
onClick={() => {
this.toProcess(row);
}}
>
处理
</el-button>
) : (
""
)}
</div>
); );
} }
} }
...@@ -224,4 +205,4 @@ ...@@ -224,4 +205,4 @@
}; };
} }
}; };
</script> </script>
\ No newline at end of file
attendance-performance-manager-ui/admin/src/views/check/review/record/view.vue
View file @ 6782c2eb
...@@ -23,6 +23,12 @@ ...@@ -23,6 +23,12 @@
<el-descriptions-item label="窗口编号" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="窗口编号" label-class-name="labelClass" content-class-name="contentClass">
{{form.windowNum}} {{form.windowNum}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所属部门" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="评价结果" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="评价结果" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("reviewResult", form.reviewResult) }} {{ util_formatters("reviewResult", form.reviewResult) }}
</el-descriptions-item> </el-descriptions-item>
...@@ -41,12 +47,6 @@ ...@@ -41,12 +47,6 @@
<el-descriptions-item label="规则名称" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="规则名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.ruleName}} {{form.ruleName}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所属部门" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="扣分方式" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="扣分方式" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("subMethod", form.subMethod) }} {{ util_formatters("subMethod", form.subMethod) }}
</el-descriptions-item> </el-descriptions-item>
......
attendance-performance-manager-ui/admin/src/views/perform/attend/record/drawershow.vue
View file @ 6782c2eb
...@@ -12,22 +12,26 @@ ...@@ -12,22 +12,26 @@
<Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/> <Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/>
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/> <Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/> <Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
<Field label="职位ID" prop="positionId" v-model="form.positionId" placeholder="请输入职位ID"/>
<Field label="职位名称" prop="positionName" v-model="form.positionName" placeholder="请输入职位名称"/>
<Field label="所属考勤组ID" prop="attendanceGroupId" v-model="form.attendanceGroupId" placeholder="请输入所属考勤组ID"/> <Field label="所属考勤组ID" prop="attendanceGroupId" v-model="form.attendanceGroupId" placeholder="请输入所属考勤组ID"/>
<Field label="所属考勤组名称" prop="attendanceGroupName" v-model="form.attendanceGroupName" placeholder="请输入所属考勤组名称"/> <Field label="所属考勤组名称" prop="attendanceGroupName" v-model="form.attendanceGroupName" placeholder="请输入所属考勤组名称"/>
<Field label="班次ID" prop="shiftsId" v-model="form.shiftsId" placeholder="请输入班次ID"/>
<Field label="班次名称" prop="shiftsName" v-model="form.shiftsName" placeholder="请输入班次名称"/>
<Field label="考勤时间" prop="attendanceDate" v-model="form.attendanceDate" type="date" /> <Field label="考勤时间" prop="attendanceDate" v-model="form.attendanceDate" type="date" />
<Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/> <Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/>
<Field label="规则名称" prop="ruleName" v-model="form.ruleName" placeholder="请输入规则名称"/> <Field label="规则名称" prop="ruleNme" v-model="form.ruleNme" placeholder="请输入规则名称"/>
<Field label="异常时间" prop="errorTime" v-model="form.errorTime" type="date" />
<Field label="上下班时间" prop="goOffTimeStr" v-model="form.goOffTimeStr" placeholder="请输入上下班时间"/>
<Field label="实际打卡时间" prop="actualAttendTime" v-model="form.actualAttendTime" type="date" />
<Field label="异常处理结果" prop="errorResult" v-model="form.errorResult" placeholder="请输入异常处理结果"/>
<Field label="扣分方式" prop="subMethod" v-model="form.subMethod" type="select" :enumData="dict.subMethod" placeholder="请选择扣分方式"/>
<Field label="扣分人员" prop="deductPerson" v-model="form.deductPerson" placeholder="请输入扣分人员"/>
<Field label="扣分时间" prop="deductTime" v-model="form.deductTime" type="date" />
<Field label="增减类型" prop="subAddType" v-model="form.subAddType" type="select" :enumData="dict.subAddType" placeholder="请选择增减类型"/> <Field label="增减类型" prop="subAddType" v-model="form.subAddType" type="select" :enumData="dict.subAddType" placeholder="请选择增减类型"/>
<Field label="扣分或增加分值" prop="score" v-model="form.score" placeholder="请输入扣分或增加分值"/> <Field label="扣分或增加分值" prop="score" v-model="form.score" placeholder="请输入扣分或增加分值"/>
<Field label="处理状态" prop="processStatus" v-model="form.processStatus" type="select" :enumData="dict.processStatus" 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' v-if="pageInfo.type!='view'" noCancelBtn />
</el-form> </el-form>
</el-drawer> </el-drawer>
...@@ -54,10 +58,15 @@ ...@@ -54,10 +58,15 @@
open: false, open: false,
direction:"rtl", direction:"rtl",
toString:[ toString:[
"subMethod",
"subAddType", "subAddType",
"processStatus",
], ],
toDate:[ toDate:[
"attendanceDate", "attendanceDate",
"errorTime",
"actualAttendTime",
"deductTime",
], ],
// 表单校验 // 表单校验
rules: { rules: {
...@@ -121,17 +130,21 @@ ...@@ -121,17 +130,21 @@
workNum : "", workNum : "",
deptId : null, deptId : null,
deptName : "", deptName : "",
positionId : null,
positionName : "",
attendanceGroupId : null, attendanceGroupId : null,
attendanceGroupName : "", attendanceGroupName : "",
shiftsId : null,
shiftsName : "",
attendanceDate : null, attendanceDate : null,
ruleId : null, ruleId : null,
ruleName : "", ruleNme : "",
errorTime : null,
goOffTimeStr : "",
actualAttendTime : null,
errorResult : "",
subMethod : 1,
deductPerson : "",
deductTime : null,
subAddType : 1, subAddType : 1,
score : 0.00, score : 0.00,
processStatus : 1,
remark : "", remark : "",
}; };
this.resetForm("form"); this.resetForm("form");
......
attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue
View file @ 6782c2eb
...@@ -158,12 +158,36 @@ ...@@ -158,12 +158,36 @@
{label: "员工姓名", prop: "staffName"}, {label: "员工姓名", prop: "staffName"},
{label: "工号", prop: "workNum"},
{label: "所属部门名称", prop: "deptName"},
{label: "所属考勤组名称", prop: "attendanceGroupName"},
{label: "考勤时间", prop: "attendanceDate", formatter: this.formatterDate}, {label: "考勤时间", prop: "attendanceDate", formatter: this.formatterDate},
{label: "规则名称", prop: "ruleNme"},
{label: "异常时间", prop: "errorTime", formatter: this.formatterDate},
{label: "上下班时间", prop: "goOffTimeStr"},
{label: "实际打卡时间", prop: "actualAttendTime", formatter: this.formatterDate},
{label: "异常处理结果", prop: "errorResult"},
{label: "扣分方式", prop: "subMethod",formatter: this.formatter},
{label: "扣分人员", prop: "deductPerson"},
{label: "扣分时间", prop: "deductTime", formatter: this.formatterDate},
{label: "增减类型", prop: "subAddType",formatter: this.formatter}, {label: "增减类型", prop: "subAddType",formatter: this.formatter},
{label: "扣分或增加分值", prop: "score", formatter: this.formatter}, {label: "扣分或增加分值", prop: "score", formatter: this.formatter},
{label: "处理状态", prop: "processStatus",formatter: this.formatter},
{label: "创建用户", prop: "createUserId", formatter: this.formatter}, {label: "创建用户", prop: "createUserId", formatter: this.formatter},
{ {
label: "操作", label: "操作",
...@@ -179,4 +203,4 @@ ...@@ -179,4 +203,4 @@
}; };
} }
}; };
</script> </script>
\ No newline at end of file
attendance-performance-manager-ui/admin/src/views/perform/attend/record/view.vue
View file @ 6782c2eb
...@@ -23,24 +23,12 @@ ...@@ -23,24 +23,12 @@
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}} {{form.deptName}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="职位ID" label-class-name="labelClass" content-class-name="contentClass">
{{form.positionId}}
</el-descriptions-item>
<el-descriptions-item label="职位名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.positionName}}
</el-descriptions-item>
<el-descriptions-item label="所属考勤组ID" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="所属考勤组ID" label-class-name="labelClass" content-class-name="contentClass">
{{form.attendanceGroupId}} {{form.attendanceGroupId}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所属考勤组名称" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="所属考勤组名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.attendanceGroupName}} {{form.attendanceGroupName}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="班次ID" label-class-name="labelClass" content-class-name="contentClass">
{{form.shiftsId}}
</el-descriptions-item>
<el-descriptions-item label="班次名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.shiftsName}}
</el-descriptions-item>
<el-descriptions-item label="考勤时间" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="考勤时间" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatterDate(form.attendanceDate)}} {{ util_formatterDate(form.attendanceDate)}}
</el-descriptions-item> </el-descriptions-item>
...@@ -48,7 +36,28 @@ ...@@ -48,7 +36,28 @@
{{form.ruleId}} {{form.ruleId}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="规则名称" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="规则名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.ruleName}} {{form.ruleNme}}
</el-descriptions-item>
<el-descriptions-item label="异常时间" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatterDate(form.errorTime)}}
</el-descriptions-item>
<el-descriptions-item label="上下班时间" label-class-name="labelClass" content-class-name="contentClass">
{{form.goOffTimeStr}}
</el-descriptions-item>
<el-descriptions-item label="实际打卡时间" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatterDate(form.actualAttendTime)}}
</el-descriptions-item>
<el-descriptions-item label="异常处理结果" label-class-name="labelClass" content-class-name="contentClass">
{{form.errorResult}}
</el-descriptions-item>
<el-descriptions-item label="扣分方式" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("subMethod", form.subMethod) }}
</el-descriptions-item>
<el-descriptions-item label="扣分人员" label-class-name="labelClass" content-class-name="contentClass">
{{form.deductPerson}}
</el-descriptions-item>
<el-descriptions-item label="扣分时间" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatterDate(form.deductTime)}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="增减类型" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="增减类型" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("subAddType", form.subAddType) }} {{ util_formatters("subAddType", form.subAddType) }}
...@@ -56,6 +65,9 @@ ...@@ -56,6 +65,9 @@
<el-descriptions-item label="扣分或增加分值" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="扣分或增加分值" label-class-name="labelClass" content-class-name="contentClass">
{{form.score}} {{form.score}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="处理状态" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("processStatus", form.processStatus) }}
</el-descriptions-item>
<el-descriptions-item label="备注" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="备注" label-class-name="labelClass" content-class-name="contentClass">
{{form.remark}} {{form.remark}}
</el-descriptions-item> </el-descriptions-item>
...@@ -78,7 +90,9 @@ ...@@ -78,7 +90,9 @@
size:"small", size:"small",
column:2, column:2,
toString:[ toString:[
"subMethod",
"subAddType", "subAddType",
"processStatus",
], ],
toArrays: [ toArrays: [
......
attendance-performance-manager-ui/admin/src/views/perform/complain/record/drawershow.vue
View file @ 6782c2eb
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
<Field label="员工姓名" prop="staffName" v-model="form.staffName" placeholder="请输入员工姓名"/> <Field label="员工姓名" prop="staffName" v-model="form.staffName" placeholder="请输入员工姓名"/>
<Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/> <Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/>
<Field label="窗口编号" prop="windowNum" v-model="form.windowNum" placeholder="请输入窗口编号"/> <Field label="窗口编号" prop="windowNum" v-model="form.windowNum" placeholder="请输入窗口编号"/>
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
<Field label="投诉标题" prop="complainTitle" v-model="form.complainTitle" placeholder="请输入投诉标题"/> <Field label="投诉标题" prop="complainTitle" v-model="form.complainTitle" placeholder="请输入投诉标题"/>
<Field label="投诉内容"><editor v-model="form.complainContent" :min-height="256"/></Field> <Field label="投诉内容"><editor v-model="form.complainContent" :min-height="256"/></Field>
<Field label="投诉人真实姓名" prop="complainRealName" v-model="form.complainRealName" placeholder="请输入投诉人真实姓名"/> <Field label="投诉人真实姓名" prop="complainRealName" v-model="form.complainRealName" placeholder="请输入投诉人真实姓名"/>
...@@ -20,8 +22,6 @@ ...@@ -20,8 +22,6 @@
<Field label="投诉设备" prop="complainDevice" v-model="form.complainDevice" placeholder="请输入投诉设备"/> <Field label="投诉设备" prop="complainDevice" v-model="form.complainDevice" placeholder="请输入投诉设备"/>
<Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/> <Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/>
<Field label="规则名称" prop="ruleName" v-model="form.ruleName" placeholder="请输入规则名称"/> <Field label="规则名称" prop="ruleName" v-model="form.ruleName" placeholder="请输入规则名称"/>
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
<Field label="扣分方式" prop="subMethod" v-model="form.subMethod" type="select" :enumData="dict.subMethod" placeholder="请选择扣分方式"/> <Field label="扣分方式" prop="subMethod" v-model="form.subMethod" type="select" :enumData="dict.subMethod" placeholder="请选择扣分方式"/>
<Field label="扣分人员" prop="deductPerson" v-model="form.deductPerson" placeholder="请输入扣分人员"/> <Field label="扣分人员" prop="deductPerson" v-model="form.deductPerson" placeholder="请输入扣分人员"/>
<Field label="扣分时间" prop="deductTime" v-model="form.deductTime" type="date" /> <Field label="扣分时间" prop="deductTime" v-model="form.deductTime" type="date" />
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</el-row> </el-row>
<form-buttons @submit='submitForm' noCancelBtn /> <form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn />
</el-form> </el-form>
</el-drawer> </el-drawer>
...@@ -126,6 +126,8 @@ ...@@ -126,6 +126,8 @@
staffName : "", staffName : "",
workNum : "", workNum : "",
windowNum : "", windowNum : "",
deptId : null,
deptName : "",
complainTitle : "", complainTitle : "",
complainContent : "", complainContent : "",
complainRealName : "", complainRealName : "",
...@@ -135,8 +137,6 @@ ...@@ -135,8 +137,6 @@
complainDevice : "", complainDevice : "",
ruleId : null, ruleId : null,
ruleName : "", ruleName : "",
deptId : null,
deptName : "",
subMethod : 1, subMethod : 1,
deductPerson : "", deductPerson : "",
deductTime : null, deductTime : null,
......
attendance-performance-manager-ui/admin/src/views/perform/complain/record/list.vue
View file @ 6782c2eb
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
// 是否更新已经存在的数据 // 是否更新已经存在的数据
updateSupport: 0, updateSupport: 0,
// 上传的地址 // 上传的地址
url: "/attendance/perform/complain/record/importData", url: "/m/perform/complain/record/importData",
}, },
isExport: false, isExport: false,
config: { config: {
...@@ -158,12 +158,32 @@ ...@@ -158,12 +158,32 @@
{label: "员工姓名", prop: "staffName"}, {label: "员工姓名", prop: "staffName"},
{label: "投诉时间", prop: "complainTime", formatter: this.formatterDate}, {label: "工号", prop: "workNum"},
{label: "窗口编号", prop: "windowNum"},
{label: "所属部门名称", prop: "deptName"}, {label: "所属部门名称", prop: "deptName"},
{label: "投诉标题", prop: "complainTitle"},
{label: "投诉内容", prop: "complainContent"},
{label: "投诉人真实姓名", prop: "complainRealName"},
{label: "联系电话", prop: "contact"},
{label: "投诉时间", prop: "complainTime", formatter: this.formatterDate},
{label: "投诉来源", prop: "complainSource"},
{label: "投诉设备", prop: "complainDevice"},
{label: "规则名称", prop: "ruleName"},
{label: "扣分方式", prop: "subMethod",formatter: this.formatter}, {label: "扣分方式", prop: "subMethod",formatter: this.formatter},
{label: "扣分人员", prop: "deductPerson"},
{label: "扣分时间", prop: "deductTime", formatter: this.formatterDate}, {label: "扣分时间", prop: "deductTime", formatter: this.formatterDate},
{label: "扣分或增加分值", prop: "score", formatter: this.formatter}, {label: "扣分或增加分值", prop: "score", formatter: this.formatter},
...@@ -185,4 +205,4 @@ ...@@ -185,4 +205,4 @@
}; };
} }
}; };
</script> </script>
\ No newline at end of file
attendance-performance-manager-ui/admin/src/views/perform/complain/record/view.vue
View file @ 6782c2eb
...@@ -20,6 +20,12 @@ ...@@ -20,6 +20,12 @@
<el-descriptions-item label="窗口编号" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="窗口编号" label-class-name="labelClass" content-class-name="contentClass">
{{form.windowNum}} {{form.windowNum}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所属部门" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="投诉标题" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="投诉标题" label-class-name="labelClass" content-class-name="contentClass">
{{form.complainTitle}} {{form.complainTitle}}
</el-descriptions-item> </el-descriptions-item>
...@@ -47,12 +53,6 @@ ...@@ -47,12 +53,6 @@
<el-descriptions-item label="规则名称" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="规则名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.ruleName}} {{form.ruleName}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所属部门" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="扣分方式" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="扣分方式" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("subMethod", form.subMethod) }} {{ util_formatters("subMethod", form.subMethod) }}
</el-descriptions-item> </el-descriptions-item>
......
attendance-performance-manager-ui/admin/src/views/perform/effect/record/drawershow.vue
View file @ 6782c2eb
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
<Field label="员工姓名" prop="staffName" v-model="form.staffName" placeholder="请输入员工姓名"/> <Field label="员工姓名" prop="staffName" v-model="form.staffName" placeholder="请输入员工姓名"/>
<Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/> <Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/>
<Field label="窗口编号" prop="windowNum" v-model="form.windowNum" placeholder="请输入窗口编号"/> <Field label="窗口编号" prop="windowNum" v-model="form.windowNum" placeholder="请输入窗口编号"/>
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
<Field label="违规类型" prop="irregularType" v-model="form.irregularType" type="select" :enumData="dict.irregularType" placeholder="请选择违规类型"/> <Field label="违规类型" prop="irregularType" v-model="form.irregularType" type="select" :enumData="dict.irregularType" placeholder="请选择违规类型"/>
<Field label="发生时间" prop="happenTime" v-model="form.happenTime" type="date" /> <Field label="发生时间" prop="happenTime" v-model="form.happenTime" type="date" />
<Field label="持续时间，秒" prop="duration" v-model="form.duration" placeholder="请输入持续时间，秒"/> <Field label="持续时间，秒" prop="duration" v-model="form.duration" placeholder="请输入持续时间，秒"/>
...@@ -18,8 +20,6 @@ ...@@ -18,8 +20,6 @@
<Field label="图片凭证地址" prop="snapPath" v-model="form.snapPath" type="textarea" placeholder="请输入图片凭证地址"/> <Field label="图片凭证地址" prop="snapPath" v-model="form.snapPath" type="textarea" placeholder="请输入图片凭证地址"/>
<Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/> <Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/>
<Field label="规则名称" prop="ruleName" v-model="form.ruleName" placeholder="请输入规则名称"/> <Field label="规则名称" prop="ruleName" v-model="form.ruleName" placeholder="请输入规则名称"/>
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
<Field label="扣分方式" prop="subMethod" v-model="form.subMethod" type="select" :enumData="dict.subMethod" placeholder="请选择扣分方式"/> <Field label="扣分方式" prop="subMethod" v-model="form.subMethod" type="select" :enumData="dict.subMethod" placeholder="请选择扣分方式"/>
<Field label="扣分人员" prop="deductPerson" v-model="form.deductPerson" placeholder="请输入扣分人员"/> <Field label="扣分人员" prop="deductPerson" v-model="form.deductPerson" placeholder="请输入扣分人员"/>
<Field label="扣分时间" prop="deductTime" v-model="form.deductTime" type="date" /> <Field label="扣分时间" prop="deductTime" v-model="form.deductTime" type="date" />
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</el-row> </el-row>
<form-buttons @submit='submitForm' noCancelBtn /> <form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn />
</el-form> </el-form>
</el-drawer> </el-drawer>
...@@ -126,6 +126,8 @@ ...@@ -126,6 +126,8 @@
staffName : "", staffName : "",
workNum : "", workNum : "",
windowNum : "", windowNum : "",
deptId : null,
deptName : "",
irregularType : null, irregularType : null,
happenTime : null, happenTime : null,
duration : 0, duration : 0,
...@@ -133,8 +135,6 @@ ...@@ -133,8 +135,6 @@
snapPath : "", snapPath : "",
ruleId : null, ruleId : null,
ruleName : "", ruleName : "",
deptId : null,
deptName : "",
subMethod : 1, subMethod : 1,
deductPerson : "", deductPerson : "",
deductTime : null, deductTime : null,
......
attendance-performance-manager-ui/admin/src/views/perform/effect/record/list.vue
View file @ 6782c2eb
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
// 是否更新已经存在的数据 // 是否更新已经存在的数据
updateSupport: 0, updateSupport: 0,
// 上传的地址 // 上传的地址
url: "/attendance/perform/effect/record/importData", url: "/m/perform/effect/record/importData",
}, },
isExport: false, isExport: false,
config: { config: {
...@@ -158,12 +158,32 @@ ...@@ -158,12 +158,32 @@
{label: "员工姓名", prop: "staffName"}, {label: "员工姓名", prop: "staffName"},
{label: "工号", prop: "workNum"},
{label: "窗口编号", prop: "windowNum"},
{label: "所属部门", prop: "deptId", formatter: this.formatter},
{label: "所属部门名称", prop: "deptName"},
{label: "违规类型", prop: "irregularType",formatter: this.formatter},
{label: "发生时间", prop: "happenTime", formatter: this.formatterDate}, {label: "发生时间", prop: "happenTime", formatter: this.formatterDate},
{label: "持续时间，秒", prop: "duration",formatter: this.formatter},
{label: "报警时间", prop: "alarmTime", formatter: this.formatterDate}, {label: "报警时间", prop: "alarmTime", formatter: this.formatterDate},
{label: "图片凭证地址", prop: "snapPath"},
{label: "绩效规则id", prop: "ruleId", formatter: this.formatter},
{label: "规则名称", prop: "ruleName"},
{label: "扣分方式", prop: "subMethod",formatter: this.formatter}, {label: "扣分方式", prop: "subMethod",formatter: this.formatter},
{label: "扣分人员", prop: "deductPerson"},
{label: "扣分时间", prop: "deductTime", formatter: this.formatterDate}, {label: "扣分时间", prop: "deductTime", formatter: this.formatterDate},
{label: "扣分或增加分值", prop: "score", formatter: this.formatter}, {label: "扣分或增加分值", prop: "score", formatter: this.formatter},
...@@ -185,4 +205,4 @@ ...@@ -185,4 +205,4 @@
}; };
} }
}; };
</script> </script>
\ No newline at end of file
attendance-performance-manager-ui/admin/src/views/perform/effect/record/view.vue
View file @ 6782c2eb
...@@ -20,6 +20,12 @@ ...@@ -20,6 +20,12 @@
<el-descriptions-item label="窗口编号" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="窗口编号" label-class-name="labelClass" content-class-name="contentClass">
{{form.windowNum}} {{form.windowNum}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所属部门" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="违规类型" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="违规类型" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("irregularType", form.irregularType) }} {{ util_formatters("irregularType", form.irregularType) }}
</el-descriptions-item> </el-descriptions-item>
...@@ -41,12 +47,6 @@ ...@@ -41,12 +47,6 @@
<el-descriptions-item label="规则名称" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="规则名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.ruleName}} {{form.ruleName}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所属部门" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="扣分方式" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="扣分方式" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("subMethod", form.subMethod) }} {{ util_formatters("subMethod", form.subMethod) }}
</el-descriptions-item> </el-descriptions-item>
......
attendance-performance-manager-ui/admin/src/views/perform/gowork/record/drawershow.vue
View file @ 6782c2eb
...@@ -11,14 +11,14 @@ ...@@ -11,14 +11,14 @@
<Field label="员工姓名" prop="staffName" v-model="form.staffName" placeholder="请输入员工姓名"/> <Field label="员工姓名" prop="staffName" v-model="form.staffName" placeholder="请输入员工姓名"/>
<Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/> <Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/>
<Field label="窗口编号" prop="windowNum" v-model="form.windowNum" placeholder="请输入窗口编号"/> <Field label="窗口编号" prop="windowNum" v-model="form.windowNum" placeholder="请输入窗口编号"/>
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
<Field label="办件编码" prop="goworkCode" v-model="form.goworkCode" placeholder="请输入办件编码"/> <Field label="办件编码" prop="goworkCode" v-model="form.goworkCode" placeholder="请输入办件编码"/>
<Field label="办件所属部门" prop="goworkDepts" v-model="form.goworkDepts" type="textarea" placeholder="请输入办件所属部门"/> <Field label="办件所属部门" prop="goworkDepts" v-model="form.goworkDepts" type="textarea" placeholder="请输入办件所属部门"/>
<Field label="事项名称" prop="matterlName" v-model="form.matterlName" type="textarea" placeholder="请输入事项名称"/> <Field label="事项名称" prop="matterlName" v-model="form.matterlName" type="textarea" placeholder="请输入事项名称"/>
<Field label="办理时间" prop="goworkTime" v-model="form.goworkTime" type="date" /> <Field label="办理时间" prop="goworkTime" v-model="form.goworkTime" type="date" />
<Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/> <Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/>
<Field label="规则名称" prop="ruleName" v-model="form.ruleName" placeholder="请输入规则名称"/> <Field label="规则名称" prop="ruleName" v-model="form.ruleName" placeholder="请输入规则名称"/>
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
<Field label="扣分方式" prop="subMethod" v-model="form.subMethod" type="select" :enumData="dict.subMethod" placeholder="请选择扣分方式"/> <Field label="扣分方式" prop="subMethod" v-model="form.subMethod" type="select" :enumData="dict.subMethod" placeholder="请选择扣分方式"/>
<Field label="扣分人员" prop="deductPerson" v-model="form.deductPerson" placeholder="请输入扣分人员"/> <Field label="扣分人员" prop="deductPerson" v-model="form.deductPerson" placeholder="请输入扣分人员"/>
<Field label="扣分时间" prop="deductTime" v-model="form.deductTime" type="date" /> <Field label="扣分时间" prop="deductTime" v-model="form.deductTime" type="date" />
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</el-row> </el-row>
<form-buttons @submit='submitForm' noCancelBtn /> <form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn />
</el-form> </el-form>
</el-drawer> </el-drawer>
...@@ -123,14 +123,14 @@ ...@@ -123,14 +123,14 @@
staffName : "", staffName : "",
workNum : "", workNum : "",
windowNum : "", windowNum : "",
deptId : null,
deptName : "",
goworkCode : "", goworkCode : "",
goworkDepts : "", goworkDepts : "",
matterlName : "", matterlName : "",
goworkTime : null, goworkTime : null,
ruleId : null, ruleId : null,
ruleName : "", ruleName : "",
deptId : null,
deptName : "",
subMethod : 1, subMethod : 1,
deductPerson : "", deductPerson : "",
deductTime : null, deductTime : null,
......
attendance-performance-manager-ui/admin/src/views/perform/gowork/record/list.vue
View file @ 6782c2eb
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
// 是否更新已经存在的数据 // 是否更新已经存在的数据
updateSupport: 0, updateSupport: 0,
// 上传的地址 // 上传的地址
url: "/attendance/perform/gowork/record/importData", url: "/m/perform/gowork/record/importData",
}, },
isExport: false, isExport: false,
config: { config: {
...@@ -158,10 +158,26 @@ ...@@ -158,10 +158,26 @@
{label: "员工姓名", prop: "staffName"}, {label: "员工姓名", prop: "staffName"},
{label: "工号", prop: "workNum"},
{label: "窗口编号", prop: "windowNum"},
{label: "所属部门名称", prop: "deptName"},
{label: "办件编码", prop: "goworkCode"},
{label: "办件所属部门", prop: "goworkDepts"},
{label: "事项名称", prop: "matterlName"},
{label: "办理时间", prop: "goworkTime", formatter: this.formatterDate}, {label: "办理时间", prop: "goworkTime", formatter: this.formatterDate},
{label: "规则名称", prop: "ruleName"},
{label: "扣分方式", prop: "subMethod",formatter: this.formatter}, {label: "扣分方式", prop: "subMethod",formatter: this.formatter},
{label: "扣分人员", prop: "deductPerson"},
{label: "扣分时间", prop: "deductTime", formatter: this.formatterDate}, {label: "扣分时间", prop: "deductTime", formatter: this.formatterDate},
{label: "扣分或增加分值", prop: "score", formatter: this.formatter}, {label: "扣分或增加分值", prop: "score", formatter: this.formatter},
...@@ -183,4 +199,4 @@ ...@@ -183,4 +199,4 @@
}; };
} }
}; };
</script> </script>
\ No newline at end of file
attendance-performance-manager-ui/admin/src/views/perform/gowork/record/view.vue
View file @ 6782c2eb
...@@ -20,6 +20,12 @@ ...@@ -20,6 +20,12 @@
<el-descriptions-item label="窗口编号" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="窗口编号" label-class-name="labelClass" content-class-name="contentClass">
{{form.windowNum}} {{form.windowNum}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所属部门" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="办件编码" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="办件编码" label-class-name="labelClass" content-class-name="contentClass">
{{form.goworkCode}} {{form.goworkCode}}
</el-descriptions-item> </el-descriptions-item>
...@@ -38,12 +44,6 @@ ...@@ -38,12 +44,6 @@
<el-descriptions-item label="规则名称" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="规则名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.ruleName}} {{form.ruleName}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所属部门" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="扣分方式" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="扣分方式" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("subMethod", form.subMethod) }} {{ util_formatters("subMethod", form.subMethod) }}
</el-descriptions-item> </el-descriptions-item>
......
attendance-performance-manager-ui/admin/src/views/perform/other/record/drawershow.vue
View file @ 6782c2eb
...@@ -11,14 +11,14 @@ ...@@ -11,14 +11,14 @@
<Field label="员工姓名" prop="staffName" v-model="form.staffName" placeholder="请输入员工姓名"/> <Field label="员工姓名" prop="staffName" v-model="form.staffName" placeholder="请输入员工姓名"/>
<Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/> <Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/>
<Field label="窗口编号" prop="windowNum" v-model="form.windowNum" placeholder="请输入窗口编号"/> <Field label="窗口编号" prop="windowNum" v-model="form.windowNum" placeholder="请输入窗口编号"/>
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
<Field label="违规类型" prop="irregularOtherType" v-model="form.irregularOtherType" type="select" :enumData="dict.irregularOtherType" placeholder="请选择违规类型"/> <Field label="违规类型" prop="irregularOtherType" v-model="form.irregularOtherType" type="select" :enumData="dict.irregularOtherType" placeholder="请选择违规类型"/>
<Field label="发生时间" prop="happenTime" v-model="form.happenTime" type="date" /> <Field label="发生时间" prop="happenTime" v-model="form.happenTime" type="date" />
<Field label="持续时间，秒" prop="duration" v-model="form.duration" placeholder="请输入持续时间，秒"/> <Field label="持续时间，秒" prop="duration" v-model="form.duration" placeholder="请输入持续时间，秒"/>
<Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/> <Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/>
<Field label="规则名称" prop="ruleName" v-model="form.ruleName" placeholder="请输入规则名称"/> <Field label="规则名称" prop="ruleName" v-model="form.ruleName" placeholder="请输入规则名称"/>
<Field label="评分标准" prop="ruleDesc" v-model="form.ruleDesc" type="textarea" placeholder="请输入评分标准"/> <Field label="评分标准" prop="ruleDesc" v-model="form.ruleDesc" type="textarea" placeholder="请输入评分标准"/>
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
<Field label="扣分方式" prop="subMethod" v-model="form.subMethod" type="select" :enumData="dict.subMethod" placeholder="请选择扣分方式"/> <Field label="扣分方式" prop="subMethod" v-model="form.subMethod" type="select" :enumData="dict.subMethod" placeholder="请选择扣分方式"/>
<Field label="扣分人员" prop="deductPerson" v-model="form.deductPerson" placeholder="请输入扣分人员"/> <Field label="扣分人员" prop="deductPerson" v-model="form.deductPerson" placeholder="请输入扣分人员"/>
<Field label="扣分时间" prop="deductTime" v-model="form.deductTime" type="date" /> <Field label="扣分时间" prop="deductTime" v-model="form.deductTime" type="date" />
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</el-row> </el-row>
<form-buttons @submit='submitForm' noCancelBtn /> <form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn />
</el-form> </el-form>
</el-drawer> </el-drawer>
...@@ -124,14 +124,14 @@ ...@@ -124,14 +124,14 @@
staffName : "", staffName : "",
workNum : "", workNum : "",
windowNum : "", windowNum : "",
deptId : null,
deptName : "",
irregularOtherType : null, irregularOtherType : null,
happenTime : null, happenTime : null,
duration : 0, duration : 0,
ruleId : null, ruleId : null,
ruleName : "", ruleName : "",
ruleDesc : "", ruleDesc : "",
deptId : null,
deptName : "",
subMethod : 1, subMethod : 1,
deductPerson : "", deductPerson : "",
deductTime : null, deductTime : null,
......
attendance-performance-manager-ui/admin/src/views/perform/other/record/list.vue
View file @ 6782c2eb
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
// 是否更新已经存在的数据 // 是否更新已经存在的数据
updateSupport: 0, updateSupport: 0,
// 上传的地址 // 上传的地址
url: "/attendance/perform/other/record/importData", url: "/m/perform/other/record/importData",
}, },
isExport: false, isExport: false,
config: { config: {
...@@ -158,10 +158,30 @@ ...@@ -158,10 +158,30 @@
{label: "员工姓名", prop: "staffName"}, {label: "员工姓名", prop: "staffName"},
{label: "工号", prop: "workNum"},
{label: "窗口编号", prop: "windowNum"},
{label: "所属部门", prop: "deptId", formatter: this.formatter},
{label: "所属部门名称", prop: "deptName"},
{label: "违规类型", prop: "irregularOtherType",formatter: this.formatter},
{label: "发生时间", prop: "happenTime", formatter: this.formatterDate}, {label: "发生时间", prop: "happenTime", formatter: this.formatterDate},
{label: "持续时间，秒", prop: "duration",formatter: this.formatter},
{label: "绩效规则id", prop: "ruleId", formatter: this.formatter},
{label: "规则名称", prop: "ruleName"},
{label: "评分标准", prop: "ruleDesc"},
{label: "扣分方式", prop: "subMethod",formatter: this.formatter}, {label: "扣分方式", prop: "subMethod",formatter: this.formatter},
{label: "扣分人员", prop: "deductPerson"},
{label: "扣分时间", prop: "deductTime", formatter: this.formatterDate}, {label: "扣分时间", prop: "deductTime", formatter: this.formatterDate},
{label: "扣分或增加分值", prop: "score", formatter: this.formatter}, {label: "扣分或增加分值", prop: "score", formatter: this.formatter},
...@@ -183,4 +203,4 @@ ...@@ -183,4 +203,4 @@
}; };
} }
}; };
</script> </script>
\ No newline at end of file
attendance-performance-manager-ui/admin/src/views/perform/other/record/view.vue
View file @ 6782c2eb
...@@ -20,6 +20,12 @@ ...@@ -20,6 +20,12 @@
<el-descriptions-item label="窗口编号" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="窗口编号" label-class-name="labelClass" content-class-name="contentClass">
{{form.windowNum}} {{form.windowNum}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所属部门" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="违规类型" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="违规类型" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("irregularOtherType", form.irregularOtherType) }} {{ util_formatters("irregularOtherType", form.irregularOtherType) }}
</el-descriptions-item> </el-descriptions-item>
...@@ -38,12 +44,6 @@ ...@@ -38,12 +44,6 @@
<el-descriptions-item label="评分标准" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="评分标准" label-class-name="labelClass" content-class-name="contentClass">
{{form.ruleDesc}} {{form.ruleDesc}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所属部门" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="扣分方式" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="扣分方式" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("subMethod", form.subMethod) }} {{ util_formatters("subMethod", form.subMethod) }}
</el-descriptions-item> </el-descriptions-item>
......
attendance-performance-manager-ui/admin/src/views/perform/review/record/drawershow.vue
View file @ 6782c2eb
...@@ -11,14 +11,14 @@ ...@@ -11,14 +11,14 @@
<Field label="员工姓名" prop="staffName" v-model="form.staffName" placeholder="请输入员工姓名"/> <Field label="员工姓名" prop="staffName" v-model="form.staffName" placeholder="请输入员工姓名"/>
<Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/> <Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/>
<Field label="窗口编号" prop="windowNum" v-model="form.windowNum" placeholder="请输入窗口编号"/> <Field label="窗口编号" prop="windowNum" v-model="form.windowNum" placeholder="请输入窗口编号"/>
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
<Field label="评价结果" prop="reviewResult" v-model="form.reviewResult" type="select" :enumData="dict.reviewResult" placeholder="请选择评价结果"/> <Field label="评价结果" prop="reviewResult" v-model="form.reviewResult" type="select" :enumData="dict.reviewResult" placeholder="请选择评价结果"/>
<Field label="评价时间" prop="reviewTime" v-model="form.reviewTime" type="date" /> <Field label="评价时间" prop="reviewTime" v-model="form.reviewTime" type="date" />
<Field label="评价来源" prop="reviewSource" v-model="form.reviewSource" type="select" :enumData="dict.reviewSource" placeholder="请选择评价来源"/> <Field label="评价来源" prop="reviewSource" v-model="form.reviewSource" type="select" :enumData="dict.reviewSource" placeholder="请选择评价来源"/>
<Field label="评价设备" prop="reviewDevice" v-model="form.reviewDevice" placeholder="请输入评价设备"/> <Field label="评价设备" prop="reviewDevice" v-model="form.reviewDevice" placeholder="请输入评价设备"/>
<Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/> <Field label="绩效规则id" prop="ruleId" v-model="form.ruleId" placeholder="请输入绩效规则id"/>
<Field label="规则名称" prop="ruleName" v-model="form.ruleName" placeholder="请输入规则名称"/> <Field label="规则名称" prop="ruleName" v-model="form.ruleName" placeholder="请输入规则名称"/>
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
<Field label="扣分方式" prop="subMethod" v-model="form.subMethod" type="select" :enumData="dict.subMethod" placeholder="请选择扣分方式"/> <Field label="扣分方式" prop="subMethod" v-model="form.subMethod" type="select" :enumData="dict.subMethod" placeholder="请选择扣分方式"/>
<Field label="扣分人员" prop="deductPerson" v-model="form.deductPerson" placeholder="请输入扣分人员"/> <Field label="扣分人员" prop="deductPerson" v-model="form.deductPerson" placeholder="请输入扣分人员"/>
<Field label="扣分时间" prop="deductTime" v-model="form.deductTime" type="date" /> <Field label="扣分时间" prop="deductTime" v-model="form.deductTime" type="date" />
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</el-row> </el-row>
<form-buttons @submit='submitForm' noCancelBtn /> <form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn />
</el-form> </el-form>
</el-drawer> </el-drawer>
...@@ -124,14 +124,14 @@ ...@@ -124,14 +124,14 @@
staffName : "", staffName : "",
workNum : "", workNum : "",
windowNum : "", windowNum : "",
deptId : null,
deptName : "",
reviewResult : null, reviewResult : null,
reviewTime : null, reviewTime : null,
reviewSource : "", reviewSource : "",
reviewDevice : "", reviewDevice : "",
ruleId : null, ruleId : null,
ruleName : "", ruleName : "",
deptId : null,
deptName : "",
subMethod : 1, subMethod : 1,
deductPerson : "", deductPerson : "",
deductTime : null, deductTime : null,
......
attendance-performance-manager-ui/admin/src/views/perform/review/record/list.vue
View file @ 6782c2eb
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
// 是否更新已经存在的数据 // 是否更新已经存在的数据
updateSupport: 0, updateSupport: 0,
// 上传的地址 // 上传的地址
url: "/attendance/perform/review/record/importData", url: "/m/perform/review/record/importData",
}, },
isExport: false, isExport: false,
config: { config: {
...@@ -158,8 +158,24 @@ ...@@ -158,8 +158,24 @@
{label: "员工姓名", prop: "staffName"}, {label: "员工姓名", prop: "staffName"},
{label: "工号", prop: "workNum"},
{label: "窗口编号", prop: "windowNum"},
{label: "所属部门", prop: "deptId", formatter: this.formatter},
{label: "所属部门名称", prop: "deptName"},
{label: "评价结果", prop: "reviewResult",formatter: this.formatter},
{label: "评价时间", prop: "reviewTime", formatter: this.formatterDate}, {label: "评价时间", prop: "reviewTime", formatter: this.formatterDate},
{label: "评价来源", prop: "reviewSource"},
{label: "评价设备", prop: "reviewDevice"},
{label: "规则名称", prop: "ruleName"},
{label: "扣分方式", prop: "subMethod",formatter: this.formatter}, {label: "扣分方式", prop: "subMethod",formatter: this.formatter},
{label: "扣分时间", prop: "deductTime", formatter: this.formatterDate}, {label: "扣分时间", prop: "deductTime", formatter: this.formatterDate},
...@@ -183,4 +199,4 @@ ...@@ -183,4 +199,4 @@
}; };
} }
}; };
</script> </script>
\ No newline at end of file
attendance-performance-manager-ui/admin/src/views/perform/review/record/view.vue
View file @ 6782c2eb
...@@ -20,6 +20,12 @@ ...@@ -20,6 +20,12 @@
<el-descriptions-item label="窗口编号" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="窗口编号" label-class-name="labelClass" content-class-name="contentClass">
{{form.windowNum}} {{form.windowNum}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所属部门" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="评价结果" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="评价结果" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("reviewResult", form.reviewResult) }} {{ util_formatters("reviewResult", form.reviewResult) }}
</el-descriptions-item> </el-descriptions-item>
...@@ -38,12 +44,6 @@ ...@@ -38,12 +44,6 @@
<el-descriptions-item label="规则名称" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="规则名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.ruleName}} {{form.ruleName}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="所属部门" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="扣分方式" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="扣分方式" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("subMethod", form.subMethod) }} {{ util_formatters("subMethod", form.subMethod) }}
</el-descriptions-item> </el-descriptions-item>
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordEntity.java
View file @ 6782c2eb
...@@ -43,14 +43,6 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -43,14 +43,6 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
*/ */
private String deptName; private String deptName;
/** /**
* 职位ID
*/
private Long positionId;
/**
* 职位名称
*/
private String positionName;
/**
* 所属考勤组ID * 所属考勤组ID
*/ */
private Long attendanceGroupId; private Long attendanceGroupId;
...@@ -59,14 +51,6 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -59,14 +51,6 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
*/ */
private String attendanceGroupName; private String attendanceGroupName;
/** /**
* 班次ID
*/
private Long shiftsId;
/**
* 班次名称
*/
private String shiftsName;
/**
* 考勤时间 * 考勤时间
*/ */
private Date attendanceDate; private Date attendanceDate;
...@@ -89,7 +73,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -89,7 +73,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
/** /**
* 上下班时间 * 上下班时间
*/ */
private Date goOffTime; private String goOffTimeStr;
/** /**
* 异常时间 * 异常时间
*/ */
...@@ -103,13 +87,25 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -103,13 +87,25 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
*/ */
private String errorResult; private String errorResult;
/** /**
* 处理状态(1.未处理,2.已处理) * 核查人员
*/ */
private Integer checkStatus; private String checkPerson;
/**
* 核查时间
*/
private Date checkTime;
/**
* 核查说明
*/
private String checkDesc;
/** /**
* 备注 * 核查结果
*/ */
private String remark; private String checkResult;
/**
* 处理状态(1.未处理,2.已处理)
*/
private Integer checkStatus;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -140,18 +136,10 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -140,18 +136,10 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
this.deptName = ""; this.deptName = "";
this.positionId = -1L;
this.positionName = "";
this.attendanceGroupId = -1L; this.attendanceGroupId = -1L;
this.attendanceGroupName = ""; this.attendanceGroupName = "";
this.shiftsId = -1L;
this.shiftsName = "";
this.attendanceDate = null; this.attendanceDate = null;
this.ruleId = -1L; this.ruleId = -1L;
...@@ -162,7 +150,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -162,7 +150,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
this.score = BigDecimal.valueOf(0.00); this.score = BigDecimal.valueOf(0.00);
this.goOffTime = null; this.goOffTimeStr = "";
this.errorTime = null; this.errorTime = null;
...@@ -170,8 +158,14 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -170,8 +158,14 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
this.errorResult = ""; this.errorResult = "";
this.checkStatus = 1; this.checkPerson = "";
this.checkTime = null;
this.remark = ""; this.checkDesc = "";
this.checkResult = "";
this.checkStatus = 1;
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckComplainRecordEntity.java
View file @ 6782c2eb
...@@ -39,6 +39,14 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo { ...@@ -39,6 +39,14 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
*/ */
private String windowNum; private String windowNum;
/** /**
* 所属部门
*/
private Long deptId;
/**
* 所属部门名称
*/
private String deptName;
/**
* 投诉标题 * 投诉标题
*/ */
private String complainTitle; private String complainTitle;
...@@ -75,14 +83,6 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo { ...@@ -75,14 +83,6 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
*/ */
private String ruleName; private String ruleName;
/** /**
* 所属部门
*/
private Long deptId;
/**
* 所属部门名称
*/
private String deptName;
/**
* 扣分方式(1.系统自动,2.人工添加) * 扣分方式(1.系统自动,2.人工添加)
*/ */
private Integer subMethod; private Integer subMethod;
...@@ -150,6 +150,10 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo { ...@@ -150,6 +150,10 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
this.windowNum = ""; this.windowNum = "";
this.deptId = -1L;
this.deptName = "";
this.complainTitle = ""; this.complainTitle = "";
this.complainContent = ""; this.complainContent = "";
...@@ -168,10 +172,6 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo { ...@@ -168,10 +172,6 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
this.ruleName = ""; this.ruleName = "";
this.deptId = -1L;
this.deptName = "";
this.subMethod = 1; this.subMethod = 1;
this.deductPerson = ""; this.deductPerson = "";
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckEffectRecordEntity.java
View file @ 6782c2eb
...@@ -39,6 +39,14 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo { ...@@ -39,6 +39,14 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
*/ */
private String windowNum; private String windowNum;
/** /**
* 所属部门
*/
private Long deptId;
/**
* 所属部门名称
*/
private String deptName;
/**
* 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉) * 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉)
*/ */
private Integer irregularType; private Integer irregularType;
...@@ -67,14 +75,6 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo { ...@@ -67,14 +75,6 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
*/ */
private String ruleName; private String ruleName;
/** /**
* 所属部门
*/
private Long deptId;
/**
* 所属部门名称
*/
private String deptName;
/**
* 扣分方式(1.系统自动,2.人工添加) * 扣分方式(1.系统自动,2.人工添加)
*/ */
private Integer subMethod; private Integer subMethod;
...@@ -142,6 +142,10 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo { ...@@ -142,6 +142,10 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
this.windowNum = ""; this.windowNum = "";
this.deptId = -1L;
this.deptName = "";
this.irregularType = -1; this.irregularType = -1;
this.happenTime = null; this.happenTime = null;
...@@ -156,10 +160,6 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo { ...@@ -156,10 +160,6 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
this.ruleName = ""; this.ruleName = "";
this.deptId = -1L;
this.deptName = "";
this.subMethod = 1; this.subMethod = 1;
this.deductPerson = ""; this.deductPerson = "";
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckGoworkRecordEntity.java
View file @ 6782c2eb
...@@ -39,6 +39,14 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -39,6 +39,14 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
*/ */
private String windowNum; private String windowNum;
/** /**
* 所属部门
*/
private Long deptId;
/**
* 所属部门名称
*/
private String deptName;
/**
* 办件编码 * 办件编码
*/ */
private String goworkCode; private String goworkCode;
...@@ -63,14 +71,6 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -63,14 +71,6 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
*/ */
private String ruleName; private String ruleName;
/** /**
* 所属部门
*/
private Long deptId;
/**
* 所属部门名称
*/
private String deptName;
/**
* 扣分方式(1.系统自动,2.人工添加) * 扣分方式(1.系统自动,2.人工添加)
*/ */
private Integer subMethod; private Integer subMethod;
...@@ -138,6 +138,10 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -138,6 +138,10 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
this.windowNum = ""; this.windowNum = "";
this.deptId = -1L;
this.deptName = "";
this.goworkCode = ""; this.goworkCode = "";
this.goworkDepts = ""; this.goworkDepts = "";
...@@ -150,10 +154,6 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -150,10 +154,6 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
this.ruleName = ""; this.ruleName = "";
this.deptId = -1L;
this.deptName = "";
this.subMethod = 1; this.subMethod = 1;
this.deductPerson = ""; this.deductPerson = "";
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckOtherRecordEntity.java
View file @ 6782c2eb
...@@ -35,6 +35,14 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo { ...@@ -35,6 +35,14 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
*/ */
private String workNum; private String workNum;
/** /**
* 所属部门
*/
private Long deptId;
/**
* 所属部门名称
*/
private String deptName;
/**
* 窗口编号 * 窗口编号
*/ */
private String windowNum; private String windowNum;
...@@ -63,14 +71,6 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo { ...@@ -63,14 +71,6 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
*/ */
private String ruleDesc; private String ruleDesc;
/** /**
* 所属部门
*/
private Long deptId;
/**
* 所属部门名称
*/
private String deptName;
/**
* 扣分方式(1.系统自动,2.人工添加) * 扣分方式(1.系统自动,2.人工添加)
*/ */
private Integer subMethod; private Integer subMethod;
...@@ -136,6 +136,10 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo { ...@@ -136,6 +136,10 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
this.workNum = ""; this.workNum = "";
this.deptId = -1L;
this.deptName = "";
this.windowNum = ""; this.windowNum = "";
this.irregularOtherType = -1; this.irregularOtherType = -1;
...@@ -150,10 +154,6 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo { ...@@ -150,10 +154,6 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
this.ruleDesc = ""; this.ruleDesc = "";
this.deptId = -1L;
this.deptName = "";
this.subMethod = 1; this.subMethod = 1;
this.deductPerson = ""; this.deductPerson = "";
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckReviewRecordEntity.java
View file @ 6782c2eb
...@@ -39,6 +39,14 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -39,6 +39,14 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
*/ */
private String windowNum; private String windowNum;
/** /**
* 所属部门
*/
private Long deptId;
/**
* 所属部门名称
*/
private String deptName;
/**
* 评价结果(1.非常不满意,2.差评) * 评价结果(1.非常不满意,2.差评)
*/ */
private Integer reviewResult; private Integer reviewResult;
...@@ -63,14 +71,6 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -63,14 +71,6 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
*/ */
private String ruleName; private String ruleName;
/** /**
* 所属部门
*/
private Long deptId;
/**
* 所属部门名称
*/
private String deptName;
/**
* 扣分方式(1.系统自动,2.人工添加) * 扣分方式(1.系统自动,2.人工添加)
*/ */
private Integer subMethod; private Integer subMethod;
...@@ -138,6 +138,10 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -138,6 +138,10 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
this.windowNum = ""; this.windowNum = "";
this.deptId = -1L;
this.deptName = "";
this.reviewResult = -1; this.reviewResult = -1;
this.reviewTime = null; this.reviewTime = null;
...@@ -150,10 +154,6 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -150,10 +154,6 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
this.ruleName = ""; this.ruleName = "";
this.deptId = -1L;
this.deptName = "";
this.subMethod = 1; this.subMethod = 1;
this.deductPerson = ""; this.deductPerson = "";
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAttendRecordVo.java
View file @ 6782c2eb
package com.mortals.xhx.module.check.model.vo; package com.mortals.xhx.module.check.model.vo;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.CheckAttendRecordEntity; import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -13,6 +14,21 @@ import lombok.Data; ...@@ -13,6 +14,21 @@ import lombok.Data;
@Data @Data
public class CheckAttendRecordVo extends BaseEntityLong { public class CheckAttendRecordVo extends BaseEntityLong {
/**
* 核查人员
*/
@Excel(name = "核查人员")
private String checkPerson;
/**
* 核查说明
*/
@Excel(name = "核查说明")
private String checkDesc;
/**
* 核查结果
*/
@Excel(name = "核查结果")
private String checkResult;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckComplainRecordVo.java
View file @ 6782c2eb
...@@ -30,6 +30,11 @@ public class CheckComplainRecordVo extends BaseEntityLong { ...@@ -30,6 +30,11 @@ public class CheckComplainRecordVo extends BaseEntityLong {
@Excel(name = "窗口编号") @Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 所属部门名称
*/
@Excel(name = "所属部门名称")
private String deptName;
/**
* 投诉标题 * 投诉标题
*/ */
@Excel(name = "投诉标题") @Excel(name = "投诉标题")
...@@ -45,11 +50,6 @@ public class CheckComplainRecordVo extends BaseEntityLong { ...@@ -45,11 +50,6 @@ public class CheckComplainRecordVo extends BaseEntityLong {
@Excel(name = "联系电话") @Excel(name = "联系电话")
private String contact; private String contact;
/** /**
* 所属部门名称
*/
@Excel(name = "所属部门名称")
private String deptName;
/**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员") @Excel(name = "扣分人员")
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckEffectRecordVo.java
View file @ 6782c2eb
...@@ -31,6 +31,11 @@ public class CheckEffectRecordVo extends BaseEntityLong { ...@@ -31,6 +31,11 @@ public class CheckEffectRecordVo extends BaseEntityLong {
@Excel(name = "窗口编号") @Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 所属部门名称
*/
@Excel(name = "所属部门名称")
private String deptName;
/**
* 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉) * 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉)
*/ */
@Excel(name = "违规类型", readConverterExp = "1=脱岗,2.离岗,3.玩手机,4.睡觉") @Excel(name = "违规类型", readConverterExp = "1=脱岗,2.离岗,3.玩手机,4.睡觉")
...@@ -41,11 +46,6 @@ public class CheckEffectRecordVo extends BaseEntityLong { ...@@ -41,11 +46,6 @@ public class CheckEffectRecordVo extends BaseEntityLong {
@Excel(name = "发生时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "发生时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date happenTime; private Date happenTime;
/** /**
* 所属部门名称
*/
@Excel(name = "所属部门名称")
private String deptName;
/**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员") @Excel(name = "扣分人员")
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckGoworkRecordVo.java
View file @ 6782c2eb
...@@ -28,6 +28,11 @@ public class CheckGoworkRecordVo extends BaseEntityLong { ...@@ -28,6 +28,11 @@ public class CheckGoworkRecordVo extends BaseEntityLong {
@Excel(name = "窗口编号") @Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 所属部门名称
*/
@Excel(name = "所属部门名称")
private String deptName;
/**
* 办件编码 * 办件编码
*/ */
@Excel(name = "办件编码") @Excel(name = "办件编码")
...@@ -53,11 +58,6 @@ public class CheckGoworkRecordVo extends BaseEntityLong { ...@@ -53,11 +58,6 @@ public class CheckGoworkRecordVo extends BaseEntityLong {
@Excel(name = "规则名称") @Excel(name = "规则名称")
private String ruleName; private String ruleName;
/** /**
* 所属部门名称
*/
@Excel(name = "所属部门名称")
private String deptName;
/**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员") @Excel(name = "扣分人员")
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/PerformAttendRecordDao.java
View file @ 6782c2eb
...@@ -8,7 +8,7 @@ import java.util.List; ...@@ -8,7 +8,7 @@ import java.util.List;
* 考勤绩效记录信息 DAO接口 * 考勤绩效记录信息 DAO接口
* *
* @author zxfei * @author zxfei
* @date 2023-05-17 * @date 2023-05-18
*/ */
public interface PerformAttendRecordDao extends ICRUDDao<PerformAttendRecordEntity,Long>{ public interface PerformAttendRecordDao extends ICRUDDao<PerformAttendRecordEntity,Long>{
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/PerformComplainRecordDao.java
View file @ 6782c2eb
...@@ -8,7 +8,7 @@ import java.util.List; ...@@ -8,7 +8,7 @@ import java.util.List;
* 评价绩效投诉记录信息 DAO接口 * 评价绩效投诉记录信息 DAO接口
* *
* @author zxfei * @author zxfei
* @date 2023-05-17 * @date 2023-05-18
*/ */
public interface PerformComplainRecordDao extends ICRUDDao<PerformComplainRecordEntity,Long>{ public interface PerformComplainRecordDao extends ICRUDDao<PerformComplainRecordEntity,Long>{
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/PerformEffectRecordDao.java
View file @ 6782c2eb
...@@ -8,7 +8,7 @@ import java.util.List; ...@@ -8,7 +8,7 @@ import java.util.List;
* 效能绩效记录信息 DAO接口 * 效能绩效记录信息 DAO接口
* *
* @author zxfei * @author zxfei
* @date 2023-05-17 * @date 2023-05-18
*/ */
public interface PerformEffectRecordDao extends ICRUDDao<PerformEffectRecordEntity,Long>{ public interface PerformEffectRecordDao extends ICRUDDao<PerformEffectRecordEntity,Long>{
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/PerformGoworkRecordDao.java
View file @ 6782c2eb
...@@ -8,7 +8,7 @@ import java.util.List; ...@@ -8,7 +8,7 @@ import java.util.List;
* 办件绩效记录信息 DAO接口 * 办件绩效记录信息 DAO接口
* *
* @author zxfei * @author zxfei
* @date 2023-05-17 * @date 2023-05-18
*/ */
public interface PerformGoworkRecordDao extends ICRUDDao<PerformGoworkRecordEntity,Long>{ public interface PerformGoworkRecordDao extends ICRUDDao<PerformGoworkRecordEntity,Long>{
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/PerformOtherRecordDao.java
View file @ 6782c2eb
...@@ -8,7 +8,7 @@ import java.util.List; ...@@ -8,7 +8,7 @@ import java.util.List;
* 其它绩效记录信息 DAO接口 * 其它绩效记录信息 DAO接口
* *
* @author zxfei * @author zxfei
* @date 2023-05-17 * @date 2023-05-18
*/ */
public interface PerformOtherRecordDao extends ICRUDDao<PerformOtherRecordEntity,Long>{ public interface PerformOtherRecordDao extends ICRUDDao<PerformOtherRecordEntity,Long>{
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/PerformReviewRecordDao.java
View file @ 6782c2eb
...@@ -8,7 +8,7 @@ import java.util.List; ...@@ -8,7 +8,7 @@ import java.util.List;
* 评价差评绩效记录信息 DAO接口 * 评价差评绩效记录信息 DAO接口
* *
* @author zxfei * @author zxfei
* @date 2023-05-17 * @date 2023-05-18
*/ */
public interface PerformReviewRecordDao extends ICRUDDao<PerformReviewRecordEntity,Long>{ public interface PerformReviewRecordDao extends ICRUDDao<PerformReviewRecordEntity,Long>{
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/ibatis/PerformAttendRecordDaoImpl.java
View file @ 6782c2eb
...@@ -11,7 +11,7 @@ import java.util.List; ...@@ -11,7 +11,7 @@ import java.util.List;
* 考勤绩效记录信息DaoImpl DAO接口 * 考勤绩效记录信息DaoImpl DAO接口
* *
* @author zxfei * @author zxfei
* @date 2023-05-17 * @date 2023-05-18
*/ */
@Repository("performAttendRecordDao") @Repository("performAttendRecordDao")
public class PerformAttendRecordDaoImpl extends BaseCRUDDaoMybatis<PerformAttendRecordEntity,Long> implements PerformAttendRecordDao { public class PerformAttendRecordDaoImpl extends BaseCRUDDaoMybatis<PerformAttendRecordEntity,Long> implements PerformAttendRecordDao {
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/ibatis/PerformComplainRecordDaoImpl.java
View file @ 6782c2eb
...@@ -11,7 +11,7 @@ import java.util.List; ...@@ -11,7 +11,7 @@ import java.util.List;
* 评价绩效投诉记录信息DaoImpl DAO接口 * 评价绩效投诉记录信息DaoImpl DAO接口
* *
* @author zxfei * @author zxfei
* @date 2023-05-17 * @date 2023-05-18
*/ */
@Repository("performComplainRecordDao") @Repository("performComplainRecordDao")
public class PerformComplainRecordDaoImpl extends BaseCRUDDaoMybatis<PerformComplainRecordEntity,Long> implements PerformComplainRecordDao { public class PerformComplainRecordDaoImpl extends BaseCRUDDaoMybatis<PerformComplainRecordEntity,Long> implements PerformComplainRecordDao {
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/ibatis/PerformEffectRecordDaoImpl.java
View file @ 6782c2eb
...@@ -11,7 +11,7 @@ import java.util.List; ...@@ -11,7 +11,7 @@ import java.util.List;
* 效能绩效记录信息DaoImpl DAO接口 * 效能绩效记录信息DaoImpl DAO接口
* *
* @author zxfei * @author zxfei
* @date 2023-05-17 * @date 2023-05-18
*/ */
@Repository("performEffectRecordDao") @Repository("performEffectRecordDao")
public class PerformEffectRecordDaoImpl extends BaseCRUDDaoMybatis<PerformEffectRecordEntity,Long> implements PerformEffectRecordDao { public class PerformEffectRecordDaoImpl extends BaseCRUDDaoMybatis<PerformEffectRecordEntity,Long> implements PerformEffectRecordDao {
......
doc/考勤绩效管理系统.docx
View file @ 6782c2eb
This diff is collapsed.
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