酒店修改

src/components/Hotel/DiDa/HotelDetails.vue

@@ -527,8 +527,7 @@
               {{ DidaHotelDetails.Name_CN }}
             </div>
           </div>
-          <div
-            v-if="DidaHotelRoomDetails&&DidaHotelRoomDetails.LowestPrice">
+          <div v-if="DidaHotelRoomDetails&&DidaHotelRoomDetails.LowestPrice">
             <span class="text-orange text-weight-bold fz18 q-pl-lg ">
               {{ DidaHotelRoomDetails.LowestPrice.Currency }}
               {{ DidaHotelRoomDetails.LowestPrice.Value }}
@@ -966,9 +965,9 @@
           <el-card style="width:100%;">
             <div style=" border-bottom: 1px solid #ddd; width:100%;padding-bottom:8px;font-size:16px;"
               class="text-weight-bold"><b>{{$t('objFill.jiudianxiangqing')}}</b></div>
-            <template v-if="DidaDescription&&DidaDescription.length>0">
-              <div class="q-pt-sm q-px-lg12 PolicyDiv DidaDescriptionDiv" v-for="(itemDe, indexDe) in DidaDescription"
-                :key="`hdddd_`+indexDe" style="line-height:27px;" v-html="itemDe.HotelDescription_CN">
+            <template v-if="DidaHotelDetails.description&&DidaHotelDetails.description.length>0">
+              <div class="q-pt-sm q-px-lg12 PolicyDiv DidaDescriptionDiv" style="line-height:27px;"
+                v-html="DidaHotelDetails.description">
               </div>
             </template>
             <template v-else>
@@ -984,21 +983,28 @@
           <el-card style="width:100%;">
             <div style="border-bottom: 1px solid #ddd; width:100%;padding-bottom:8px;font-size:16px;"
               class="text-weight-bold"><b>{{$t('hotel.hotel_policy')}}</b></div>
-            <template v-if="Policy&&Policy.length>0">
-              <div v-for="(itemp, indexp) in Policy" style="width:100%;" class="q-px-lg12" :key="`hdp_`+indexp">
-                <div v-if="itemp.Type=='CheckInOut'" style="margin-top:15px;">
-                  <el-timeline>
-                    <el-timeline-item v-for="(itempo, indexpo) in itemp.List" :key="indexpo" color="#33B3FF">
-                      <div v-html="itempo.Description_CN" style="line-height:27px;"></div>
-                    </el-timeline-item>
-                  </el-timeline>
+            <template v-if="Policy">
+              <div style="width:100%;" class="q-px-lg12">
+                <el-timeline style="margin-top:15px;">
+                  <el-timeline-item color="#33B3FF">
+                    <div v-html="`入住时间:`+Policy.checkinFrom" style="line-height:27px;"></div>
+                  </el-timeline-item>
+                  <el-timeline-item color="#33B3FF">
+                    <div v-html="`退房时间:`+Policy.checkoutTo" style="line-height:27px;"></div>
+                  </el-timeline-item>
+                </el-timeline>
+                <div class="q-pt-sm PolicyDiv" style="margin-top:15px"
+                  v-if="Policy.description&&Policy.description.length>0" v-html="Policy.description">
                 </div>
-                <template v-else>
-                  <div class="q-pt-sm PolicyDiv" :style="indexp==1?'':'margin-top:15px'"
-                    v-if="itempo.Description_CN&&itempo.Description_CN.length>0" v-for="(itempo, indexpo) in itemp.List"
-                    :key="`hdd2_`+indexpo" v-html="itempo.Description_CN">
+                <template v-if="Policy.extraInfoList&&Policy.extraInfoList.length>0">
+                  <div class="q-pt-sm PolicyDiv" style="margin-top:15px"
+                    v-for="(itempo, indexpo) in Policy.extraInfoList" :key="`hdd2_`+indexpo"
+                    v-if="itempo.type!='CheckInOut'" v-html="itempo.description">
                   </div>
                 </template>
+                <div class="q-pt-sm PolicyDiv" style="margin-top:15px"
+                  v-if="Policy.importantNotice&&Policy.importantNotice.length>0" v-html="Policy.importantNotice">
+                </div>
               </div>
             </template>
             <template v-else>
