From 8df0c5cc3a475778ef92020dd99aaec77cc2cc24 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期日, 28 四月 2024 14:18:11 +0800
Subject: [PATCH] 应发工资报表的前端开发
---
src/views/employeeSalary/salaryPlan/index.vue | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/views/employeeSalary/salaryPlan/index.vue b/src/views/employeeSalary/salaryPlan/index.vue
index ce8fc4a..881c9e9 100644
--- a/src/views/employeeSalary/salaryPlan/index.vue
+++ b/src/views/employeeSalary/salaryPlan/index.vue
@@ -113,11 +113,11 @@
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=''
- salaryFormulaValue=item.salaryFormula?item.salaryFormula.split("锛�").join(''):[]
+ salaryFormulaValue=item.salaryFormula?item.salaryFormula.split(",").join(''):[]
return {
...item,
workTypeNames:workTypeNames,
@@ -142,7 +142,7 @@
},
// 鏂板
addBtnClick() {
- this.editRow = { title:'鏂板缓',type:'add' }
+ this.editRow = { title:'鏂板缓',type: 'add' }
this.$refs.add.islook = true;
},
// 鎼滅储
@@ -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