领队用款

src/components/LeaderManagement/leaderPay.vue

@@ -36,8 +36,8 @@
             <td width="150">车辆号</td>
             <td width="80">用车方式</td>
             <td width="150">实际信息</td>
-            <td width="150">总金额</td>
             <td width="150">实际金额</td>
+            <td width="150">预计金额</td>
             <td width="150">付款方式</td>
             <td width="300">备注</td>
             <td width="300">凭证</td>
@@ -92,8 +92,8 @@
           <td width="100">占床/不占床</td>
           <td width="150">房间类型/数量</td>
           <td width="150">实际信息</td>
-          <td width="80">总金额</td>
           <td width="80">实际金额</td>
+          <td width="80">预计金额</td>
           <td width="80">付款方式</td>
           <td width="300">备注</td>
           <td>凭证</td>
@@ -157,8 +157,8 @@
             <td width="100">类别</td>
             <td width="150">用餐人数</td>
             <td width="150">实际信息</td>
-            <td width="80">总金额</td>
             <td width="80">实际金额</td>
+            <td width="80">预计金额</td>
             <td width="80">付款方式</td>
             <td width="300">备注</td>
             <td>凭证</td>
@@ -196,7 +196,9 @@
                 </div>
               </td>
               <td class="jdtd" valign="middle">
-                {{calculationPrice(item)}}
+                 <div v-for="subItem in item.DiningSummaryList">
+                 {{calculationPrice(subItem)}}
+                </div>
               </td>
               <td class="jdtd" valign="middle">
                 {{item.PayType !=null && item.PayType !='' ? (item.PayType== 1? '现付' :(item.PayType ==2 ? '签单' :(item.PayType == 4 ? '预付' :(item.item.PayType ==5 ?'实物抵扣' :'')))):''}}
@@ -225,8 +227,8 @@
             <td width="100">总人数</td>
             <td width="150">门票类别</td>
             <td width="150">实际信息</td>
-            <td width="80">总金额</td>
             <td width="80">实际金额</td>
+            <td width="80">预计金额</td>
             <td width="80">付款方式</td>
             <td width="300">备注</td>
             <td>凭证</td>
@@ -266,7 +268,9 @@
                 </div>
               </td>
               <td class="jdtd" valign="middle">
-                {{ScenicspotPrice(item)}}
+                  <div v-for="subItem in item.ScenicStatisticsList">
+                  {{ScenicspotPrice(subItem)}}
+                </div>
               </td>
               <td class="jdtd" valign="middle">
                 {{item.PayType !=null && item.PayType !='' ? (item.PayType== 1? '现付' :(item.PayType ==2 ? '签单' :(item.PayType == 4 ? '预付' :(item.item.PayType ==5 ?'实物抵扣' :'')))):''}}
@@ -691,7 +695,7 @@
 
       // 酒店
       HotelPrice(obj) {
-        let totalPrice = 0;
+          let totalPrice = 0;
         obj.OrderDetailsList.forEach(item => {
           totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
         })
@@ -700,21 +704,20 @@
       },
       // 餐饮
       calculationPrice(obj){
-        // let totalPrice = 0;
-        // obj.DiningSummaryList.forEach(item => {
-        //   totalPrice += item.PeoplePrice * (item.PeopleNum - item.Discount) * (1 - item.DiscountPrice / 100);
-        // })
-        // obj.TotalPrice = totalPrice.toFixed(2);
-        // return obj.TotalPrice
+         let totalPrice = 0;
+        obj.DiningPriceList.forEach(item => {
+          totalPrice += item.PeoplePrice * (item.PeopleNum - item.Discount) * (1 - item.DiscountPrice / 100);
+        })
+        return  totalPrice.toFixed(2)
       },
       // 景点
       ScenicspotPrice(obj) {
-        // let totalPrice = 0;
-        // obj.TicketPriceList.forEach(item => {
-        //   totalPrice += item.PeoplePrice * (item.UsePeopleNum - item.Discount) * (1 - item.DiscountPrice / 100);
-        // })
-        // obj.TotalPrice = totalPrice.toFixed(2);
-        // return obj.TotalPrice
+        let totalPrice = 0;
+        obj.TicketPriceList.forEach(item => {
+          totalPrice += item.PeoplePrice * (item.UsePeopleNum - item.Discount) * (1 - item.DiscountPrice / 100);
+        })
+        obj.TotalPrice = totalPrice.toFixed(2);
+        return obj.TotalPrice
       },