From 083bc1030f7dda031f04976c7f02109d31eeff0e Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期三, 07 八月 2024 16:06:26 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before
---
src/components/tool/value-table.vue | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 21dba9f..d9df2a2 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" :isShowZero="isShowZero"
+ <el-table-column :prop="a.label" :label="a.value" :sortable="a.sort === 'custom' ? 'custom' : false" :isColumnWidth="isColumnWidth" :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">
@@ -624,10 +624,19 @@
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')) {
+ if (item[val] === null && (val.includes('Hours') || val === 'total')) {
item[val] = 0
}
})
@@ -636,23 +645,28 @@
if (this.tableData.length === 0 && this.page.current > 1) {
this.selectList('lastPage')
}
- if (this.isColumnWidth) {
- this.tableHead.forEach(item => {
- if (item.value.length === 4) {
- item.width = 120
- } else if (item.value.length === 3){
- 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 {
- item.width = this.data.sort === false && item.label.includes('Hours') ? 46 : 86
- }
- })
- }
+ // if (this.isColumnWidth) {
+ // this.tableHead.forEach(item => {
+ // if(!item.width){
+ // if (item.value.length === 4) {
+ // item.width = 120
+ // } else if (item.value.length === 3){
+ // item.width = 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 = item.label.includes('Hours') ? 52 : 86
+ // } else {
+ // item.width = item.label.includes('Hours') ? 46 : 86
+ // }
+ // }
+ // })
+ // }
+
// console.log(JSON.stringify(this.tableHead)+"---------"+JSON.stringify(this.tableData))
for (var a in this.data.selectField) {
if (this.data.selectField[a].choose == true) {
--
Gitblit v1.9.3