Pre Merge pull request !4 from webuilder/master
This commit is contained in:
commit
6c39a3079d
@ -93,7 +93,7 @@ export default {
|
|||||||
// 然后将数组转为对象数组
|
// 然后将数组转为对象数组
|
||||||
this.fileList = list.map(item => {
|
this.fileList = list.map(item => {
|
||||||
if (typeof item === "string") {
|
if (typeof item === "string") {
|
||||||
if (item.indexOf(this.baseUrl) === -1) {
|
if (item.indexOf(this.baseUrl) === -1 && item.indexOf('://') < 0) {
|
||||||
item = { name: this.baseUrl + item, url: this.baseUrl + item };
|
item = { name: this.baseUrl + item, url: this.baseUrl + item };
|
||||||
} else {
|
} else {
|
||||||
item = { name: item, url: item };
|
item = { name: item, url: item };
|
||||||
|
@ -565,7 +565,7 @@ export default {
|
|||||||
},
|
},
|
||||||
/** 导出按钮操作 */
|
/** 导出按钮操作 */
|
||||||
handleExport() {
|
handleExport() {
|
||||||
this.download('md/client/export', {
|
this.download('mes/md/client/export', {
|
||||||
...this.queryParams
|
...this.queryParams
|
||||||
}, `client_${new Date().getTime()}.xlsx`)
|
}, `client_${new Date().getTime()}.xlsx`)
|
||||||
},
|
},
|
||||||
|
2
src/views/mes/md/vendor/index.vue
vendored
2
src/views/mes/md/vendor/index.vue
vendored
@ -539,7 +539,7 @@ export default {
|
|||||||
},
|
},
|
||||||
/** 导出按钮操作 */
|
/** 导出按钮操作 */
|
||||||
handleExport() {
|
handleExport() {
|
||||||
this.download('md/vendor/export', {
|
this.download('mes/md/vendor/export', {
|
||||||
...this.queryParams
|
...this.queryParams
|
||||||
}, `vendor_${new Date().getTime()}.xlsx`)
|
}, `vendor_${new Date().getTime()}.xlsx`)
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user