页面修改

src/components/Contract/ElectronicContract.vue

@@ -1256,7 +1256,7 @@
             let sign = title + "V2"
             const a = document.createElement('a');
             a.setAttribute('download', '');
-            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
+            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdfNew?fileName=' + sign +
               '.pdf&&fPath=' + res.data.data);
             a.click();
           } else {

src/components/SalesconfirmationOrder.vue

@@ -1024,7 +1024,7 @@
             let sign = title + "V2"
             const a = document.createElement('a');
             a.setAttribute('download', '');
-            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
+            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdfNew?fileName=' + sign +
               '.pdf&&fPath=' + res.data.data);
             a.click();
           } else {

src/components/TravelContractDetail.vue

@@ -1049,7 +1049,7 @@
             let sign = title + "V2"
             const a = document.getElementById('contractDownLoad');
             a.setAttribute('download', '');
-            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
+            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdfNew?fileName=' + sign +
               '.pdf&&fPath=' + res.data.data);
             a.click();
           } else {

src/components/TravelContractDetailRB.vue

@@ -848,7 +848,7 @@
             let sign = title + "V2"
             const a = document.createElement('a');
             a.setAttribute('download', '');
-            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
+            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdfNew?fileName=' + sign +
               '.pdf&&fPath=' + res.data.data);
             a.click();
           } else {

src/components/TravelControlTrip.vue

@@ -517,7 +517,7 @@
               let sign = title
               const a = document.createElement('a');
               a.setAttribute('download', '');
-              a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
+              a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdfNew?fileName=' + sign +
                 '.pdf&&fPath=' + res.data.data);
               a.click();
             }, 1000)

src/components/administrative/ContractManage.vue

@@ -434,7 +434,7 @@
             let sign = item.T_ContractNum;
             const a = document.createElement('a');
             a.setAttribute('download', '');
-            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
+            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdfNew?fileName=' + sign +
               '.pdf&&fPath=' + res.data.data);
             a.click();
           } else {

src/components/administrative/ViittoContract.vue

@@ -211,7 +211,7 @@
               let sign = item.CustomerName+"_合同.doc";
               const a = document.createElement('a');
               a.setAttribute('download', '');
-              a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
+              a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdfNew?fileName=' + sign +
                 '.doc&&fPath=' + res.data.data);
               a.click();
           } else {

src/components/confirmationOrder.vue

@@ -397,7 +397,7 @@
                   a.setAttribute(
                     "href",
                     urlObj.DomainUrl +
-                    "/api/file/DownloadFileForPdf?fileName=" +
+                    "/api/file/DownloadFileForPdfNew?fileName=" +
                     sign +
                     ".pdf&&fPath=" +
                     res.data.data

src/components/confirmationOrderDownLoad.vue

@@ -830,7 +830,7 @@
               let sign = title
               const a = document.createElement('a');
               a.setAttribute('download', '');
-              a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
+              a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdfNew?fileName=' + sign +
                 '.pdf&&fPath=' + res.data.data);
               a.click();
             }, 1000)
@@ -1107,7 +1107,7 @@
             let sign = title + "V3"
             const a = document.createElement('a');
             a.setAttribute('download', '');
-            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
+            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdfNew?fileName=' + sign +
               '.pdf&&fPath=' + res.data.data);
             a.click();
           } else {
@@ -1181,7 +1181,7 @@
             let sign = title + "V2"
             const a = document.createElement('a');
             a.setAttribute('download', '');
-            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
+            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdfNew?fileName=' + sign +
               '.pdf&&fPath=' + res.data.data);
             a.click();
           } else {
@@ -1255,7 +1255,7 @@
             let sign = title + "V2"
             const a = document.createElement('a');
             a.setAttribute('download', '');
-            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
+            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdfNew?fileName=' + sign +
               '.pdf&&fPath=' + res.data.data);
             a.click();
           } else {
@@ -1376,7 +1376,7 @@
             let sign = title + "V2"
             const a = document.createElement('a');
             a.setAttribute('download', '');
-            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
+            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdfNew?fileName=' + sign +
               '.doc&&fPath=' + res.data.data);
             a.click();
           } else {

src/components/confirmationOrderDownLoadNew.vue

@@ -519,7 +519,7 @@
             let sign = title + "V2"
             const a = document.createElement('a');
             a.setAttribute('download', '');
-            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
+            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdfNew?fileName=' + sign +
               '.doc&&fPath=' + res.data.data);
             a.click();
           } else {
@@ -581,7 +581,7 @@
             this.pdfLoading = true;
             let urlObj = this.domainManager();
             var ocrUrl = "";
-            ocrUrl = urlObj.ocrUrl + "/Home/DownloadFileForPdf?configId=" + msg.configId + "&url=" +
+            ocrUrl = urlObj.ocrUrl + "/Home/DownloadFileForPdfNew?configId=" + msg.configId + "&url=" +
               encodeURIComponent(path);
             this.$http({
               headers: {

src/components/newConfimationOrder.vue

@@ -976,7 +976,7 @@
             let sign = title + "V3"
             const a = document.createElement('a');
             a.setAttribute('download', '');
-            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
+            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdfNew?fileName=' + sign +
               '.pdf&&fPath=' + res.data.data);
             a.click();
           } else {
@@ -1050,7 +1050,7 @@
              let sign = title+"V3"
               const a = document.createElement('a');
               a.setAttribute('download', '');
-              a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
+              a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdfNew?fileName=' + sign +
                 '.doc&&fPath=' + res.data.data);
               a.click();
           } else {

src/components/orderCommon/edit-orderform.vue

@@ -1396,12 +1396,14 @@
               this.addObj.OtherPrice *
               (Number(this.addMsg.ManNum) +
                 Number(this.addMsg.ChirdNum) +
-                Number(this.addMsg.OldPeopleNum)) +
+                Number(this.addMsg.OldPeopleNum))
+                 +
               this.addObj.VisaPrice *
               (Number(this.addMsg.AirticketNum) +
                 Number(this.addMsg.ManNum) +
                 Number(this.addMsg.ChirdNum) +
-                Number(this.addMsg.OldPeopleNum)) -
+                Number(this.addMsg.OldPeopleNum))
+                 -
               this.addObj.BackVisaPrice *
               (Number(this.addMsg.AirticketNum) +
                 Number(this.addMsg.ManNum) +