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

src/components/Hotel/roomReservationsDetails.vue

@@ -26,6 +26,8 @@
           <span v-if="IsOperation==1" style="color:red;font-size:14px;">已制单，不能在修改!</span>
         </li>
       </ul>
+      税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br/>
+      税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)
     </div>
     <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; " :style="{height: boxHeight + 'px'}"
       class="ownScrollbarStyle" ref="ownScrollbarStyle">

src/components/LeaderManagement/leaderReimbursement.vue

@@ -132,28 +132,34 @@
     </table>
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
       <tr>
-        <th colspan="22" class="bgwhite">酒店使用</th>
+        <th colspan="22" class="bgwhite">酒店使用 </th>
+      </tr>
+      <tr>
+        <th colspan="22" class="bgwhite">
+          税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br />
+          税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)
+        </th>
       </tr>
       <tr class="title">
         <th width="90">使用时间</th>
         <th width="150">酒店名称</th>
-        <th width="70">占床<br/>不占床</th>
-        <th width="70">实际<br/>用房数</th>
-        <th width="70">房间<br/>类型</th>
+        <th width="70">占床<br />不占床</th>
+        <th width="70">实际<br />用房数</th>
+        <th width="70">房间<br />类型</th>
         <th width="70">房间数</th>
-        <th width="60">预定<br/>人数</th>
-        <th width="60">免费<br/>人数</th>
+        <th width="60">预定<br />人数</th>
+        <th width="60">免费<br />人数</th>
         <th width="60">单价/人</th>
-        <th width="60">金额<br/>小计</th>
-        <th width="60">返佣<br/>类型</th>
+        <th width="60">金额<br />小计</th>
+        <th width="60">返佣<br />类型</th>
         <th width="60">返佣</th>
-        <th width="60">返佣<br/>金额</th>
+        <th width="60">返佣<br />金额</th>
         <th width="60">入汤税</th>
         <th width="60">城市税</th>
         <th width="60">停车费</th>
-        <th width="60">税入<br/>税别</th>
+        <th width="60">税入<br />税别</th>
         <th width="60">总金额</th>
-        <th width="60">付款<br/>方式</th>
+        <th width="60">付款<br />方式</th>
         <th width="100">供应商</th>
         <th width="100">状态</th>
         <th width="100">备注</th>
@@ -161,7 +167,8 @@
       <template v-for='(outItem,outIndex) in list.HotelOrderListReport'>
         <template v-for="(subItem,subIndex) in outItem.HotelOrderList">
           <tr v-for="(childItem,childIndex) in subItem.OrderDetailsList">
-            <td v-if="childIndex==0&&subIndex==0" :rowspan="6*outItem.HotelOrderList.length" style="white-space:nowrap; ">{{outItem.UseTimeStr}}
+            <td v-if="childIndex==0&&subIndex==0" :rowspan="6*outItem.HotelOrderList.length"
+              style="white-space:nowrap; ">{{outItem.UseTimeStr}}
             </td>
             <td v-if="childIndex==0" :rowspan="6" style="text-align:left; ">{{subItem.HotelName}}
               <p class="cursorpointer" style="margin-top:5px;color: blue;">
@@ -224,26 +231,26 @@
               {{childItem.RebateRatio}} %
             </td>
             <td style="white-space:nowrap; ">
-                 <!--含税-->
-                <template v-if="subItem.RebateType==1">
-                  <!--税别-->
-                  <template v-if="subItem.TaxType==2">
-                    {{ (childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1 + 0.08 )*( childItem.RebateRatio / 100)).toFixed(2)}}
-                  </template>
-                  <template v-else>
-                    {{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1)*( childItem.RebateRatio / 100)).toFixed(2) }}
-                  </template>
+              <!--含税-->
+              <template v-if="subItem.RebateType==1">
+                <!--税别-->
+                <template v-if="subItem.TaxType==2">
+                  {{ (childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1 + 0.08 )*( childItem.RebateRatio / 100)).toFixed(2)}}
                 </template>
-                <!--不含税-->
                 <template v-else>
-                  <!--税别-->
-                  <template v-if="subItem.TaxType==2">
-                    {{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1 + 0.08)*( childItem.RebateRatio / 100)).toFixed(2)}}
-                  </template>
-                  <template v-else>
-                    {{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1)*( childItem.RebateRatio / 100)).toFixed(2)}}
-                  </template>
+                  {{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1)*( childItem.RebateRatio / 100)).toFixed(2) }}
                 </template>
+              </template>
+              <!--不含税-->
+              <template v-else>
+                <!--税别-->
+                <template v-if="subItem.TaxType==2">
+                  {{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1 + 0.08)*( childItem.RebateRatio / 100)).toFixed(2)}}
+                </template>
+                <template v-else>
+                  {{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1)*( childItem.RebateRatio / 100)).toFixed(2)}}
+                </template>
+              </template>
             </td>
             <td v-if="childIndex==0" :rowspan="6">
               {{subItem.InTangTax}}

src/components/busManagement/busStatistics.vue

@@ -147,7 +147,8 @@
               </td>
               <td>
                 <div class="w80">
-                  <template v-if="item.CommonReport&&item.CommonReport.BusPlanListReport&&item.CommonReport.BusPlanListReport.length>0&&item.CommonReport.BusPlanListReport[0].BusPlanOrderList&&item.CommonReport.BusPlanListReport[0].BusPlanOrderList[0]">
+                  <template
+                    v-if="item.CommonReport&&item.CommonReport.BusPlanListReport&&item.CommonReport.BusPlanListReport.length>0&&item.CommonReport.BusPlanListReport[0].BusPlanOrderList&&item.CommonReport.BusPlanListReport[0].BusPlanOrderList[0]">
                     {{item.CommonReport.BusPlanListReport[0].BusPlanOrderList[0].MainBusTypeStr}}
                   </template>
                 </div>
@@ -407,6 +408,7 @@
           if (res.data.resultCode == 1) {
             this.total = res.data.data.count;
             this.DataList = res.data.data.pageData.data;
+            console.log("this.dataList",this.DataList);
             this.thLengthTitle = [];
             this.colspanTotal = res.data.data.pageData.columnsCount + 13;
             for (let i = 1; i <= res.data.data.pageData.columnsCount; i++) {
@@ -438,7 +440,6 @@
         "-" +
         myDate.getDate();
       this.msg.StartDate = nowDate;
-      //this.msg.StartDate = '2019-08-12';
       let width = window.innerWidth - 50;
       let height = window.innerHeight - 65 - 210;
       this.boxHeight = height;

src/components/scenicSpot/admissionStatistics.vue

@@ -90,12 +90,12 @@
                       </el-popover>
                     </td>
                     <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
-                      <div class="w120 link">
+                      <div class="w150 link">
                         <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}({{item.TCID}})</p>
                       </div>
                     </td>
                     <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
-                      <div class="w120 link">
+                      <div class="w150 link">
                         <p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')">
                           {{item.TotalSeat}}/{{item.CommonReport.HouseStatistics.RealityYSeatNum}}/{{item.CommonReport.HouseStatistics.RealityESeatNum}}/{{item.CommonReport.HouseStatistics.RealityFSeatNum}}
                         </p>