From 52fc68b64212289b1ec7483e9fbcc7f5d14965ba Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 25 四月 2024 16:34:06 +0800
Subject: [PATCH] 配置生丝标准的前端开发+输入常量的前端开发+配置满勤奖的前端开发
---
src/views/employeeSalary/salaryPlan/index.vue | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/views/employeeSalary/salaryPlan/index.vue b/src/views/employeeSalary/salaryPlan/index.vue
index df91ded..21c5787 100644
--- a/src/views/employeeSalary/salaryPlan/index.vue
+++ b/src/views/employeeSalary/salaryPlan/index.vue
@@ -50,14 +50,13 @@
tableList: {},
showCol: ["鏂规鍚嶇О", "宸ョ", "钖祫绫诲瀷", "璁¤垂鍛ㄦ湡", "璁¤垂鍏紡瀹氫箟", "娣诲姞鏃堕棿", "娣诲姞浜�"],
tableColumn: [
- // { label: "杞﹂棿", prop: "workshopNumber",iconRight:"el-icon-setting"},
- { label: "鏂规鍚嶇О", prop: "workshopNumber",min:110},
- { label: "宸ョ", prop: "groupNumber",min:100 },
- { label: "钖祫绫诲瀷", prop: "startCarNumber",min:110 },
- { label: "璁¤垂鍛ㄦ湡", prop: "endCarNumber",min:110 },
- { label: "璁¤垂鍏紡瀹氫箟", prop: "carFlag",min:140 },
- { label: "娣诲姞鏃堕棿", prop: "notes",min:130 },
- { label: "娣诲姞浜�", prop: "notes",min:110 },
+ { label: "鏂规鍚嶇О", prop: "name",min:110},
+ { label: "宸ョ", prop: "workTypeNames",min:100 },
+ { label: "钖祫绫诲瀷", prop: "salaryType",min:110 },
+ { label: "璁¤垂鍛ㄦ湡", prop: "cycle",min:110 },
+ { label: "璁¤垂鍏紡瀹氫箟", prop: "salaryFormula",min:140 },
+ { label: "娣诲姞鏃堕棿", prop: "createTime",min:130 },
+ { label: "娣诲姞浜�", prop: "addPeople",min:110 },
],
keyword: '',
editRow:{},
@@ -111,7 +110,18 @@
.then((res) => {
if (res.code === 200) {
if (res.data) {
- const list = res.data
+ const list = res.data.map(item=>{
+ let workTypeNames=''
+ if(item.workTypes){
+ for(let i in item.workTypes){
+ workTypeNames=workTypeNames+','+item.workTypeNames[i].name
+ }
+ }
+ return {
+ ...item,
+ workTypeNames:workTypeNames
+ }
+ })
this.tableList.tableInfomation = list || []
this.pagerOptions.totalCount = res.total
} else {
@@ -130,9 +140,8 @@
},
// 鏂板
addBtnClick() {
- this.editConfig.infomitton={}
- this.editConfig.dialogTitle="鏂板"
- this.editConfig.visible=true
+ this.editRow = { title:'鏂板缓',type:'add' }
+ this.$refs.add.islook = true;
},
// 鎼滅储
onFilterSearch(searchText) {
@@ -153,10 +162,6 @@
this.editRow = { ...config,
title:'缂栬緫',
type:'edit',
- shopNameObj:{
- value:config.shopId,
- label:config.shopName,
- },
workTypeObj:{
value:config.workTypeId,
label:config.workType,
--
Gitblit v1.8.0