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

src/components/Hotel/HotelWorkList.vue

@@ -16,9 +16,9 @@
       </ul>
     </div>
     <div class="hotelProductManage2_tableBox" style="margin-bottom: 20px;">
-      <span style="color: green; background-color:green ; padding: 2px 4px; border-radius: 5px;">OK</span> 
-      <span style="color: #F75000; background-color: #F75000; padding: 2px 4px; border-radius: 5px;">暂定</span>
-      <span style="color:red; background-color: red; padding: 2px 4px; border-radius: 5px;">未操作</span> 
+      <span style="color:#FFFFFF; background-color:green ; padding: 2px 4px; border-radius: 5px;">OK</span> 
+      <span style="color:#FFFFFF; background-color:#3333CC; padding: 2px 4px; border-radius: 5px;">暂定</span>
+      <span style="color:#FFFFFF; background-color:red; padding: 2px 4px; border-radius: 5px;">未操作</span> 
     </div>
     <el-table :data="dataList" style="width:100%" border v-loading='loading' height="700">
       <el-table-column fixed label="酒店名称" min-width="180">
@@ -36,7 +36,7 @@
           <template v-else v-for="childItem in scope.row.DayList[index].HotelJourneyOrderList">
             <div style="white-space:nowrap;color:red;" :title="childItem.TCID+'【未操作】'" v-if="childItem.DMCState==0">{{childItem.BookGroup}}</div>
             <div style="white-space:nowrap;color:green;" :title="childItem.TCID+'【OK】'" v-if="childItem.DMCState==1">{{childItem.BookGroup}}</div>
-            <div style="white-space:nowrap;color:#F75000;" :title="childItem.TCID+'【暂定】'" v-if="childItem.DMCState==2">{{childItem.BookGroup}}</div>
+            <div style="white-space:nowrap;color:#3333CC;" :title="childItem.TCID+'【暂定】'" v-if="childItem.DMCState==2">{{childItem.BookGroup}}</div>
           </template>
         </template>
       </el-table-column>

src/components/Ticketing/TicketManager.vue

@@ -1676,7 +1676,9 @@
                 </div>
               </el-col>
               <el-col :span="8">
-                <div class="TCID_cont" style="padding-top:5px;">PNR：{{item.PNR}}</div>
+                <div class="TCID_cont" style="padding-top:5px;">PNR：{{item.PNR}}
+                  <template v-if="item.MidpiecePNR">&nbsp;&nbsp;中段PNR:{{item.MidpiecePNR}}</template>
+                </div>
               </el-col>
             </el-row>
           </li>

src/components/TravelManager/Ticket/TravelMyTicket.vue

@@ -867,7 +867,7 @@
               </el-col>
               <el-col :span="8">
                 <div class="TCID_cont">
-                  PNR：{{item.PNR}}
+                  PNR：{{item.PNR}} <template v-if="item.MidpiecePNR">&nbsp;&nbsp;中段PNR:{{item.MidpiecePNR}}</template>
                 </div>
               </el-col>
             </el-row>

src/components/TravelManager/Ticket/TravelticketManager.vue

@@ -850,7 +850,7 @@
               </el-col>
               <el-col :span="10">
                 <div class="TCID_cont">
-                  PNR：{{item.PNR}}
+                  PNR：{{item.PNR}}<template v-if="item.MidpiecePNR">&nbsp;&nbsp;中段PNR:{{item.MidpiecePNR}}</template>
                 </div>
               </el-col>
             </el-row>

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -649,6 +649,7 @@
                           <th width="70" style="text-align:center;">机票数量</th>
                           <th width="70" style="text-align:center;">价格</th>
                           <th width="130" style="text-align:center;">PNR</th>
+                          <th width="130" style="text-align:center;">中段PNR</th>
                           <th width="100" style="text-align:center;">票务</th>
                         </tr>
                         <tr v-for="subItem in item.TicketList">
@@ -656,6 +657,7 @@
                           <td style="text-align:center;">{{subItem.TicketNum}}</td>
                           <td style="text-align:center;">{{subItem.TicketPrice}}</td>
                           <td style="text-align:center;">{{subItem.PNR}}</td>
+                          <td style="text-align:center;">{{subItem.MidpiecePNR}}</td>
                           <td style="text-align:center;">{{subItem.TicketCreateByName}}</td>
                         </tr>
                       </table>