@@ -1016,9 +1022,9 @@
               class="text-weight-bold"><b>{{$t('objFill.v101.hote.jiudianss')}}</b></div>
             <template v-if="Facilities&&Facilities.length>0">
               <div class="q-pt-sm q-px-lg12 Facilities" v-for="(itemf, indexf) in Facilities" :key="`hdd_`+indexf"
-                v-if="itemf.Description_CN&&itemf.Description_CN.length>0" style="line-height:27px;">
-                <el-tooltip :content="itemf.Description_CN" placement="bottom" effect="light">
-                  <span>{{itemf.Description_CN}}</span>
+                v-if="itemf.description&&itemf.description.length>0" style="line-height:27px;">
+                <el-tooltip :content="itemf.description" placement="bottom" effect="light">
+                  <span>{{itemf.description}}</span>
                 </el-tooltip>
               </div>
             </template>
@@ -1038,9 +1044,9 @@
                 class="hotel-info-section__warning">{{$t('objFill.v101.hote.jiudssjck')}}</span></div>
             <template v-if="RoomFacilities&&RoomFacilities.length>0">
               <div class="q-pt-sm q-px-lg12 Facilities" v-for="(itemf, indexf) in RoomFacilities" :key="`hdf`+indexf"
-                v-if="itemf.Description_CN&&itemf.Description_CN.length>0" style="line-height:27px;">
-                <el-tooltip :content="itemf.Description_CN" placement="bottom" effect="light">
-                  <span>{{itemf.Description_CN}}</span>
+                v-if="itemf.description&&itemf.description.length>0" style="line-height:27px;">
+                <el-tooltip :content="itemf.description" placement="bottom" effect="light">
+                  <span>{{itemf.description}}</span>
                 </el-tooltip>
               </div>
             </template>
@@ -1173,7 +1179,7 @@
           var tempData = [];
           _this.loading = true;
           if (_this.DidaHotelRoomDetails && _this.DidaHotelRoomDetails.HotelList && _this.DidaHotelRoomDetails
-            .HotelList .length > 0) {
+            .HotelList.length > 0) {
             tempData = JSON.parse(JSON.stringify(_this.DidaHotelRoomDetails.HotelList));
             if (_this.qMsg.RoomTypeName && _this.qMsg.RoomTypeName != '') {
               tempData = tempData.filter(qitem => qitem.RoomName_CN == _this.qMsg.RoomTypeName);
@@ -1288,7 +1294,9 @@
       getDidaHotelDetails: function () {
         this.apipost('dmc_post_GetDidaHotelDetails', this.hotelMsg, res => {
           if (res.data.resultCode == 1) {
-            this.DidaHotelDetails = res.data.data
+            var tempObj = res.data.data;
+            console.log("tempObj", tempObj);
+            this.DidaHotelDetails = tempObj;
             this.hotelMapUrl = `http://api.weboss.hk/baidu_map/api.php?prop1=` + this.DidaHotelDetails
               .Name_CN + `&prop2=` + this.DidaHotelDetails.Address_CN + `&prop3=` + this.DidaHotelDetails
               .Longitude + `,` + this.DidaHotelDetails
@@ -1299,6 +1307,16 @@
             if (this.DidaHotelDetails.StarRating) {
               this.startNum = Math.ceil(this.DidaHotelDetails.StarRating);
             }
+            this.DidaHotelImg = tempObj.images;
+            if (tempObj.policy) {
+              this.Policy = tempObj.policy;
+            }
+            if (tempObj.HotelFacilityList && tempObj.HotelFacilityList.length > 0) {
+              this.Facilities = tempObj.HotelFacilityList;
+            }
+            if (tempObj.RoomFacilityList && tempObj.RoomFacilityList.length > 0) {
+              this.RoomFacilities = tempObj.RoomFacilityList;
+            }
           }
         }, null)
       },
@@ -1373,42 +1391,6 @@
         }
         return mealtypeName;
       },
