页面修改

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -610,9 +610,10 @@
                         v-if="item.PriceOfferUrl" target="_blank">下载报价单</a>
                     </span>
                   </p>
-              
+
                   <p class="travelnowrap" v-if="item.Config_OfferId&&item.Config_OfferId>0">
-                    <span style="cursor:pointer;text-decoration:underline;color:blue;" @click="showDialog(item.ID, item.Config_OfferId)">报价详情</span>
+                    <span style="cursor:pointer;text-decoration:underline;color:blue;"
+                      @click="showDialog(item.ID, item.Config_OfferId)">报价详情</span>
                   </p>
                   <p class="travelnowrap flex" v-if="item.OfferShouPeiFee>0">
                     <span>手配费</span>
@@ -683,10 +684,11 @@
                       </div>
                     </el-popover>
                   </p>
-                  <p class="travelnowrap" v-if="item.LineID==14 && item.IsOpenHotel==1">
+                  <p class="travelnowrap"
+                    v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168)  && item.IsOpenHotel==1">
                     <span style="color:red;font-weight:bold;">※ {{$t('op.DJyiguanbi')}}.</span>
                   </p>
-      
+
                 </div>
               </div>
               <div class="el-col" style="width:190px;">
@@ -1061,7 +1063,8 @@
                         {{$t('op.HotelXJ')}}
                       </el-dropdown-item>
                       <!-- 结团 -->
-                      <el-dropdown-item v-if="item.Status==1&&Number(item.OrderGuestNum)>0" @click.native="OutGroup(item.TCID,2,item.TravelEndAudit)">
+                      <el-dropdown-item v-if="item.Status==1&&Number(item.OrderGuestNum)>0"
+                        @click.native="OutGroup(item.TCID,2,item.TravelEndAudit)">
                         {{$t('Operation.Op_jietuan')}}
                       </el-dropdown-item>
                       <el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1,item.TravelEndAudit)">

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -221,7 +221,7 @@
                     </el-checkbox-group>
                   </span>
                 </div>
-           
+
                 <div class="comSearchDiv">
                   <span>{{$t('Airticket.Air_salesPlatform')}}</span>
                   <span>
@@ -482,7 +482,26 @@
                     {{item.OutBranchName}}
                   </p>
                   <p class="travelnowrap" v-if="item.Config_OfferId">
-                    <span style="cursor:pointer;text-decoration:underline;color:blue;" @click="showDialog(item.ID, item.Config_OfferId)">报价详情</span>
+                    <span style="cursor:pointer;text-decoration:underline;color:blue;"
+                      @click="showDialog(item.ID, item.Config_OfferId)">报价详情</span>
+                  </p>
+                  <p
+                    v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
+                    <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
+                      <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
+                        :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
+                        @SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
+                      <div slot="reference">
+                        <span class="price"
+                          style="cursor:pointer;text-decoration:underline;">{{$t('salesModule.HotelOrder')}}</span>
+                        <span
+                          style="color: #e95252">op{{item.OpSureHouse==2 ? '已确认' : '未确认'}}{{$t('op.Fenfang')}}</span>
+                      </div>
+                    </el-popover>
+                  </p>
+                  <p class="travelnowrap"
+                    v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168) && item.IsOpenHotel==1">
+                    <span style="color:red;font-weight:bold;">※ {{$t('op.DJyiguanbi')}}.</span>
                   </p>
                 </div>
               </div>
@@ -723,7 +742,8 @@
                         @click.native="setUpPlat(item)">{{$t('Operation.Op_shangjia')}}</el-dropdown-item>
                       <el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">
                         {{$t('Operation.Op_xiajia')}}</el-dropdown-item>
-                      <el-dropdown-item v-if="item.Status==1&&Number(item.OrderGuestNum)>0" @click.native="OutGroup(item.TCID,2)">
+                      <el-dropdown-item v-if="item.Status==1&&Number(item.OrderGuestNum)>0"
+                        @click.native="OutGroup(item.TCID,2)">
                         {{$t('Operation.Op_jietuan')}}
                       </el-dropdown-item>
                       <el-dropdown-item @click.native="goB2B(item.ConfigId)">{{$t('Operation.Op_b2bView')}}
@@ -820,10 +840,12 @@
   </div>
 </template>
 <script>
