页面修改

src/components/TravelManager/Ticket/TravelMyTicket.vue

@@ -73,7 +73,7 @@
     margin: 20px 0 0px 15px;
     transition: linear all 0.5s;
     background-color: #fff;
-    padding:10px 0 5px 0;
+    padding: 10px 0 5px 0;
     position: relative;
   }
 
@@ -671,7 +671,8 @@
           <span class="hotel_name">
             <em>{{$t('system.ph_flightTime')}}</em>
             <el-date-picker class="w150" v-model="Query.QFlightDateStart" type="date"
-              :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" :placeholder="$t('hotel.hotel_StartDate')">
+              :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd"
+              :placeholder="$t('hotel.hotel_StartDate')">
             </el-date-picker>
             <el-date-picker class="w150" v-model="Query.QFlightDateEnd" type="date" value-format="yyyy-MM-dd"
               :picker-options="pickerBeginDateAfter" :placeholder="$t('hotel.hotel_EndDate')">
@@ -681,14 +682,16 @@
         <li>
           <span class="hotel_name">
             <em>{{$t('system.query_flightNum')}}</em>
-            <el-input v-model="Query.Flight_number" type="text" @keyup.native.enter="getList" :placeholder="$t('system.ph_airNum')">
+            <el-input v-model="Query.Flight_number" type="text" @keyup.native.enter="getList"
+              :placeholder="$t('system.ph_airNum')">
             </el-input>
           </span>
         </li>
         <li>
           <span>
             <em>{{$t('fnc.jpbianhao')}}</em>
-            <el-input v-model="Query.AirticketId" :placeholder="$t('fnc.jpbianhao')" @keyup.native="checkInteger(Query,'AirticketId')">
+            <el-input v-model="Query.AirticketId" :placeholder="$t('fnc.jpbianhao')"
+              @keyup.native="checkInteger(Query,'AirticketId')">
             </el-input>
           </span>
         </li>
@@ -827,8 +830,10 @@
               </el-col>
               <el-col :span="3" class="vmiddle">
                 <div class="_btn _tmt_page">
-                  <button class="hollowFixedBtn inversion" type="button" @click="outBtn(item)">{{$t('op.Inversion')}}</button>
-                  <el-tooltip class="item" effect="dark" :content="$t('fnc.rizhi')" placement="top-start" style="display:none">
+                  <button class="hollowFixedBtn inversion" type="button"
+                    @click="outBtn(item)">{{$t('op.Inversion')}}</button>
+                  <el-tooltip class="item" effect="dark" :content="$t('fnc.rizhi')" placement="top-start"
+                    style="display:none">
                     <el-popover popper-class="Journal" width="400" trigger="click">
                       <div class="InfoChangeLog">
                         <div class="changLog">
@@ -859,7 +864,8 @@
                 </div>
               </el-col>
               <el-col :span="4">
-                <div class="TCID_cont"> {{$t('op.Procurement')}}：<span style="color:red;">{{item.PurchaseManName}}</span> </div>
+                <div class="TCID_cont"> {{$t('op.Procurement')}}：<span
+                    style="color:red;">{{item.PurchaseManName}}</span> </div>
               </el-col>
               <el-col :span="6">
                 <div class="TCID_cont">
@@ -868,7 +874,15 @@
               </el-col>
               <el-col :span="6">
                 <div class="TCID_cont">
-                  PNR：{{item.PNR}} <template v-if="item.MidpiecePNR">&nbsp;&nbsp;{{$t('op.CenterPNR')}}:{{item.MidpiecePNR}}</template>
+                  PNR：{{item.PNR}} <template
+                    v-if="item.MidpiecePNR">&nbsp;&nbsp;{{$t('op.CenterPNR')}}:{{item.MidpiecePNR}}</template>
+                </div>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <div class="TCID_cont " style="color:red">
+                  备注：{{item.Remark}}
                 </div>
               </el-col>
             </el-row>
@@ -893,8 +907,10 @@
             <span class="flightSetNum" style="display:none;">{{$t('op.TransferedNum')}}：</span>
             <el-input v-model="outData.OutNum" type="text" class="w160" :placeholder="OutPlaceHolder"
               style="display:none;"></el-input>
-            <button class="normalBtn TurnSureBtn" @click="setOut()">{{$t('salesModule.Recipient')}}{{$t('pub.sureBtn')}}</button>
-            <button class="normalBtn" @click="isShowSet=false,outData.OutNum='',outData.ReciveEmployeeId=0">{{$t('pub.cancelBtn')}}</button>
+            <button class="normalBtn TurnSureBtn"
+              @click="setOut()">{{$t('salesModule.Recipient')}}{{$t('pub.sureBtn')}}</button>
+            <button class="normalBtn"
+              @click="isShowSet=false,outData.OutNum='',outData.ReciveEmployeeId=0">{{$t('pub.cancelBtn')}}</button>
           </div>
         </div>
       </div>

