页面修改

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -374,8 +374,7 @@
                     <span v-if="item.Status==5" title="结团审核中" style="background: rgb(0 128 255);">审核中</span>
                     <span v-if="item.Status==1" title="销售">{{$t('visaT.sale')}}</span>
                     <span v-if="item.GroupRecommendType==1" title="精品">精</span>
-                    <label
-                      style="display:inline-block;margin:5px 0 0 5px;font-size:12px;">
+                    <label style="display:inline-block;margin:5px 0 0 5px;font-size:12px;">
                       <!-- {{item.PriceTeamTypeName}} -->
                       单团
                     </label>
@@ -785,8 +784,8 @@
                 </div>
               </div>
             </div>
-            <div class="TC_remarkContent" v-if="item.OPRemark||item.OPInnerRemark||item.DmcRemarkLast||item.OutGroupAuditRemark||item.PriceTagList">
-              <!-- {{item.OutGroupAuditState}}-----{{item.OutGroupAuditRemark}} -->
+            <div class="TC_remarkContent"
+              v-if="item.OPRemark||item.OPInnerRemark||item.DmcRemarkLast||item.OutGroupAuditRemark||item.PriceTagList">
               <div class="clearfix TCL-redType" v-if="item.OutGroupAuditState==3&&item.OutGroupAuditRemark">
                 <div class="TCL_remarkTitle">驳回缘由：</div>
                 <div class="TCL_Content">{{item.OutGroupAuditRemark}} {{item.OutGroupAuditDate}}</div>
@@ -799,10 +798,21 @@
                 <div class="TCL_remarkTitle">{{$t('Operation.Op_duineiRemark')}}：</div>
                 <div class="TCL_Content">{{item.OPInnerRemark}}</div>
               </div>
-              <div class="clearfix TCL-redType" v-if="item.PriceTagList.length>0">
-                <div class="TCL_remarkTitle">{{$t('sm.biaoqian')}}：</div>
-                <div class="TCL_Content">
-                  <span v-for="(chidItem,childIndex) in item.PriceTagList" :key="childIndex">{{chidItem.Content}}</span>
+              <div class="clearfix TCL-redType" v-if="item.DMCNum">
+                <div class="TCL_remarkTitle">{{$t('op.DJBZTH')}}：</div>
+                <div class="TCL_Content">{{item.DMCNum}}</div>
+              </div>
+              <div class="clearfix TCL-redType"
+                v-if="(item.DmcRemarkLast&&item.DmcRemarkLast.DMCRemark!='') ||  item.HotelDiningBus.HotelChangeState>0 || item.HotelDiningBus.DiningChangeState>0 || item.HotelDiningBus.ResultBusTypeStr!='' ">
+                <div class="TCL_remarkTitle">{{$t('Operation.Op_dijieRemark')}}：</div>
+                <div class="TCL_Content">{{item.DmcRemarkLast!=null? item.DmcRemarkLast.DMCRemark:''}}
+                  <a v-if="item.HotelDiningBus.HotelChangeState>0" @click="goHotelDiningBus(item,item.HotelDiningBus,1)"
+                    style="color:blue;cursor:pointer">{{$t('Operation.Op_HotelChange')}}</a>
+                  <a v-if="item.HotelDiningBus.DiningChangeState>0"
+                    @click="goHotelDiningBus(item,item.HotelDiningBus,2)"
+                    style="color:blue;cursor:pointer">{{$t('Operation.Op_HotelChange')}}</a>
+                  <a
+                    v-if="item.HotelDiningBus.ResultBusTypeStr!=''">{{$t('Operation.Op_carType')}}:{{item.HotelDiningBus.ResultBusTypeStr}}</a>
                 </div>
               </div>
             </div>

src/components/commonPage/commonHotelInfo.vue

@@ -47,8 +47,10 @@
           <th width="120">{{$t('salesModule.HotelStatus')}}</th>
           <th width="120">{{$t('salesModule.OPstatus')}}</th>
           <th width="120">{{$t('salesModule.DJstatus')}}</th>
