Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

f721c102 · zhengke · 1944b7fc · b86a8e6a · f721c102 · f721c102
Commit f721c102 authored Mar 25, 2019 by zhengke
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 420 additions and 335 deletions

roomReservations.vue src/components/Hotel/roomReservations.vue +1 -1

bookDinnerStatistics.vue src/components/Restaurant/bookDinnerStatistics.vue +419 -334

No files found.
--- a/src/components/Hotel/roomReservations.vue
+++ b/src/components/Hotel/roomReservations.vue
@@ -51,7 +51,7 @@
            <tr>
              <td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
                <div style="max-width: 100px; min-width: 50px; ">{{outindex+1}}</div>
-                <div v-if='outItem.StaticsReportList.length>1' class="w100">合团号：{{outItem.NewCombinationNum}}</div>
+                <div v-if='outItem.StaticsReportList.length>0' class="w100">合团号：{{outItem.NewCombinationNum}}</div>
              </td>
              <td>
                <div class="w80">

--- a/src/components/Restaurant/bookDinnerStatistics.vue
+++ b/src/components/Restaurant/bookDinnerStatistics.vue