页面修改

src/components/Supplier/roomQuery2.vue

@@ -44,7 +44,8 @@
             </td>
             <td>
               <template v-for="(subItem,subIndex) in item.FlightList2">
-                <span class="roomNowrap"><span class="roomFlightNumber">{{subItem.Flight_number}}</span> {{subItem.TicketDepartureTime}} {{subItem.DepartureName}}({{subItem.DIATA}})
+                <span class="roomNowrap"><span class="roomFlightNumber">{{subItem.Flight_number}}</span>
+                  {{subItem.TicketDepartureTime}} {{subItem.DepartureName}}({{subItem.DIATA}})
                   <i class="iconfont icon-weibiaoti40 rq_Arrow"></i>
                   {{subItem.TicketArrivalTime}} {{subItem.ArrivalCityName}}({{subItem.AIATA}})</span>
               </template>
@@ -83,11 +84,13 @@
                       </th>
                     </tr>
                     <template v-for="(subItem,subIndex) in HotelList">
-                       <tbody >
+                      <tbody>
                         <template v-for="(childItem,childIndex) in subItem.HotelOrderList">
                           <tr>
-                             <td v-if="childIndex==0" :rowspan="subItem.HotelOrderList.length>1?subItem.HotelOrderList.length*2:subItem.HotelOrderList.length+1" style="text-align:center;">
-                               第{{subIndex+1}}天  <br/>
+                            <td v-if="childIndex==0"
+                              :rowspan="subItem.HotelOrderList.length>1?subItem.HotelOrderList.length*2:subItem.HotelOrderList.length+1"
+                              style="text-align:center;">
+                              第{{subIndex+1}}天 <br />
                               {{subItem.UseTimeStr}}
                             </td>
                             <td>
@@ -97,7 +100,8 @@
                               {{childItem.NewHotelName}}
                             </td>
                             <td>
-                                 <template v-for="(detailsItem,detailsIndex) in childItem.OrderDetailsList" v-if="detailsItem.HouseTypeCount>0" >
+                              <template v-for="(detailsItem,detailsIndex) in childItem.OrderDetailsList"
+                                v-if="detailsItem.HouseTypeCount>0">
                                 <template v-if="detailsItem.HouseType==1">单间</template>
                                 <template v-if="detailsItem.HouseType==2">标准双人间</template>
                                 <template v-if="detailsItem.HouseType==3">大床房</template>
@@ -106,7 +110,7 @@
                                 {{detailsItem.HouseTypeCount}} 间
                                 价格: {{detailsItem.UnitPrice}}
                                 返佣: {{detailsItem.RebateRatio}}
-                                    <br/>
+                                <br />
                               </template>
                             </td>
                             <td>
@@ -123,7 +127,28 @@
                       </tbody>
                     </template>
                   </table>
-                  <a class="hotelLink" slot="reference" @click="getHotelList(item.TCID,item.NewCombinationNum)">酒店使用情况</a>
+                  <a class="hotelLink" slot="reference"
+                    @click="getHotelList(item.TCID,item.NewCombinationNum)">酒店使用情况</a>
+                </el-popover>
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="酒店信息" placement="top-start">
+                <el-popover placement="bottom" width="400" trigger="click" popper-class="rq_HotelDetails">
+                  <table>
+                    <tr>
+                      <td>
+                        备注：
+                      </td>
+                      <td>
+                        <el-input class='mt10' v-model='RemarkObj.SupplierToDmcRemarks' type='textarea'></el-input>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td colspan="2">
+                        <input type="button" value="保存" @click="saveSupplierToDmcRemarks" class="normalBtn" />
+                      </td>
+                    </tr>
+                  </table>
+                  <a class="hotelLink" slot="reference" @click="getClickItem(item)">备注</a>
                 </el-popover>
               </el-tooltip>
             </td>
@@ -133,6 +158,11 @@
               注意事项： {{item.SupplierRemarks}}
             </td>
           </tr>
+          <tr>
+            <td colspan="8" style="text-align:left;padding-left:5px;">
+              对地接备注： {{item.SupplierToDmcRemarks}}
+            </td>
+          </tr>
         </tbody>
       </table>
     </div>
@@ -144,7 +174,7 @@
     data() {
       return {
         loading: false,
-        hotelLoading:false,
+        hotelLoading: false,
         total: 0,
         msg: {
           pageIndex: 1,
@@ -172,6 +202,11 @@
         UserInfo: {}, //用户信息
         dataList: [], //数据列表
         HotelList: [], //酒店列表
+        //供应商对地接备注
+        RemarkObj: {
+          TCID: 0,
+          SupplierToDmcRemarks: ""
+        },
         //日志信息
         LogsList: [],
         queryLogMsg: {
@@ -208,21 +243,35 @@
           }
         }, err => {})
       },
