From fd5845de8d0200ae55710e07e19fc31e3e67b422 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 14 十二月 2023 18:32:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/technology/structure/index.vue | 47 ++++++++---------------------------------------
1 files changed, 8 insertions(+), 39 deletions(-)
diff --git a/src/views/technology/structure/index.vue b/src/views/technology/structure/index.vue
index 8ceba97..53ae977 100644
--- a/src/views/technology/structure/index.vue
+++ b/src/views/technology/structure/index.vue
@@ -47,44 +47,12 @@
multiple
>
<i class="el-icon-upload"></i>
- <div class="el-upload__text"><em>瀵煎叆瑁呭鏁版嵁</em></div>
+ <div class="el-upload__text"><em>瀵煎叆浜у搧缁撴瀯</em></div>
<div class="el-upload__tip" slot="tip">
鍙兘涓婁紶xlsx/xls鏂囦欢锛屼笖涓嶈秴杩�10M<el-button
type="text"
style="font-size:12px;"
- @click="downZhuangbeiDataTemplate"
- >涓嬭浇妯℃澘</el-button
- >
- </div>
- </el-upload>
- </div>
- <div>
- <el-upload
- style="margin-left:8px;display: inline;"
- class="upload-demo"
- drag
- :headers="headers"
- :action="shepinUploadInfo.url"
- :beforeUpload="beforeAvatarUpload"
- :limit="1"
- :show-file-list="false"
- :file-list="shepinfileList"
- :data="shepinUploadInfo.uploadData"
- :on-success="shepinFileSuccessUploadScan"
- :on-error="handleError"
- accept=".xlsx,.xls,.csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
- :auto-upload="true"
- ref="shepinUploadScan"
- multiple
- >
- <i class="el-icon-upload"></i>
- <div class="el-upload__text"><em>瀵煎叆灏勯鏁版嵁</em></div>
- <div class="el-upload__tip" slot="tip">
- 鍙兘涓婁紶xlsx/xls鏂囦欢锛屼笖涓嶈秴杩�10M<el-button
- type="text"
- style="font-size:12px;"
- @click="downShepinDataTemplate"
- >涓嬭浇妯℃澘</el-button
+ ></el-button
>
</div>
</el-upload>
@@ -129,8 +97,8 @@
customUpload: true,
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: false,
- url: '/mes/structure/uploadExt'
+ isShow: true,
+ url: '/mes/structure/uploadExcelPlus'
},
prelang: 'structure',
options: {
@@ -326,7 +294,7 @@
zhuangbeiUploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
isShow: true,
- url: '/mes/structure/uploadExt'
+ url: '/mes/structure/uploadExcelPlus'
},
zhuangbeifileList: [],
shepinfileList: [],
@@ -487,8 +455,9 @@
this.$message.warning(response.msg)
} else {
this.$message({
- message: '涓婁紶鎴愬姛',
- type: 'success'
+ message: response.data,
+ type: 'success',
+ dangerouslyUseHTMLString: true
})
this.getData()
}
--
Gitblit v1.9.3