From 3be31836178cdb323614e7c90ab3429faa1017d3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 09 一月 2024 10:46:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/plan/customerorder/index.vue | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index d376ddf..7990386 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -855,6 +855,13 @@
permitArr: []
})
}
+ this.table.toolbar.push({
+ text: '涓嬭浇Word',
+ disabled: false,
+ type: 'primary',
+ fun: this.downloadWord,
+ permitArr: ['03plan','04planed'],
+ })
if (this.permissions.customerorder_create_masterplan) {
this.table.toolbar.push({
text: '涓荤敓浜ц鍒�',
@@ -863,13 +870,6 @@
permitArr: []
})
}
- this.table.toolbar.push({
- text: '涓嬭浇Word',
- disabled: false,
- type: 'primary',
- fun: this.downloadWord,
- permitArr: ['03plan','04planed'],
- })
},
methods: {
//涓嬭浇word
@@ -884,7 +884,9 @@
const blob = response.data
const link = document.createElement('a')
link.href = URL.createObjectURL(blob)
- link.download = '宸ヨ壓鏂囦欢.docx'
+ const disposition = response.headers["content-disposition"]
+ let temp = disposition.substring(disposition.lastIndexOf('=') + 1)
+ link.download = decodeURI(temp)
document.body.appendChild(link)
link.click()
window.setTimeout(function() {
@@ -1047,7 +1049,8 @@
}
})
if (flag) {
- checkOA(this.multipleSelection.map((e) => e.id)).then((res) => {
+
+ checkOA(this.multipleSelection.map((e) => e.id),{}).then((res) => {
if (!res.data.data.success) {
this.$confirm(`${res.data.data.message}`, '鎻愮ず', {
confirmButtonText: '纭畾',
--
Gitblit v1.9.3