From 38e6f27a8082e1173e3c02a33da5da39b6c6872c Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 31 七月 2024 13:33:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/tool/value-table.vue | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 68e01c5..3335bf3 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -123,7 +123,7 @@
</el-table-column>
<el-table-column type="index" align="center" label="搴忓彿" :width="selectionWidth" v-if="data.isIndex" :key="Math.random()">
</el-table-column>
- <el-table-column :prop="a.label" :label="a.value" :sortable="data.sort==false?false:'custom'" :isColumnWidth="isColumnWidth" :width="a.width"
+ <el-table-column :prop="a.label" :label="a.value" :sortable="a.sort === 'custom' ? 'custom' : false" :isColumnWidth="isColumnWidth" :width="a.width" :isShowZero="isShowZero"
v-for="(a, ai) in tableHead" :key="ai" show-overflow-tooltip :min-width="columnMinWidth" v-if="!data.headNoShow||(data.headNoShow&&data.headNoShow.length==0)||(data.headNoShow&&data.headNoShow.length>0&&!data.headNoShow.find(d=>d==a.label))">
<template slot-scope="scope">
<div v-if="showType(a.label, data.tagField) != null">
@@ -348,6 +348,10 @@
default: () => '155'
},
isColumnWidth: {
+ type: Boolean,
+ default: () => false
+ },
+ isShowZero: {
type: Boolean,
default: () => false
},
@@ -590,8 +594,8 @@
this.selectList('page')
},
selectList(val) {
- console.log('val---', val)
- console.log('this.page---', this.page)
+ // console.log('val---', val)
+ // console.log('this.page---', this.page)
this.loading = true
if(val===undefined){
this.page.current = 1;
@@ -620,6 +624,24 @@
this.total = res.data.body.total
this.tableHead = res.data.head
this.tableData = res.data.body.records
+ if (this.data.needSort !== undefined) {
+ for (var i = 0; i < this.data.needSort.length; i++) {
+ this.tableHead.forEach(item => {
+ if (item.label === this.data.needSort[i]) {
+ item.sort = 'custom'
+ }
+ })
+ }
+ }
+ if (this.isShowZero) {
+ this.tableData.map(item => {
+ Object.keys(item).forEach(val => {
+ if (item[val] === null && (val.includes('Hours') || val === 'total')) {
+ item[val] = 0
+ }
+ })
+ })
+ }
if (this.tableData.length === 0 && this.page.current > 1) {
this.selectList('lastPage')
}
@@ -628,15 +650,17 @@
if (item.value.length === 4) {
item.width = 120
} else if (item.value.length === 3){
- item.width = 100
+ item.width = this.data.sort === false && item.label.includes('Hours') ? 50 : 100
} else if (item.value.length === 5){
item.width = 130
} else if (item.value.length === 7){
item.width = 160
} else if (item.value.length === 6){
item.width = 150
+ } else if (item.value.length === 2){
+ item.width = this.data.sort === false && item.label.includes('Hours') ? 52 : 86
} else {
- item.width = 86
+ item.width = this.data.sort === false && item.label.includes('Hours') ? 46 : 86
}
})
}
@@ -1157,14 +1181,7 @@
list.forEach(item => {
delete item.orderBy
item.state = state
- if (e === 0) {
- auxiliaryWorkingHoursDays.push(item)
- } else {
- auxiliaryWorkingHoursDays.push({
- id: item.id,
- state: item.state
- })
- }
+ auxiliaryWorkingHoursDays.push(item)
})
this.$axios.post(url, {auxiliaryWorkingHoursDays: auxiliaryWorkingHoursDays
},{
--
Gitblit v1.9.3