-          <th width="110" v-if="showHotelObj.showPrice">{{$t('restaurant.res_Number')}}<br />{{$t('Operation.Op_price')}}</th>
-          <th width="120" v-if="showHotelObj.showPay">{{$t('fnc.fkfangshi')}}<br/>{{$t('restaurant.res_commissionColumn')}}</th>
+          <th width="110" v-if="showHotelObj.showPrice">
+            {{$t('restaurant.res_Number')}}<br />{{$t('Operation.Op_price')}}</th>
+          <th width="120" v-if="showHotelObj.showPay">
+            {{$t('fnc.fkfangshi')}}<br />{{$t('restaurant.res_commissionColumn')}}</th>
           <th width="130" v-if="showHotelObj.showZhan">{{$t('salesModule.UseRoomTime')}}</th>
           <th width="100" v-if="showHotelObj.showZhan">{{$t('salesModule.SureTime')}}</th>
           <th width="100" v-if="showHotelObj.ShowSupplier">{{$t('hotel.hotel_Supplier')}}</th>
@@ -73,12 +75,12 @@
               {{hotelSubItem.HotelName!=hotelSubItem.NewHotelName?""+hotelSubItem.NewHotelName:""}}
             </td>
             <td>
-               <template v-if="hotelSubItem.OPState==1||hotelSubItem.DMCState==1">
-                  <a style="color:green">{{$t('salesModule.BZRZ')}}</a>
-                </template>
+              <template v-if="hotelSubItem.OPState==1||hotelSubItem.DMCState==1">
+                <a style="color:green">{{$t('salesModule.BZRZ')}}</a>
+              </template>
             </td>
             <td>
-              <span v-if="hotelSubItem.HotelName!='温馨的家' &&hotelSubItem.HotelName!='机场附近酒店'"> 
+              <span v-if="hotelSubItem.HotelName!='温馨的家' &&hotelSubItem.HotelName!='机场附近酒店'">
                 <template v-if="hotelSubItem.OPState==1">
                   <a style="color:green">{{$t('salesModule.OPZD')}}</a>
                 </template>
@@ -108,9 +110,9 @@
               </a>
             </td>
             <td v-if="showHotelObj.showPay">
-              {{hotelSubItem.PayTypeStr}}  <template v-if="hotelSubItem.TaxType==1">{{$t('pub.SR')}}</template> 
+              {{hotelSubItem.PayTypeStr}} <template v-if="hotelSubItem.TaxType==1">{{$t('pub.SR')}}</template>
               <template v-if="hotelSubItem.TaxType==2">{{$t('pub.SB')}}</template>
-                  {{hotelSubItem.RebateRatio}}
+              {{hotelSubItem.RebateRatio}}
             </td>
 
             <td v-if="showHotelObj.showZhan" style="white-space:nowrap; ">
@@ -130,6 +132,7 @@
                 <div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;"
                   @click="GetHotelLog(hotelSubItem,index,hotelSubIndex)">{{$t('fnc.rizhi')}}</div>
               </el-popover>
+              {{hotelSubItem.UpdateByName}}
             </td>
           </tr>
         </template>
@@ -163,7 +166,7 @@
               <span v-else>{{$t('active.cl_zanwu')}}</span>
             </td>
             <td class="tdRight">
-             {{$t('salesModule.SPtime')}}：
+              {{$t('salesModule.SPtime')}}：
             </td>
             <td class="tdLeft">
               <span v-if="HotelObj[0].ShouPeiStatusTimeStr">{{HotelObj[0].ShouPeiStatusTimeStr}}</span>
@@ -174,8 +177,9 @@
         <template v-if="showHotelObj.showBtnList">
           <tr>
             <td colspan="4" style="padding:10px 0;text-align:center;">
-              <input type="button" class="normalBtn" :value="HotelObj[0].ShouPeiStatus==0?'手配书(确定)':'手配书(暂定)'" @click="subSetShouPeiShu(HotelObj[0].ShouPeiStatus)" />
-               <input type="button" class="normalBtn" value="下载" @click="DownLoadShouPeiShu()" />
+              <input type="button" class="normalBtn" :value="HotelObj[0].ShouPeiStatus==0?'手配书(确定)':'手配书(暂定)'"
+                @click="subSetShouPeiShu(HotelObj[0].ShouPeiStatus)" />
+              <input type="button" class="normalBtn" value="下载" @click="DownLoadShouPeiShu()" />
             </td>
           </tr>
         </template>
@@ -223,11 +227,11 @@
         });
       },
       //根据日期返回星期几
-      getDayByDate(dateString){
-        if(dateString){
+      getDayByDate(dateString) {
+        if (dateString) {
           var date;
           var dateArray = dateString.split("-");
-          date = new Date(dateArray[0], parseInt(dateArray[1] - 1), dateArray[2]); 
+          date = new Date(dateArray[0], parseInt(dateArray[1] - 1), dateArray[2]);
           return "日一二三四五六".charAt(date.getDay());
         }
       }