From d7557c1681b2da87df6509b3faf5dc4cefac1da2 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期四, 19 十月 2023 13:45:30 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/components/makepager/CommonFormTableView.vue | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 6644d38..5bd8931 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -121,7 +121,6 @@
v-else
v-model="scope.row[item.prop]"
placeholder=""
- :min="0"
:precision="2"
:controls="false"
size="mini"
@@ -149,7 +148,7 @@
<!-- 浣嶇疆 -->
<el-form-item v-else-if="item.location" 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 }}</span>
<el-select
v-else
v-model="scope.row[item.prop]"
--
Gitblit v1.8.0