From fe9dff60a1a10ec91303e5807dc33f12a6507b31 Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Thu, 26 Dec 2024 15:59:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=95=B0=E6=8D=AE=E9=9A=94?= =?UTF-8?q?=E7=A6=BB=EF=BC=8Cbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/process/leaveReporting.js | 10 +++++++ src/api/process/rest.js | 7 +++++ src/views/process/evection/index.vue | 11 ++++--- src/views/process/leaveReporting/index.vue | 34 ++++++++++------------ src/views/process/outExam/index.vue | 33 +++++++++++---------- src/views/report/originalReport/index.vue | 18 ++++++------ src/views/system/userInfo/index.vue | 2 ++ 7 files changed, 67 insertions(+), 48 deletions(-) diff --git a/src/api/process/leaveReporting.js b/src/api/process/leaveReporting.js index d6243d3..0765409 100644 --- a/src/api/process/leaveReporting.js +++ b/src/api/process/leaveReporting.js @@ -78,3 +78,13 @@ export function getUserList(id) { method: 'get' }) } + + +// 计算时间 +export function getDaysDate(data) { + return request({ + url: '/system/leaveReporting/getDays', + method: 'post', + data: data + }) +} diff --git a/src/api/process/rest.js b/src/api/process/rest.js index 3bc268e..133ef84 100644 --- a/src/api/process/rest.js +++ b/src/api/process/rest.js @@ -86,3 +86,10 @@ export function getUserList(id) { method: 'get' }) } + +export function getUserListCheck(id) { + return request({ + url: '/system/leaveReporting/getUserListCheck/' + id, + method: 'get' + }) +} diff --git a/src/views/process/evection/index.vue b/src/views/process/evection/index.vue index b2e7997..c8eb0e4 100644 --- a/src/views/process/evection/index.vue +++ b/src/views/process/evection/index.vue @@ -489,10 +489,6 @@ export default { pageSize: 10 }, personOptions: [], - - typeList: [{id: '病假', name: '病假'}, {id: '年休假', name: '年休假'}, {id: '探亲假', name: '探亲假'}, - {id: '事假', name: '事假'}, {id: '产假', name: '产假'}, {id: '婚假', name: '婚假'}, {id: '丧假', name: '丧假'}], - // 表单参数 form: {}, // 表单校验 @@ -761,8 +757,10 @@ export default { if (valid) { var lists = this.form.orgHeadUserIdList.join(","); var idsArray = lists.split(",") + console.log("idsArray",idsArray) const Ids = this.$store.state.user.id+""; const containsIds = idsArray.includes(Ids); + console.log("containsIds",containsIds) var filteredIds; if(containsIds){ //去掉它 @@ -771,6 +769,11 @@ export default { this.$modal.msgError("出行人需要添加申请人"); return ; } + + if (filteredIds.length === 0) { + this.$modal.msgError("出行人需要添加申请人以外的人员。"); + return ; + } console.log(filteredIds) this.form.travelers = filteredIds.join(","); console.log(this.form.travelers) diff --git a/src/views/process/leaveReporting/index.vue b/src/views/process/leaveReporting/index.vue index 1acf662..0d45184 100644 --- a/src/views/process/leaveReporting/index.vue +++ b/src/views/process/leaveReporting/index.vue @@ -395,7 +395,8 @@ import { updateLeaveReporting, getPostName, getUserList, - exportLeaveReporting + exportLeaveReporting, + getDaysDate } from "@/api/process/leaveReporting"; import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; @@ -496,6 +497,7 @@ export default { } }, }, + daysNumber:"", }; }, created() { @@ -503,30 +505,24 @@ export default { this.getUserLists(); }, methods: { - handleDateChange() { + async handleDateChange() { this.form.leaveStartInterval = 1; this.form.leaveEndInterval = 2; if (this.form.leaveStartDate && this.form.leaveEndDate) { - let daysNumber = this.daysBetween(this.form.leaveStartDate, this.form.leaveEndDate) - // 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 - } + await this.daysBetween(this.form.leaveStartDate, this.form.leaveEndDate) + console.log(this.daysNumber) + this.form.leaveDuration = this.daysNumber } }, - daysBetween(date1, date2) { - const oneDay = 24 * 60 * 60 * 1000; - const date1Ms = new Date(date1).getTime() - const date2Ms = new Date(date2).getTime() - const diff = Math.abs(date1Ms - date2Ms); // 计算两日期的差值 - return diff / oneDay; // 返回天数 + async daysBetween(date1, date2) { + var data = { + "leaveStartDate":date1, + "leaveEndDate":date2, + } + await getDaysDate(data).then(response => { + this.daysNumber = response.data.date; + }); }, /** 查询列表 */ getList() { diff --git a/src/views/process/outExam/index.vue b/src/views/process/outExam/index.vue index 16e048e..9bd8a3a 100644 --- a/src/views/process/outExam/index.vue +++ b/src/views/process/outExam/index.vue @@ -92,12 +92,12 @@ - + - + @@ -105,7 +105,8 @@ - + + - + - + - + - + @@ -168,7 +169,7 @@ - - - + - + - + - + @@ -221,7 +222,7 @@ \ No newline at end of file + diff --git a/src/views/system/userInfo/index.vue b/src/views/system/userInfo/index.vue index 135e8b9..a20c452 100644 --- a/src/views/system/userInfo/index.vue +++ b/src/views/system/userInfo/index.vue @@ -500,6 +500,7 @@ this.$refs["form"].validate(valid => { if (valid) { if (this.form.userId != undefined) { + console.log("人员修改",this.form); updateUser(this.form).then(response => { this.$modal.msgSuccess("修改成功"); this.open = false; @@ -507,6 +508,7 @@ this.getList(); }); } else { + console.log("新增成功",this.form); addUser(this.form).then(response => { this.$modal.msgSuccess("新增成功"); this.open = false;