From 78ba89a381c2ca6a745ffa0c3b6c903ed3130d5f Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 24 四月 2024 11:08:15 +0800
Subject: [PATCH] 更新考勤统计的入参修改
---
src/views/employeeSalary/attendanceStatistics/index.vue | 8 ++++----
src/views/employeeSalary/salaryPlan/index.vue | 17 ++++++-----------
src/views/employeeSalary/attendanceStatistics/components/AttendanceStatisticsDetails.vue | 13 +++++++++++--
3 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/src/views/employeeSalary/attendanceStatistics/components/AttendanceStatisticsDetails.vue b/src/views/employeeSalary/attendanceStatistics/components/AttendanceStatisticsDetails.vue
index 31643ee..0e4ac96 100644
--- a/src/views/employeeSalary/attendanceStatistics/components/AttendanceStatisticsDetails.vue
+++ b/src/views/employeeSalary/attendanceStatistics/components/AttendanceStatisticsDetails.vue
@@ -163,6 +163,8 @@
formInfo() {
if (this.islook) {
this.form = {};
+ this.isEditOne=false
+ this.isEditTwo=false
this.$nextTick(()=>{
this.$refs["form"].resetFields();
if (this.editRow.workerId) {
@@ -194,6 +196,7 @@
cancelMethod() {
this.$refs["form"].resetFields();
this.islook = false;
+ this.$emit('shutdown')
},
submitForm(formName,name) {
this.$refs[formName].validate((valid) => {
@@ -204,7 +207,14 @@
date:form.month+'-'+day,
overTimeDuration:Number(form.weekdayOverTime),
status:form.status,
- workerId:form.workerId
+ workerId:form.workerId,
+ classes:form.classes,
+ classesEndTime:form.classesEndTime,
+ classesStartTime:form.classesStartTime,
+ endWorkTime:form.endWorkTime,
+ startWorkTime:form.startWorkTime,
+ workTypeId:form.workTypeId,
+ workerName:form.workerName,
}
updateAttendance(params).then((res) => {
if (res.code == 200) {
@@ -213,7 +223,6 @@
type: "success",
});
this[name]=false
- this.$emit('shutdown')
this.cancelMethod();
}
});
diff --git a/src/views/employeeSalary/attendanceStatistics/index.vue b/src/views/employeeSalary/attendanceStatistics/index.vue
index 836dfb2..4680b7a 100644
--- a/src/views/employeeSalary/attendanceStatistics/index.vue
+++ b/src/views/employeeSalary/attendanceStatistics/index.vue
@@ -157,10 +157,10 @@
{ label: "鏈堜唤", prop: "month", min: 90 ,fixed:'left'},
];
let tableColumn3=[
- { label: "宸ヤ綔鏃ュ姞鐝椂闀�(灏忔椂)", prop: "weekdayOverTime", min: 140,fixed:'right'},
- { label: "浼戞伅鏃ュ姞鐝椂闀�(灏忔椂)", prop: "restDayOverTime", min: 140,fixed:'right' },
- { label: "搴斿嚭鍕ゅぉ鏁�", prop: "requiredAttendanceDays", min: 110 ,fixed:'right'},
- { label: "瀹為檯鍑哄嫟澶╂暟", prop: "actualAttendanceDays", min: 110,fixed:'right'},
+ { label: "宸ヤ綔鏃ュ姞鐝椂闀�(灏忔椂)", prop: "weekdayOverTime", min: 140,},
+ { label: "浼戞伅鏃ュ姞鐝椂闀�(灏忔椂)", prop: "restDayOverTime", min: 140, },
+ { label: "搴斿嚭鍕ゅぉ鏁�", prop: "requiredAttendanceDays", min: 110 ,},
+ { label: "瀹為檯鍑哄嫟澶╂暟", prop: "actualAttendanceDays", min: 110,},
]
let tableColumn2=[]
let headerList=res.data.list.length>0?res.data.list[0]:[]
diff --git a/src/views/employeeSalary/salaryPlan/index.vue b/src/views/employeeSalary/salaryPlan/index.vue
index 732c3c1..3dbae58 100644
--- a/src/views/employeeSalary/salaryPlan/index.vue
+++ b/src/views/employeeSalary/salaryPlan/index.vue
@@ -12,7 +12,6 @@
<TableCommonView
:table-list="tableList"
@selTableCol="selTableCol"
- @handleShow="handleShow"
@tableRowClick="tableRowClick"
>
<template slot="tableButton">
@@ -52,13 +51,13 @@
showCol: ["鏂规鍚嶇О", "宸ョ", "钖祫绫诲瀷", "璁¤垂鍛ㄦ湡", "璁¤垂鍏紡瀹氫箟", "娣诲姞鏃堕棿", "娣诲姞浜�"],
tableColumn: [
// { label: "杞﹂棿", prop: "workshopNumber",iconRight:"el-icon-setting"},
- { label: "鏂规鍚嶇О", prop: "workshopNumber",},
- { label: "宸ョ", prop: "groupNumber", },
- { label: "钖祫绫诲瀷", prop: "startCarNumber" },
- { label: "璁¤垂鍛ㄦ湡", prop: "endCarNumber" },
+ { label: "鏂规鍚嶇О", prop: "workshopNumber",min:110},
+ { label: "宸ョ", prop: "groupNumber",min:100 },
+ { label: "钖祫绫诲瀷", prop: "startCarNumber",min:110 },
+ { label: "璁¤垂鍛ㄦ湡", prop: "endCarNumber",min:110 },
{ label: "璁¤垂鍏紡瀹氫箟", prop: "carFlag", },
- { label: "娣诲姞鏃堕棿", prop: "notes", },
- { label: "娣诲姞浜�", prop: "notes", },
+ { label: "娣诲姞鏃堕棿", prop: "notes",min:130 },
+ { label: "娣诲姞浜�", prop: "notes",min:110 },
],
editConfig:{
visible:false,
@@ -118,10 +117,6 @@
onFilterSearch(searchText) {
this.getDataParams.keyWord = searchText,
this.getData()
- },
- // 缁勫埆
- handleShow() {
-
},
// 琛ㄦ牸琛岀偣鍑�
tableRowClick(row) {
--
Gitblit v1.8.0