-      //获取酒店图片信息
-      getDiDaHotelImgList() {
-        this.apipost('dmc_post_GetDiDaHotelImgList', this.hotelMsg, res => {
-          if (res.data.resultCode == 1) {
-            this.DidaHotelImg = [];
-            res.data.data.forEach((item, index) => {
-              this.DidaHotelImg.push(item.ImageUrl);
-            });
-          }
-        }, null)
-      },
-      //获取酒店详情信息
-      getDidaDescriptionList() {
-        this.apipost('dmc_post_GetDidaDescriptionList', this.hotelMsg, res => {
-          if (res.data.resultCode == 1) {
-            this.DidaDescription = res.data.data;
-          }
-        }, null)
-      },
-      //获取酒店设施信息
-      getDidaFacilitiesList() {
-        this.apipost('dmc_post_GetDiDaHotelFacilitiesList', this.hotelMsg, res => {
-          if (res.data.resultCode == 1) {
-            this.Facilities = res.data.data.HotelFacility;
-            this.RoomFacilities = res.data.data.RoomFacility;
-          }
-        }, null)
-      },
-      //获取酒店政策信息
-      getDidaPolicyList() {
-        this.apipost('dmc_post_GetDiDaHotelPolicyList', this.hotelMsg, res => {
-          if (res.data.resultCode == 1) {
-            this.Policy = res.data.data;
-          }
-        }, null)
-      },
       //日期格式化
       getformatDateStr(value) {
         var dt = new Date(value);
@@ -1583,11 +1565,7 @@
       this.getdidaMealType();
       this.getdidaBedType();
       this.getDiDaPriceSearchList();
-      this.getDiDaHotelImgList();
       this.getDidaHotelDetails();
-      this.getDidaDescriptionList();
-      this.getDidaFacilitiesList();
-      this.getDidaPolicyList();
     }
   };
 

src/components/Hotel/DiDa/HotelList.vue

@@ -251,7 +251,6 @@
                   <i class="text-grey-13 q-mr-xs el-icon-location-outline" name="place" size="xs"></i>
                   {{item.address}}
                 </p>
-
                 <template v-if="item.DescriptionList&&item.DescriptionList.length>0">
                   <el-popover placement="top" width="600" :title="$t('objFill.v101.hote.jiudianjj')" trigger="click">
                     <div style="line-height:27px;" v-html="item.DescriptionList[0].HotelDescription_CN"></div>
@@ -271,7 +270,6 @@
               </div>
             </div>
           </div>
-
         </el-card>
       </div>
     </div>
@@ -432,7 +430,6 @@
         this.currentPage = 1;
         this.getPageList()
       },
-
       getPrice(price) {
         return Math.ceil(price);
       },

src/components/TravelManager/TravelList/HotelOrderTotal.vue

@@ -211,10 +211,11 @@
             </el-select>
           </span>
         </li>
-        <li v-if="ActionMenuCode.indexOf('ThirdHotelOrder')!=-1">
+        <!--v-if="ActionMenuCode.indexOf('ThirdHotelOrder')!=-1"-->
+        <li>
           <span>
             <em>{{$t('active.cl_addPp')}}</em>
-            <el-select filterable v-model='msg.CreateBy'>
+            <el-select filterable v-model='msg.CreateBy' clearable>
               <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
               <el-option v-for='item in EmployeeList' :label='item.EmName' :value='item.EmployeeId'
                 :key='item.EmployeeId'>
@@ -230,9 +231,8 @@
         <li>
           <span>
             <em>{{$t('salesModule.StartJoin')}}</em>
-            <!-- <el-date-picker type="date" v-model="msg.StartTime" :picker-options="StartTimeBefore"
-              value-format="yyyy-MM-dd" placeholder></el-date-picker> -->
-            <DateLimit :clearable="false" :StartGroupDate="msg.StartTime" :EndGroupDate="msg.EndTime" @change="(date)=> msg.StartTime = date"></DateLimit>
+            <DateLimit :clearable="false" :StartGroupDate="msg.StartTime" :EndGroupDate="msg.EndTime"
+              @change="(date)=> msg.StartTime = date"></DateLimit>
           </span>
         </li>
         <li>
@@ -245,20 +245,19 @@
         <li>
           <span>
             <em>{{$t('salesModule.CreateTime')}}</em>
