Skip to content

A
attendance-performance-platform
Commit 87216c4f authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 69ebf551 47ca8729
Expand all Show whitespace changes
Inline Side-by-side
Showing with 408 additions and 340 deletions
attendance-performance-manager-ui/admin/src/views/attendance/record/error/drawershow.vue
View file @ 87216c4f
......@@ -4,46 +4,62 @@
title="批量处理"
:visible.sync="open"
:direction="direction"
size="50%">
size="50%"
>
<div style="padding:20px;font-size:15px">
<div>
已选择{{selection.length}}个：
</div>
<div>已选择{{ selection.length }}个：</div>
<div class="staffList mt20">
<div v-for="item in selection" :key="item" class="mt10">
将<span> {{item.staffName}} </span>
<span>的 {{item.goOrOff}} 时间 {{item.goOffDateTime}} 打卡异常状态</span>
将<span> {{ item.staffName }} </span>
<span
>的 {{ item.goOrOff }} 时间
{{ item.goOffDateTime }} 打卡异常状态</span
>
<span class="ml10" style="color:#f56c6c">
{{dict['errorStatus'][item.errorStatus]}}
{{ dict["errorStatus"][item.errorStatus] }}
</span>
<span class="ml10">修改为</span>
</div>
<div class="mt10">
<!--
<!--
<Field label="" v-model="dealParams.processResult" type="select" :enumData="dict.errorStatus"/>
-->
<!-- 处理异常状态 -->
<el-select v-model="dealParams.processResult">
<el-select v-model="dealParams.errorStatus">
<el-option
v-for='($label, $value) in dict.errorStatus'
v-for="($label, $value) in dict.errorStatus"
:key="$value"
:label="$label"
:value="$value">
:value="$value"
>
</el-option>
</el-select>
<!-- 早退/迟到 -->
<el-input style="width:220px" placeholder="请输入数字" :maxlength="4" v-model="duration"
v-if="dealParams.processResult == '1'|| dealParams.processResult == '2'"
class="ml20" type="number">
<el-input
style="width:220px"
placeholder="请输入数字"
:maxlength="4"
v-model="duration"
v-if="
dealParams.errorStatus == '1' || dealParams.errorStatus == '2'
"
class="ml20"
type="number"
>
<template slot="append">分钟</template>
</el-input>
</div>
<div class="mt10">
<span>备注：</span>
<el-input placeholder="请输入备注" type="textarea" show-word-limit class="mt10"
:maxlength="50" v-model="dealParams.remark"></el-input>
<span>处理结果：</span>
<el-input
placeholder="请输入处理结果"
type="textarea"
show-word-limit
class="mt10"
:maxlength="50"
v-model="dealParams.processResult"
></el-input>
</div>
</div>
<div class="mt20">
......@@ -51,16 +67,13 @@
<el-button @click="cancleFn">取消</el-button>
</div>
</div>
</el-drawer>
</template>
<script>
export default {
export default {
name: "AttendanceRecordDetail",
created() {
},
created() {},
data() {
return {
// 遮罩层
......@@ -69,100 +82,105 @@
title: "考勤打卡记录信息",
// 是否显示弹出层
open: false,
direction:"rtl",
toString: ["processResult"],
direction: "rtl",
toString: ["processResult", "errorStatus"],
// 表单校验
rules: {
staffName: [
{required: true,message: "请输入员工姓名", trigger: "blur" },
{max: 64,message: "最多只能录入64个字符",trigger: "blur",},
],
createTime: [
{required: true,message: "请选择创建时间" },
{ required: true, message: "请输入员工姓名", trigger: "blur" },
{ max: 64, message: "最多只能录入64个字符", trigger: "blur" },
],
createTime: [{ required: true, message: "请选择创建时间" }],
},
dealParams:{
remark:'',
errorStatus:null,
durtion:0,
processResult:'',
recordErrorEntities:[],//处理员工
processStatus:1//处理状态
dealParams: {
remark: "",
errorStatus: null,
durtion: 0,
processResult: "",
recordErrorEntities: [], //处理员工
processStatus: 1, //处理状态
},
selection:[],
query:{},
urls:{
currUrl:'',
saveUrl:'attendance/record/error/save'
selection: [],
query: {},
urls: {
currUrl: "",
saveUrl: "attendance/record/error/save",
},
dict:{
errorStatus:''
dict: {
errorStatus: "",
},
duration:''
}
duration: "",
};
},
methods: {
// 渲染前置处理
beforeRender(data) {
return data
return data;
},
/** 编辑 */
edit(row,selection) {
if(selection.length<1){
this.selection = [row]
edit(row, selection) {
if (selection.length < 1) {
this.selection = [row];
this.query = { id: row.id };
}else{
this.selection = selection
this.query = {id:this.selection[0].id}
} else {
this.selection = selection;
this.query = { id: this.selection[0].id };
}
this.dealParams.recordErrorEntities = this.selection
this.urls.currUrl ="attendance/record/error/edit";
this.getInital(this.query.id)
this.dealParams.recordErrorEntities = this.selection;
this.urls.currUrl = "attendance/record/error/edit";
this.getInital(this.query.id);
},
/**获取数据后弹框 */
afterRender(data) {
this.open = true;
},
getInital(id){
this.$post(this.urls.currUrl+'?id='+id).then(res => {
if(res.code == 1){
this.afterRender()
this.dict = res.data.dict
getInital(id) {
this.$post(this.urls.currUrl + "?id=" + id).then((res) => {
if (res.code == 1) {
this.afterRender();
this.dict = res.data.dict;
}
})
});
},
// 保存
saveForm(){
if(this.dealParams.processResult == ''){
this.$message.error('请选择处理结果')
return
saveForm() {
if (this.dealParams.errorStatus == "") {
this.$message.error("请选择处理结果");
return;
}
this.dealParams.errorStatus=this.dealParams.processResult
if(this.duration && (this.dealParams.processResult == '1' || this.dealParams.processResult == '2')){
this.dealParams.processResult =this.dict.errorStatus[this.dealParams.processResult] + this.duration +'分钟'
this.dealParams.durtion=this.duration
this.dealParams.errorStatus = this.dealParams.errorStatus;
if (
this.duration &&
(this.dealParams.errorStatus == "1" ||
this.dealParams.errorStatus == "2")
) {
this.dealParams.errorStatus =
this.dict.errorStatus[this.dealParams.errorStatus] +
this.duration +
"分钟";
this.dealParams.durtion = this.duration;
}
// 保存结果处理
this.$post(this.urls.saveUrl,this.dealParams).then(res => {
if(res.code == 1){
this.cancleFn()
this.$post(this.urls.saveUrl, this.dealParams).then((res) => {
if (res.code == 1) {
this.cancleFn();
}
})
});
},
cancleFn(){
this.open = false
cancleFn() {
this.open = false;
this.dealParams = {
remark:'',
errorStatus:null,
durtion:0,
processResult:'',
recordErrorEntities:[],//处理员工
processStatus:1//处理状态
}
this.$emit("ok")
}
}
}
remark: "",
errorStatus: null,
durtion: 0,
processResult: "",
recordErrorEntities: [], //处理员工
processStatus: 1, //处理状态
};
this.$emit("ok");
},
},
};
</script>
attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue
View file @ 87216c4f
......@@ -102,8 +102,11 @@ export default {
methods: {
// 处理
handleArr(arr, currentTime) {
let index = arr.findIndex((item) => item.createTime === currentTime);
console.log(currentTime);
console.log(arr);
let index = arr.findIndex((item) => item.createTime == currentTime);
if (index > -1) {
console.log(arr[index].attendanceSummary);
return arr[index].attendanceSummary;
} else {
return "-";
......@@ -263,16 +266,21 @@ export default {
{ label: "出勤天数", prop: "goTimes", formatter: this.formatter },
{
label: "上午缺卡次数",
label: "缺卡次数",
prop: "morningTimes",
formatter: this.formatter,
},
// {
// label: "上午缺卡次数",
// prop: "morningTimes",
// formatter: this.formatter,
// },
{
label: "下午缺卡次数",
prop: "afternoonTimes",
formatter: this.formatter,
},
// {
// label: "下午缺卡次数",
// prop: "afternoonTimes",
// formatter: this.formatter,
// },
{ label: "回单位（天）", prop: "backToUnit" },
{ label: "因公请假（天）", prop: "onDutyLeave" },
......
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