|
@@ -881,12 +881,11 @@
|
|
if (arrID.length != 0) {
|
|
if (arrID.length != 0) {
|
|
let arr3 = []
|
|
let arr3 = []
|
|
arrID.forEach(item => {
|
|
arrID.forEach(item => {
|
|
- if (item.status == 8) {
|
|
|
|
|
|
+ if (item.status == 2 || item.status == 3 || item.status == 9) {
|
|
arr3.push(item.waybillNo)
|
|
arr3.push(item.waybillNo)
|
|
}
|
|
}
|
|
})
|
|
})
|
|
this.printData = arr3
|
|
this.printData = arr3
|
|
- console.log(arr3,365)
|
|
|
|
if (arr3.length > 0) {
|
|
if (arr3.length > 0) {
|
|
this.printWaybillVisible = true
|
|
this.printWaybillVisible = true
|
|
} else {
|
|
} else {
|
|
@@ -932,9 +931,11 @@
|
|
templateDownload() {
|
|
templateDownload() {
|
|
this.downloadFlag = true
|
|
this.downloadFlag = true
|
|
exportTemplate().then(response => {
|
|
exportTemplate().then(response => {
|
|
- let filename = '运单模板'
|
|
|
|
|
|
+ let arrList = response.fileName.split('.')
|
|
|
|
+ let fixedStr = decodeURIComponent(arrList[0]);
|
|
|
|
+ let filename = fixedStr + '.' + arrList[1]
|
|
// this.blobDownload(response, filename)
|
|
// this.blobDownload(response, filename)
|
|
- this.blobDownload(response.data, response.fileName)
|
|
|
|
|
|
+ this.blobDownload(response.data, filename)
|
|
this.downloadFlag = false
|
|
this.downloadFlag = false
|
|
})
|
|
})
|
|
},
|
|
},
|
|
@@ -1013,7 +1014,7 @@
|
|
var downloadUrl = window.URL.createObjectURL(data);
|
|
var downloadUrl = window.URL.createObjectURL(data);
|
|
var anchor = document.createElement("a");
|
|
var anchor = document.createElement("a");
|
|
anchor.href = downloadUrl;
|
|
anchor.href = downloadUrl;
|
|
- anchor.download = name + ".xls";
|
|
|
|
|
|
+ anchor.download = name;
|
|
anchor.click();
|
|
anchor.click();
|
|
window.URL.revokeObjectURL(data);
|
|
window.URL.revokeObjectURL(data);
|
|
},
|
|
},
|