From 22b1e8c61b4cf049f1c980aea459f3b90620a1b0 Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期四, 23 五月 2024 17:26:12 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before
---
src/components/tool/value-table.vue | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index da52460..57471ca 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -309,7 +309,7 @@
<el-dialog title="鏁版嵁瀵煎叆" :visible.sync="uploadDia" width="500px">
<div style="margin: 0 auto;">
<el-upload ref="upload" drag :action="javaApi + inputUrl" :headers="token" :file-list="fileList" name="file"
- :auto-upload="false" accept=".csv" :limit="1" :on-change="beforeUpload" :on-success="onSuccess"
+ :auto-upload="false" :accept="data.accept===undefined?'.csv':data.accept" :limit="1" :on-change="beforeUpload" :on-success="onSuccess"
:on-error="onError" :data="{param: data.uploadStr}">
<i class="el-icon-upload"></i>
<div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
@@ -564,14 +564,17 @@
},
sizeChange(val) {
this.page.size = val
- this.selectList()
+ this.selectList('page')
},
currentChange(val) {
this.page.current = val
- this.selectList()
+ this.selectList('page')
},
- selectList() {
+ selectList(val) {
this.loading = true
+ if(val===undefined){
+ this.page.current = 1;
+ }
if (this.data.isPage != undefined && this.data.isPage != true) {
this.page = {
current: -1,
@@ -961,7 +964,8 @@
this.uploadDia = true
},
beforeUpload(file, fileList) {
- if (file.raw.type != 'text/csv') {
+ console.log(file.raw.type);
+ if (file.raw.type != (this.data.inputType===undefined?'text/csv':this.data.inputType)) {
this.$message.error('涓婁紶鏂囦欢鏍煎紡涓嶆纭�');
this.$refs.upload.clearFiles()
return false;
--
Gitblit v1.9.3