no message

src/components/Hotel/reservation/HotelOrderList.vue

@@ -231,13 +231,14 @@
             res => {
               if (res.data.resultCode == 1) {
                 let data = res.data.data.pageData
-                // let addList = function(arr){
-                //   arr.forEach(x=>{
+                let addList = function(arr){
+                  arr.forEach(x=>{
+                    x.list = []
                     // x.Tax = 0
                     // x.Tax2 = 0
-                //   })
-                // }
-                // addList(data)
+                  })
+                }
+                addList(data)
                 data.forEach(item => {
                   item.DetailList.forEach(x=>{
                     x.Number = 0
@@ -251,7 +252,19 @@
                     x.Money = x.HotelMoeny+x.TaxesPrice
                   })
                 })
+                
                 this.OrderList = data;
+                this.OrderList.forEach(item=>{
+                  let datas = {
+                    Income: item.Income,
+                    CostMoney: item.CostMoney,
+                    PlatformTax: item.PlatformTax,
+                    Refund: item.Refund,
+                    HandFittingIncome: item.HandFittingIncome,
+                    HandFittingTax: item.HandFittingTax
+                  }
+                  item.list.push(datas)
+                })
                 this.total = res.data.data.count;
               }else {
                 this.Error(res.data.message);

src/components/Hotel/reservation/OrderList.vue

@@ -141,7 +141,6 @@
                     <span class="ml">小计：{{x.Money}}</span>
                   </div>
                 </div>
-                
               </template>
             </el-table-column>
             <el-table-column label="订单号" min-width="100">
@@ -152,58 +151,60 @@
                 </template>
               </template>
             </el-table-column>
-            <el-table-column label="实收" min-width="100">
+            <el-table-column label="城市税" min-width="60">
               <template slot-scope="scope">
-                <span>{{item.Income?item.Income:'-'}}</span>
+                  {{scope.row.Tax>0?scope.row.Tax.toFixed(2):'-'}}
               </template>
             </el-table-column>
-            <el-table-column label="成本" min-width="100">
+            <el-table-column label="入汤税" min-width="60" style="background:#EAEAEA">
               <template slot-scope="scope">
-                <span>{{item.CostMoney?item.CostMoney:'-'}}</span>
+                {{scope.row.Tax2>0?scope.row.Tax2.toFixed(2):'-'}}
               </template>
             </el-table-column>
-            <el-table-column label="平台税金" min-width="100">
+            <el-table-column label="小计" min-width="70" style="background:#EAEAEA">
               <template slot-scope="scope">
-                <span>{{item.PlatformTax?item.PlatformTax:'-'}}</span>
+                  {{scope.row.Money.toFixed(2)}}
               </template>
             </el-table-column>
-            <el-table-column label="退款" min-width="100">
+            <el-table-column label="付款方式" min-width="80" style="background:#EAEAEA">
               <template slot-scope="scope">
-                <span>{{item.Refund?item.Refund:'-'}}</span>
+                  {{scope.row.CustomerPayType==1?'到店自付':'出发前付款'}}
               </template>
             </el-table-column>
-            <el-table-column label="手配费实收" min-width="100">
+          </el-table>
+        </div>
+        <el-table :data="item.list" style="width:100%" border>
+          <el-table-column label="实收" min-width="100">
             <template slot-scope="scope">
-                <span>{{item.HandFittingIncome?item.HandFittingIncome:'-'}}</span>
+              <span>{{scope.row.Income?scope.row.Income:'-'}}</span>
             </template>
           </el-table-column>
-            <el-table-column label="手配费平台税金" min-width="100">
+          <el-table-column label="成本" min-width="100">
             <template slot-scope="scope">
-                <span>{{item.HandFittingTax?item.HandFittingTax:'-'}}</span>
+              <span>{{scope.row.CostMoney?scope.row.CostMoney:'-'}}</span>
             </template>
           </el-table-column>
-            <el-table-column label="城市税" min-width="60">
+          <el-table-column label="平台税金" min-width="100">
             <template slot-scope="scope">
-                  {{scope.row.Tax>0?scope.row.Tax.toFixed(2):'-'}}
+              <span>{{scope.row.PlatformTax?scope.row.PlatformTax:'-'}}</span>
             </template>
           </el-table-column>
-            <el-table-column label="入汤税" min-width="60" style="background:#EAEAEA">
+          <el-table-column label="退款" min-width="100">
             <template slot-scope="scope">
-                {{scope.row.Tax2>0?scope.row.Tax2.toFixed(2):'-'}}
+              <span>{{scope.row.Refund?scope.row.Refund:'-'}}</span>
             </template>
           </el-table-column>
-            <el-table-column label="小计" min-width="70" style="background:#EAEAEA">
+          <el-table-column label="手配费实收" min-width="100">
             <template slot-scope="scope">
-                  {{scope.row.Money.toFixed(2)}}
+              <span>{{scope.row.HandFittingIncome?scope.row.HandFittingIncome:'-'}}</span>
             </template>
           </el-table-column>
-            <el-table-column label="付款方式" min-width="80" style="background:#EAEAEA">
+          <el-table-column label="手配费平台税金" min-width="100">
             <template slot-scope="scope">
-                  {{scope.row.CustomerPayType==1?'到店自付':'出发前付款'}}
+              <span>{{scope.row.HandFittingTax?scope.row.HandFittingTax:'-'}}</span>
             </template>
           </el-table-column>
         </el-table>
-        </div>
         <div class="row justify-sb mt mb20">
           <!-- <div class="row pt20">
             <i class="el-icon-warning cF57A98 fz15 mr"></i>