+  import commonHotelInfo from "../../commonPage/commonHotelInfo.vue";
   import priceDialog from '../TravelNewQuotation/priceDialog.vue';
   export default {
     components: {
-      priceDialog
+      priceDialog,
+      commonHotelInfo,
     },
     data() {
       return {
@@ -903,7 +925,7 @@
           LineIdList: [],
           LineteamId: 0,
           TCNUM: "",
-          TCID:"",
+          TCID: "",
           StartGroupDate: "",
           EndGroupDate: "",
           OutBranchId: -1,
@@ -937,6 +959,17 @@
           //团控状态
           FreePlanType: -1
         },
+        showHotelObj: {
+          showPrice: true, //是否显示价格
+          showPay: false, //是否显示支付方式
+          showZhan: true, //占房时间
+          showBtnList: false, //是否下载、确认按钮
+          ShowTaxType: false, //显示税入税别
+          ShowRebateRatio: false, //显示返佣比列
+          ShowSupplier: true, //是否显示供应商
+          showCaozuoTime: true, //操作时间
+          colspanLength: 5 //跨行
+        },
         remarkMsg: {
           TCID: 0,
           OPRemark: "",
@@ -1372,7 +1405,7 @@
           query: {
             id: id,
             OutBranchId: OutBranchId,
-            IsHaveAuth:true,
+            IsHaveAuth: true,
             blank: "y",
             tab: "团队收支明细"
           }
@@ -1640,7 +1673,7 @@
           this.queryMsg = this.$store.state.pageCondition;
         }
       }
-      if(!this.$route.query.tcmun){
+      if (!this.$route.query.tcmun) {
         var myDate = new Date();
         var nowDate =
           myDate.getFullYear() +
@@ -1650,7 +1683,7 @@
           myDate.getDate();
         this.queryMsg.StartGroupDate = nowDate;
       }
-      
+
       if (
         this.queryCommonData.IsParentCompany != 1 &&
         userInfo.RB_Branch_id != 49

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -50,7 +50,7 @@
           :priceList="PriceList" v-if="TeamType==0" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
           :TeamType="TeamType" :CurrentUserInfo="CurrentUserInfo" :IsDirect="PostConfig.IsDirect"></TravelPrice>
         <!--小包团-->
-        <TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
+        <TravelPrice2 @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
           v-if="TeamType==1" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
           :TeamType="TeamType" :CurrentUserInfo="CurrentUserInfo" :IsDirect="PostConfig.IsDirect"></TravelPrice2>
         <!--一日游-->

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -301,7 +301,6 @@
 
   .TphotelTable tr td {
     background-color: #fff;
-    /* padding:8px 0; */
     border: 1px solid #d1d1d1;
   }
 
@@ -454,8 +453,8 @@
                     <el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule"
                       :false-label="UnCheckedLessPrice">{{$t('op.CanLessPrice')}}
                     </el-checkbox>
-                    <el-checkbox v-model="priceData.IsNeedAirportShuttle" @change="IsNeedAirportShuttleChange" :true-label="CheckedVaule"
-                      :false-label="UnCheckedLessPrice">是否需要送团
+                    <el-checkbox v-model="priceData.IsNeedAirportShuttle" @change="IsNeedAirportShuttleChange"
+                      :true-label="CheckedVaule" :false-label="UnCheckedLessPrice">是否需要送团
                     </el-checkbox>
                     <template v-if="CurrentUserInfo.RB_Group_id==2">
                       <input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
@@ -739,7 +738,8 @@
                     </el-input>
                   </el-form-item>
                   <el-form-item prop="SendPersion">
-                    <el-input class="w260" :disabled="!priceData.IsNeedAirportShuttle" placeholder="请输入送团人" v-model="priceData.SendPersion">
+                    <el-input class="w260" :disabled="!priceData.IsNeedAirportShuttle" placeholder="请输入送团人"
+                      v-model="priceData.SendPersion">
                       <template slot="prepend">送团人</template>
                     </el-input>
                   </el-form-item>
@@ -747,10 +747,10 @@
                   <el-form-item>
                   </el-form-item>
                   <el-form-item>
-                  <div class="w260"></div>
+                    <div class="w260"></div>
                   </el-form-item>
                   <el-form-item>
-                  <div class="w260"></div>
+                    <div class="w260"></div>
                   </el-form-item>
                   <el-form-item style="margin-top: -20px">
                     <el-input :placeholder="$t('pub.pleaseImport')" class="w260 ComSeat" v-model="priceData.GatherTag">
@@ -1221,7 +1221,7 @@
     },
     methods: {
       IsNeedAirportShuttleChange() {
-        if(!this.priceData.IsNeedAirportShuttle) {
+        if (!this.priceData.IsNeedAirportShuttle) {
           this.priceData.SendPersion = ''
         }
       },