Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/App.vue

@@ -113,7 +113,7 @@ export default {
 }
 </script>
 <style>
-  @import "//at.alicdn.com/t/font_635492_uiowlzftn6k.css";
+  @import "//at.alicdn.com/t/font_635492_b8jianjuawm.css";
   @import "./assets/css/Semibold.css";
   @import "./assets/css/global/config.css";
   @import "./assets/css/fileIcon.css";

src/components/FinancialModule/invoicesManagerAdd.vue

@@ -146,14 +146,23 @@
         <td>到账日期</td>
         <td>{{orderList.TradeDateStr}}</td>
       </tr>
+
       <tr>
         <td>团号</td>
-        <td colspan="3" class="w600 text-align-left">{{msg.TCID}}</td>
-      </tr>
-      <tr>
+        <td>{{msg.TCID}}</td>
         <td>订单号</td>
-        <td colspan="3" class="w600 text-align-left">{{msg.OrderId}}</td>
+        <td>{{msg.OrderId}}</td>
       </tr>
+<!--      <tr>-->
+<!--        <td>团号</td>-->
+<!--        <td colspan="3" class="w600 text-align-left">{{msg.TCID}}</td>-->
+<!--      </tr>-->
+<!--      <tr>-->
+<!--        <td>订单号</td>-->
+<!--        <td colspan="3" class="w600 text-align-left">{{msg.OrderId}}</td>-->
+<!--      </tr>-->
+
+
       <tr>
         <td rowspan="6">开具内容</td>
         <td>
@@ -216,12 +225,25 @@
           <el-input placeholder type="number" v-model="msg.BankNo"></el-input>
         </td>
       </tr>
+
       <tr>
         <td>备注</td>
-        <td colspan="3">
+        <td>
           <el-input type="textarea" placeholder v-model="msg.Remarks"></el-input>
         </td>
+        <td>预计到账时间</td>
+        <td>
+            <el-date-picker v-model='msg.AccountingDate' class="w230" value-format="yyyy-MM-dd" type="date"
+                            placeholder="选择日期"></el-date-picker>
+        </td>
       </tr>
+<!--      <tr>-->
+<!--        <td>备注</td>-->
+<!--        <td colspan="3">-->
+<!--          <el-input type="textarea" placeholder v-model="msg.Remarks"></el-input>-->
+<!--        </td>-->
+<!--      </tr>-->
+
     </table>
     <div>
       <div>
@@ -289,6 +311,7 @@ export default {
         IsDefaultInfo: 1,
         ApplyPics: [],
         ID: 0,
+        AccountingDate:''
       },
       DepartName: "",
       emName: "",

src/components/FinancialModule/invoicesManagerDetail.vue

@@ -271,16 +271,16 @@
       </tr>
       <tr>
         <td>{{$t('ios.tuanhao')}}</td>
-        <td colspan="3" class="w600 text-align-left font-weight cursorpointer" @click="goUrlT('productQuery', detail.TCNUM, '产品查询')">
+        <td  class="text-align-left font-weight cursorpointer" @click="goUrlT('productQuery', detail.TCNUM, '产品查询')">
           {{detail.TCNUM}}({{detail.TCID}})
         </td>
-      </tr>
-      <tr>
+
         <td>{{$t('ios.ddanhao')}}</td>
-        <td colspan="3" class="w600 text-align-left font-weight cursorpointer">
+        <td  class="text-align-left font-weight cursorpointer">
           <span @click="goUrlO(detail.OrderId)">{{detail.OrderId}}</span>
         </td>
       </tr>
+
       <tr>
         <td>{{$t('ios.cwdanju')}}</td>
         <td colspan="3" class="w600 text-align-left font-weight cursorpointer">
@@ -329,9 +329,13 @@
       </tr>
       <tr>
         <td>{{$t('hotel.hotel_remark')}}</td>
-        <td colspan="3">
+        <td>
           {{detail.Remarks}}
         </td>
+        <td>预计到账时间</td>
+        <td style="width: 190px;">
+          {{detail.AccountingDate}}
+        </td>
       </tr>
     </table>
     <el-dialog :title="$t('pub.hintMsg')" width="400px" :visible.sync="dialogFormVisible2" center :before-close="closeChangeMachie" >

src/components/Restaurant/RestaurantPackage.vue

 <style>
