From b4adff68a07b783fc90da1c9370d8be5f383e700 Mon Sep 17 00:00:00 2001 From: 黎星凯 <13949086503@163.com> Date: 星期三, 08 五月 2024 13:46:34 +0800 Subject: [PATCH] 20240528修改: bug41、42、43修改 领用单(分发单),调拨单,流程优化 --- admin-web/src/views/mixins/listPage.js | 34 +++++++++++++++------------------- 1 files changed, 15 insertions(+), 19 deletions(-) diff --git a/admin-web/src/views/mixins/listPage.js b/admin-web/src/views/mixins/listPage.js index 416cae5..c7fc1c5 100644 --- a/admin-web/src/views/mixins/listPage.js +++ b/admin-web/src/views/mixins/listPage.js @@ -1,6 +1,7 @@ import * as DateFormatter from '@/utils/DateFormatter'; import {mapGetters} from 'vuex'; import * as dataExport from "@/api/exportExcel" +import {downLoad} from "@/utils/base"; export default { data() { @@ -11,6 +12,12 @@ filterFrom: {}, editSetting: { title: '', + id: '', + orgId: '', + show: false, + }, + uploadPageSetting: { + title: '涓婁紶椤甸潰', id: '', orgId: '', show: false, @@ -42,7 +49,6 @@ methods: { // 瀵煎嚭 handleExport(api, fileName, params) { - console.log(fileName) let loading = this.$loading({ lock: true, text: '瀵煎嚭涓紝璇风◢鍊�...', @@ -52,24 +58,8 @@ // 鍒ゆ柇鎬绘潯鏁版槸鍚﹀ぇ浜庢渶澶ф敮鎸佹潯鏁� dataExport[api](params) .then((res) => { - const blob = new Blob([res], {type: 'application/vnd.ms-excel'}); - if ('download' in document.createElement('a')) { - // 闈濱E涓嬭浇 - const elink = document.createElement('a'); - elink.download = `${fileName}.xls`; - elink.style.display = 'none'; - const URL = window.URL || window.webkitURL - const href = URL.createObjectURL(blob) - elink.href = href; - document.body.appendChild(elink); - elink.click(); - URL.revokeObjectURL(elink.href); - document.body.removeChild(elink); - window.URL.revokeObjectURL(href) - } else { - // IE10+涓嬭浇 - navigator.msSaveBlob(blob, `${fileName}.xls`); - } + console.log(res) + downLoad(res) this.$message.success('瀵煎嚭鎴愬姛锛�'); loading.close(); }) @@ -97,6 +87,12 @@ this.detailSetting.title = '璇︽儏'; this.detailSetting.show = true; }, + // 瀵煎叆 + handleUploadPage(row) { + this.uploadPageSetting.id = row.id; + this.uploadPageSetting.title = '瀵煎叆'; + this.uploadPageSetting.show = true; + }, // 鍒嗛〉 handleSizeChange(pageSize) { this.pageSize = pageSize; -- Gitblit v1.9.1