From 0042dbfd410064ebfab00826f927ed73448db5ec Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 21 五月 2024 14:53:20 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before into master
---
src/views/common/ztt-remote-select.vue | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/views/common/ztt-remote-select.vue b/src/views/common/ztt-remote-select.vue
index 72a4002..ea23b87 100644
--- a/src/views/common/ztt-remote-select.vue
+++ b/src/views/common/ztt-remote-select.vue
@@ -6,7 +6,7 @@
remote
@change="changeValue"
:disabled="isDisabled"
- placeholder="璇疯緭鍏�"
+ placeholder="璇疯緭鍏ュ鎴疯鍗曞彿"
:remote-method="remoteMethod"
clearable
:loading="selectLoading"
@@ -20,7 +20,7 @@
value="title"
disabled
>
- <span v-for="(col, j) in columns" :key="col.prop">{{ col.label }}</span>
+ <span v-for="(col, j) in columns" :key="col.prop"><span>{{ col.label }}</span></span>
</el-option>
<el-option
class="lmes-select-body"
@@ -29,13 +29,23 @@
:label="formatter(item)"
:value="item[valueColumn]"
>
- <span v-for="(col, j) in columns" :key="col.prop + i">{{
- col.formatter
- ? col.formatter(item[col.prop])
- : item[col.prop]
- ? item[col.prop]
- : '--'
- }}</span>
+ <span v-for="(col, j) in columns" :key="col.prop + i">
+ <el-tooltip :content="col.formatter
+ ? col.formatter(item[col.prop])
+ : item[col.prop]
+ ? item[col.prop]
+ : '--'">
+ <span style="overflow: hidden;">
+ {{
+ col.formatter
+ ? col.formatter(item[col.prop])
+ : item[col.prop]
+ ? item[col.prop]
+ : '--'
+ }}
+ </span>
+ </el-tooltip>
+ </span>
</el-option>
</el-select>
</div>
@@ -111,6 +121,7 @@
text-align: center;
font-size: 13px;
line-height: 44px;
+
}
.lmes-select-head span,
@@ -121,6 +132,8 @@
padding: 0 10px !important;
}
+
+
.lmes-select-head,
.lmes-select-body,
.lmes-select-nodata {
--
Gitblit v1.9.3