-            <!-- <el-date-picker type="date" v-model="msg.CStartTime" :picker-options="CStartTimeBefore"
-              value-format="yyyy-MM-dd" placeholder></el-date-picker> -->
-              <DateLimit :clearable="true" :StartGroupDate="msg.CStartTime" :EndGroupDate="msg.CEndTime" @change="(date)=> msg.CStartTime = date"></DateLimit>
+            <DateLimit :clearable="true" :StartGroupDate="msg.CStartTime" :EndGroupDate="msg.CEndTime"
+              @change="(date)=> msg.CStartTime = date"></DateLimit>
           </span>
         </li>
         <li>
           <span>
             <em>{{$t('salesModule.CreateOverTime')}}</em>
-            <el-date-picker v-if="msg.CStartTime" type="date" v-model="msg.CEndTime" :picker-options="CEndTimeAfter" value-format="yyyy-MM-dd"
-              placeholder></el-date-picker>
-            <DateLimit v-else :clearable="true" :StartGroupDate="msg.CEndTime" @change="(date)=> msg.CEndTime = date"></DateLimit>
+            <el-date-picker v-if="msg.CStartTime" type="date" v-model="msg.CEndTime" :picker-options="CEndTimeAfter"
+              value-format="yyyy-MM-dd" placeholder></el-date-picker>
+            <DateLimit v-else :clearable="true" :StartGroupDate="msg.CEndTime" @change="(date)=> msg.CEndTime = date">
+            </DateLimit>
           </span>
         </li>
-
         <li>
           <input type="button" class="hollowFixedBtn" @click="resetPageIndex();getList(),getTotalCount()"
             :value="$t('pub.searchBtn')" />
@@ -324,7 +323,6 @@
             </p>
           </div>
         </el-col>
-
       </el-row>
     </div>
 
@@ -340,8 +338,8 @@
         <th>{{$t('salesModule.BigBag')}}</th>
         <th>{{$t('sm.youhuijine')}}</th>
         <th>{{$t('Operation.Op_daishou')}}</th>
-        <th>{{$t('op.JapnaseYen')}}</th>
-        <th>{{$t('op.RYCBJ')}}</th>
+        <!-- <th>{{$t('op.JapnaseYen')}}</th>
+        <th>{{$t('op.RYCBJ')}}</th> -->
         <th>{{$t('hotel.hotel_OrderStates')}}</th>
         <th>{{$t('fnc.cjshijian')}}</th>
         <th>{{$t('op.RZLDR')}}</th>
@@ -352,8 +350,15 @@
         <th width="180">{{$t('system.table_operation')}}</th>
       </tr>
       <tbody v-for="(item,index) in dataList">
-        <tr>
-          <td style="border-bottom:2px solid #333" rowspan="2">{{item.OrderID}}</td>
+        <tr :key="`d_`+index">
+          <td style="border-bottom:2px solid #333" rowspan="2">{{item.OrderID}}
+            <div>
+              <el-tooltip class="item" effect="dark" :content="$t('objFill.xiaochengxdd')" placement="top">
+                <img v-if="item.OrderSource == 5||item.OrderSource == 7" src="../../../assets/img/userman/wx.png"
+                  style="width:24px;height: 24px;position:relative;top:5px;" alt="" />
+              </el-tooltip>
+            </div>
+          </td>
           <td>{{item.ThirdOrderNo}}</td>
           <td><span class="cursorpointer text-decoration" @click="GotoUrl(item.TCNUM)"
               v-if="item.TCID">{{item.TCNUM}}({{item.TCID}})</span></td>
@@ -364,8 +369,8 @@
           <td>{{item.RedEnvelopeMoney}}</td>
           <td>{{item.DiscountMoney}}</td>
           <td>{{item.DueinMoney}}</td>
-          <td>{{item.UpdateJapanese}}/{{item.totalChargeableRateInfoTaxOut}}</td>
-          <td>{{item.UpdateJapanese-(item.totalChargeableRateInfoTaxOut*0.04)}}</td>
+          <!-- <td>{{item.UpdateJapanese}}/{{item.totalChargeableRateInfoTaxOut}}</td>
+          <td>{{item.UpdateJapanese-(item.totalChargeableRateInfoTaxOut*0.04)}}</td> -->
           <td>
             <span :class="item.OrderStatus=='已取消'?'color_red_order':''">{{item.OrderStatus}}</span>
           </td>
