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

休假报备、出差报备：增加 修改、删除按钮,已核定的禁止修改、删除

This commit is contained in:
lSun 2025-02-13 10:57:26 +08:00
parent 65944b86cb
commit c4e5eafcf0
5 changed files with 657 additions and 592 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/process/evection/index.vue
View File

@ -538,17 +538,25 @@ export default {
// 开始日期选择限制
startPickerOptions: {
disabledDate: (v) => {
const today = new Date()
today.setHours(0, 0, 0, 0)
if (this.form.leaveEndDate) {
return v.getTime() > new Date(this.form.leaveEndDate).getTime()
const end = new Date(this.form.leaveEndDate);
end.setHours(0, 0, 0, 0);
return v.getTime() > end.getTime() || v.getTime() < today.getTime();
}
return v.getTime() < today.getTime()
},
},
// 结束日期选择限制
endPickerOptions: {
disabledDate: (v) => {
const today = new Date()
today.setHours(0, 0, 0, 0)
if (this.form.leaveStartDate) {
return v.getTime() < new Date(this.form.leaveStartDate).getTime() - 86400000; // - 86400000是否包括当天
}
return v.getTime() < today.getTime()
},
},
daysNumber:"",

10
src/views/process/leaveReporting/index.vue
View File

@ -491,17 +491,25 @@ export default {
// 开始日期选择限制
startPickerOptions: {
disabledDate: (v) => {
const today = new Date()
today.setHours(0, 0, 0, 0)
if (this.form.leaveEndDate) {
return v.getTime() > new Date(this.form.leaveEndDate).getTime()
const end = new Date(this.form.leaveEndDate);
end.setHours(0, 0, 0, 0);
return v.getTime() > end.getTime() || v.getTime() < today.getTime();
}
return v.getTime() < today.getTime()
},
},
// 结束日期选择限制
endPickerOptions: {
disabledDate: (v) => {
const today = new Date()
today.setHours(0, 0, 0, 0)
if (this.form.leaveStartDate) {
return v.getTime() < new Date(this.form.leaveStartDate).getTime() - 86400000; // - 86400000是否包括当天
}
return v.getTime() < today.getTime()
},
},
daysNumber:"",

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

@ -398,17 +398,27 @@ export default {
// 开始日期选择限制
startPickerOptions: {
disabledDate: (v) => {
const today = new Date()
today.setHours(0, 0, 0, 0)
if (this.form.leaveEndDate) {
return v.getTime() > new Date(this.form.leaveEndDate).getTime()
const end = new Date(this.form.leaveEndDate);
end.setHours(0, 0, 0, 0);
return v.getTime() > end.getTime() || v.getTime() < today.getTime();
}
return v.getTime() < today.getTime()
},
},
// 结束日期选择限制
endPickerOptions: {
disabledDate: (v) => {
const today = new Date()
today.setHours(0, 0, 0, 0)
if (this.form.leaveStartDate) {
return v.getTime() < new Date(this.form.leaveStartDate).getTime() - 86400000; // - 86400000是否包括当天
}
return v.getTime() < today.getTime()
},
},
daysNumber: "",

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

File diff suppressed because it is too large Load Diff

6
src/views/process/workReport/index.vue
View File

@ -56,7 +56,7 @@
</el-table-column>
<el-table-column label="出差人数" align="center" width="180">
<template slot-scope="scope">
<span class="clickable" @click="handleClick('出差报备',scope.row)" style="color: blue; cursor: pointer;">
<span class="clickable" @click="handleClick('出差',scope.row)" style="color: blue; cursor: pointer;">
{{ scope.row.businessTripNum }}
</span>
</template>
@ -588,7 +588,7 @@ export default {
this.title = "轮休人员";
} else if (type==='临时外出'){
this.title = "临时外出人员";
} else if (type==='出差报备'){
} else if (type==='出差'){
this.title = "出差人员";
} else if (type==='请假'){
this.title = "请假人数";
@ -619,7 +619,7 @@ export default {
});
},
handleRowClick(row) {
if (this.searchConditions.type==='出差报备'){
if (this.searchConditions.type==='出差'){
getEvection(row.uuId).then(response => {
this.form = response.data;
let num = [];