11

src/components/SalesModule/passengerSaleList.vue

@@ -31,26 +31,18 @@
             <th width="6%">{{$t('admin.admin_IssueDate')}}</th>
             <th width="6%">{{$t('objFill.huzhaoyxq')}}</th>
             <th width="6%">{{$t('objFill.kehushouji')}}</th>
-<<<<<<< HEAD
             <th width="8%">{{$t('objFill.shengfenzheng')}}</th>
             <th width="4%">{{$t('visa.v_qianzhengst')}}</th>
             <th width="4%">{{$t('objFill.shifouxuesheng')}}</th>
             <th width="9%">{{$t('hotel.table_operat')}}</th>
-=======
-            <th width="9%">{{$t('objFill.shengfenzheng')}}</th>
-            <th width="5%">{{$t('visa.v_qianzhengst')}}</th>
-            <th width="5%">{{$t('objFill.shifouxuesheng')}}</th>
-             <td >退景点</td>
-            <th width="8%">{{$t('hotel.table_operat')}}</th>
->>>>>>> 2c3ee94d1e1016d8ffbe274a5805ae0509eb8c73
           </tr>
         </thead>
         <tbody v-show="tableList.length>0">
-          <template v-for="(item,index) in tableList"  >
+          <template v-for="(item,index) in tableList">
             <tr :class="{'redTr':item.VisaState==1}" :key="`d1_`+index">
-            <td >{{item.Sort}}</td>
-            <td>{{item.HoustNo}}</td>
-            <td>{{item.HouseType}}</td>
+              <td :rowspan="item.BackScenicList&&item.BackScenicList.length>0?2:1">{{item.Sort}}</td>
+              <td :rowspan="item.BackScenicList&&item.BackScenicList.length>0?2:1">{{item.HoustNo}}</td>
+              <td :rowspan="item.BackScenicList&&item.BackScenicList.length>0?2:1">{{item.HouseType}}</td>
               <td>{{item.Name}}</td>
               <td>{{item.ESurName}}</td>
               <td>{{item.EName}}</td>
@@ -66,9 +58,6 @@
               <td>{{item.IdCard}}</td>
               <td>{{item.VisaState==1?$t('salesModule.RefuseQ'):$t('pub.normalSel')}}</td>
               <td style="color:red;">{{item.IsHightSchool==1?$t('objFill.xuesheng'):""}}</td>
-            <td> <div v-if="item.BackScenicList!=null&&item.BackScenicList.length>0">
-              <p v-for="(itemb,indexb) in item.BackScenicList" :key="indexb">{{itemb.CouponsName}}{{item.BackScenicList.length!=(indexb+1)?"、":""}}</p>
-              </div></td>
               <td>
                 <el-button-group>
                   <el-tooltip v-if="isOrder==1 && !isDis" class="item" effect="dark" :content="$t('pub.updateMsg')"
@@ -76,8 +65,8 @@
                     <el-button type="primary" style='background:#00C6FF; border-color:#00C6FF'
                       icon="iconfont icon-bianji-smal" @click="goUrlA(item.Id)"></el-button>
                   </el-tooltip>
-                <el-tooltip v-if="isOrder==1 && !isDis" class="item" effect="dark" :content="$t('system.table_delete')"
-                  placement="top-start">
+                  <el-tooltip v-if="isOrder==1 && !isDis" class="item" effect="dark"
+                    :content="$t('system.table_delete')" placement="top-start">
                     <el-button type="primary" style='background:#9E8DE3; border-color:#9E8DE3'
                       icon="iconfont icon-shanchu" @click="pal_del(item)"></el-button>
                   </el-tooltip>
@@ -89,10 +78,15 @@
                 </el-button-group>
               </td>
             </tr>
-              <!-- <tr :class="{'redTr':item.VisaState==1}" :key="`d2_`+index">
-             
-            
-          </tr> -->
+            <tr v-if="item.BackScenicList&&item.BackScenicList.length>0" :class="{'redTr':item.VisaState==1}"
+              :key="`d2_`+index">
+              <td colspan="16" style="text-align:left;">
+                退 <font style="color:red;font-weight:bold;">{{item.BackScenicList.length}}</font> 个景点;
+                <template v-for="(subItem,subIndex) in item.BackScenicList">
+                  <font style="color:red;">{{subIndex+1}}、{{subItem.CouponsName}}&nbsp;</font>
+                </template>
+              </td>
+            </tr>
           </template>
         </tbody>
         <tbody v-show="tableList.length===0" class="passengerSaleList_table_noInfo">