页面修改

src/components/Hotel/roomReservationsDetails.vue

@@ -33,7 +33,7 @@
           <th width="100">房间类型</th>
           <th width="70">房间数</th>
           <th width="70">房间<br />人数</th>
-          <th width="110">修改酒店</th>
+          <th width="170">修改酒店/供应商</th>
           <th width="80">房间<br />预定数</th>
           <th width="80">预定人数</th>
           <th width="80">尚差<br />房间数</th>
@@ -114,21 +114,43 @@
                 {{subItem.HouseStatistics.HouseTypeList[childIndex].HouseGuestNum}}
               </td>
               <td v-if="childIndex==0" :rowspan="5">
-                <div class="w150">
+                <table class="hotelTable">
+                  <tr>
+                    <td  width="70" style="text-align:right;">酒店</td>
+                    <td>
                       <!--:disabled="subItem.OPState==1"-->
-
-                  <el-select  class='w120 sel' v-model='subItem.NewHotelId' filterable :placeholder="$t('pub.pleaseSel')"
-
-                  <el-select class='w120 sel' v-model='subItem.NewHotelId' filterable :placeholder="$t('pub.pleaseSel')"
-
-                    @visible-change='getHotelList(subItem)' @change='sendValue(subItem)'>
+                      <el-select class='w120 sel' v-model='subItem.NewHotelId' filterable
+                        :placeholder="$t('pub.pleaseSel')" @visible-change='getHotelList(subItem)'
+                        @change='sendValue(subItem)'>
                         <el-option v-for='itemHotel in subItem.hotelList' :label='itemHotel.Name' :value='itemHotel.ID'
                           :key='itemHotel.ID'>
                           <span style="float: left">{{itemHotel.Name}}</span>
                           <span style="float: right; color:red; font-size: 13px">{{itemHotel.Inventory }}</span>
                         </el-option>
                       </el-select>
-
+                    </td>
+                  </tr>
+                  <tr>
+                    <td colspan="2" style="height:5px;"></td>
+                  </tr>
+                  <tr>
+                    <td  width="70" style="text-align:right;">
+                      供应商
+                    </td>
+                    <td>
+                      <el-select class='w120 sel' v-model='subItem.SupplierId' filterable placeholder="请选择供应商">
+                        <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
+                        <el-option v-for="(SupplierItem,Supplierindex) in SupplierList" :key="Supplierindex"
+                          :label="SupplierItem.Name" :value="SupplierItem.ID">
+                        </el-option>
+                      </el-select>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td colspan="2" style="height:5px;"></td>
+                  </tr>
+                  <tr>
+                    <td colspan="2">
                       <p style="padding-top: 5px;">
                         <a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a>
                       </p>
@@ -136,7 +158,9 @@
                         <el-button size="small" type="danger" @click='getItem(index, subIndex)'>
                           {{!subItem.ContractUrl ? '上传手配书' : '重新上传手配书'}}</el-button>
                       </el-upload>
-                </div>
+                    </td>
+                  </tr>
+                </table>
               </td>
               <!-- 房间数 -->
               <td>
@@ -248,7 +272,7 @@
               <!-- 操作 -->
               <td v-if="childIndex==0" :rowspan="5">
                 <!--v-if="subItem.OPState!=1"-->
-                <template v-if="subItem.OPState!=1">
+                <template v-if="subItem.OPState==1">
                   <span class="Hotel_red">OP选房确认</span>
                 </template>
                 <template v-if="IsOperation!=1">
@@ -300,7 +324,9 @@
         checkedsubIndex: '',
         loading: false,
         boxHeight: 0,
-        IsOperation:'',
+        IsOperation: '',
+        //供应商列表
+        SupplierList: [],
       }
     },
     methods: {
@@ -480,7 +506,7 @@
           obj.Tel = ckedObj.Tel;
           obj.NewHotelName = ckedObj.Name;
           obj.PayStyle = ckedObj.PayStyle;
-          obj.PayStyleExt=ckedObj.PayStyle;
+          obj.PayStyleExt = ckedObj.PayStyle;
         } else {
           obj.Address = '';
           obj.Tel = '';
@@ -584,7 +610,17 @@
           })
           this.ClickItem.ContractUrl = str != "" ? str.substring(0, str.length - 1) : str;
         });
-
+      },
+      // 获取供应商
+      initSupplier() {
+        this.apipost("supplier_post_GetAllList", {
+          Type: 1,
+          Country: 651
+        }, res => {
+          if (res.data.resultCode === 1) {
+            this.SupplierList = res.data.data;
+          }
+        }, err => {});
       },
     },
     mounted() {
@@ -595,6 +631,7 @@
       let height = window.innerHeight - 65 - 55;
       this.boxHeight = height;
       this.offsetwidth = width;
+      this.initSupplier();
       this.getList();
     }
   }

src/components/Supplier/roomQuery.vue

@@ -119,7 +119,7 @@
         <template v-for="(item,index) in dataList">
           <template v-for="(subItem,subIndex) in item.subList">
             <tr v-for="(childItem,childIndex) in subItem.hotelList" :class="{roomQuerySplitTrCss:index%2!=0}">
-              <td v-if="childIndex==0&&subIndex==0" :rowspan="subItem.hotelList.length*item.subList.length">
+              <td v-if="childIndex==0&&subIndex==0" :rowspan="item.RowSpan">
                 {{item.NewCombinationNum}}
               </td>
               <td v-if="childIndex==0" :rowspan="subItem.hotelList.length">
@@ -142,9 +142,14 @@
               </td>
               <td>
                 <span style="color:red;">
+                  <template v-if="childItem.SupplierId==UserInfo.SupplierId">
                   <template v-if="childItem.OPState==1">[OP选房-OK]</template>
                   <template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[未操作]":"[暂定]")}}
                   </template>
+                  </template>
+                  <template v-else>
+                      [组团社自理]
+                  </template>
                 </span>
               </td>
               <td v-if="childIndex==0" :rowspan="subItem.hotelList.length">
@@ -194,6 +199,7 @@
           PriceStatus: 0,
           CombinationNum: ''
         },
+        UserInfo:{},
         //分公司类表
         companyList: [],
         //酒店列表
@@ -334,6 +340,7 @@
           if (res.data.resultCode == 1) {
             this.total = res.data.data.count;
             this.dataList = res.data.data.pageData;
+            console.log("dataList",this.dataList);
           } else {
             this.$message.error(res.data.message)
           }
@@ -449,6 +456,7 @@
       },
     },
     mounted() {
+      this.UserInfo=this.getLocalStorageSupplier();
       let myDate = new Date();
       let nowDate =
         myDate.getFullYear() +