src/components/TravelManager/Ticket/TravelticketManager.vue

@@ -67,7 +67,7 @@
     overflow: hidden;
     transition: linear all 0.5s;
     background-color: #fff;
-    padding:10px 0 5px 0;
+    padding: 10px 0 5px 0;
   }
 
   .TravelticketManager ._ol_list>li:hover {
@@ -117,7 +117,7 @@
   .TravelticketManager ._oll_info {
     padding-left: 20px;
     overflow: hidden;
-    margin-top:-15px;
+    margin-top: -15px;
   }
 
   .TravelticketManager ._oll_img {
@@ -189,7 +189,7 @@
     width: 120px;
     height: 60px;
     background-color: #f9f9f9;
-    margin-right:15px;
+    margin-right: 15px;
   }
 
   .SeatListTM>ul>li:nth-child(1) {
@@ -590,7 +590,7 @@
   }
 
   .Ticket_TCIDTMA {
-    margin:2px 2px 0 0;
+    margin: 2px 2px 0 0;
   }
 
   .TravelticketManager .disClick {
@@ -658,21 +658,24 @@
         <li>
           <span class="hotel_name">
             <em>{{$t('system.query_flightNum')}}</em>
-            <el-input v-model="Query.Flight_number" type="text" @keyup.native.enter="getList" :placeholder="$t('system.ph_airNum')">
+            <el-input v-model="Query.Flight_number" type="text" @keyup.native.enter="getList"
+              :placeholder="$t('system.ph_airNum')">
             </el-input>
           </span>
         </li>
         <li>
           <span class="hotel_name">
             <em>PNR</em>
-            <el-input v-model="Query.PNR" type="text" @keyup.native.enter="getList" :placeholder="$t('pub.pleaseImport')">
+            <el-input v-model="Query.PNR" type="text" @keyup.native.enter="getList"
+              :placeholder="$t('pub.pleaseImport')">
             </el-input>
           </span>
         </li>
         <li>
           <span>
             <em>{{$t('fnc.jpbianhao')}}</em>
-            <el-input v-model="Query.ID" :placeholder="$t('fnc.jpbianhao')" @keyup.native="checkInteger(Query,'ID')"></el-input>
+            <el-input v-model="Query.ID" :placeholder="$t('fnc.jpbianhao')" @keyup.native="checkInteger(Query,'ID')">
+            </el-input>
           </span>
         </li>
         <li>
@@ -848,11 +851,20 @@
                 </div>
               </el-col>
               <el-col :span="6">
-                <div class="TCID_cont"> {{$t('op.Procurement')}}：<span style="color:red;">{{item.PurchaseManName}}</span> </div>
+                <div class="TCID_cont"> {{$t('op.Procurement')}}：<span
+                    style="color:red;">{{item.PurchaseManName}}</span> </div>
               </el-col>
               <el-col :span="10">
                 <div class="TCID_cont">
-                  PNR：{{item.PNR}}<template v-if="item.MidpiecePNR">&nbsp;&nbsp;{{$t('op.CenterPNR')}}:{{item.MidpiecePNR}}</template>
+                  PNR：{{item.PNR}}<template
+                    v-if="item.MidpiecePNR">&nbsp;&nbsp;{{$t('op.CenterPNR')}}:{{item.MidpiecePNR}}</template>
+                </div>
+              </el-col>
+            </el-row>
+            <el-row :gutter="0">
+              <el-col :span="24">
+                <div class="TCID_cont" style="color:red">
+                  备注：{{item.Remark}}
                 </div>
               </el-col>
             </el-row>
@@ -922,7 +934,7 @@
           PNR: "",
           //票务人员
           CreateBy: 0,
-          SellType:0,//只查询团队机票
+          SellType: 0, //只查询团队机票
         },
         //线路列表
         LineList: [],
@@ -973,7 +985,7 @@
           name: path,
           query: {
             "tcmun": obj,
-            IsUnionCked:0,//只看主团
+            IsUnionCked: 0, //只看主团
             blank: 'y',
             tab: title
           }
@@ -1083,7 +1095,9 @@
       //根据当前员工所在部门获取该部门及子部门员工信息
       getEmployeeList() {
         this.apipost(
-          'admin_get_GetEmployeeByUserDepartmentId', {IsGetTicket:1},
+          'admin_get_GetEmployeeByUserDepartmentId', {
+            IsGetTicket: 1
+          },
           res => {
             if (res.data.resultCode == 1) {
               this.EmployeeList = res.data.data