1

src/components/commonPage/commonHotelInfo.vue

@@ -55,15 +55,51 @@
             {{$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> 
+          <th width="100" v-if="showHotelObj.ShowSupplier">{{$t('hotel.hotel_Supplier')}}</th>
           <!-- <th width="80" v-if="showHotelObj.caiwu">{{$t('pub.yes')}}{{$t('pub.no')}}<br />{{$t('fnc.fukuan')}}</th>-->
           <th width="70" v-if="showHotelObj.showPrice">
             {{$t('fnc.rizhi')}}
           </th>
         </tr>
         <template v-for="(hotelItem,index) in  HotelObj">
-          <tr v-for="(hotelSubItem,hotelSubIndex) in hotelItem.SubList">
+          <tr v-for="(hotelSubItem,hotelSubIndex) in hotelItem.SubList" :key="`h_`+index+`_h_`+hotelSubIndex">
             <td width="120" v-if="hotelSubIndex==0" :rowspan="hotelItem.SubList.length" style="white-space:nowrap; ">
+              <!-- <template v-if="showHotelObj.showPrice">
+                <el-popover placement="right" width="320" trigger="click">
+                  <table>
+                    <tr>
+                      <td>
+                        更换酒店:
+                      </td>
+                      <td>
+                        <el-select filterable remote
+                          :remote-method="(query) => remoteSearchAdGroup(query, hotelSubItem)"
+                          v-model='hotelSubItem.HotelId' :placeholder="$t('objFill.qingshurujdmc')" :loading="loading"
+                          @change="getHotel(hotelSubItem,hotelSubItem.HotelId)">
+                          <el-option v-for="(x) in HotelList" :key="x.ID" :label="x.Name" :value='x.ID'>
+                            <template v-if="x.Inventory>0||x.CostPrice>0">
+                              <span style="float: left">{{ x.Name }}</span>
+                              <span style="float: right; font-size: 13px">
+                                <font style="color:blue">库存:{{ x.Inventory }}</font>
+                                &nbsp;<font style="color:#67C23A">价格:{{x.CostPrice}}</font>
+                              </span>
+                            </template>
+                          </el-option>
+                        </el-select>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td colspan="2" style="text-align:center;">
+                        <el-button type="primary" size="small">保存</el-button>
+                      </td>
+                    </tr>
+                  </table>
+                  <span slot="reference"> {{hotelItem.UseDay}}&nbsp;({{getDayByDate(hotelItem.UseDay)}})</span>
+                </el-popover>
+              </template>
+              <template v-else>
+                {{hotelItem.UseDay}}&nbsp;({{getDayByDate(hotelItem.UseDay)}})
+              </template> -->
               {{hotelItem.UseDay}}&nbsp;({{getDayByDate(hotelItem.UseDay)}})
             </td>
             <td style="text-align:left;padding-left:3px;">
@@ -79,8 +115,8 @@
             </td>
             <td v-if="showHotelObj.showPrice">
               总库存:{{hotelSubItem.Inventory}}
-               <br/>
-               剩余:{{hotelSubItem.RemainingInventory}}
+              <br />
+              剩余:{{hotelSubItem.RemainingInventory}}
             </td>
             <td>
               <template v-if="hotelSubItem.OPState==1||hotelSubItem.DMCState==1">
@@ -122,7 +158,6 @@
               <template v-if="hotelSubItem.TaxType==2">{{$t('pub.SB')}}</template>
               {{hotelSubItem.RebateRatio}}
             </td>
-
             <td v-if="showHotelObj.showZhan" style="white-space:nowrap; ">
               <template v-if="hotelSubItem.OPState==1||(hotelSubItem.OPState==2 && hotelSubItem.DMCState==0)">
                 {{hotelSubItem.CreateDateStr}}
@@ -184,24 +219,23 @@
               <span v-else>{{$t('active.cl_zanwu')}}</span>
             </td>
           </tr>
-       
           <tr v-if="showHotelObj.caiwu&&HotelObj&&HotelObj.length>0&&HotelObj[0].FrList&&HotelObj[0].FrList.length > 0">
             <td class="tdRight">
               {{$t('salesModule.DJNUM')}}：
             </td>
             <td class="tdLeft" colspan="3" style="padding:10px 0;text-align:left;">
-                    <span style="margin-right:15px;" v-for="(item2, index2) in HotelObj[0].FrList" :key="index2"  @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID,'')"> <span style="cursor:pointer;margin-right:5px; text-decoration:underline;">{{ item2.FrID }}</span> <span>({{item2.StatusStr}})</span></span>
-                 
-                  </td>
+              <span style="margin-right:15px;" v-for="(item2, index2) in HotelObj[0].FrList" :key="index2"
+                @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID,'')"> <span
+                  style="cursor:pointer;margin-right:5px; text-decoration:underline;">{{ item2.FrID }}</span>
+                <span>({{item2.StatusStr}})</span></span>
+            </td>
           </tr>
