From a3094611deac91e0ec35bcfe3f3fdd3bdf993466 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 26 四月 2024 16:18:40 +0800
Subject: [PATCH] 考勤统计模块 增加月份对应的星期的数据处理+对应考勤统计的样式调整
---
src/views/employeeSalary/salaryPlan/index.vue | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/views/employeeSalary/salaryPlan/index.vue b/src/views/employeeSalary/salaryPlan/index.vue
index a1109ee..8ca639d 100644
--- a/src/views/employeeSalary/salaryPlan/index.vue
+++ b/src/views/employeeSalary/salaryPlan/index.vue
@@ -113,7 +113,7 @@
let workTypeNames=''
if(item.workTypes){
for(let i in item.workTypes){
- workTypeNames=workTypeNames+','+item.workTypeNames[i].name
+ workTypeNames=item.workTypes[i].workName+','+workTypeNames
}
}
let salaryFormulaValue=''
@@ -157,15 +157,22 @@
// 缂栬緫
handleClick(row) {
let config=JSON.parse(JSON.stringify(row));
+ let arr=config.workTypes?config.workTypes:[]
+ let workTypes=[]
+ if(arr&&arr.length>0){
+ for(let i in arr){
+ workTypes.push({
+ value:arr[i].ID,
+ label: arr[i].workName
+ })
+ }
+ }
this.editRow = {
...config,
title:'缂栬緫',
type:'edit',
id:config.ID,
- workTypeObj:{
- value:config.workTypeId,
- label:config.workType,
- }
+ workTypes:workTypes
}
this.$refs.add.islook = true;
},
--
Gitblit v1.8.0