页面修改

src/components/leaderPay2.vue

@@ -441,46 +441,6 @@
             </tr>
           </template>
         </template>
-        <!-- <template v-for='(item,index) in list.ScenicList'>
-          <template v-for="(subItem,subIndex) in item.ScenicStatisticsList">
-            <tr v-for="(childItem,childIndex) in subItem.TicketPriceList">
-              <td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
-                {{subItem.ScenicName}}
-              </td>
-              <td>
-                {{peopleStrToWord(childItem.PeopleType)}}:{{childItem.PeopleNum}}
-              </td>
-              <td>
-                <p>
-                  {{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}}
-                </p>
-              </td>
-              <td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
-                <span v-if="subItem.PayStyle === 1">现付</span>
-                <span v-else-if="subItem.PayStyle === 2">公司结算</span>
-                <span v-else-if="subItem.PayStyle === 3">预付</span>
-                <span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
-                <span v-else></span>
-                </br>
-                <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
-              </td>
-
-              <td>
-                {{subItem.PayStyle === 1 ? moneyFormat((childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
-              </td>
-              <td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
-                {{scenicTotalPrice(subItem, subItem.TicketPriceList)}}
-              </td>
-              <td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
-                {{subItem.TradingTotalPrice}}
-              </td>
-
-              <td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
-                {{subItem.Remarks}}
-              </td>
-            </tr>
-          </template>
-        </template> -->
       </table>
 
       <table border="0" cellspacing="1" class="leaderPayTable leaderPayTable2">
@@ -490,7 +450,6 @@
         <tr>
           <th width="">使用日期</th>
           <th width="">高速公路费</th>
-          <!--          <th width="">预计总金额</th>-->
           <th width="">实付金额</th>
           <th width="">备注</th>
           <th width="40">操作</th>
@@ -501,9 +460,6 @@
             <td>
               {{item2.HighSpeedPrice >= 0 && item2.HighSpeedPrice !== null && item2.HighSpeedPayType > 0 ? (item2.HighSpeedPayType === 1 ? moneyFormat(item2.HighSpeedPrice) : 0) : ''}}
             </td>
-            <!--          <td v-if='index==0' :rowspan='list.BusList.length'>-->
-            <!--            {{busTotalPrice(list.BusList)}}-->
-            <!--          </td>-->
             <td v-if="index2 ==0" :rowspan="item.data.length">
               {{item2.TotalPrice}}
             </td>
@@ -575,7 +531,7 @@
               <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
                 {{diningTotalPrice(subItem, subItem.DiningPriceList)}}
               </td>
-              <td v-if="childIndex==0 && subIndex ==0" :rowspan="item.row">{{subItem.TradingTotalPrice}}</td>
+              <td v-if="childIndex==0 && subIndex ==0" :rowspan="item.row">{{GetDinnerPrice(item)}}</td>
               <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
                 {{subItem.Remarks}}
               </td>
@@ -687,19 +643,8 @@
           <td>0</td>
           <td>{{moneyFormat(item.TotalPrice)}}</td>
           <td>
-            <!-- <span class="cursorpointer text-decoratio" @click="godetailAll('zifeizhiS')">明细</span> -->
           </td>
         </tr>
-        <!-- <tr v-show="(totalList.ExpendTotalPrice-totalScenicPrice-totalTrafficPrice-totalDinnerPrice-totalHotelPrice)>0">
-          <td>其他费用</td>
-          <td>0</td>
-          <td>
-            {{moneyFormat(totalList.ExpendTotalPrice-totalScenicPrice-totalTrafficPrice-totalDinnerPrice-totalHotelPrice)}}
-          </td>
-          <td>
-            
-          </td>
-        </tr> -->
         <tr v-for="item in planPriceList">
           <td>
             <span v-if="item.UserType==3">景点门票</span>
@@ -765,7 +710,6 @@
           <td>
             <p>{{item.Type==1 ? $t('fnc.yingshou') : $t('fnc.yingfu') }}：<span
                 class="">{{moneyFormat(item.OriginalMoneyTotal)}}</span></p>
-            <!-- <p>{{item.Type==1 ? $t('fnc.shishou') : $t('fnc.shifu') }}：<span class="">{{moneyFormat(item.PayMoney)}}</span></p> -->
           </td>
           <td>
             <template v-if='item.Type===1'>
@@ -793,7 +737,6 @@
           <th>预付合计</th>
           <th>实际领款</th>
           <th>实付合计</th>
-          <!-- <th>实际报账金额</th> -->
           <th>领队退款</th>
         </tr>
         <tr v-for="(item, index) in TotalPriceData"
@@ -802,7 +745,6 @@
           <td>{{moneyFormat(item.PlanPrice)}}</td>
           <td>{{moneyFormat(item.PlanTotalPrice)}}</td>
           <td>{{moneyFormat(item.ExpendTotalPrice)}}</td>
-          <!-- <td>{{index == 0 ? moneyFormat(AllBZPrice) : moneyFormat(item.ExpendTotalPrice)}}</td> -->
           <td>
             {{index == 0 ? moneyFormat(item.PlanTotalPrice - AllBZPrice): moneyFormat(item.PlanTotalPrice - item.ExpendTotalPrice)}}
           </td>
@@ -1028,7 +970,6 @@
         <input type="button" class="leader2Btn" @click="AuditOrder(1)" value="审核不通过"
           v-show="dataList.LeaderApply.Status==1">
         <input type="button" class="leader2Btn" value="打印" @click="printTable()">
-        <!-- <input type="button" class="leader2Btn" value="查看详情" @click="Lookdetails()"> -->
       </div>
     </div>
     <a :href="blankUrl" id="blankLink" target="_blank" style="display:none">1</a>
@@ -1079,7 +1020,7 @@
   export default {
     data() {
       return {
-        LineId:0,
+        LineId: 0,
         planPriceList: [],
         zhuijiaList: [],
         zhuijiaMoney: 0,
@@ -1139,6 +1080,13 @@
       };
     },
     methods: {
+      GetDinnerPrice(item) {
+        var totalPrice = 0;
+        item.data.forEach(subItem => {
+          totalPrice += subItem.TradingTotalPrice
+        });
+        return totalPrice.toFixed(2);
+      },
       getOrderType(type) {
         // 1-其他订单，2-小费收入，3-团费小计，4-自费收入，5-自费支出
         if (type == 1) return '其他费用'
@@ -1439,11 +1387,10 @@
         }, null)
       },
       goZhiDan: function (obj) {
-         let id = [];
-         if (obj.LineId==this.LineId){
-            id = [75]
-        }
-        else{
+        let id = [];
+        if (obj.LineId == this.LineId) {
+          id = [75]
+        } else {
           id = [59, 63, 78];
         }
         let TCIDARR = [obj.TCIDS];
@@ -1464,7 +1411,6 @@
         dom.click();
       },
       goFncUrl: function (path, id) {
-        //   this.$router.push({ name: path, query: { id: id, blank: "y" } });
         let fullPath = `/${path}?id=${id}&blank=y&tab=`;
         let dom = document.querySelector("#blankLink");
         dom.href = `http://${window.location.host}/#${fullPath}`;
@@ -1480,7 +1426,7 @@
             if (res.data.resultCode == 1) {
               let TotalNav = res.data.data.list;
               let listCost = res.data.data.listCost;
-              this.LineId=res.data.data.EntryId;
+              this.LineId = res.data.data.EntryId;
               listCost.forEach(x => {
                 x.price = 0
               })
@@ -1640,7 +1586,6 @@
       },
       getnewList() {
         this.loading = true;
-        // dmcstatistics_post_GetNewPlanTotalPrice_V2
         this.apipost('dmcstatistics_post_GetNewLeaderPayStatics_V1', this.msg, res => {
           this.loading = false;
           if (res.data.resultCode == 1) {
@@ -1719,6 +1664,7 @@
               Diningdest[i].row = row
             }
             this.DiningDataList = this.unique(Diningdest, 'id');
+            console.log("DiningDataList", this.DiningDataList)
             //票 
             let ScenicList = []
             for (let i = 0; i < res.data.data.ScenicList.length; i++) {
@@ -1765,7 +1711,6 @@
               Scenicdest[i].row = row
             }
             this.ScenicDataList = this.unique(Scenicdest, 'TicketID');
-            // this.ScenicDataList = Scenicdest
             //酒 
             let HotelList = []
             for (let i = 0; i < res.data.data.HotelOrderListReport.length; i++) {
@@ -1773,20 +1718,18 @@
                 HotelList.push(res.data.data.HotelOrderListReport[i].HotelOrderList[o])
               }
             }
-            console.log(HotelList)
             var Hotelmap = {},
               Hoteldest = [];
             for (var i = 0; i < HotelList.length; i++) {
               var ai = HotelList[i];
-              console.log(ai.NewHotelId, ai.CheckInDateStr, i)
               if (!Hotelmap[ai.CheckInDateStr]) {
-                    Hoteldest.push({
-                      CheckInDateStr: ai.CheckInDateStr,
-                      NewHotelId: ai.NewHotelId,
-                      id: ai.NewHotelId + ai.CheckInDateStr,
-                      data: [ai]
-                    });
-                    Hotelmap[ai.CheckInDateStr] = ai;
+                Hoteldest.push({
+                  CheckInDateStr: ai.CheckInDateStr,
+                  NewHotelId: ai.NewHotelId,
+                  id: ai.NewHotelId + ai.CheckInDateStr,
+                  data: [ai]
+                });
+                Hotelmap[ai.CheckInDateStr] = ai;
               } else {
                 let list = []
                 for (var j = 0; j < Hoteldest.length; j++) {