页面修改

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -483,8 +483,8 @@
                         style="display:inline-block;margin:0 5px;position:relative;top:-3px;">.</span>{{item.BusNumber}}
                     </div>
                   </div>
-                  <div class="TC_TravelSalePlat clearfix" style="font-size: 11px;">
-                    <span v-if="item.CustomerName">{{item.CustomerName}}
+                  <div v-if="item.CustomerName" class="TC_TravelSalePlat clearfix" style="font-size: 11px;font-weight:bold;color:red">
+                    <span v-if="item.CustomerName">客户名称：{{item.CustomerName}}
                     </span>
                     <span v-if="item.OfferPayTypeStr">({{item.OfferPayTypeStr}})
                     </span>

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -1335,6 +1335,29 @@
         // this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
         return totalMoney;
       },
+      //获取主成本价
+      getCostJpyTotalMoney() {
+        let totalMoney =
+          this.getConvertMoney(this.OtherPrice.InlandAirTicketMoney) +
+          this.getConvertMoney(this.OtherPrice.InlandShipTicketMoney) +
+          this.getConvertMoney(this.OtherPrice.InlandTrainTicketMoney) +
+          this.getConvertMoney(this.OtherPrice.InternationalAirTicket) +
+          this.getConvertMoney(this.OtherPrice.DriverGuideMoney) +
+          this.getConvertMoney(this.OtherPrice.GuideMoney) +
+          this.getConvertMoney(this.OtherPrice.LeaderTripMoney) +
+          this.getConvertMoney(this.OtherPrice.OfficeCommissionMoney) +
+          this.getConvertMoney(this.OtherPrice.SafeMoney) +
+          this.getConvertMoney(this.OtherPrice.SalesCommissionMoney) +
+          this.getConvertMoney(this.OtherPrice.TripMoney) +
+          this.getConvertMoney(this.OtherPrice.GuidePeopleMoney) -
+          this.getConvertMoney(this.OtherPrice.KBMoney) +
+          this.getConvertMoney(this.OtherPrice.VisaMoney) - 
+          this.getConvertMoney(this.OtherPrice.TipComplement) -
+          this.getConvertMoney(this.OtherPrice.GuideComplement);
+        //KBMoney[团负费用减法]
+        // this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
+        return totalMoney;
+      },
       //获取系列列表
       getLineTeamList(lineId, isClear) {
         if (isClear && isClear == 1) {
@@ -1547,20 +1570,14 @@
 
           //房餐车景点价格
           var trip = Number(that.getLocalTotalMoney(x.PeopleNumber));
-
+          var jpyTrip = Number(that.getLocalJpyTotalMoney(x.PeopleNumber));
           //其他价格
           var otherPrice = Number(that.getCostTotalMoney());
-
+          var jpyotherPrice=Number(that.getCostJpyTotalMoney());
           x.TotalMoney = (trip + otherPrice +
             Number(that.getConvertMoney(x.SubtotalMoney))
           ).toFixed(0);
-          // console.log('this.getCurrencyMoney(this.subItem.CurrencyId)', this.dayCostPrice)
-          // console.log('this.getCurrencyMoney(this.subItem.CurrencyId)', this.getCurrencyMoney(this.dayCostPrice[0].CurrencyId), this.dayCostPrice[0].CurrencyId)
-          if(this.dayCostPrice[0] && this.dayCostPrice[0].CurrencyId) {
-            x.JPYTotalMoney = ((trip + otherPrice +
-            Number(that.getConvertMoney(x.SubtotalMoney))
-          )/this.getCurrencyMoney(this.dayCostPrice[0].CurrencyId)).toFixed(0);
-          }
+          x.JPYTotalMoney = (jpyTrip + jpyotherPrice).toFixed(2);
         });
       },
       //价格转换器
@@ -1582,6 +1599,19 @@
           Number(this.getDayXiaoJi(7, 2)) / Number(PeopleNumber);
         return totalMoney.toFixed(0);
       },
+      //获取地接项目报价
+      getLocalJpyTotalMoney(PeopleNumber) {
+        let totalMoney = 0.0;
+        totalMoney = Number(this.getDayXiaoJi(1, 1)) +
+          Number(this.getDayXiaoJi(3, 1)) +
+          Number(this.getDayXiaoJi(4, 1)) +
+          Number(this.getDayXiaoJi(5, 1)) +
+          Number(this.getDayXiaoJi(6, 1)) +
+          Number(this.getDayXiaoJi(2, 1)) / Number(PeopleNumber) +
+          Number(this.getDayXiaoJi(7, 1)) / Number(PeopleNumber);
+        return totalMoney.toFixed(0);
+      },
+
       //计算领队分摊
       getLeaderShare() {
         let that = this;

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -1013,27 +1013,6 @@
         //KBMoney[团负费用减法]
         return totalMoney;
       },
-      //计算总价
-      getSubtotalMoney() {
-        let that = this;
-        this.CostNumberList.forEach(x => {
-          x.SubtotalMoney = (
-            that.getConvertMoney(x.AirTicketMoney) +
-            that.getConvertMoney(x.TicketMoney) +
-            that.getConvertMoney(x.SingleRoomMoney) +
-            that.getConvertMoney(x.InlandTrafficMoney) +
-            that.getConvertMoney(x.OtherMoney) +
-            that.getConvertMoney(x.LeaderGuideDriveZhuSu)
-          ).toFixed(0);
-          //房餐车景点价格
-          var trip = Number(that.getLocalTotalMoney(x.PeopleNumber));
-          //其他价格
-          var otherPrice = Number(that.getCostTotalMoney())
-          x.TotalMoney = (trip + otherPrice +
-            Number(that.getConvertMoney(x.SubtotalMoney))
-          ).toFixed(0);
-        });
-      },
       //价格转换器
       getConvertMoney(value) {
         if (value === "" || value === undefined || value === null) {
@@ -1074,20 +1053,15 @@
       },
       getchange() {
         this.getLeaderShare();
-        this.getSubtotalMoney();
+ 
       }
     },
     mounted() {
-      this.getSubtotalMoney();
+    
     },
     created() {},
     watch: {
-      CostNumberList: {
-        handler: function (val, oldVal) {
-          this.getchange()
-        },
-        deep: true
-      },
+      
     },
   };