-       
         </template>
-       
-      
         <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?$t('objFill.shoupeisqd'):$t('objFill.shoupeiszd')"
+              <input type="button" class="normalBtn"
+                :value="HotelObj[0].ShouPeiStatus==0?$t('objFill.shoupeisqd'):$t('objFill.shoupeiszd')"
                 @click="subSetShouPeiShu(HotelObj[0].ShouPeiStatus)" />
               <input type="button" class="normalBtn" :value="$t('objFill.xz')" @click="DownLoadShouPeiShu()" />
             </td>
@@ -219,6 +253,7 @@
     data() {
       return {
         loading: false,
+        HotelList: [],
       };
     },
     components: {
@@ -226,6 +261,43 @@
       commonHotelLog
     },
     methods: {
+      remoteSearchAdGroup(query, subItem) {
+        if (query !== '') {
+          this.loading = true;
+          this.initHotel(query, subItem)
+        } else {
+          this.HotelList = []
+        }
+      },
+      //初始化酒店列表
+      initHotel(query, subItem, day) {
+        var hMsg = {
+          Name: query,
+          IsAllHotel: 1,
+          sDate: subItem.JourneyDate
+        };
+        this.apipost(
+          "hotel_post_GetHasStockHotelList", hMsg,
+          res => {
+            this.loading = false
+            if (res.data.resultCode == 1) {
+              this.HotelList = res.data.data;
+              this.$forceUpdate()
+            }
+          },
+          null
+        );
+      },
+      // 获取酒店名称
+      getHotel(subItem, HotelId) {
+        subItem.HotelList.forEach(x => {
+          if (x.ID == HotelId) {
+            subItem.HotelName = x.Name;
+            subItem.HotelCostPrice = x.CostPrice;
+          }
+        })
+        this.$forceUpdate()
+      },
       //调用子组件获取日志方法
       GetHotelLog(subItem, index, hotelSubIndex) {
         let str = `comHotelLog${index}${hotelSubIndex}`
@@ -236,7 +308,8 @@
         let qMsg = {
           TCID: this.TCID
         };
-        let fileName = this.$t('objFilll.shoupeishu')+"【" + this.DMCNum + "】" + this.$commonUtils.getCurrentDate() + ".xls";
+        let fileName = this.$t('objFilll.shoupeishu') + "【" + this.DMCNum + "】" + this.$commonUtils.getCurrentDate() +
+          ".xls";
         this.GetLocalFile("hotel_SPS_DownLoad", qMsg, fileName,
           res => {
             this.loading = false;
@@ -245,7 +318,8 @@
       //子组件调用父组件方法
       subSetShouPeiShu(ShouPeiStatus) {
         var that = this;
-        var str = this.$t('objFilll.shifoujspssz') + (ShouPeiStatus == 0 ? "【"+this.$t('pub.sureBtn') +"】" : "【"+this.$t('visa.v_zanding')+"】") + "?";
+        var str = this.$t('objFilll.shifoujspssz') + (ShouPeiStatus == 0 ? "【" + this.$t('pub.sureBtn') + "】" : "【" +
+          this.$t('visa.v_zanding') + "】") + "?";
         this.Confirm(str, function () {
           that.$emit('SetShouPeiShu');
         });

src/components/dmc/manager/dmcTotalTable.vue

@@ -149,8 +149,6 @@
     <div class="mt10 fz14 color333 dmcTotalIconStyle">
       {{$t('ground.yiqueding')}}:<span style="color:#4BCA81 ;">√</span>{{$t('ground.daiqueding')}}:<span
         style="color: #E95252;">O</span>{{$t('salesModule.NotDeal')}}:<span style="color:#E95252 ;">X</span>
-
-
       <span style="font-size: 12px; float: right;">*{{$t('objFill.v101.dmc.zhuyldxbc')}}</span>
     </div>
     <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle">
@@ -457,7 +455,7 @@
                   <span slot="reference" style="cursor:pointer;text-decoration:underline;">{{outItem.TotalPrice}}</span>
                 </el-popover>
               </td>
-              <td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0'>
+              <td :rowspan="2">
                 <div style="width: 150px;">
                   <el-button-group>
                     <el-tooltip class="item" effect="dark" :content="$t('ground.djxinxi')" placement="top-start">