-      //获取日志
+      //获取酒店列表
       getHotelList(TCID, NewCombinationNum) {
-        console.log(TCID)
-        this.hotelLoading=true;
+        this.hotelLoading = true;
         this.HotelList = [];
         var qMsg = {
           TCID: TCID,
           NewCombinationNum: NewCombinationNum
         };
         this.ApiPost2('dmcstatistics_post_GetSupplierHotelListService', qMsg, res => {
-          this.hotelLoading=false;
+          this.hotelLoading = false;
           if (res.data.resultCode == 1) {
             this.HotelList = res.data.data;
-             console.log("this.HotelList",this.HotelList);
-          }else{
+          } else {
+            this.Error(res.data.message);
+          }
+        }, err => {})
+      },
+      //获取点击备注
+      getClickItem(item) {
+        this.RemarkObj.TCID = item.TCID;
+        this.RemarkObj.SupplierToDmcRemarks = item.SupplierToDmcRemarks;
+      },
+      //保存供应商对地接备注
+      saveSupplierToDmcRemarks() {
+        this.ApiPost2('dmcstatistics_post_SetSupplierToDmcRemarksService', this.RemarkObj, res => {
+          this.hotelLoading = false;
+          if (res.data.resultCode == 1) {
+            this.getList();
+          } else {
             this.Error(res.data.message);
           }
         }, err => {})
@@ -263,11 +312,13 @@
     background-color: #fff;
     border: 1px solid #d1d1d1;
   }
-  .roomQuery_SupplierTable tbody:nth-child(2n+2){
+
+  .roomQuery_SupplierTable tbody:nth-child(2n+2) {
     background: #fafafa;
   }
-  .roomQuery_SupplierTable tbody tr:last-child{
-    border-bottom:2px solid #333;
+
+  .roomQuery_SupplierTable tbody tr:last-child {
+    border-bottom: 2px solid #333;
   }
 
   .roomQuery_SupplierTable tr th {
@@ -328,25 +379,48 @@
     text-decoration: underline;
     cursor: pointer;
   }
-  .roomQuery .roomNowrap{
+
+  .roomQuery .roomNowrap {
     white-space: nowrap;
     display: block;
     text-align: left;
-    padding-left:20px;
+    padding-left: 20px;
   }
-  .roomQuery .roomFlightNumber{
-    color:#FF0066;
+
+  .roomQuery .roomFlightNumber {
+    color: #FF0066;
     font-weight: bold;
   }
- .rq_HotelTable { padding: 10px 0 0 20px; background-color: #ededed; border-collapse: collapse; border: 1px solid #d2d2d2; font-size: 12px;}
- .rq_HotelTable th { background-color: #ededed; padding: 5px 10px;text-align: center;}
- .rq_HotelTable td { background-color: #ffffff; padding: 9px 10px;color: #333333;border: 1px solid #d2d2d2;}
- .rq_HotelDetails{
-  max-height:400px;
+
+  .rq_HotelTable {
+    padding: 10px 0 0 20px;
+    background-color: #ededed;
+    border-collapse: collapse;
+    border: 1px solid #d2d2d2;
+    font-size: 12px;
+  }
+
+  .rq_HotelTable th {
+    background-color: #ededed;
+    padding: 5px 10px;
+    text-align: center;
+  }
+
+  .rq_HotelTable td {
+    background-color: #ffffff;
+    padding: 9px 10px;
+    color: #333333;
+    border: 1px solid #d2d2d2;
+  }
+
+  .rq_HotelDetails {
+    max-height: 400px;
     overflow: auto;
-}
-.roomQuery .rq_Arrow{
+  }
+
+  .roomQuery .rq_Arrow {
     position: relative;
-  top:3px;
-}
+    top: 3px;
+  }
+
 </style>

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -440,7 +440,7 @@
                     <el-checkbox v-model="priceData.IsSupportChildren" :true-label="CheckedVaule"
                       :false-label="UnCheckedVaule">支持儿童出游
                     </el-checkbox>
-                    <el-checkbox v-model="priceData.IsBookTeam" :true-label="CheckedVaule" v-if="PostConfig.LineId==14"
+                    <el-checkbox style="display:none;" v-model="priceData.IsBookTeam" :true-label="CheckedVaule" v-if="PostConfig.LineId==14"
                       :false-label="UnCheckedVaule">订团
                     </el-checkbox>
                     <el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule"