no message

src/components/SalesModule/productQuery2.vue

@@ -757,7 +757,7 @@
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
       layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
     </el-pagination>
-    <productOrderList :loading="loading"></productOrderList>
+    <productOrderList :loading="loading" :list="list"></productOrderList>
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
       layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
     </el-pagination>

src/components/orderCommon/productOrderList.vue

@@ -725,7 +725,7 @@
                 <el-popover width="630" trigger="click">
                   <table class="PQ_detail">
                     <tr>
-                        <td colspan="5" style="text-align: left; padding-left: 10px">
+                      <td colspan="6" style="text-align: left; padding-left: 10px">
                         {{ $t("salesModule.BasePrice") }}
                       </td>
                     </tr>
@@ -734,7 +734,7 @@
                       <th>{{ $t("salesModule.HYTHJ") }}</th>
                       <th>{{ $t("salesModule.PTTHJ") }}</th>
                       <th>{{ $t("salesModule.ZKHYJ") }}</th>
-                        <th>{{ $t("salesModule.PTZKJ") }}</th>
+                      <th colspan="2">{{ $t("salesModule.PTZKJ") }}</th>
                     </tr>
                     <tr>
                       <td>{{ $t("salesModule.Adult") }}</td>
@@ -749,7 +749,7 @@
                           item.B2CMemberPrice | priceFormat(item.B2CMemberPrice)
                         }}
                       </td>
-                        <td>{{ item.B2CPrice | priceFormat(item.B2CPrice) }}</td>
+                      <td colspan="2">{{ item.B2CPrice | priceFormat(item.B2CPrice) }}</td>
                     </tr>
                     <tr>
                       <td>{{ $t("salesModule.ChildBed") }}</td>
@@ -775,7 +775,7 @@
                             )
                         }}
                       </td>
-                        <td>
+                      <td colspan="2">
                         {{
                           (item.B2CPrice + item.ChildNeedPrice)
                             | priceFormat(item.B2CPrice + item.ChildNeedPrice)
@@ -806,7 +806,7 @@
                             )
                         }}
                       </td>
-                        <td>
+                      <td colspan="2">
                         {{
                           (item.B2CPrice - item.ChildNoNeedPrice)
                             | priceFormat(item.B2CPrice - item.ChildNoNeedPrice)
@@ -815,7 +815,7 @@
                     </tr>
                     <tr>
                       <td>{{ $t("salesModule.SingleJ") }}</td>
-                        <td colspan="4">
+                      <td colspan="5">
                         {{
                           item.SingleDMCPrice | priceFormat(item.SingleDMCPrice)
                         }}
@@ -823,12 +823,12 @@
                     </tr>
                     <tr>
                       <td>{{ $t("Operation.Op_baby") }}</td>
-                        <td colspan="4">
+                      <td colspan="5">
                         {{ item.BabyPrice | priceFormat(item.BabyPrice) }}
                       </td>
                     </tr>
                     <tr>
-                        <td colspan="5" style="text-align: left; padding-left: 10px">
+                      <td colspan="6" style="text-align: left; padding-left: 10px">
                         {{ $t("salesModule.OtherPrice") }}
                       </td>
                     </tr>
@@ -838,6 +838,7 @@
                       <th>{{ $t("salesModule.VisaBack") }}</th>
                       <th>{{ $t("Operation.Op_singleRoomcha") }}</th>
                       <th>{{ $t("Operation.Op_zafei") }}</th>
+                      <th>小费</th>
                     </tr>
                     <tr>
                       <td>
@@ -866,6 +867,7 @@
                       <td>
                         {{ item.OtherPrice | priceFormat(item.OtherPrice) }}
                       </td>
+                      <td>{{ item.TipAmount | priceFormat(item.TipAmount) }}</td>
                     </tr>
                   </table>
                   <span slot="reference" class="price">{{
@@ -1047,25 +1049,6 @@
       <div class="noData" v-else>
         {{ $t("system.content_noData") }}
       </div>
-        <el-dialog custom-class="ComTeamPlan_info_box" :title="tripTitle" :visible.sync="outerVisible" center>
-            <commonTeamInfo ref="comTeam"></commonTeamInfo>
-          </el-dialog>
-      
-          <el-dialog custom-class="w450" title="行程下载" :visible.sync="travelControlTripLayerShow" center>
-            <tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="1">
-            </tripDownLoadCommon>
-          </el-dialog>
-          <!-- 下单 -->
-          <div class="buy-box" v-show="isShowTeamOrder">
-            <orderForm @success="reSearchPage" @close="closeForm" 
-            :PTCID="teamInfo.TCID" 
-            :POrderId="0" 
-            :PBranchId="0" 
-            :PProductType="1" 
-            :showCity="true"
-            :productObj="teamInfo">
-            </orderForm>
-          </div>
     </div>
   </template>