From c77637aa6781f3275839674cb4fa2d4b72b8827c Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期一, 15 七月 2024 19:34:55 +0800
Subject: [PATCH] fix:修复纤度登记表，检验表，产量等级表部分的bug修复
---
src/views/employeeSalary/salaryPlan/index.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/views/employeeSalary/salaryPlan/index.vue b/src/views/employeeSalary/salaryPlan/index.vue
index 8ca639d..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 },
@@ -117,11 +117,12 @@
}
}
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 || []
--
Gitblit v1.8.0