Merge branch 'feature/trippest'

webht/third_party/trippestOrderSync/views/vendor_money_sum.php

@@ -148,7 +148,7 @@
                 <?php if ( ! empty($col_sum)) {
                 ?>
                 <tr class="text-bold">
-                    <td class="text-left" rowspan="2">合计（仅包价产品）</td>
+                    <td class="text-left">合计（仅包价产品）</td>
                     <td><?php echo $col_sum['trippest']['sum_trippest_sum'] ?></td>
                     <td><?php echo $col_sum['trippest']['sum_vendor_sum'] ?></td>
                     <td><?php echo bcadd($col_sum['trippest']['sum_trippest_sum'],$col_sum['trippest']['sum_vendor_sum']); ?></td>
@@ -168,7 +168,7 @@
                     <th >总报价/USD</th>
                     <th >总收款/RMB</th>
                     <th >计入上表海纳收团款</th>
-                    <th colspan="4">应扣除的其他地接收款: (实时计算, 存在汇率误差)</th>
+                    <th colspan="5">应扣除的其他地接收款: (实时计算, 存在汇率误差)</th>
                 </tr>
                 <?php foreach ($trippest_order_multi_city as $ko => $order) {
                 ?>
@@ -180,13 +180,13 @@
                     <td ><?php echo bcsub($order['money_sum'],$order["other_vendorprice_RMB"]) ?>
                         <br> <?php echo ($order["vendor_name"]) ?>
                     </td>
-                    <td colspan="4" class="text-left"><?php echo $order["other_vendorprice_RMB"] ?></td>
+                    <td colspan="5" class="text-left"><?php echo $order["other_vendorprice_RMB"] ?></td>
                 </tr>
                 <?php } } ?>
                 <?php if ( ! empty($trippest_order_cost_debug)) {
                 ?>
                 <tr class="text-bold">
-                    <td colspan="9"></td>
+                    <td colspan="10"></td>
                 </tr>
                 <tr class="text-bold bg-grey">
                     <th ><span class="text-red">成本异常,建议重新审核:</span> 订单号</th>
@@ -194,7 +194,7 @@
                     <th >拼团人等</th>
                     <th >订单: 成人数 + 儿童数</th>
                     <th >订单成本</th>
-                    <th colspan="4">财务表备注</th>
+                    <th colspan="5">财务表备注</th>
                 </tr>
                 <?php foreach ($trippest_order_cost_debug as $ko => $order) {
                 ?>
@@ -204,7 +204,7 @@
                     <td ><?php echo $order['RPT_PersonGrade'] ?></td>
                     <td ><?php echo $order['tourRSd'] ?> + <?php echo $order['tourRSx'] ?></td>
                     <td ><?php echo $order['tourcost'] ?></td>
-                    <td colspan="4" class="text-left"> <?php echo ($order["tourBZ"]) ?></td>
+                    <td colspan="5" class="text-left"> <?php echo ($order["tourBZ"]) ?></td>
                 </tr>
                 <?php } } ?>
             </tbody>
@@ -244,6 +244,8 @@
                     <td><?php // echo $sync['sync']['vendor_profit'] ?></td>
                 </tr>
                  <?php } }?>
+                <?php if ( ! empty($col_sum)) {
+                ?>
                  <tr class="text-bold">
                     <td class="text-left">合计</td>
                     <!-- <td><?php //echo $col_sum['sync']['sum_trippest_sum'] ?></td> -->
@@ -254,6 +256,7 @@
                     <td><?php // echo $col_sum['sync']['sum_trippest_profit'] ?></td>
                     <td><?php // echo $col_sum['sync']['sum_vendor_profit'] ?></td>
                 </tr>
+                <?php } ?>
             </tbody>
         </table>
 <!--