From a075ef6b7cbd09d727068ef3d7e08691775dbb16 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 22 三月 2024 17:58:58 +0800
Subject: [PATCH] 合并冲突
---
src/components/tool/value-table.vue | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 889071c..065c628 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -55,11 +55,11 @@
} */
.value-table .highlight-danger-row-border td:first-child {
- border-left: 4px solid red;
+ border-left: 4px solid #f56c6c;
}
.value-table .highlight-danger-row-border td:last-child {
- border-right: 4px solid red;
+ border-right: 4px solid #f56c6c;
}
.value-table .el-upload {
@@ -73,8 +73,9 @@
<template>
<div class="value-table">
- <div class="table">
- <el-table ref="eltable" :data="tableData" style="width: 100%;" height="100%" tooltip-effect="dark" border
+ <div class="table" :style="data.isPage!=undefined&&data.isPage!=true?'height:100%':''">
+ <el-table ref="eltable" :data="tableData" style="width: 100%;" height="100%"
+ tooltip-effect="dark" border
@selection-change="selectChange" @select="select" v-loading="loading" @sort-change="sortChange"
@row-click="rowClick" :show-summary="data.countFleid!=undefined && data.countFleid.length > 0"
:summary-method="getSummaries" :row-class-name="tableRowClassName">
@@ -112,10 +113,10 @@
</el-table-column>
</el-table>
</div>
- <div class="page">
+ <div class="page" v-if="data.isPage==undefined||data.isPage">
<el-pagination @size-change="sizeChange" @current-change="currentChange" :current-page="page.current"
:page-sizes="[10, 20, 30, 50, 100]" :page-size="page.size" layout="total, sizes, prev, pager, next, jumper"
- :total="total">
+ :total="total" >
</el-pagination>
</div>
<el-dialog title="缂栬緫" :visible.sync="upDia" :width="data.row==1?'500px':500+data.row * 200 + 'px'">
@@ -231,6 +232,7 @@
import {
Page
} from 'iview';
+import { data } from 'jquery';
export default {
props: {
tableRowClassName: {
@@ -311,6 +313,7 @@
showSelect: false,
select: true,
row: 1,
+ isPage:true,//
do: [{
font: '鍒犻櫎',
type: 'text'
@@ -370,6 +373,13 @@
} else {
this.multipleSelection = val[val.length - 1];
}
+ if(this.data.selectMethod!=undefined){
+ if(this.$parent.$el.className.indexOf('el-')==0){
+ this.$parent.$parent[this.data.selectMethod](val)
+ }else{
+ this.$parent[this.data.selectMethod](val)
+ }
+ }
},
select(val, row) {
if (!this.data.select) {
@@ -395,6 +405,12 @@
},
selectList() {
this.loading = true
+ if(this.data.isPage!=undefined&&this.data.isPage!=true){
+ this.page = {
+ current: -1,
+ size: -1,
+ }
+ }
this.$axios.post(this.url, {
page: this.page,
entity: this.data.entity
--
Gitblit v1.9.3