From 15a76ccca71377fca795d74c0c28b75daf57889c Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 29 四月 2024 15:55:16 +0800
Subject: [PATCH] 纤度登记表模块新增和编辑车间绑定值修改入参和显示的数据重组+纤度检验表模块 详情页面车间对应字段修改

---
 src/views/employeeSalary/attendanceStatistics/index.vue |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/views/employeeSalary/attendanceStatistics/index.vue b/src/views/employeeSalary/attendanceStatistics/index.vue
index 836dfb2..38c223d 100644
--- a/src/views/employeeSalary/attendanceStatistics/index.vue
+++ b/src/views/employeeSalary/attendanceStatistics/index.vue
@@ -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