From 00c9c554fcfbb1755af6c41f19dc5ae6f8294075 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 18 七月 2024 18:05:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/tool/value-table.vue | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 8d20d12..cf0b8b7 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -115,12 +115,12 @@
:summary-method="getSummaries" :row-class-name="tableRowClassName" :row-key="record=>record.id"
:current-row-key="data.currentId" :highlight-current-row="data.highlight===undefined||data.highlight"
:span-method="spanMethod" :key="specialKey">
- <el-table-column type="selection" width="65" v-if="data.showSelect" :key="Math.random()">
+ <el-table-column type="selection" :width="selectionWidth" v-if="data.showSelect" :key="Math.random()">
</el-table-column>
- <el-table-column type="index" align="center" label="搴忓彿" width="65" v-if="data.isIndex" :key="Math.random()">
+ <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'"
- v-for="(a, ai) in tableHead" :key="ai" show-overflow-tooltip min-width="155" v-if="!data.headNoShow||(data.headNoShow&&data.headNoShow.length==0)||(data.headNoShow&&data.headNoShow.length>0&&!data.headNoShow.find(d=>d==a.label))">
+ <el-table-column :prop="a.label" :label="a.value" :sortable="data.sort==false?false:'custom'" :isColumnWidth="isColumnWidth" :width="a.width"
+ 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">
<template v-if="typeof(scope.row[a.label]) == 'object'">
@@ -335,6 +335,18 @@
} from 'jquery';
export default {
props: {
+ selectionWidth: {
+ type: String,
+ default: () => '65'
+ },
+ columnMinWidth: {
+ type: String,
+ default: () => '155'
+ },
+ isColumnWidth: {
+ type: Boolean,
+ default: () => false
+ },
tableRowClassName: {
type: Function
},
@@ -574,9 +586,14 @@
this.selectList('page')
},
selectList(val) {
+ console.log('val---', val)
+ console.log('this.page---', this.page)
this.loading = true
if(val===undefined){
this.page.current = 1;
+ }
+ if (val === 'lastPage') {
+ this.page.current = this.page.current - 1 // 渚嬪鍒犻櫎鏈〉鏈�鍚庝竴鏉℃暟鎹紝灏嗗綋鍓嶉〉闈㈠畾涓轰笂涓�椤碉紝闄ょ涓�椤靛
}
if (this.data.isPage != undefined && this.data.isPage != true) {
this.page = {
@@ -599,6 +616,26 @@
this.total = res.data.body.total
this.tableHead = res.data.head
this.tableData = res.data.body.records
+ 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 = 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 = 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) {
@@ -766,7 +803,7 @@
return
}
this.$message.success('鍒犻櫎鎴愬姛')
- this.selectList()
+ this.selectList('page')
this.$emit('delete')
}).catch(e => {
this.$message.error('鍒犻櫎澶辫触')
@@ -828,7 +865,7 @@
}
this.$message.success('淇敼鎴愬姛')
this.upDia = false
- this.selectList()
+ this.selectList('page')
this.$refs.eltable.doLayout();
this.upLoad = false
}).catch(e => {
@@ -920,7 +957,7 @@
}
this.$message.success('娣诲姞鎴愬姛')
this.addDia = false
- this.selectList()
+ this.selectList('page')
this.addLoad = false
}).catch(e => {
this.addDia = false
--
Gitblit v1.9.3