From dab59f7624a2fb8d4114bb67b554ff09d91f810c Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 10 四月 2025 13:07:36 +0800
Subject: [PATCH] Merge branch 'radio-frequency-cable' of http://114.132.189.42:9002/r/lims-ruoyi-before into radio-frequency-cable
---
src/components/Table/lims-table.vue | 55 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index 3accd8a..d6cfd4f 100644
--- a/src/components/Table/lims-table.vue
+++ b/src/components/Table/lims-table.vue
@@ -12,9 +12,11 @@
<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" :prop="item.prop"
- :show-overflow-tooltip="item.dataType === 'action' || item.dataType === 'slot' ? false : true"
- :min-width="item.dataType == 'action' ? btnWidth : getTitleWidth(item)"
- :sortable="item.sortable ? true : false" :type="item.type" :width="item.dataType == 'action' ? btnWidth : getTitleWidth(item)" align="center">
+ :show-overflow-tooltip="item.dataType === 'action' || item.dataType === 'slot' ? false : true"
+ :min-width="item.dataType == 'action' ? btnWidth : getTitleWidth(item)" :sortable="item.sortable ? true : false"
+ :type="item.type"
+ :width="item.dataType == 'action' ? btnWidth : (column.length < 10 ? 'auto' : getTitleWidth(item))"
+ 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" />
@@ -63,29 +65,26 @@
</div>
<!-- 鎸夐挳 -->
- <div v-else-if="item.dataType == 'action'"
- :style="`width:${getWidth(item.operation, scope.row)}`">
+ <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"
+ :disabled="o.disabled ? o.disabled(scope.row) : false" :plain="o.plain"
:style="{ color: o.name === '鍒犻櫎' ? '#f56c6c' : o.color }" :type="o.type | typeFn(scope.row)"
@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)"
- :key="uploadKeys[scope.$index]"
- ref="uploadRef"
- size="mini" :multiple="o.multiple ? o.multiple : false" :limit="1"
- :disabled="o.disabled ? o.disabled(scope.row) : false" :accept="o.accept
+ :key="uploadKeys[scope.$index]" ref="uploadRef" size="mini" :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" :headers="uploadHeader"
- :before-upload="(file) => beforeUpload(file, scope.$index)"
- :on-change="(file, fileList) => handleChange(file, fileList, scope.$index)"
- :on-error="(error, file, fileList) => onError(error, file, fileList, scope.$index)"
- :on-success="(response, file, fileList) => handleSuccessUp(response, file, fileList, scope.$index)"
- :on-exceed="onExceed" :show-file-list="false">
+ v-show="o.showHide ? o.showHide(scope.row) : true" :headers="uploadHeader"
+ :before-upload="(file) => beforeUpload(file, scope.$index)"
+ :on-change="(file, fileList) => handleChange(file, fileList, scope.$index)"
+ :on-error="(error, file, fileList) => onError(error, file, fileList, scope.$index)"
+ :on-success="(response, file, fileList) => handleSuccessUp(response, file, fileList, scope.$index, o)"
+ :on-exceed="onExceed" :show-file-list="false">
<el-button :size="o.size ? o.size : 'small'" type="text"
:disabled="o.disabled ? o.disabled(scope.row) : false">{{ o.name }}</el-button>
</el-upload>
@@ -302,19 +301,21 @@
count += a.name.length;
}
});
- this.btnWidth = count * 15 + 50 + "px";
+ this.btnWidth = count * 15 + 60 + "px";
return count * 15 + 50 + "px";
},
getTitleWidth(row) {
- if (row.label.includes('鏃堕棿') || row.label.includes('缂栧彿') || row.label.includes('鏍峰搧鍚嶇О') || row.label.includes('闆朵欢')) {
+ if (row.label.includes('鏃堕棿') || row.label.includes('鍙�') || row.label.includes('鏍峰搧鍚嶇О') || row.label.includes('闆朵欢')) {
return 160
+ } else if (row.label.includes('浜у搧') || row.label.includes('妯℃澘鍚嶇О')) {
+ return 200
} else if (row.label.includes('鎿嶄綔')) {
return row.width
} else {
const span = document.createElement('span');
span.innerText = row.label;
document.body.appendChild(span);
- const width = `${span.offsetWidth + 50}px`;
+ const width = `${span.offsetWidth + 60}px`;
document.body.removeChild(span);
return width;
@@ -344,7 +345,7 @@
setCurrent(row) {
this.$refs.multipleTable.setCurrentRow();
},
- handleSuccessUp(response, file, fileList, index) {
+ handleSuccessUp(response, file, fileList, index, o) {
if (response.code == 200) {
// 娓呴櫎鏂囦欢鍒楄〃骞舵洿鏂板綋鍓嶆枃浠�
if (this.uploadRefs[index]) {
@@ -354,7 +355,10 @@
this.$message.success("涓婁紶鎴愬姛");
// 閲嶇疆缁勪欢鐘舵��
this.resetUploadComponent(index);
-
+ // 鎴愬姛鍚庡洖璋冨嚱鏁�
+ if (o.handleSuccessUp) {
+ o.handleSuccessUp()
+ }
} else {
this.$message.error(response.message);
}
@@ -374,7 +378,7 @@
// 鏇存柊褰撳墠鏂囦欢
this.currentFiles[index] = file;
},
- beforeUpload (file, index) {
+ beforeUpload(file, index) {
this.currentFiles[index] = {}
if (file.size > 1024 * 1024 * 10) {
this.$message.error('涓婁紶鏂囦欢涓嶈秴杩�10M');
@@ -481,9 +485,11 @@
color: rgb(64, 158, 255);
cursor: pointer;
}
+
>>>.cell {
padding: 0 !important;
}
+
.cell {
white-space: nowrap;
overflow: hidden;
@@ -496,6 +502,7 @@
height: 10px;
/* 璁剧疆婊氬姩鏉″搴� */
}
+
.lims-table .highlight-warning-row-border td:first-child {
border-left: 4px solid #ffcd29;
}
@@ -511,4 +518,8 @@
.lims-table .highlight-danger-row-border td:last-child {
border-right: 4px solid #f56c6c;
}
+
+>>>.is-disabled {
+ color: #C0C4CC !important;
+}
</style>
--
Gitblit v1.9.3