From 83be7ca0c138b64b3447cc207b63c7933690f6ec Mon Sep 17 00:00:00 2001
From: 曹睿 <360930172@qq.com>
Date: 星期二, 25 二月 2025 09:08:58 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/components/Table/lims-table.vue | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index 725f320..05e1d85 100644
--- a/src/components/Table/lims-table.vue
+++ b/src/components/Table/lims-table.vue
@@ -5,14 +5,14 @@
: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">
+ @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' ? false : true" :sortable="item.sortable ? true : false"
+ :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 == ''"> -->
@@ -70,13 +70,21 @@
@click="o.clickFun(scope.row)" :key="key">
{{ o.name }}
</el-button>
- <el-upload action="#" size="mini" :on-change="(file, fileList) => o.clickFun(scope.row, file, fileList)
- " :multiple="o.multiple ? o.multiple : false" :limit="o.limit ? o.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-show="o.showHide ? o.showHide(scope.row) : true" :auto-upload="false" :on-exceed="onExceed"
+ 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>
@@ -268,7 +276,7 @@
row.forEach((a) => {
count += a.name.length;
});
- return count * 15 + 40 + "px";
+ return count * 15 + 70 + "px";
},
iconFn(row) {
if (row.name === "缂栬緫" || row.name === "淇敼") {
@@ -296,6 +304,22 @@
},
setCurrent(row) {
this.$refs.multipleTable.setCurrentRow();
+ },
+ handleSuccessUp(response, label) {
+ if (typeof label === "string") {
+ if (response.code == 200) {
+ this.upData[label] = response.data.url;
+ }
+ } else {
+ if (response.code == 200) {
+ this.$message.success("涓婁紶鎴愬姛");
+ }
+ }
+ },
+ onError(err, file, fileList) {
+ this.$message.error("涓婁紶澶辫触");
+ this.$refs.upload.clearFiles();
+ this.uploading = false;
},
onExceed() {
this.$message.warning("瓒呭嚭鏂囦欢涓暟");
@@ -427,3 +451,25 @@
/* 璁剧疆婊氬姩鏉″搴� */
}
</style>
+<style>
+.lims-table .highlight-warning-row-border td:first-child {
+ border-left: 4px solid #ffcd29;
+}
+
+.lims-table .highlight-warning-row-border td:last-child {
+ border-right: 4px solid #ffcd29;
+}
+
+/* .lims-table .highlight-danger-row-border td {
+ border-top: 2px solid red;
+ border-bottom: 2px solid red;
+ } */
+
+.lims-table .highlight-danger-row-border td:first-child {
+ border-left: 4px solid #f56c6c;
+}
+
+.lims-table .highlight-danger-row-border td:last-child {
+ border-right: 4px solid #f56c6c;
+}
+</style>
--
Gitblit v1.9.3