-.RestaurantPackage .singeRowTable tr:nth-child(n + 2):hover {
+  .RestaurantPackage .singeRowTable tr:nth-child(n + 2):hover {
     background-color: white;
     box-shadow: 0px 0px 14px 0px #adadad;
     z-index: 10;
     position: relative;
-}
-.RestaurantPackage .DaysInfo span {
+  }
+
+  .RestaurantPackage .DaysInfo span {
     display: inline-block;
     background-color: #2aaef2;
     color: white;
@@ -13,49 +14,58 @@
     padding: 0 10px;
     height: 30px;
     line-height: 30px;
-}
-.RestaurantPackage .DaysInfo span i {
+  }
+
+  .RestaurantPackage .DaysInfo span i {
     margin-right: 10px;
-}
-.RestaurantPackage .singeRowTable tr:nth-child(n + 2) {
+  }
+
+  .RestaurantPackage .singeRowTable tr:nth-child(n + 2) {
     height: 80px;
     text-align: center;
-}
-.RestaurantPackage .detailsIT .singeRowTable tr:nth-child(n + 2):hover {
+  }
+
+  .RestaurantPackage .detailsIT .singeRowTable tr:nth-child(n + 2):hover {
     background-color: white;
     box-shadow: 0px 0px 14px 0px #adadad;
     z-index: 10;
     position: relative;
-}
-.RestaurantPackage .Ldata {
+  }
+
+  .RestaurantPackage .Ldata {
     color: #333333;
     margin-top: 5px;
-}
-.RestaurantPackage .LP {
+  }
+
+  .RestaurantPackage .LP {
     color: #e95252;
-}
-.RestaurantPackage .HP {
+  }
+
+  .RestaurantPackage .HP {
     color: #2aaef2;
     text-align: left;
     font-size: 14px;
     font-weight: bold;
     padding-left: 5px;
     display: inline-block;
-}
-.RestaurantPackage .T1 {
+  }
+
+  .RestaurantPackage .T1 {
     text-align: right;
     color: #666666;
     display: inline-block;
-}
-.RestaurantPackage .T2 {
+  }
+
+  .RestaurantPackage .T2 {
     text-align: left;
     color: #e95252;
     font-size: 14px;
     font-weight: bold;
     padding-left: 5px;
     display: inline-block;
-}
-.RestaurantPackage .descripTion {
+  }
+
+  .RestaurantPackage .descripTion {
     border-radius: 4px;
     width: 266px;
     text-align: left;
@@ -67,11 +77,13 @@
     -webkit-box-orient: vertical;
     /* autoprefixer: on */
     -webkit-line-clamp: 2;
-}
-.RestaurantPackage .singeRowTable tr:nth-child(n + 2):hover .descripTion {
+  }
+
+  .RestaurantPackage .singeRowTable tr:nth-child(n + 2):hover .descripTion {
     background-color: #ededed;
-}
-.RestaurantPackage .roomName {
+  }
+
+  .RestaurantPackage .roomName {
     display: inline-block;
     width: 200px;
     overflow: hidden;
@@ -79,7 +91,8 @@
     white-space: nowrap;
     text-align: left;
     padding-left: 20px;
-}
+  }
+
 </style>
 <template>
   <div class='flexOne RestaurantPackage'>
@@ -90,12 +103,15 @@
           <el-input v-model="msg.MealName" maxlength="30" @keyup.native.enter="getList"></el-input>
         </li>
         <li>
-                     <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList(),resetPageIndex()"/>
-                     <input type="button" class="normalBtn" @click="resetId(),outerVisible = true,dialogTitle='添加套餐'" :value="$t('pub.addBtn')"/>
+          <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')"
+            @click="getList(),resetPageIndex()" />
+          <input type="button" class="normalBtn" @click="resetId(),outerVisible = true,dialogTitle='添加套餐'"
+            :value="$t('pub.addBtn')" />
         </li>
       </ul>
     </div>
-        <table class="singeRowTable centerTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading" style="border-collapse:separate;border-spacing:0px 10px;table-layout:fixed;">
+    <table class="singeRowTable centerTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading"
+      style="border-collapse:separate;border-spacing:0px 10px;table-layout:fixed;">
       <tr>
         <th width="200">{{$t('restaurant.res_packageName')}}</th>
         <th width="200">{{$t('scen.sc_bjts')}}</th>
@@ -116,29 +132,36 @@
         <td>
           <p class="clearfix">
             <span class="tit_name T1">
