From 211e68e2aea13b56a5a8af8a46023e7c2e4a1c89 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Fri, 18 Oct 2024 09:39:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/exceptionHandle/errorForm/index.vue | 8 ++++----
src/views/process/outApply/index.vue | 4 +++-
src/views/process/restApply/index.vue | 2 ++
src/views/process/rolesRemind/index.vue | 4 ++++
src/views/system/messages/index.vue | 10 +++++-----
5 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/views/exceptionHandle/errorForm/index.vue b/src/views/exceptionHandle/errorForm/index.vue
index 0ac65bf..cb49929 100644
--- a/src/views/exceptionHandle/errorForm/index.vue
+++ b/src/views/exceptionHandle/errorForm/index.vue
@@ -114,10 +114,10 @@
-
-
-
-
+
+
+
+
{{ '审核中' }}
diff --git a/src/views/process/outApply/index.vue b/src/views/process/outApply/index.vue
index b0d6d6e..ff121f8 100644
--- a/src/views/process/outApply/index.vue
+++ b/src/views/process/outApply/index.vue
@@ -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
}
}
},
diff --git a/src/views/process/restApply/index.vue b/src/views/process/restApply/index.vue
index 1f70c4e..e59b8ff 100644
--- a/src/views/process/restApply/index.vue
+++ b/src/views/process/restApply/index.vue
@@ -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
}
}
},
diff --git a/src/views/process/rolesRemind/index.vue b/src/views/process/rolesRemind/index.vue
index 3108b98..fa1b239 100644
--- a/src/views/process/rolesRemind/index.vue
+++ b/src/views/process/rolesRemind/index.vue
@@ -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: {
diff --git a/src/views/system/messages/index.vue b/src/views/system/messages/index.vue
index 9b04f36..461ccf3 100644
--- a/src/views/system/messages/index.vue
+++ b/src/views/system/messages/index.vue
@@ -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}})