From 1ccee4c44055c977374a7675063cd241ccfcfe5b Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 07 五月 2024 18:23:51 +0800
Subject: [PATCH] 纤度检验表 车间不显示的问题修改
---
src/views/employeeSalary/attendanceStatistics/index.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/views/employeeSalary/attendanceStatistics/index.vue b/src/views/employeeSalary/attendanceStatistics/index.vue
index 836dfb2..d3aa38f 100644
--- a/src/views/employeeSalary/attendanceStatistics/index.vue
+++ b/src/views/employeeSalary/attendanceStatistics/index.vue
@@ -50,7 +50,7 @@
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import AttendanceStatisticsDetails from "@/views/employeeSalary/attendanceStatistics/components/AttendanceStatisticsDetails"
import NewDate from "@/api/date";
-const { getCurrentMonth } = NewDate;
+const { getPreviousMonth } = NewDate;
export default {
name: "attendanceStatistics",
props: {
@@ -69,7 +69,7 @@
},
},
object:{
- date:getCurrentMonth()
+ date:getPreviousMonth()
},
editRow:{
@@ -115,6 +115,7 @@
tableInfomation: [],
allcol: [],
showcol: this.showCol,
+ headerHeight:'47px',
tableColumn: this.setColumnVisible(this.showCol)
}
this.tableList.allcol = this.tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
@@ -157,10 +158,10 @@
{ label: "鏈堜唤", prop: "month", min: 90 ,fixed:'left'},
];
let tableColumn3=[
- { label: "宸ヤ綔鏃ュ姞鐝椂闀�(灏忔椂)", prop: "weekdayOverTime", min: 140,fixed:'right'},
- { label: "浼戞伅鏃ュ姞鐝椂闀�(灏忔椂)", prop: "restDayOverTime", min: 140,fixed:'right' },
- { label: "搴斿嚭鍕ゅぉ鏁�", prop: "requiredAttendanceDays", min: 110 ,fixed:'right'},
- { label: "瀹為檯鍑哄嫟澶╂暟", prop: "actualAttendanceDays", min: 110,fixed:'right'},
+ { label: "宸ヤ綔鏃ュ姞鐝椂闀�(灏忔椂)", prop: "weekdayOverTime", min: 140,},
+ { label: "浼戞伅鏃ュ姞鐝椂闀�(灏忔椂)", prop: "restDayOverTime", min: 140, },
+ { label: "搴斿嚭鍕ゅぉ鏁�", prop: "requiredAttendanceDays", min: 110 ,},
+ { label: "瀹為檯鍑哄嫟澶╂暟", prop: "actualAttendanceDays", min: 110,},
]
let tableColumn2=[]
let headerList=res.data.list.length>0?res.data.list[0]:[]
@@ -168,8 +169,9 @@
for(let i in headerList.details){
tableColumn2.push({
label:headerList.details[i].date+'',
+ weekDay:headerList.details[i].weekDay+'',
prop:'headerDate'+headerList.details[i].date,
- min:100,
+ min:80,
default:true,
isCallMethod:true,
isClass: true,
@@ -246,7 +248,6 @@
this.getData()
},
selCommonClick(row,prop,item){
-
let config=JSON.parse(JSON.stringify(row));
let details=config.details
let headerItem={}
--
Gitblit v1.8.0