-                          {{item.CurrencyName==''?'':item.CurrencyName}}<span v-if="item.CurrencyCode">({{item.CurrencyCode}})</span></span><span class='tit_name T2'>{{item.LPrice}}</span> 
+              {{item.CurrencyName==''?'':item.CurrencyName}}<span
+                v-if="item.CurrencyCode">({{item.CurrencyCode}})</span></span><span
+              class='tit_name T2'>{{item.LPrice}}</span>
           </p>
           <p class="Ldata">{{item.LDate}}</p>
         </td>
         <td>
           <p class="clearfix">
             <span class="tit_name T1">
-                          {{item.CurrencyName==''?'':item.CurrencyName}}<span v-if="item.CurrencyCode">({{item.CurrencyCode}})</span></span><span class='tit_name HP'>{{item.HPrice}}</span>
+              {{item.CurrencyName==''?'':item.CurrencyName}}<span
+                v-if="item.CurrencyCode">({{item.CurrencyCode}})</span></span><span
+              class='tit_name HP'>{{item.HPrice}}</span>
           </p>
           <p class="Ldata">{{item.HDate}}</p>
         </td>
         <td>
-                    <el-tooltip class="item" effect="dark" v-if="item.MealDesc" :content="item.MealDesc" placement="top-start" popper-class="max-w250">
+          <el-tooltip class="item" effect="dark" v-if="item.MealDesc" :content="item.MealDesc" placement="top-start"
+            popper-class="max-w250">
             <span class="descripTion">{{item.MealDesc}}</span>
           </el-tooltip>
         </td>
         <td>
           <el-button-group>
             <el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
-                            <el-button type="primary" icon="iconfont icon-Edit" @click="outerVisible = true,dialogTitle='修改套餐',updateResturant(item.Id)"></el-button>
+              <el-button type="primary" icon="iconfont icon-Edit"
+                @click="outerVisible = true,dialogTitle='修改套餐',updateResturant(item.Id)"></el-button>
             </el-tooltip>
             <el-tooltip class="item" effect="dark" :content="$t('restaurant.res_bidManage')" placement="top-start">
-                            <el-button type="primary" icon="iconfont icon-ico_shezhi" @click="goUrl('RestaurantPrice',item.Id)"></el-button>
+              <el-button type="primary" icon="iconfont icon-ico_shezhi" @click="goUrl('RestaurantPrice',item.Id)">
+              </el-button>
             </el-tooltip>
             <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
               <el-button type="danger" icon="el-icon-delete" @click="isDelete(item.Id)"></el-button>
@@ -147,24 +170,18 @@
         </td>
       </tr>
     </table>
-        <el-dialog custom-class='w500' :visible.sync="outerVisible" :title="dialogTitle" center :before-close="closeChangeMachie">
+    <el-dialog custom-class='w500' :visible.sync="outerVisible" :title="dialogTitle" center
+      :before-close="closeChangeMachie">
       <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="110px">
         <el-form-item :label="$t('restaurant.res_packageResource')" prop="DiningId">
           <el-select :placeholder="$t('pub.pleaseSel')" class="w300" disabled v-model="addMsg.DiningId">
-                        <el-option
-                        v-for="item in resList"
-                        :key="item.ID"
-                        :label="item.Name"
-                        :value="item.ID">
+            <el-option v-for="item in resList" :key="item.ID" :label="item.Name" :value="item.ID">
             </el-option>
           </el-select>
         </el-form-item>
-<el-form-item :label="$t('restaurant.res_packageName')" prop="DiningMealType">
+        <el-form-item :label="$t('restaurant.res_packageName')" prop="DiningMealType">
           <el-select filterable v-model='addMsg.DiningMealType' :placeholder="$t('pub.pleaseSel')">
-                      <el-option v-for='item in DiningMealTypeList' 
-                      :label='item.Name'
-                      :value='item.ID'
-                      :key='item.ID'>
+            <el-option v-for='item in DiningMealTypeList' :label='item.Name' :value='item.ID' :key='item.ID'>
             </el-option>
           </el-select>
         </el-form-item>
