zzyuan
/
gz-att-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

前端修改

This commit is contained in:
zzyuan 2024-10-18 09:39:11 +08:00
parent a31b89d2ae
commit 211e68e2ae
5 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/exceptionHandle/errorForm/index.vue
View File

@ -114,10 +114,10 @@
</el-table-column>
<el-table-column label="姓名" align="center" prop="name" sortable/>
<el-table-column label="所属部门" align="center" prop="orgName" sortable/>
<el-table-column label="请假类型" align="center" prop="leaveType" sortable/>
<el-table-column label="请假开始时间" align="center" prop="leaveStartDate" sortable/>
<el-table-column label="请假结束时间" align="center" prop="leaveEndDate" sortable/>
<el-table-column label="请假时长(天)" align="center" prop="leaveDuration" sortable/>
<el-table-column label="申请类型" align="center" prop="leaveType" sortable/>
<el-table-column label="开始时间" align="center" prop="leaveStartDate" sortable/>
<el-table-column label="结束时间" align="center" prop="leaveEndDate" sortable/>
<el-table-column label="时长(天)" align="center" prop="leaveDuration" sortable/>
<el-table-column label="审批状态" align="center" prop="examineStatus" sortable>
<template slot-scope="scope">
<span v-if="scope.row.examineStatus==0">{{ '审核中' }}</span>

4
src/views/process/outApply/index.vue
View File

@ -307,13 +307,15 @@ export default {
handleDateChange(){
if(this.form.leaveStartDate&&this.form.leaveEndDate){
let daysNumber = this.daysBetween(this.form.leaveStartDate,this.form.leaveEndDate)
console.log(daysNumber)
// console.log(daysNumber)
if(this.form.leaveStartInterval==1&&this.form.leaveEndInterval==1){
this.form.leaveDuration=daysNumber+0.5
}else if(this.form.leaveStartInterval==1&&this.form.leaveEndInterval==2){
this.form.leaveDuration=daysNumber+1
}else if(this.form.leaveStartInterval==2&&this.form.leaveEndInterval==2){
this.form.leaveDuration=daysNumber+0.5
}else if(this.form.leaveStartInterval==2&&this.form.leaveEndInterval==1){
this.form.leaveDuration=daysNumber
}
}
},

2
src/views/process/restApply/index.vue
View File

@ -305,6 +305,8 @@
this.form.leaveDuration=daysNumber+1
}else if(this.form.leaveStartInterval==2&&this.form.leaveEndInterval==2){
this.form.leaveDuration=daysNumber+0.5
}else if(this.form.leaveStartInterval==2&&this.form.leaveEndInterval==1){
this.form.leaveDuration=daysNumber
}
}
},

4
src/views/process/rolesRemind/index.vue
View File

@ -151,6 +151,10 @@ export default {
};
},
created() {
if(this.$route.query.param){
console.log(this.$route.query.param)
this.queryParams.deptRoleName=this.$route.query.param
}
this.getList();
},
methods: {

10
src/views/system/messages/index.vue
View File

@ -115,15 +115,15 @@
this.$router.replace({ path: '/attendanceReport/monthlyError',query:{param:value}})
}else if(type.indexOf('轮休外出办事异常统计')>-1){//month
this.$router.replace({ path: '/exceptionHandle/errorData',query:{param:value} })
}else if(type.indexOf('项目部角色未配置')>-1){//userName
this.$router.replace({ path: '/process/roles',query:{param:value}})
}else if(type.indexOf('项目部角色未配置')>-1){//项目经理
this.$router.replace({ path: '/process/rolesRemind',query:{param:value}})
}else if(type.indexOf('项目部角色人员变更')>-1){//userName
this.$router.replace({ path: '/process/rolesExamine',query:{param:value}})
}else if(type.indexOf('轮休审批提醒')>-1){//userName
this.$router.replace({ path: '/process/restExam',query:{param:value}})
}else if(type.indexOf('临时外出审批提醒')>-1){//userName
this.$router.replace({ path: '/process/outExam',query:{param:value}})
}else if(type.indexOf('项目部角色人员变更')>-1){//userName
this.$router.replace({ path: '/process/rolesExamine',query:{param:value}})
}else if(type.indexOf('分公司项目部新增')>-1){
}else if(type.indexOf('分公司项目部新增')>-1){//userName
this.$router.replace({ path: '/process/branchProExamine',query:{param:value}})
}else if(type.indexOf('考勤明细修改申请')>-1){//userName
this.$router.replace({ path: '/process/record',query:{param:value}})