页面修改

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1088,7 +1088,8 @@
                     <span v-if="item.LeaderName" class="TCL-greenType">{{
                       item.LeaderName
                     }}</span>
-                    <span v-else class="TCL-redType" style="cursor:pointer;text-decoration: underline;" @click="setLeaderOrGuide(item,0)">
+                    <span v-else class="TCL-redType" style="cursor:pointer;text-decoration: underline;"
+                      @click="setLeaderOrGuide(item,0)">
                       {{ $t("ground.szlindui") }}
                     </span>
                   </p>
@@ -1620,7 +1621,12 @@
             <div class="TC_remarkContent" v-if="item.PriceChangeModel&&item.PriceChangeModel.ID > 0">
               <div class="clearfix TCL-redType">
                 <div class="TCL_remarkTitle" style="width: auto">
-                  <span style="color: black">价格变更： {{ item.PriceChangeModel.ChangeRemark }}</span>
+                  <span style="color: black">价格变更： {{ item.PriceChangeModel.ChangeRemark }} 
+                    (<font style="color:red;">
+                      {{$t("Operation.Op_tradePrice")}}：{{item.PriceChangeModel.NewB2BPrice}}&nbsp;
+                      {{$t("Operation.Op_directPrice")}}：{{item.PriceChangeModel.NewB2CPrice}}
+                    </font>
+                    )</span>
                   <template v-if="item.PriceChangeModel.ChangePriceStatus == 1">
                     <span
                       style="color: blue; font-weight: bold">【{{ item.PriceChangeModel.ChangePriceStatusStr }}】</span>

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -1115,7 +1115,13 @@
             <div class="TC_remarkContent" v-if="item.PriceChangeModel&&item.PriceChangeModel.ID > 0">
               <div class="clearfix TCL-redType">
                 <div class="TCL_remarkTitle" style="width: auto">
-                  <span style="color: black">价格变更： {{ item.PriceChangeModel.ChangeRemark }}</span>
+                  <span style="color: black">价格变更： {{ item.PriceChangeModel.ChangeRemark }}
+                    (<font style="color:red;">
+                      {{$t("Operation.Op_tradePrice")}}：{{item.PriceChangeModel.NewB2BPrice}}&nbsp;
+                      {{$t("Operation.Op_directPrice")}}：{{item.PriceChangeModel.NewB2CPrice}}
+                    </font>
+                    )
+                  </span>
                   <template v-if="item.PriceChangeModel.ChangePriceStatus == 1">
                     <span
                       style="color: blue; font-weight: bold">【{{ item.PriceChangeModel.ChangePriceStatusStr }}】</span>

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -929,7 +929,13 @@
             <div class="TC_remarkContent" v-if="item.PriceChangeModel&&item.PriceChangeModel.ID > 0">
               <div class="clearfix TCL-redType">
                 <div class="TCL_remarkTitle" style="width: auto">
-                  <span style="color: black">价格变更： {{ item.PriceChangeModel.ChangeRemark }}</span>
+                  <span style="color: black">价格变更： {{ item.PriceChangeModel.ChangeRemark }}
+                    (<font style="color:red;">
+                      {{$t("Operation.Op_tradePrice")}}：{{item.PriceChangeModel.NewB2BPrice}}&nbsp;
+                      {{$t("Operation.Op_directPrice")}}：{{item.PriceChangeModel.NewB2CPrice}}
+                    </font>
+                    )
+                  </span>
                   <template v-if="item.PriceChangeModel.ChangePriceStatus == 1">
                     <span
                       style="color: blue; font-weight: bold">【{{ item.PriceChangeModel.ChangePriceStatusStr }}】</span>
@@ -1510,7 +1516,7 @@
               that.changePriceMsg.isShowChangePrice = false;
               that.changePriceMsg.NewB2BPrice = "";
               that.changePriceMsg.NewB2CPrice = "";
-              that.changePriceMsg.ChangeRemark="";
+              that.changePriceMsg.ChangeRemark = "";
               that.changePriceMsg.TCID = 0;
               that.getControlList();
             } else {

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -840,6 +840,9 @@
                           <el-date-picker class="w150" type="date" v-model="QFlightDateEnd"
                             :picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder>
                           </el-date-picker>
+                          {{$t('fnc.jpbianhao')}}:
+                          <el-input v-model="QAirTicketId" class="w150">
+                          </el-input>
                           <button class="normalBtn" @click.stop="getSelectFilght()">{{$t('pub.searchBtn')}}</button>
                         </div>
                         <div class="jiDiv">
@@ -1261,6 +1264,7 @@
         TeamListArr: [],
         busPriceList: [], //车辆列表
         standardCurrencyName: '',
+        QAirTicketId: "", //查询机票编号
       };
     },
     methods: {
@@ -1430,7 +1434,7 @@
                 GuideNum: 0, //导游人数
                 IsLeaderDaiTuan: 1, //领队带团/不带团
                 IsNewArrival: 0, //是否新品
-                TeamId:0,//团队分组编号
+                TeamId: 0, //团队分组编号
               };
             }
             this.returnPriceList.push(objItem);
@@ -1537,7 +1541,8 @@
           CreateBy: createBy,
           AirTicketId: this.priceData.AirTicketId,
           TCID: this.priceData.TCID,
-          LineId: this.PostConfig.LineId
+          LineId: this.PostConfig.LineId,
+          QAirTicketId: this.QAirTicketId,
         };
 
         let that = this;