From 9a0e4f1641f41a3dc1df4453ad416fb1522bd2ea Mon Sep 17 00:00:00 2001 From: 王震 <10952869+daywangzhen@user.noreply.gitee.com> Date: 星期四, 18 一月 2024 17:30:49 +0800 Subject: [PATCH] modified: src/page/wel.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue --- src/views/common/ztt-table.vue | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue index bdb3592..e963067 100644 --- a/src/views/common/ztt-table.vue +++ b/src/views/common/ztt-table.vue @@ -164,7 +164,7 @@ :span-method="objectSpanMethod" :header-cell-style="tableHeaderStyle" v-adaptive="{ bottomOffset: bottomOffset, fixedHeight: fixedHeight }" - height="100px" + height="300px" :class="[ 'commonTable', isGeneralSearch && !isEdit @@ -508,8 +508,9 @@ <div class="el-upload__tip" slot="tip" > 鍙兘涓婁紶xlsx/xls鏂囦欢锛屼笖涓嶈秴杩�10M<el-button type="text" - style="font-size:12px;" - @click="downDataTemplate" v-if="uploadInfo.Download" + style="font-size:14px;text-decoration: underline;" + @click="downDataTemplate(uploadInfo.fileName)" + v-if="uploadInfo.download" >涓嬭浇妯℃澘</el-button > </div> @@ -566,6 +567,10 @@ default: ()=>{ return 'id' } + }, + toolbarMaxLength: { + type: Number, + default: 5, }, // 琛ㄦ牸鍨嬪彿锛歮ini,medium,small tableSize: { type: String, default: 'small' }, @@ -754,11 +759,11 @@ return colList }, getToolBarBtn() { - return this.table.toolbar ? this.table.toolbar.slice(0, 5) : [] + return this.table.toolbar ? this.table.toolbar.slice(0, this.toolbarMaxLength) : [] }, getToolbarDown() { - return this.getToolBarBtn.length === 5 - ? this.table.toolbar.slice(5, this.table.toolbar.length) + return this.getToolBarBtn.length == this.toolbarMaxLength + ? this.table.toolbar.slice(this.toolbarMaxLength, this.table.toolbar.length) : [] }, isRefreshBtn() { @@ -1582,7 +1587,8 @@ if(response.data!=""&&response.data!=[]&&response.data!=null){ this.$message({ message: response.data, - type: 'success' + type: 'success', + dangerouslyUseHTMLString: true, }) }else{ this.$message({ @@ -1614,7 +1620,11 @@ const blob = new Blob([response.data], { type: 'application/force-download' }) - const filename = decodeURI('妯℃澘鏂囦欢.xlsx') + let fileName="妯℃澘鏂囦欢"; + if(this.uploadInfo.fileName!=undefined&&this.uploadInfo.fileName!=''&&this.uploadInfo.fileName!=null){ + fileName=this.uploadInfo.fileName + } + const filename = decodeURI(fileName+'.xlsx') // 鍒涘缓涓�涓秴閾炬帴锛屽皢鏂囦欢娴佽祴杩涘幓锛岀劧鍚庡疄鐜拌繖涓秴閾炬帴鐨勫崟鍑讳簨浠� const elink = document.createElement('a') elink.download = filename -- Gitblit v1.9.3