@@ -427,7 +432,7 @@
             <div class="SH_OrderDan">
               <div>{{$t('fnc.skdanju')}}：</div>
               <div>
-                <span v-for="subItem in item.FinanceList">
+                <span v-for="(subItem,subIndex) in item.FinanceList" :key="`d_`+index+`s_`+subIndex">
                   <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
                     v-if="subItem.ColorState===1" class="groupTourOrder_tickets_blue">{{subItem.FrID}}</span>
                   <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
@@ -443,7 +448,7 @@
             <div class="SH_OrderDan">
               <div>{{$t('fnc.fkdanju')}}：</div>
               <div>
-                <span v-for="subItem in item.RefundFinanceList">
+                <span v-for="(subItem,subIndex) in item.RefundFinanceList" :key="`d1_`+index+`s1_`+subIndex">
                   <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
                     v-if="subItem.ColorState===1" class="groupTourOrder_tickets_blue">{{subItem.FrID}}</span>
                   <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
@@ -456,7 +461,6 @@
                 <span v-if="item.RefundFinanceList==0">{{$t('system.content_noData')}}</span>
               </div>
             </div>
-
           </td>
         </tr>
       </tbody>
@@ -465,7 +469,8 @@
       <i class="iconfont icon-kong"></i>
       <p>{{$t("active.ld_noData")}}</p>
     </div>
-    <el-dialog :title="$t('objFill.v101.Rest.qingxuanzthao')" width="400px" :visible.sync="dialogFormVisible" center :before-close="closeChangeMachie">
+    <el-dialog :title="$t('objFill.v101.Rest.qingxuanzthao')" width="400px" :visible.sync="dialogFormVisible" center
+      :before-close="closeChangeMachie">
       <el-form label-width="110px">
         <el-form-item :label="$t('visa.v_tuanhao')">
           <el-select v-model="TCID" filterable remote reserve-keyword :placeholder="$t('pub.pleaseImport')"
@@ -482,7 +487,8 @@
       </div>
     </el-dialog>
 
-    <el-dialog :title="$t('objFill.v101.xiugaijiag')" width="400px" :visible.sync="updatePriceDialog" center :before-close="closeChangeMachie">
+    <el-dialog :title="$t('objFill.v101.xiugaijiag')" width="400px" :visible.sync="updatePriceDialog" center
+      :before-close="closeChangeMachie">
       <el-form label-width="110px">
         <el-form-item :label="$t('op.RYHS')">
           <el-input type="text" v-model="updateMsg.UpdateJapanesePrice"
@@ -492,7 +498,6 @@
           <el-input type="text" v-model="updateMsg.totalChargeableRateInfoTaxOut"
             @keyup.native="checkPrice(updateMsg,'totalChargeableRateInfoTaxOut')"></el-input>
         </el-form-item>
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <button class="hollowFixedBtn" @click="updatePriceDialog=false">{{$t('pub.cancelBtn')}}</button>
@@ -524,7 +529,9 @@
 <script>
   import DateLimit from '../../public/DateLimit.vue';
   export default {
-    components:{DateLimit},
+    components: {
+      DateLimit
+    },
     data() {
       return {
         //当前登录用户功能权限
@@ -649,7 +656,7 @@
         this.CheckUserAuth(actionCode, res => {
           if (res.data.resultCode == 1 && res.data.data == 1) {
 
-          }else{
+          } else {
             let StartDate = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
             this.msg.StartTime = StartDate
           }
@@ -734,7 +741,7 @@
         }
       },
       queren(type, OrderID) {
-        let text = type == 1 ?this.$t('sm.qrhOrderbhzdqx') : this.$t('sm.qxhddhzdqx')
+        let text = type == 1 ? this.$t('sm.qrhOrderbhzdqx') : this.$t('sm.qxhddhzdqx')
         this.$confirm(text, this.$t('tips.tips'), {
           confirmButtonText: this.$t('pub.sureBtn'),
           cancelButtonText: this.$t('pub.cancelBtn'),