Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/TravelManager/TravelList/DistributionTransport.vue

@@ -370,12 +370,10 @@
       },
       getCompanyList() { //获取公司列表
         this.apipost('sellorder_post_GetBranchList', {}, res => {
-
           if (res.data.resultCode == 1) {
             this.CompanyList = res.data.data;
           } else {}
         }, err => {})
-
       },
       //点击选中日历日期获取联运数据
       clickedDay(item) {

src/components/confirmationOrderDownLoadNew.vue

@@ -536,15 +536,23 @@
         var that = this;
         let urlObj = this.domainManager();
         let msg = this.getPostMsg();
-        var title = this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游';
+        var title = "";
+        if (this.priceList && this.priceList.length > 0 && this.priceList[0].priceFlight && this.priceList[0]
+          .priceFlight.length > 0) {
+          if (this.priceList[0].priceFlight[0].alName && this.priceList[0].priceFlight[0].alName != '') {
+            title += this.priceList[0].priceFlight[0].alName;
+          }
+        }
+        title += this.orderMsg.startDate;
         //欧洲
         if (this.dataAll.lineId == 168 || this.dataAll.lineId == 119) {
-          title = this.orderMsg.startDate;
-          if (this.dataAll.title.length > 80) {
-            title += this.dataAll.title.substring(0, 80);
+          if (this.dataAll.title.length > 60) {
+            title += this.dataAll.title.substring(0, 60);
           } else {
             title += this.dataAll.title;
           }
+        } else {
+          title += this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游';
         }
         console.log("title", title);
         var fileName = title + ".pdf";

src/components/index.vue

@@ -1913,12 +1913,12 @@
       if (this.ChangeThePriceList.length > 0) {
         if ((!localStorage.getItem("ChangeThePriceDataTime") ||
             (localStorage.getItem("ChangeThePriceDataTime") != this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
-            )) {
+          )) {
           this.GetChangeThePrice()
         }
         if ((!localStorage.getItem("ExamineThePriceDataTime") ||
             (localStorage.getItem("ExamineThePriceDataTime") != this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
-            )) {
+          )) {
           this.GetExaminePriceOrderPageList()
         }
         // 两小时请求一次改价、审核改价提醒
@@ -1958,7 +1958,7 @@
       this.allWindowWidth = allWindowWidth - 50 - 220 - 60;
       let maxLength = parseInt(allWindowWidth / 110);
       this.maxLength = maxLength;
-      //this.testApi();
+      this.testApi();
       //this.testEmp();
       let userinfo = this.getLocalStorage();
       let ActionMenuCode = userinfo.ActionMenuCode;
@@ -2032,7 +2032,7 @@
                 if (!this.ExamineThePriceMsg.total2) this.ExamineThePriceMsg.total2 = res.data.data.count
                 // localStorage.setItem("ChangeThePriceData", JSON.stringify(res.data.data.pageData));
                 localStorage.setItem("ChangeThePriceDataTime", this.getBeforeDate(0, new Date().Format(
-                "yyyy-MM-dd")));
+                  "yyyy-MM-dd")));
                 this.ChangeThePriceObj.ChangeThePriceData = res.data.data.pageData
                 this.ChangeThePriceVisible = true
               } else {
@@ -2073,9 +2073,10 @@
       testApi() {
         // var postMsg = {};
         // var cmd = "";
-        // cmd = "admin_get_GetErpLoginInfoByUid";
-        // postMsg = {
-        //   EmployeeId: 615
+        // cmd = "triptemplate_GetTripConfig";
+        // postMsg = { 
+        //   ConfigId:9117,
+       
         // }
         // this.apipost(
         //   cmd, postMsg,