From 60322c503d201e4d1000e62d8ecf17db4f628e4c Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 12 三月 2025 15:49:23 +0800
Subject: [PATCH] 合并冲突
---
src/components/Table/lims-table.vue | 129 +++++++++++++++++++++++++++++++------------
1 files changed, 93 insertions(+), 36 deletions(-)
diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index f3e3a3d..07953d4 100644
--- a/src/components/Table/lims-table.vue
+++ b/src/components/Table/lims-table.vue
@@ -4,17 +4,18 @@
<el-table ref="multipleTable" v-loading="tableLoading" :border="border" :data="tableData"
:header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" :height="height"
:highlight-current-row="highlightCurrentRow" :row-class-name="rowClassName" :row-style="rowStyle"
- :row-key="rowKey" :span-method="spanMethod" stripe style="width: 100%" tooltip-effect="dark" @row-click="rowClick"
- @current-change="currentChange" @selection-change="handleSelectionChange" class="lims-table">
+ :row-key="rowKey" :span-method="spanMethod" :stripe="stripe" style="width: 100%" tooltip-effect="dark"
+ @row-click="rowClick" @current-change="currentChange" @selection-change="handleSelectionChange"
+ class="lims-table">
<el-table-column align="center" type="selection" width="55" v-if="isSelection" />
<el-table-column align="center" label="搴忓彿" type="index" width="60" :index="indexMethod" />
<el-table-column v-for="(item, index) in column" :key="index" :column-key="item.columnKey"
:filter-method="item.filterHandler" :filter-multiple="item.filterMultiple" :filtered-value="item.filteredValue"
:filters="item.filters" :fixed="item.fixed" :label="item.label" :min-width="item.minWidth" :prop="item.prop"
- :show-overflow-tooltip="item.dataType === 'action' || item.dataType === 'slot' ? false : true"
- :sortable="item.sortable ? true : false" :type="item.type"
- :width="item.dataType === 'action' ? getWidth(item.operation) : item.width" align="center">
+ :show-overflow-tooltip="item.dataType === 'action' || item.dataType === 'slot' ? false : true
+ " :sortable="item.sortable ? true : false" :type="item.type" align="center"
+ :width="item.dataType == 'action' ? btnWidth : item.width">
<!-- <div class="123" v-if="item.type == ''"> -->
<template v-if="item.hasOwnProperty('colunmTemplate')" :slot="item.colunmTemplate" slot-scope="scope">
<slot v-if="item.theadSlot" :index="index" :name="item.theadSlot" :row="scope.row" />
@@ -63,7 +64,7 @@
</div>
<!-- 鎸夐挳 -->
- <div v-else-if="item.dataType == 'action'">
+ <div v-else-if="item.dataType == 'action'" :style="`width:${getWidth(item.operation, scope.row)}`">
<template v-for="(o, key) in item.operation">
<el-button v-show="o.type != 'upload'" size="mini" v-if="o.showHide ? o.showHide(scope.row) : true"
:disabled="o.disabled ? o.disabled(scope.row) : false" :icon="iconFn(o)" :plain="o.plain"
@@ -71,28 +72,16 @@
@click="o.clickFun(scope.row)" :key="key">
{{ o.name }}
</el-button>
- <!-- <el-upload :action="javaApi + o.url + '?id=' + (o.uploadIdFun ? o.uploadIdFun(scope.row) : scope.row.id)"
- size="mini" ref="upload" :multiple="o.multiple ? o.multiple : false" :limit="1"
+ <el-upload :action="javaApi +
+ o.url +
+ '?id=' +
+ (o.uploadIdFun ? o.uploadIdFun(scope.row) : scope.row.id)
+ " size="mini" ref="upload" :multiple="o.multiple ? o.multiple : false" :limit="1"
:disabled="o.disabled ? o.disabled(scope.row) : false" :accept="o.accept
? o.accept
: '.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'
" v-if="o.type == 'upload' && o.url" style="display: inline-block; width: 50px"
v-show="o.showHide ? o.showHide(scope.row) : true" :headers="uploadHeader" :on-error="onError"
- :data="o.data ? o.data(scope.row) : {}"
- :before-upload="o.beforeUpload ? o.beforeUpload(scope.row) : () => true"
- :on-exceed="onExceed" :on-success="handleSuccessUp" :show-file-list="false" :key="key">
- <el-button :size="o.size ? o.size : 'small'" type="text"
- :disabled="o.disabled ? o.disabled(scope.row) : false">{{ o.name }}</el-button>
- </el-upload> -->
- <el-upload :action="javaApi + o.url"
- size="mini" ref="upload" :multiple="o.multiple ? o.multiple : false"
- :disabled="o.disabled ? o.disabled(scope.row) : false" :accept="o.accept
- ? o.accept
- : '.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'
- " v-if="o.type == 'upload' && o.url" style="display: inline-block; width: 50px"
- v-show="o.showHide ? o.showHide(scope.row) : true" :headers="uploadHeader" :on-error="onError"
- :data="o.data ? o.data(scope.row) : {}"
- :before-upload="o.beforeUpload ? o.beforeUpload(scope.row) : () => true"
:on-exceed="onExceed" :on-success="handleSuccessUp" :show-file-list="false" :key="key">
<el-button :size="o.size ? o.size : 'small'" type="text"
:disabled="o.disabled ? o.disabled(scope.row) : false">{{ o.name }}</el-button>
@@ -111,9 +100,11 @@
</template>
</div>
<!-- 鍙偣鍑荤殑鏂囧瓧 -->
- <div v-else-if="item.dataType == 'link'" class="cell link" style="width: 100%"
- @click="goLink(scope.row, item.linkMethod)">
- <span v-if="!item.formatData">{{ scope.row[item.prop] }}</span>
+ <div v-else-if="item.dataType == 'link'" class="cell" style="width: 100%"
+ @click="goLink(scope.row, item.linkEvent)">
+ <span class="link" v-if="!item.formatData">
+ {{ scope.row[item.prop] }}
+ </span>
</div>
<!-- 榛樿绾睍绀烘暟鎹� -->
<div v-else class="cell" style="width: 100%">
@@ -124,9 +115,57 @@
</div>
</template>
</el-table-column>
+ <!-- 鎿嶄綔鍒� -->
+ <el-table-column v-if="table.operator" :label="(table.operatorConfig && table.operatorConfig.label) || '鎿嶄綔'"
+ :width="table.operatorConfig &&
+ (table.operatorConfig.width
+ ? table.operatorConfig.width
+ : calcOperationWidth())
+ " :min-width="(table.operatorConfig && table.operatorConfig.width) ||
+ table.operatorConfig.minWidth ||
+ 100
+ " align="center" :fixed="table.operatorConfig ? table.operatorConfig.fixed : 'right'"
+ :show-overflow-tooltip="true">
+ <template slot-scope="scope">
+ <template v-for="(o, index) in table.operator">
+ <el-button :key="index" v-if="o.type != 'upload'" @click.stop="o.clickFun(scope.row)"
+ :type="o.type || 'text'" :icon="o.icon" :size="o.size || 'small'"
+ :disabled="o.disabled ? o.disabled(scope.row) : false" v-show="o.showFun ? o.showFun(scope.row) : true"
+ :class="[
+ 'commonButton',
+ {
+ del: o.name === '鍒犻櫎' || o.name === '浣滃簾',
+ },
+ ]">{{ o.name }}
+ </el-button>
+ <el-upload :action="javaApi + o.url" size="mini" ref="upload" :multiple="o.multiple ? o.multiple : false"
+ :disabled="o.disabled ? o.disabled(scope.row) : false" :accept="o.accept
+ ? o.accept
+ : '.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'
+ " v-if="o.type == 'upload' && o.url" style="display: inline-block; width: 50px"
+ v-show="o.showHide ? o.showHide(scope.row) : true" :data="o.data ? o.data(scope.row) : {}" :before-upload="o.beforeUpload ? o.beforeUpload(scope.row) : () => true
+ " :headers="uploadHeader" :on-error="onError" :on-exceed="onExceed" :on-success="handleSuccessUp"
+ :show-file-list="false" :key="index">
+ <el-button :size="o.size ? o.size : 'small'" type="text"
+ :disabled="o.disabled ? o.disabled(scope.row) : false">{{ o.name }}</el-button>
+ </el-upload>
+ <el-upload action="#" :on-change="(file, fileList) => o.clickFun(scope.row, file, fileList)
+ " :multiple="o.multiple ? o.multiple : false" :limit="o.limit ? o.limit : 1"
+ :disabled="o.disabled ? o.disabled(scope.row) : false" :accept="o.accept
+ ? o.accept
+ : '.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'
+ " v-if="o.type == 'upload' && !o.url" style="display: inline-block; width: 50px"
+ v-show="o.showHide ? o.showHide(scope.row) : true" :auto-upload="false" :on-exceed="onExceed"
+ :show-file-list="false" :key="index">
+ <el-button :size="o.size ? o.size : 'small'" type="text"
+ :disabled="o.disabled ? o.disabled(scope.row) : false">{{ o.name }}</el-button>
+ </el-upload>
+ </template>
+ </template>
+ </el-table-column>
</el-table>
<pagination v-if="page" v-show="page.total > 0" :total="page.total" :layout="page.layout" :page.sync="page.current"
- :limit.sync="page.size" @pagination="pagination" style="background-color: #fff;" />
+ :limit.sync="page.size" @pagination="pagination" style="background-color: #fff" />
</div>
</template>
@@ -184,7 +223,6 @@
name: "ZTTable",
filters: {
typeFn(val, row) {
- // console.log(val, row, '11111111');
if (typeof val === "function") {
return val(row);
} else return val;
@@ -239,17 +277,28 @@
type: Boolean,
default: false,
},
+ stripe: {
+ type: Boolean,
+ default: false,
+ },
headerCellStyle: {
type: Object,
default: () => {
return {};
},
},
- column: {
- type: Array,
+ // column: {
+ // type: Array,
+ // default() {
+ // return [];
+ // },
+ // },
+ table: {
+ type: Object,
default() {
- return [];
+ return {};
},
+ required: true,
},
rowClassName: {
type: Function,
@@ -284,21 +333,29 @@
data() {
return {
spanList: [],
+ btnWidth: '120px'
};
+ },
+ watch: {
+ table(val) {
+ this.doLayout();
+ },
},
mounted() {
this.calculateSpanInfo();
+ this.column = this.table.column;
},
methods: {
- getWidth(row) {
+ getWidth(row, row0) {
let count = 0;
row.forEach((a) => {
- if (a.showHide !== undefined && a.showHide()) {
+ if (a.showHide !== undefined && a.showHide(row0)) {
count += a.name.length;
} else if (!a.showHide) {
count += a.name.length;
}
});
+ this.btnWidth = count * 15 + 70 + "px"
return count * 15 + 70 + "px";
},
iconFn(row) {
@@ -356,11 +413,11 @@
return (this.page.current - 1) * this.page.size + index + 1;
},
// 鐐瑰嚮鍗曞厓鏍糽ink浜嬩欢
- goLink(row, linkMethod) {
- if (!linkMethod) {
+ goLink(row, linkEvent) {
+ if (!linkEvent) {
return this.$message.warning("璇烽厤缃甽ingk浜嬩欢");
}
- this.$parent[linkMethod](row);
+ linkEvent.vueComponent[linkEvent.method](row);
},
// 鍚堝苟鍗曞厓鏍�
calculateSpanInfo() {
--
Gitblit v1.9.3