11

src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue

@@ -378,7 +378,6 @@
                     </template>
                   </template>
                 </template>
-
               </td>
               <td>
                 <el-input type="text" v-model='subItem.OtherName' class="w70"
@@ -960,6 +959,8 @@
       chooseDinner(obj) {
         if (this.qMsg.DinnerType == 1) {
           this.clickDinner.BreakfastName = obj.DiningName;
+          this.clickDinner.BreakFastId = obj.DiningId;
+          this.clickDinner.BreakfastCostPrice = obj.UnitPrice;
         } else if (this.qMsg.DinnerType == 2) {
           this.clickDinner.LunchName = obj.DiningName;
           this.clickDinner.LunchCostPrice = obj.UnitPrice;

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -564,6 +564,7 @@
               HotelName: "", //酒店名称
               RebatePrice: 0, //回佣
               OtherPrice: 0, //其它费用(保险、司导杂费等)
+              BreakFastId:"",//早餐Id
               DinnerIds: "", //晚餐Id
               DinnerName: "", //晚餐名称
               LunchIds: "", //午餐编号

src/components/commonPage/travelDinner.vue

@@ -401,7 +401,7 @@
             if (tempBObj) {
               ckDinnerObj.DiningId = tempBObj.Id;
               ckDinnerObj.DiningName = tempBObj.name;
-              ckDinnerObj.UnitPrice = 0;
+              ckDinnerObj.UnitPrice = tempBObj.UnitPrice;
             }
           }
         }

src/components/confirmationOrderDownLoadNew.vue

@@ -371,17 +371,17 @@
     methods: {
       setPriceDownTripService() {
         let msg = {
-          LineId: this.$route.query.lineID?this.$route.query.lineID:this.lineId,
-          LineteamId: this.$route.query.ltID?this.$route.query.ltID:this.lineteamId,
+          LineId: this.$route.query.lineID ? this.$route.query.lineID : this.lineId,
+          LineteamId: this.$route.query.ltID ? this.$route.query.ltID : this.lineteamId,
           TCID: this.$route.query.tcid,
         }
-        this.apipost('b2b_post_SetPriceDownTripService', msg,res => {
+        this.apipost('b2b_post_SetPriceDownTripService', msg, res => {
           if (res.data.resultCode == 1) {
-            
-          }else{
+
+          } else {
             this.$message.error(res.data.message);
           }
-        },err=>{
+        }, err => {
           this.$message.error(err.data.message);
         })
       },
@@ -651,13 +651,16 @@
       ToWord_2023: function (title) {
         this.setPriceDownTripService()
         var title = this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + this.$t(
-          'objFill.v101.LeaveGroupDownload.riyou')
+          'objFill.v101.LeaveGroupDownload.riyou');
+        if (this.orderId && this.orderId > 0) {
+          title += "(出团通知书)";
+        }
         this.pdfLoading = true;
         this.loadingText = this.$t('objFill.zhengzscpdf');
         let msg = this.getPostMsg();
         var that = this;
         this.pdfLoading = true;
-        this.loadingText = "正在生成WORD行程...";
+        this.loadingText = "正在生成WORD" + ((this.orderId && this.orderId > 0) ? "出团通知书" : "行程") + "...";
         this.download_timer = setInterval(function () {
           that.checkWord(msg, title)
         }, 2000);
@@ -758,8 +761,8 @@
         title += this.orderMsg.startDate;
         //欧洲
         if (this.dataAll.lineId == 168 || this.dataAll.lineId == 119) {
-          if (this.dataAll.title.length > 60) {
-            title += this.dataAll.title.substring(0, 60);
+          if (this.dataAll.title.length > 50) {
+            title += this.dataAll.title.substring(0, 50);
           } else {
             title += this.dataAll.title;
           }
@@ -767,6 +770,9 @@
           title += this.orderMsg.lineteamName + this.orderMsg.dayNum + this.$t(
             'objFill.v101.LeaveGroupDownload.riyou');
         }
+        if (this.orderId && this.orderId > 0) {
+          title += "(出团通知书)"
+        }
         //阿里云行程下载
         var objFileKey = "TripDownLoad"
         objFileKey += "/" + msg.configId + "_" + msg.tcid;

src/components/newTravelmanager/travelLineTrip/HotelTripThree.vue

@@ -436,6 +436,11 @@
             return item.Id === breakfastObj.BreakfastUseType; //筛选出匹配数据
           });
           if (obj != undefined) {
+            if (breakfastObj.BreakfastUseType == 5080) {
+              breakfastObj.DinnerId = breakfastObj.BreakfastUseType;
+            } else {
+              breakfastObj.DinnerId = 0
+            }
             breakfastObj.DinnerName = obj.name;
           }
         } else {