save

src/components/Hotel/roomReservationsDetailsNew.vue

@@ -1040,23 +1040,25 @@
         let jpaObj = this.allCurrencyList.find(item => {
           return item.ID === 3; //筛选出匹配数据
         });
-        obj.OrderDetailsList.forEach((item, index) => {
-          var tempPrice = 0;
-          var coefficient = 1;
-          //税别
-          if (obj.TaxType == 2) {
-            coefficient = 1 + this.XiaoFeiTaxFee;
-          }
-          if (index == 4 && obj.DMCPayType == 9) {
-            tempPrice = 0;
-          } else {
-            tempPrice = item.UnitPrice * (item.BookNum - item.HotelDiscount) * (coefficient - item.RebateRatio /
-              100);
-          }
-          totalPrice += tempPrice;
-        })
-        totalPrice += obj.ParkFee + obj.CityTax + obj.InTangTax;
-        obj.TotalPrice = totalPrice.toFixed(2);
+        // obj.OrderDetailsList.forEach((item, index) => {
+        //   var tempPrice = 0;
+        //   var coefficient = 1;
+        //   //税别
+        //   if (obj.TaxType == 2) {
+        //     coefficient = 1 + this.XiaoFeiTaxFee;
+        //   }
+        //   if (index == 4 && obj.DMCPayType == 9) {
+        //     tempPrice = 0;
+        //   } else {
+        //     tempPrice = item.UnitPrice * (item.BookNum - item.HotelDiscount) * (coefficient - item.RebateRatio /
+        //       100);
+        //   }
+        //   totalPrice += tempPrice;
+        // })
+        // totalPrice += obj.ParkFee + obj.CityTax + obj.InTangTax;
+        const item = obj.OrderDetailsList.find(item => item.HouseType === 2) || {TotalPrice: 0}
+        console.log(item, obj.OrderDetailsList)
+        obj.TotalPrice = item.TotalPrice.toFixed(2);
         if (this.LineId == 14) {
           if (currentObj && currentObj.ID > 0) {
             //人民币
@@ -1080,7 +1082,7 @@
           }
         }
         // 将金额总计的值赋值给金额小计
-        obj.OrderDetailsList[0].TotalPrice = Number(totalPrice).toFixed(2);
+        obj.OrderDetailsList[0].TotalPrice = Number(obj.TotalPrice).toFixed(2);
         this.$forceUpdate();
       },
       changeTotalPrice(obj) {

src/components/dmc/manager/dmcTotalTable.vue

@@ -388,7 +388,7 @@
                 </div>
               </td>
               <td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0'>
-                <span @click="showDialog(0, item.OfferId)" style="cursor: pointer">{{item.OfferId}}</span>
+                <span @click="showDialog(0, item.OfferId)" style="cursor: pointer" v-if="item.OfferId">报价单</span>
               </td>
               <td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0' style="width: 150px;">
                 <el-popover width="100" trigger="click" popper-class="DMC_HotelPop">

src/components/leaderPay2.vue

@@ -624,11 +624,13 @@
                   <span style="color:red"> 不含税</span>
                 </template>
               </td>
-              <td>
-                {{moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount))}}
+              <td v-if="subItem.OrderDetailsList.length === 1">
+                {{subItem.OrderDetailsList[0].TotalPrice ? subItem.OrderDetailsList[0].TotalPrice : moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount))}}
               </td>
+              <td v-else>
+                {{moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount))}}</td>
               <td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
-                {{hotelTotalPrice(subItem.OrderDetailsList)}}
+                {{hotelTotalPrice(subItem.OrderDetailsList, subItem)}}
               </td>
               <td v-if="subIndex==0 && childIndex == 0" :rowspan="item.row">{{subItem.TradingTotalPrice}}</td>
               <td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
@@ -2176,7 +2178,7 @@
         this.apipost('dmcstatistics_post_GetNewLeaderPayStatics_V1', this.msg, res => {
           this.loading = false;
           if (res.data.resultCode == 1) {
-
+            console.log('dmcstatistics_post_GetNewLeaderPayStatics_V1', res.data.data)
             this.list = res.data.data;
             // 预计金额
             this.planPriceList = this.list.planPriceList;
@@ -2346,6 +2348,7 @@
               Hoteldest[i].row = row
             }
             this.HotelDataList = this.unique(Hoteldest, 'id');
+            console.log('dmcstatistics_post_GetNewLeaderPayStatics_V1 result', this.list)
           } else {
             this.$message.error(res.data.message);
           }
@@ -2387,7 +2390,8 @@
         }
         return this.moneyFormat(totalPrice)
       },
-      hotelTotalPrice(obj) {
+      hotelTotalPrice(obj, data) {
+        console.log('hotelTotalPrice', obj, data)
         let totalPrice = 0
         obj.forEach(x => {
           if (x.PayStyle === 1) {
@@ -2396,6 +2400,10 @@
             totalPrice += 0
           }
         })
+        // 新版，直接使用后端返回的价格
+        if(obj.length === 1 && obj[0].TotalPrice) {
+          totalPrice = obj[0].TotalPrice
+        }
         return this.moneyFormat(totalPrice)
       },
       getzongJE() {