From 481d82ebd4504501b408c458f3d87d912692588e Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期二, 16 七月 2024 11:32:06 +0800
Subject: [PATCH] fix:修复纤度登记表，检验表切换
---
src/views/employeeSalary/salaryPlan/index.vue | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/views/employeeSalary/salaryPlan/index.vue b/src/views/employeeSalary/salaryPlan/index.vue
index ce8fc4a..733a436 100644
--- a/src/views/employeeSalary/salaryPlan/index.vue
+++ b/src/views/employeeSalary/salaryPlan/index.vue
@@ -24,12 +24,12 @@
</template>
</TableCommonView>
</div>
- <AddDialog
- ref="add" :editRow="editRow" @refresh="refresh"
- />
<div class="btn-pager">
<PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
+ <AddDialog
+ ref="add" :editRow="editRow" @refresh="refresh"
+ />
</div>
</div>
</template>
@@ -51,7 +51,7 @@
tableColumn: [
{ label: "鏂规鍚嶇О", prop: "name",min:110},
{ label: "宸ョ", prop: "workTypeNames",min:100 },
- { label: "钖祫绫诲瀷", prop: "salaryType",min:110 },
+ { label: "钖祫绫诲瀷", prop: "salaryTypeName",min:110 },
{ label: "璁¤垂鍛ㄦ湡", prop: "cycle",min:110 },
{ label: "璁¤垂鍏紡瀹氫箟", prop: "salaryFormulaValue",min:140 },
{ label: "娣诲姞鏃堕棿", prop: "createTime",min:130 },
@@ -113,15 +113,16 @@
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,
salaryFormulaValue:salaryFormulaValue,
+ salaryTypeName:item.salaryType?item.salaryType.name:''
}
})
this.tableList.tableInfomation = list || []
@@ -142,7 +143,7 @@
},
// 鏂板
addBtnClick() {
- this.editRow = { title:'鏂板缓',type:'add' }
+ this.editRow = { title:'鏂板缓',type: 'add' }
this.$refs.add.islook = true;
},
// 鎼滅储
@@ -157,15 +158,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