页面修改

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -1068,7 +1068,6 @@
         if (isClear && isClear == 1) {
           this.postConfig.LineteamId = 0;
         }
-
         let msg = {
           lineID: lineId,
           isTOOP: 1
@@ -1259,18 +1258,20 @@
         let that = this;
         this.CostNumberList.forEach(x => {
           x.SubtotalMoney = (
-            this.getConvertMoney(x.AirTicketMoney) +
-            this.getConvertMoney(x.TicketMoney) +
-            this.getConvertMoney(x.SingleRoomMoney) +
-            this.getConvertMoney(x.InlandTrafficMoney) +
-            this.getConvertMoney(x.OtherMoney)
+            that.getConvertMoney(x.AirTicketMoney) +
+            that.getConvertMoney(x.TicketMoney) +
+            that.getConvertMoney(x.SingleRoomMoney) +
+            that.getConvertMoney(x.InlandTrafficMoney) +
+            that.getConvertMoney(x.OtherMoney)
           ).toFixed(0);
           x.TotalMoney = (
-            that.getLocalTotalMoney() +
-            that.getCostTotalMoney() +
-            this.getConvertMoney(x.SubtotalMoney) +
-            this.getCurrencyNumberTotalMoney(x.PeopleNumber)
+            Number(that.getLocalTotalMoney(x.PeopleNumber)) +
+            Number( that.getCostTotalMoney()) + 
+           Number( that.getConvertMoney(x.SubtotalMoney) )
+          
           ).toFixed(0);
+          // + that.getCurrencyNumberTotalMoney(x.PeopleNumber)
+          console.log("x.TotalMoney", x.TotalMoney);
         });
       },
       //价格转换器
@@ -1281,21 +1282,27 @@
         return parseFloat(value);
       },
       //获取地接项目报价
-      getLocalTotalMoney() {
+      getLocalTotalMoney(PeopleNumber) {
         let totalMoney = 0.0;
-        this.dayCostPrice.forEach(x => {
-          let subTotalMoney = 0.0;
-          subTotalMoney =
-            (this.getConvertMoney(x.HotelCostPrice) +
-              this.getConvertMoney(x.BusCostPrice) +
-              this.getConvertMoney(x.ScenicCostPrice) +
-              this.getConvertMoney(x.BreakfastCostPrice) +
-              this.getConvertMoney(x.LunchCostPrice) +
-              this.getConvertMoney(x.DinnerCostPrice)) *
-            this.getCurrencyMoney(x.CurrencyId);
-          totalMoney += subTotalMoney;
-        });
-        return totalMoney;
+        totalMoney = Number(this.getDayXiaoJi(1, 2)) + Number(this.getDayXiaoJi(2, 2)) / Number(PeopleNumber) +
+          Number(this.getDayXiaoJi(3, 2)) + Number(this.getDayXiaoJi(4, 2)) + Number(this.getDayXiaoJi(5, 2)) +
+          Number(this.getDayXiaoJi(6, 2));
+        // this.dayCostPrice.forEach(x => {
+        //   let subTotalMoney = 0.0;
+        //   subTotalMoney =
+        //     (this.getConvertMoney(x.HotelCostPrice) +
+
+        //       this.getConvertMoney(x.ScenicCostPrice) +
+        //       this.getConvertMoney(x.BreakfastCostPrice) +
+        //       this.getConvertMoney(x.LunchCostPrice) +
+        //       this.getConvertMoney(x.DinnerCostPrice)) *
+        //     this.getCurrencyMoney(x.CurrencyId)
+        //     +(this.getConvertMoney(x.BusCostPrice)*this.getCurrencyMoney(x.CurrencyId)/PeopleNumber)
+        //     ;
+        //   totalMoney += subTotalMoney;
+        // });
+        console.log("totalMoney", totalMoney.toFixed(0))
+        return totalMoney.toFixed(0);
       },
       //计算领队分摊
       getLeaderShare() {
@@ -1319,6 +1326,7 @@
       }
     },
     mounted() {
+      this.getSubtotalMoney();
       this.getAllCurrency();
     },
     created() {