From 853d05b11f3ecc0edb93494d42eba29e10248340 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 13 十一月 2023 18:20:03 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev
---
src/components/makepager/CommonFormTableView.vue | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 9b8d311..8417584 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -151,6 +151,7 @@
v-model="scope.row[item.prop]"
placeholder="璇烽�夋嫨"
size="mini"
+ filterable
style="width: 80%"
@change="
(val) => {
@@ -180,6 +181,7 @@
v-model="locacionName"
placeholder="璇烽�夋嫨"
size="mini"
+ filterable
style="width: 80%"
@change="
(val) => {
@@ -203,12 +205,15 @@
<!-- 浜у搧 -->
<el-form-item v-else-if="item.product" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
<div class="custom-name">
- <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row[item.prop] }}</span>
+ <span v-if="scope.row.isEdit || scope.row.editable">{{
+ scope.row[item.prop]?.label ?? scope.row[item.prop]
+ }}</span>
<el-select
v-else
v-model="scope.row[item.prop]"
placeholder="璇烽�夋嫨"
size="mini"
+ filterable
style="width: 80%"
@change="
(val) => {
--
Gitblit v1.8.0