From b1b6d5435e244018433b3b1223eee2365cf6fc85 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 11 三月 2025 11:35:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/components/Table/lims-table.vue | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index 26cc8df..ad93b9e 100644
--- a/src/components/Table/lims-table.vue
+++ b/src/components/Table/lims-table.vue
@@ -12,9 +12,9 @@
<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" :width="item.dataType === 'action' ? getWidth(item.operation) : item.width
+ " align="center">
<!-- <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" />
@@ -71,15 +71,28 @@
@click="o.clickFun(scope.row)" :key="key">
{{ o.name }}
</el-button>
- <el-upload
- :action="o.url ? (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'" style="display: inline-block; width: 50px"
+ " 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"
: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="#" :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="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>
@@ -100,8 +113,8 @@
</template>
</el-table-column>
</el-table>
- <pagination v-show="page.total > 0" :total="page.total" :layout="page.layout" :page.sync="page.current"
- :limit.sync="page.size" @pagination="pagination" />
+ <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" />
</div>
</template>
@@ -159,7 +172,6 @@
name: "ZTTable",
filters: {
typeFn(val, row) {
- // console.log(val, row, '11111111');
if (typeof val === "function") {
return val(row);
} else return val;
@@ -231,8 +243,8 @@
default: () => { },
},
rowStyle: {
- type: Object || Function,
- default: () => { },
+ type: Function,
+ // default: () => { },
},
tableData: {
type: Array,
--
Gitblit v1.9.3