From f19edc96af3261347f48cb8f66f1f5b2feb6071e Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 17 十一月 2023 16:43:54 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before
---
src/views/common/ztt-table.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index 54ffcda..d7d6869 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -143,7 +143,7 @@
height
? fixHeight
? fixHeight
- : undefined
+ : '100px'
: $store.getters.tableHeight - otherHeight
"
v-bind="$attrs"
@@ -168,7 +168,6 @@
:span-method="objectSpanMethod"
:header-cell-style="tableHeaderStyle"
v-adaptive="{ bottomOffset: bottomOffset, fixedHeight: fixedHeight }"
- height="100px"
:class="[
'commonTable',
isGeneralSearch && !isEdit
@@ -226,7 +225,7 @@
:sortable="!isEdit ? (item.sort ? 'custom' : item.sort) : false"
v-bind="$attrs"
v-on="$listeners"
- v-if="item.isTrue"
+ v-show="item.isTrue"
:class-name="
(orderBy == null && item.prop == options.defaultOrderBy.column) ||
(orderBy != null &&
@@ -250,7 +249,7 @@
:width="inMemoryColWidth[item.prop] || item.width"
:prop="item.prop"
>
- <template slot="header" slot-scope="scope">
+ <template slot="header">
<template v-if="item.isSearch">
<div class="th" @click.stop>
<template
@@ -507,7 +506,9 @@
<i class="el-icon-upload"></i>
<div class="el-upload__text"><em>鐐瑰嚮瀵煎叆鏁版嵁</em></div>
<div class="el-upload__tip" slot="tip">
- 鍙兘涓婁紶xlsx/xls鏂囦欢锛屼笖涓嶈秴杩�30M<el-button
+ <span v-if="uploadInfo.tipText" v-text="uploadInfo.tipText"></span>
+ <span v-else>鍙兘涓婁紶xlsx/xls鏂囦欢锛屼笖涓嶈秴杩�30M銆�</span>
+ <el-button
type="text"
style="font-size:15px;text-decoration: underline;"
@click="downDataTemplate"
--
Gitblit v1.9.3