@@ -176,18 +193,20 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-                <button class="hollowFixedBtn" @click="resetForm('addMsg'),outerVisible = false">{{$t('pub.cancelBtn')}}</button> &nbsp;
+        <button class="hollowFixedBtn"
+          @click="resetForm('addMsg'),outerVisible = false">{{$t('pub.cancelBtn')}}</button> &nbsp;
         <button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
       </div>
     </el-dialog>
     <div class="noData" v-show="noData">
       {{$t('system.content_noData')}}
     </div>
-       <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=msg.total></el-pagination>
+    <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
+      layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=msg.total></el-pagination>
   </div>
 </template>
 <script>
-export default {
+  export default {
     data() {
       return {
         msg: {
@@ -203,10 +222,10 @@ export default {
           DiningId: "",
           MealName: "",
           MealDesc: "",
-        DiningMealType:"",
+          DiningMealType: "",
         },
         loading: true,
-      DiningMealTypeList:[],
+        DiningMealTypeList: [],
         outerVisible: false,
         dialogTitle: "",
         noData: false,
@@ -215,8 +234,14 @@ export default {
         resList: [],
         rules: {
           //表单必填验证
-        DiningId: [{ required: true, message: "请选择套餐资源" }],
-        DiningMealType: [{ required: true, message: "请选择套餐" }]
+          DiningId: [{
+            required: true,
+            message: "请选择套餐资源"
+          }],
+          DiningMealType: [{
+            required: true,
+            message: "请选择套餐"
+          }]
         }
       };
     },
@@ -227,7 +252,7 @@ export default {
           "meal_post_GetPageList",
           this.msg,
           res => {
-          if(res.data.resultCode==1){
+            if (res.data.resultCode == 1) {
               this.msg.total = res.data.data.count;
               if (this.msg.total > 0) {
                 this.noData = false;
@@ -236,25 +261,24 @@ export default {
                 this.noData = !this.noData;
               }
               this.loading = false;
-          }else{
+            } else {
               this.Error(res.data.message);
             }
           },
           null
         );
       },
-    GetDiningMealTypeList(){
-    		this.apipost('meal_post_GetDiningMealType',{},res=>{
-				if(res.data.resultCode==1){
-          this.DiningMealTypeList=res.data.data
+      GetDiningMealTypeList() {
+        this.apipost('meal_post_GetDiningMealType', {}, res => {
+          if (res.data.resultCode == 1) {
+            this.DiningMealTypeList = res.data.data
           }
-			},err=>{}) 
+        }, err => {})
       },
       saveResource() {
-        this.DiningMealTypeList.forEach(item=>{
-					if(this.addMsg.DiningMealType==item.ID)
-					{
-						 this.addMsg.MealName =item.Name
+        this.DiningMealTypeList.forEach(item => {
+          if (this.addMsg.DiningMealType == item.ID) {
+            this.addMsg.MealName = item.Name
           }
         })
         this.apipost(
@@ -281,7 +305,6 @@ export default {
           "meal_post_Get",
           msg,
           res => {
-            console.log(res)
             if (res.data.resultCode == 1) {
               this.addMsg = res.data.data;
               this.addMsg.DiningId = parseInt(res.data.data.DiningId);
@@ -327,7 +350,12 @@ export default {
       goUrl(path, id) {
         this.$router.push({
           path: path,
-        query: { MealId: id, DiningId: this.addMsg.DiningId,blank:'y',tab:'报价管理' }
+          query: {
+            MealId: id,
+            DiningId: this.addMsg.DiningId,
+            blank: 'y',
+            tab: '报价管理'
+          }
         });
       },
       handleCurrentChange(val) {
@@ -381,5 +409,6 @@ export default {
       this.getList();
       this.GetDiningMealTypeList();
     }
-};
+  };
+
 </script>

src/components/SalesModule/addPassenger.vue

@@ -140,6 +140,12 @@
          element-loading-background="rgba(0, 0, 0, 0.7)">
       <div class="contForm">
         <el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="100px">
+          <li>
+            <el-form-item label="身份证号码" prop="IdCard">
+              <el-input v-model="addMsg.IdCard" type="text" size=mini class="w230" maxlength="50" placeholder="请填写" @blur.prevent="authentication()">
+              </el-input>
+            </el-form-item>
+          </li>
           <li>
             <el-form-item label="中文姓" prop="SurName">
               <el-input v-model='addMsg.SurName' class="w230" @input="Transformation(addMsg.SurName,'SurName')"
@@ -235,12 +241,7 @@
               </el-input>
             </el-form-item>
           </li>
-          <li>
-            <el-form-item label="身份证号码" prop="IdCard">
-              <el-input v-model="addMsg.IdCard" type="text" size=mini class="w230" maxlength="50" placeholder="请填写">
-              </el-input>
-            </el-form-item>
-          </li>
+
 
           <li>
             <el-form-item label="家庭详细地址" prop="AddressDetail">
@@ -1904,7 +1905,36 @@
           err => {}
         );
       },
+      authentication() {
+        if (this.$route.query.guestId == 0) {
+          this.apipost(
+            "sellorder_post_GetGusetByIDCard",
+            {IdCard: this.addMsg.IdCard,},
+            res => {
+              if (res.data.resultCode == 1) {
+                let obj = res.data.data;
+                this.addMsg = obj;
+                this.addMsg.Sex = obj.Sex.toString();
+                this.addMsg.Marriage = obj.Marriage.toString();
+                if (this.addMsg.Marriage == "0") {
+                  this.addMsg.Marriage = "";
+                }
+                this.addMsg.IsCriminalRecord = obj.IsCriminalRecord === null ? '' : obj.IsCriminalRecord.toString();
+                this.addMsg.IsDepartureRecord = obj.IsDepartureRecord.toString();
+                this.addMsg.Id = this.$route.query.guestId;
+                this.addMsg.TCID = this.$route.query.TCID;
+                this.addMsg.OrderId = this.$route.query.orderId;
+                this.Roominformation()  //调取下房间信息
 
+              } else {
+                this.$message.error(res.data.message);
+              }
+            },
+            err => {
+            }
+          );
+        }
+      }
     },
     mounted() {
       this.getCountry();

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -531,6 +531,9 @@
                       <span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店预订状况</span>
                     </el-popover>
                   </p>
+                   <p class="travelnowrap" v-if="item.LineID==14 && item.IsOpenHotel==1">
+                    <span style="color:red;font-weight:bold;">※ 地接已关闭酒店操作,如需修改请联系地接OP.</span>
+                  </p>
                 </div>
               </div>
               <div class="el-col" style="width:190px;">
@@ -1265,7 +1268,7 @@
                   })
                 }
               });
-              // console.log('this.queryCommonData', this.queryCommonData.dataList)
+              console.log("this.queryCommonData.dataList",this.queryCommonData.dataList);
             }
           },
           err => {}

src/components/busManagement/BusInfo.vue

@@ -559,7 +559,7 @@
         } else if (obj.AirportPickUp == 13) {
           obj.PayType = 7;
         } else {
-          obj.PayType = 0;
+          obj.PayType = 2;
         }
         //高速付款方式默认现付
         obj.HighSpeedPayType = 1;
@@ -781,6 +781,7 @@
             .length - 1];
         }
         let newPlanData = this.PlanTableData[index].BusPlanOrderList[subIndex];
+        newPlanData.AirportPickUp=oldPlanData.AirportPickUp;
         newPlanData.DriverName = oldPlanData.DriverName;
         newPlanData.DriverTel = oldPlanData.DriverTel;
         newPlanData.BusNum = oldPlanData.BusNum;

src/components/commonPage/comCheckHotel.vue

@@ -4,16 +4,10 @@
         border-bottom:1px solid #d1d1d1;
     }
     .comCheckHotel>div{
-        float:left;
-        width:120px;
-        border-right:1px solid #d1d1d1;
+        width:100%;
         height:200px;
         overflow: auto
     }
-    .comCheckHotel>div:last-child{
-        width:230px;
-        border:none;
-    }
     .comCk_list{
         cursor: pointer;
         padding:0 20px;
@@ -42,21 +36,24 @@
 
 <template>
     <div>
-        <div class="cm_hotelTitle">酒店信息</div>
-        <div class="clearfix comCheckHotel">
-            <div>
-                <div class="comCk_list" v-for="(item,index) in dataList" :class="{'ckedList':ckindexOne==index}" @click="getCityList(item),ckindexOne=index">
-                    {{item.ProvinceName}}
-                </div>
+        <div class="cm_hotelTitle">
+            <el-select filterable v-model="selHotelId" @change="getChangeHotel(selHotelId)" :placeholder="$t('pub.pleaseSel')">
+              <el-option label="不限" :value='0'></el-option>
+              <el-option v-for="item in ProvinceList" :label='item.Name' :value='item.ID'
+                :key='item.ID'>
+              </el-option>
+            </el-select>         
+            酒店信息
         </div>
         <div>
-                <div class="comCk_list" v-for="(item,index) in cityList" :class="{'ckedList':ckindexTwo==index}" @click="getHotelList(item),ckindexTwo=index">
-                    {{item.CityName}}
-                </div>
+            <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+                <el-tab-pane :label="item.ProvinceName" v-for="item in dataList"></el-tab-pane>
+            </el-tabs>
         </div>
+        <div class="clearfix comCheckHotel">
             <div>
-                <div class="comCk_list" v-for="item in HotelList">
-                    <input type="checkbox" v-model="item.isChecked" @click="getCheck(item)" style=""/>
+                <div class="comCk_list" v-for="(item,index) in HotelList">
+                    <input type="checkbox" v-model="item.isChecked" @click="getCheck(item,index)" style=""/>
                     {{item.Name}}<span class="cm_Inventory">{{item.Inventory}}</span>
                 </div>
             </div>
@@ -66,21 +63,22 @@
 </template>
 <script>
 export default {
-//   props:["sDate"],
   data() {
     return {
         dataList:[],
-        cityList:[],
         HotelList:[],
         ckindexOne:-1,
         ckindexTwo:-1,  
         ID:0,
-        HotelName:''      
+        HotelName:'',
+        ProvinceList:[],
+        selHotelId:0,
+        activeName:'',
+        
     };
   },
   methods: {
       getCheckHotel(sDate){
-        this.$forceUpdate();
         this.apipost('hotel_post_GetHasStockHotelList_V2', {
           //1-只查询有库存的酒店
           IsMoreThanZero: 0,
@@ -91,49 +89,83 @@ export default {
            if (res.data.resultCode == 1) {
               this.dataList = res.data.data;
               this.dataList.forEach(x=>{
-                  x.cityList.forEach(y=>{
-                      y.HotelList.forEach(z=>{
-                          z.isChecked=false;
+                x.HotelList.forEach(y=>{
+                    y.isChecked=false;
                 })
             })
-              })
-              console.log(this.dataList,'子组件');
+            console.log(this.dataList,'datalist');
           } else {
               this.Error(res.data.message)
           }
         }, err => {})
       },
-      getCityList(item){
-          this.cityList = item.cityList;
-          this.HotelList = [];
-      },
-      getHotelList(item){
-          this.HotelList = item.HotelList;
-      },
-      getCheck(item){
-          this.HotelList.forEach(x=>{
+      getCheck(item,index){
+          this.HotelList.forEach((x,subIndex)=>{
+              if(index==subIndex){
+                x.isChecked = !x.isChecked;
+              }else{
                 x.isChecked = false;
+              }
           })
-          item.isChecked = !item.isChecked;
           this.$forceUpdate();
       },
       //向父组件传递选中酒店
       sendCkedHotel(){
-          console.log(this.dataList,'重选');
-        this.dataList.forEach(x=>{
-            x.cityList.forEach(y=>{
-                y.HotelList.forEach(z=>{
-                    if(z.isChecked){
-                        this.ID = z.ID;
-                        this.HotelName = z.Name;
+        var ckHotelObj = {};
+        this.HotelList.forEach((x,index)=>{
+            if(x.isChecked){
+                ckHotelObj.ID = x.ID;
+                ckHotelObj.Address = x.Address;
+                ckHotelObj.Inventory = x.Inventory;
+                ckHotelObj.Name = x.Name;
+                ckHotelObj.PayStyle = x.PayStyle;
+                ckHotelObj.Tel = x.Tel;
             }
         })
+        this.$emit("childHotel", ckHotelObj);
+      },
+      //获取日本下面的市->下拉框用
+      getProvinceList(){
+        let msg = {
+          Id:651
+        };
+        this.apipost("dict_post_Destination_GetChildList", msg,res => {
+            if(res.data.resultCode == 1){
+                this.ProvinceList = res.data.data;
+            }else{
+                this.Error(res.data.message);
+            }
+          },
+          err => {}
+        );
+      },
+      getChangeHotel(id){
+        let msg = {
+            Province:id
+        }
+        this.apipost(
+          "hotel_post_GetHasStockHotelList_V2",msg,res => {
+              if(res.data.resultCode==1){
+                this.dataList = res.data.data;
+                this.HotelList = [];
+                this.dataList.forEach(x=>{
+                    x.HotelList.forEach(y=>{
+                        y.isChecked=false;
                     })
                 })
-        this.$emit("childHotel", this.ID,this.HotelName);
+                console.log(this.dataList,'dataList');
+              }else{
+                  this.Error(res.data.message);
+              }
+          },
+          err => {}
+        );
+      },
+      handleClick() {
+        this.HotelList = this.dataList[this.activeName].HotelList;
       }
   },
-  mounted(){
+  mounted() {
 
   }
 };

src/components/dmc/manager/dmcTotalTable.vue

@@ -190,7 +190,7 @@
               </td>
               <td>
                 <div class="link">
-                  <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}</p>
+                  <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}({{item.TCID}})</p>
                 </div>
               </td>
               <td>
@@ -390,9 +390,17 @@
                         style="background:#00C6FF; border-color:#00C6FF"></el-button>
                     </el-tooltip>
                     <el-tooltip class="item" effect="dark" content="联系OP" placement="top-start">
-                      <el-button @click='openChart(item)' icon="iconfont icon-dianhua" type="primary"
+                      <el-button @click='openChart(item)' icon="iconfont icon-wechat" type="primary"
                         style="background:#6DD875; border-color:#6DD875"></el-button>
                     </el-tooltip>
+                    <el-tooltip v-if="item.LineId==14 && item.IsOpenHotel==0" class="item" effect="dark" content="关闭酒店操作" placement="top-start">
+                      <el-button  @click="SetIsOpenHotelService(1,item.TCID)"
+                        style="background:#E95252; border-color:#E95252" icon="iconfont icon-suo" type="primary"
+                       ></el-button>
+                    </el-tooltip>
+                    <el-tooltip v-if="item.LineId==14 && item.IsOpenHotel==1" class="item" effect="dark" content="开启酒店操作" placement="top-start">
+                      <el-button icon="iconfont icon-suo1" type="primary" style="background:green; border-color:green" @click="SetIsOpenHotelService(0,item.TCID)"></el-button>
+                    </el-tooltip>
                   </el-button-group>
                 </div>
               </td>
@@ -522,10 +530,24 @@
       saveRemark() {
         this.apipost('dmcstatistics_post_SetDMCRemark', this.NumObj, res => {
           if (res.data.resultCode == 1) {
-            this.$message.success(res.data.message)
-            this.getList()
+            this.$message.success(res.data.message);
+            this.getList();
           } else {
-            this.$message.error(res.data.message)
+            this.$message.error(res.data.message);
+          }
+        }, err => {})
+      },
+      //开启关闭酒店操作
+      SetIsOpenHotelService(status,TCID) {
+        this.apipost('dmcstatistics_post_SetIsOpenHotelService', {
+          TCID:TCID,
+          status:status
+        }, res => {
+          if (res.data.resultCode == 1) {
+            this.$message.success(res.data.message);
+            this.getList();
+          } else {
+            this.$message.error(res.data.message);
           }
         }, err => {})
       },

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -34,7 +34,7 @@
           :TCNUM="TCNUM" id="firstAnchor" :LineList="LineList"></TravelConfig>
         <TravelDaysTripDirect id="secondAnchor" @headCallBack="getDaysTrip" :NoticeParameters="NoticeParameters"
           :subConfig="journeyList" :isOpenGroup="false" :IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList"
-          v-bind:StartCity="StartCity" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend" @change="handlerChangeData" :TeamType="TeamType"></TravelDaysTripDirect>
+          v-bind:StartCity="StartCity" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend" @change="handlerChangeData" :TeamType="TeamType" :IsOpenHotel="PostConfig.IsOpenHotel"></TravelDaysTripDirect>
         <TravelFeature ref="TravelFeature" id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType"
           :isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit"></TravelFeature>
         <TravelNotice ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" :subArray="NoticeParameters"
@@ -125,6 +125,7 @@
           //是否更新酒店库存
           IsUpdateHotel:0,
           OpenTeamDescribe:"",//开团备注
+          IsOpenHotel:0,//0可以添加删除酒店，1-不能修改酒店信息
         },
         //行程
         FeatureData: {
@@ -652,6 +653,7 @@
                 //视频地址
                 this.PostConfig.VideoStr = tempData.VideoStr;
                 this.PostConfig.OpenTeamDescribe=tempData.OpenTeamDescribe;
+                this.PostConfig.IsOpenHotel=tempData.IsOpenHotel;
 
                 this.NoticeParameters.ConfigId = tempData.ConfigId;
                 this.NoticeParameters.CountryID = tempData.CountryID;

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -864,10 +864,14 @@
         </template>
       </table>
       <div slot="footer" class="dialog-footer">
-        <button class="normalBtn" type="primary" @click="saveHoteluseDetail()"
+        <button class="normalBtn" type="primary" @click="saveHoteluseDetail()" v-if="!(priceData.IsOpenHotel&&priceData.IsOpenHotel==1)"
           :class="{'disClick':!isSaved}">{{btnText}}</button> &nbsp;
         <button class="hollowFixedBtn" :class="{'disClick':!isSaved}"
           @click="cancelHotelUseDetail()">{{$t('pub.cancelBtn')}}</button>
+        <template v-if="priceData.IsOpenHotel&&priceData.IsOpenHotel==1"> 
+          <br/>
+          <span style="color:red;font-weight:bold;" >※ 地接已关闭酒店操作,如需修改请联系地接OP.</span>
+       </template>
       </div>
     </el-dialog>
 

src/components/newTravelmanager/travelLineTrip/HotelTrip.vue

@@ -104,12 +104,13 @@
                        v-model="HotelChooseArray"
                        multiple :multiple-limit="TeamType==0?3:1" @visible-change="getHotelList($event)"
                        @change="changeHotelList()"
-                       filterable placeholder="请选择">
+                       filterable placeholder="请选择" :disabled="IsOpenHotel==1?true:false">
               <el-option v-for="item in QHotelList" :label="item.Name" :value="item.ID" :key="item.ID">
                 <span style="float: left">{{ getHotelItemLabel(item) }}</span>
                 <span style="float: right; color: #8492a6; font-size: 13px">{{ item.Inventory }}</span>
               </el-option>
             </el-select>
+            <span style="color:red;font-weight:bold;" v-if="IsOpenHotel==1">※ 地接已关闭酒店操作,如需修改请联系地接OP.</span>
             <span v-if="dayObj.isRead&&IsDirect==1">
               <span v-for="item in hotelArray">
                 {{item.HotelName}}
@@ -129,7 +130,9 @@
 </template>
 <script>
   export default {
-    props: ["dayObj", "DayList", "CurrentIndex", "WarmTripDescribe", "IsDirect", "subConfig","TeamType"],
+    props: ["dayObj", "DayList", "CurrentIndex", "WarmTripDescribe", "IsDirect", "subConfig","TeamType",
+    "IsOpenHotel" //0可以添加删除酒店，1-不能修改酒店信息
+    ],
     data() {
       return {
         QHotelList: [],

src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_Direct.vue

@@ -147,6 +147,7 @@
                   v-bind:subConfig="subConfig"
                   @change="handlerChangeDateList"
                   :TeamType="TeamType"
+                  :IsOpenHotel="IsOpenHotel"
                 ></travelDaysTrip>
               </div>
             </div>
@@ -170,7 +171,8 @@
       "AirPickUp",
       "AirSend",
       "NoticeParameters",
-      "TeamType"
+      "TeamType",
+      "IsOpenHotel" //0可以添加删除酒店，1-不能修改酒店信息
     ],
     data() {
       return {

src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue

@@ -229,7 +229,7 @@
           </div>
         </div>
         <hotelTrip :dayObj="dayObj" :CurrentIndex="CurrentIndex" :DayList="DayList" :WarmTripDescribe="WarmTripDescribe"
-                   :IsDirect="NoticeParameters.IsDirect" :subConfig="subConfig"   :TeamType="TeamType"></hotelTrip>
+                   :IsDirect="NoticeParameters.IsDirect" :subConfig="subConfig"   :TeamType="TeamType" :IsOpenHotel="IsOpenHotel"></hotelTrip>
         <div class="TD_OperaContent">
           <div class="TD_ComIcon">
             <i v-if="!dayObj.isRead" class="iconfont icon-chakan" @click="getRead"></i>
@@ -277,7 +277,8 @@
       "DayList", //线路行程
       "NoticeParameters",
       "subConfig",
-      "TeamType"
+      "TeamType",
+      "IsOpenHotel" //0可以添加删除酒店，1-不能修改酒店信息
     ],
     data() {
       return {