Commit 91955809 authored by 黄奎's avatar 黄奎

页面修改

parent 426f77a8
...@@ -556,26 +556,27 @@ ...@@ -556,26 +556,27 @@
} }
console.log("title", title); console.log("title", title);
var fileName = title + ".pdf"; var fileName = title + ".pdf";
if (this.orderId && this.orderId > 0) { that.pdfDownLoad(fileName, msg);
//出团通知书下载 // if (this.orderId && this.orderId > 0) {
this.pdfDownLoad(fileName, msg); // //出团通知书下载
} else if (urlObj.IsOnline == 0) { // this.pdfDownLoad(fileName, msg);
//本地行程下载 // } else if (urlObj.IsOnline == 0) {
this.pdfDownLoad(fileName, msg); // //本地行程下载
} else { // this.pdfDownLoad(fileName, msg);
//阿里云行程下载 // } else {
var objFileKey = "TripDownLoad" // //阿里云行程下载
objFileKey += "/" + msg.configId + "_" + msg.tcid; // var objFileKey = "TripDownLoad"
objFileKey += "/" + msg.configId + "_" + msg.tcid + ".pdf"; // objFileKey += "/" + msg.configId + "_" + msg.tcid;
that.downloadChengDuFileRename(objFileKey, fileName, res => { // objFileKey += "/" + msg.configId + "_" + msg.tcid + ".pdf";
console.log("ali_doanload", res) // that.downloadChengDuFileRename(objFileKey, fileName, res => {
if (res.resultCode == 0) { // console.log("ali_doanload", res)
that.pdfDownLoad(fileName, msg); // if (res.resultCode == 0) {
} else {
that.pdfLoading = false; // } else {
} // that.pdfLoading = false;
}) // }
} // })
// }
}, },
pdfDownLoad: function (fileName, msg) { pdfDownLoad: function (fileName, msg) {
let urlObj = this.domainManager(); let urlObj = this.domainManager();
...@@ -595,7 +596,7 @@ ...@@ -595,7 +596,7 @@
this.pdfLoading = true; this.pdfLoading = true;
let urlObj = this.domainManager(); let urlObj = this.domainManager();
var ocrUrl = ""; var ocrUrl = "";
ocrUrl = urlObj.ocrUrl + "/Home/DownloadFileForPdf?configId=" + msg.configId + "&url=" + ocrUrl = urlObj.ocrUrl + "/Home/DownloadFileForPdfERP?configId=" + msg.configId + "&url=" +
encodeURIComponent(path); encodeURIComponent(path);
this.$http({ this.$http({
headers: { headers: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment