1

src/components/FinancialModule/accDetail/GuideAccount.vue

@@ -13,14 +13,8 @@
         cursor: pointer;
         text-decoration: underline;
     }
-    ._bg__ ._bg_red:hover{
-        color: rgb(230, 97, 97);
-    }
-    ._bg__ ._bg_green:hover{
-        color:rgb(66, 182, 132);
-    }
-    ._bg_red{color: #E95252;}
-    ._bg_green{color: #2BB87C}
+    .Guid_bg_red{color: #E95252;}
+    .Guid_bg_green{color: #2BB87C}
     ._addChuNa_tit{color: gray;margin-bottom: 10px;}
     ._addChuNa_tit span{ color:#333333}
 </style>
@@ -95,7 +89,7 @@
                         </el-form-item>
                     </el-col>
                     
-                    <el-col :span="8" :gutter="35">
+                    <!-- <el-col :span="8" :gutter="35">
                         <el-form-item :label="$t('fnc.a_hkfkriqi')">
                                 <el-date-picker class="h34"
                                     @change="timeAdd"
@@ -105,17 +99,32 @@
                                     :range-separator="$t('restaurant.res_To')">
                                 </el-date-picker>
                             </el-form-item>
+                    </el-col> -->
+                    <el-col :span="6">
+                      <el-form-item label="汇款/付款日期">
+                        <el-date-picker
+                          @change="timeAdd"
+                          v-model="productionDate"
+                          type="daterange"
+                          range-separator="-"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"
+                          value-format="yyyy-MM-dd"
+                        ></el-date-picker>
+                      </el-form-item>
                     </el-col>
-                    <el-col :span="8" :gutter="35">
-                        <el-form-item label="发团日期">
-                                <el-date-picker class="h34"
-                                    @change="timeAddByTC"
-                                    v-model="productionDateByTC"
-                                    type="daterange"
-                                    value-format="yyyy-MM-dd"
-                                    :range-separator="$t('restaurant.res_To')">
-                                </el-date-picker>
-                            </el-form-item>
+                    <el-col :span="6">
+                      <el-form-item label="发团日期">
+                        <el-date-picker
+                          @change="timeAddByTC"
+                          v-model="productionDateByTC"
+                          type="daterange"
+                          range-separator="-"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"
+                          value-format="yyyy-MM-dd"
+                        ></el-date-picker>
+                      </el-form-item>
                     </el-col>
                     <!-- <el-col :span="4" :gutter="35">
                         <el-form-item label="费用类型">
@@ -148,8 +157,8 @@
                     <th>{{$t('fnc.a_hkfkshijian')}}</th>
                     <th>{{$t('fnc.jylshuihao')}}</th>
                     <th>制单人</th>
-                    <th>{{$t('fnc.skjine')}}</th>
-                    <th>{{$t('fnc.fkjine')}}</th>
+                    <th>待收金额</th>
+                    <th>待付金额</th>
                     <th>总计</th>
                 </tr>
                 <!-- <tr>
@@ -170,9 +179,9 @@
                     </td> -->
                     <td>{{item.TypeName}}</td>
                     <td>{{item.BName}}</td>
-                    <!-- <td><span class="cursorpointer" :class="item.Type==1?'_bg_green':'_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td> -->
+                    <!-- <td><span class="cursorpointer" :class="item.Type==1?'Guid_bg_green':'Guid_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td> -->
                      <td>
-                        <span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrlNew(item)">
+                        <span class="cursorpointer" :class=" item.Type === 1 ? 'Guid_bg_green' : 'Guid_bg_red'" @click="goUrlNew(item)">
                             {{ item.FinanceId }}</span>
                     </td>
                     <td>

src/components/Hotel/roomReservationsDetails.vue

@@ -510,12 +510,12 @@
         findex: 0,
         childIndex: 0,
         //修改酒店价格，付款方式权限[0-不能修改，1-有权限修改]
-        IsEditHotel: 0,
+        IsEditHotel: 1,
         //0-可以操作，1-已制单，不能操作
         IsOperation: 1,
         LeaderName: "", //领队名称
         GuideName: "", //导游名称
-        IsEditHotelPeople: 0, //是否有修改人数权限[0-不能修改，1-可以修改]
+        IsEditHotelPeople: 1, //是否有修改人数权限[0-不能修改，1-可以修改]
         IsCombine: false, //是否是合团，true-是合团，false-不是合团
         allCurrencyList: [], //币种列表
       }

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -26,21 +26,21 @@
           </th>
         </tr>
         <tr>
-          <th width="150">用餐时间</th>
-          <th width="250">餐厅名称</th>
-          <th width="160">修改餐厅</th>
+          <th width="100">用餐时间</th>
+          <th width="200">餐厅名称</th>
+          <th width="150">修改餐厅</th>
           <th width="80">类别</th>
           <th width="200" style="display:none;">餐饮类型</th>
-          <th width="80">总人数</th>
+          <th width="70">总人数</th>
           <th width="70">用餐人<br />类型</th>
           <th width="70">用餐<br />人数</th>
-          <th width="100">价格</th>
-          <th width="100">免人数</th>
+          <th width="90">价格</th>
+          <th width="90">免人数</th>
           <th width="80">金额小计</th>
-          <th width="100">返佣</th>
-          <th width="120">总金额</th>
+          <th width="90">返佣</th>
+          <th width="100">总金额</th>
           <th width="210">付款方式/订餐方式/订团号</th>
-          <th width="80">备注</th>
+          <th width="170">备注</th>
         </tr>
         <template v-for="(item,index) in list">
           <template v-for="(subItem,subIndex) in item.DiningSummaryList">
@@ -81,7 +81,6 @@
                   <el-option v-for='itemHotel in item.DinnerList' :label='itemHotel.RealName' :value='itemHotel.ID'
                     :key='itemHotel.ID'></el-option>
                 </el-select>
-
               </td>
               <td v-if="childIndex==0" :rowspan="3">
                 {{subItem.UseDinnerTypeStr}}
@@ -102,8 +101,8 @@
                 <span class="spanlink" v-if='childItem.PeoplePrice==0'
                   @click="goUrl('RestaurantPackage',subItem,'套餐查询')">设置</span>
                 <template v-else>
-                   <el-input class='w50 tcenter' @input='calculationPrice(subItem)'  
-                  v-model='childItem.PeoplePrice' @keyup.native="checkInteger(childItem,'PeoplePrice')"></el-input>
+                  <el-input class='w50 tcenter' @input='calculationPrice(subItem)' v-model='childItem.PeoplePrice'
+                    @keyup.native="checkInteger(childItem,'PeoplePrice')"></el-input>
                 </template>
               </td>
               <td>
@@ -185,7 +184,22 @@
                 </table>
               </td>
               <td v-if="childIndex==0" :rowspan="3">
-                <el-input type='textarea' rows="4" class='w120' v-model='subItem.Remarks'></el-input>
+                <table class="dinnerTable">
+                  <tr>
+                    <td width="80" style="text-align:right;">备注：</td>
+                    <td>
+                      <el-input type='textarea' rows="2" class='w120' v-model='subItem.Remarks'></el-input>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td width="80" style="text-align:right;">
+                      餐配备注：
+                    </td>
+                    <td style="text-align:left;">
+                      <el-input type='textarea' rows="2" class='w120' v-model='subItem.DinnerRemark'></el-input>
+                    </td>
+                  </tr>
+                </table>
               </td>
             </tr>
           </template>
@@ -194,7 +208,6 @@
     </div>
   </div>
 </template>
-
 <script>
   export default {
     data() {
@@ -300,7 +313,7 @@
             return item.ID === obj.CurrencyId; //筛选出匹配数据
           });
         }
-        
+
         //日元
         let jpaObj = this.allCurrencyList.find(item => {
           return item.ID === 3; //筛选出匹配数据
@@ -308,7 +321,8 @@
         obj.DiningPriceList.forEach((item, index) => {
           var tempPrice = 0;
           var coefficient = 1;
-          totalPrice += item.PeoplePrice * (item.PeopleNum - item.Discount) * (coefficient - item.DiscountPrice / 100);
+          totalPrice += item.PeoplePrice * (item.PeopleNum - item.Discount) * (coefficient - item.DiscountPrice /
+            100);
           totalPrice += tempPrice;
         })
         obj.TotalPrice = totalPrice.toFixed(2);
@@ -321,24 +335,18 @@
           else if (currentObj.ID == 3) {
             obj.NewTotalPrice = "";
           } else {
-            if(currentObj.CurrentRate>1)
-            {
-              obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice*jpaObj.PayRate)/currentObj.CurrentRate).toFixed(2);
-            }
-            else
-            {
-              obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice*jpaObj.PayRate)*currentObj.CurrentRate).toFixed(2);
+            if (currentObj.CurrentRate > 1) {
+              obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice * jpaObj.PayRate) / currentObj.CurrentRate)
+                .toFixed(2);
+            } else {
+              obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice * jpaObj.PayRate) * currentObj.CurrentRate)
+                .toFixed(2);
             }
           }
         } else {
           obj.NewTotalPrice = "";
         }
         this.$forceUpdate();
-        // let totalPrice = 0;
-        // obj.DiningPriceList.forEach(item => {
-        //   totalPrice += item.PeoplePrice * (item.PeopleNum - item.Discount) * (1 - item.DiscountPrice / 100);
-        // })
-        // obj.TotalPrice = totalPrice.toFixed(2);
       },
       saveList(type) {
         this.IsDisabled = true;

src/components/commonPage/comCheckHotelV2.vue

@@ -119,7 +119,6 @@
               <label :for="'H'+index+'_'+subIndex" style="cursor: pointer">{{subItem.Name}}</label>
               <span class="cm_Inventory">{{subItem.Inventory}}</span>
               <span class="cm_Inventory">剩余:{{subItem.RemainingInventory}}</span>
-              <span class="ck_goUrl" @click="goUrl(subItem.ID)">新增库存</span>
             </div>
           </div>
         </el-tab-pane>
@@ -128,15 +127,16 @@
         <table v-loading="loading" >
           <thead>
             <tr>
-              <th>选择</th>
-              <th>酒店名称</th>
-              <th>价格</th>
+              <th style="width:70px">选择</th>
+              <th style="width:200px">酒店名称</th>
+              <th style="width:100px">价格</th>
             </tr>
           </thead>
           <tbody>
-            <tr v-for="item in ThirdHotelList">
+            <tr v-for="(item,index) in ThirdHotelList">
               <td width="50">
-                <input :id="item.hotelId" type="checkbox" />
+                <input :id="item.hotelId" type="checkbox" v-model="item.isChecked"
+                @click="getCheck(ThirdHotelList,index)" />
               </td>
               <td width="150">{{item.hotelName}}</td>
               <td width="150">{{item.lowrateTotal}}</td>
@@ -206,8 +206,7 @@
     },
     methods: {
       getCheckHotel() {
-        this.loading = true;
-        this.IsShow = false;
+      
         this.dataList = [];
         this.HotelList = [];
         this.ThirdHotelList=[];
@@ -222,6 +221,8 @@
       },
       //查询地接酒店
       GetDMCHotelList() {
+       this.loading = true;
+        this.IsShow = false;
         this.apipost('hotel_post_GetHasStockHotelList_V2', {
           //1-只查询有库存的酒店
           IsMoreThanZero: 0,
@@ -229,7 +230,8 @@
           IsAllHotel: 1,
           Province: this.qMsg.ProvinceId,
           Name: this.qMsg.Name,
-          sDate: this.qMsg.UseDate
+          sDate: this.qMsg.UseDate,
+          IsGetPic:true,//获取图片
         }, res => {
           this.loading = false;
           this.IsShow = true;
@@ -247,7 +249,10 @@
       },
       //查询第三方酒店
       GetThirdHotelList() {
+        this.loading = true;
+        this.IsShow = false;
         this.thirdHotelMsg.arrivalDate=this.qMsg.UseDate;
+        this.ThirdHotelList=[];
         if (this.thirdHotelMsg.arrivalDate == "") {
           this.Info("请选择入住时间!");
           return;
@@ -282,7 +287,14 @@
           if (res.data.resultCode == 1) {
             //总条数
             this.thirdHotelMsg.numberOfResultMatched = Number(res.data.data.numberOfResultMatched);
-            this.ThirdHotelList = res.data.data.hotelSummary;
+            var newArray= res.data.data.hotelSummary;
+            if(newArray!=null && newArray.length>0)
+            {
+               newArray.forEach(item=>{
+                 item.isChecked=false;
+               });
+            }
+            this.ThirdHotelList =newArray;
           } else {
             this.Error(res.data.message)
           }
@@ -308,17 +320,27 @@
       sendCkedHotel() {
         var ckHotelObj = {};
         if (this.ckedHotel) {
-          ckHotelObj.ID = this.ckedHotel.ID;
-          ckHotelObj.Address = this.ckedHotel.Address;
-          ckHotelObj.Inventory = this.ckedHotel.Inventory;
-          ckHotelObj.Name = this.ckedHotel.Name;
-          ckHotelObj.PayStyle = this.ckedHotel.PayStyle;
-          ckHotelObj.Tel = this.ckedHotel.Tel;
-          ckHotelObj.RebateRatio = this.ckedHotel.RebateRatio;
-          ckHotelObj.RebateCount = this.ckedHotel.RebateCount;
-          ckHotelObj.CostPrice = this.ckedHotel.CostPrice;
+          //地接酒店
+          if(this.qHotelType==1)
+          {
+             ckHotelObj.HotelId = this.ckedHotel.ID;
+             ckHotelObj.HotelName = this.ckedHotel.Name;
+             ckHotelObj.Description=this.ckedHotel.Descriptions;
+             ckHotelObj.HotelProvideType=1;
+             ckHotelObj.imgList=this.ckedHotel.ImgList;
+          }
+          //第三方酒店
+          else if(this.qHotelType==2)
+          {
+             ckHotelObj.HotelId = this.ckedHotel.hotelId;
+             ckHotelObj.HotelName = this.ckedHotel.hotelName;
+             ckHotelObj.imgList=[];
+             ckHotelObj.imgList.push({Name:this.ckedHotel.hotelName,Url:this.ckedHotel.hotelImageUrl});
+             ckHotelObj.Description=this.ckedHotel.hotelDescription;
+             ckHotelObj.HotelProvideType=2;
+          }
         }
-        this.$emit("childHotel", ckHotelObj);
+        this.$emit("childHotelChange", ckHotelObj);
       },
       //获取日本下面的市->下拉框用
       getProvinceList() {
@@ -335,22 +357,9 @@
           err => {}
         );
       },
-      goUrl(ID) {
-        this.$router.push({
-          path: 'HotelProductManage2',
-          query: {
-            id: ID,
-            Country: 651,
-            IsSelfBook: 1,
-            blank: 'y',
-            tab: '报价详情'
-          }
-        });
-      }
     },
     mounted() {
       this.getProvinceList();
     }
   };
-
-</script>
+</script>
\ No newline at end of file

src/components/dmc/manager/LeaderHander.vue

@@ -140,46 +140,46 @@
       <tr>
         <td>
           人数：{{sendReceiptData.StartCityName}}出发
-          <el-input type="text" class="w100" v-model="sendReceiptData.StartCityNum"/>
+          <el-input type="text" class="w100" v-model="sendReceiptData.StartCityNum" @keyup.native="checkPrice(sendReceiptData,'StartCityNum')" />
           位
         </td>
         <td width="250">
           其他：凑票
-          <el-input type="text" class="w135" v-model="sendReceiptData.TogetherNum"/>
+          <el-input type="text" class="w135" v-model="sendReceiptData.TogetherNum" @keyup.native="checkPrice(sendReceiptData,'TogetherNum')" />
           位
         </td>
         <td colspan="7">
           外站JOIN
-          <el-input type="text" class="w100" v-model="sendReceiptData.OutsideNum"/>
+          <el-input type="text" class="w100" v-model="sendReceiptData.OutsideNum" @keyup.native="checkPrice(sendReceiptData,'OutsideNum')" />
           位
         </td>
       </tr>
       <tr>
         <td>
           小费：金额
-          <el-input type="text" class="w128" v-model="sendReceiptData.Trip"/>
+          <el-input type="text" class="w128" v-model="sendReceiptData.Trip"  @keyup.native="checkPrice(sendReceiptData,'Trip')" />
           元/位
         </td>
         <td>
           人数：共
-          <el-input type="text" class="w150" v-model="sendReceiptData.TripNum"/>
+          <el-input type="text" class="w150" v-model="sendReceiptData.TripNum" @keyup.native="checkPrice(sendReceiptData,'TripNum')" />
           位
         </td>
         <td colspan="7">
           总计：
-          <el-input type="text" class="w120" v-model="sendReceiptData.TripTotal"/>
+          <el-input type="text" class="w120" v-model="sendReceiptData.TripTotal" @keyup.native="checkPrice(sendReceiptData,'TripTotal')" />
           万日元
         </td>
       </tr>
       <tr>
         <td>
           团款：
-          <el-input type="text" class="w160" v-model="sendReceiptData.TeamPrice"/>
+          <el-input type="text" class="w160" v-model="sendReceiptData.TeamPrice" @keyup.native="checkPrice(sendReceiptData,'TeamPrice')" />
           人民币
         </td>
         <td colspan="8">
           名单表费：
-          <el-input type="text" class="w135" v-model="sendReceiptData.TableFee"/>
+          <el-input type="text" class="w135" v-model="sendReceiptData.TableFee" @keyup.native="checkPrice(sendReceiptData,'TableFee')" />
           元
         </td>
       </tr>

src/components/index.vue

@@ -899,7 +899,7 @@
       </div>
       <div style="text-align:center">
         <p style="font-size:26px;color:#111111;margin:40px 0">第{{tsNumber}}期投诉案例分享已经发布</p>
-        <a @click="CloseTs" target="_blank" href="http://we.oytour.com:8110/?/article/13" style="font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline">点击查看</a>
+        <a @click="CloseTs" target="_blank" href="http://we.oytour.com:8110/?/article/19" style="font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline">点击查看</a>
       </div>
       </div>      
      </div>
@@ -931,7 +931,7 @@ export default {
   data() {
     return {
       tsState:false,
-      tsNumber:5,
+      tsNumber:6,
       saleRnkShow: false,
       dialogTitleNot: '',
       outerVisibleNot: false,

src/components/leaderPay2.vue

@@ -1270,7 +1270,7 @@ export default {
       }, null)
     },
     goZhiDan: function(obj) { 
-      let id = [59,63,78];
+      let id = [59,63];
       let TCIDARR = [obj.TCIDS];
       let orderObj = {
         OrderID: 0,
@@ -1438,7 +1438,7 @@ export default {
       this.dataList.LeaderApply.Status = type;
       let msg = this.dataList.LeaderApply;
       this.apipost(
-        "dmcstatistics_post_AuditLeaderapply",
+        "dmcstatistics_post_AuditLeaderapply_V2",
         msg,
         res => {
           if (res.data.resultCode == 1) {

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -51,7 +51,7 @@
         <TravelPrice3 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
           v-if="TeamType==2" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
           :TeamType="TeamType"></TravelPrice3>
-        <div class="btnFixedDiv">
+        <div class="btnFixedDiv" v-if="IsShowBtn">
           <div class="toTop" @click="backTop">
             <i class="iconfont icon-huidaodingbu"></i>
           </div>
@@ -84,6 +84,7 @@
     },
     data() {
       return {
+        IsShowBtn:false,//是否显示按钮
         ConfigId: 0, //地址栏查询参数
         NewConfigId: "", //configID加密后的字符串【预览使用】
         TCNUM: '', //团控列表传过来的tcnum
@@ -630,7 +631,6 @@
             res => {
               if (res.data.resultCode == 1) {
                 var tempData = res.data.data;
-           
                 if (tempData.Feature != null) {
                   this.FeatureData.ID = tempData.Feature.ID;
                   this.FeatureData.ConfigId = tempData.Feature.ConfigId;
@@ -753,6 +753,7 @@
                 this.Error(res.data.message);
               }
               this.loading = false;
+              this.IsShowBtn=true;
             },
             err => {}
           );
@@ -783,6 +784,7 @@
                 this.Error(res.data.message);
               }
               this.loading = false;
+              this.IsShowBtn=true;
             },
             err => {}
           );

src/components/newTravelmanager/oldTravelGroupControl/TravelDaysTrip_Direct.vue

@@ -109,11 +109,11 @@
                     <span v-if="IsDirect==1">
                       <hotelTrip v-bind:subItemObj="subItem" v-bind:DefaultList="hotelSameList" v-bind:subIndex="subIndex"
                         v-bind:DinnerList="DinnerList" v-bind:index="index" :isOpenGroup="isOpenGroup"
-                        v-bind:subTotalIndex="item.dayArray.length" ></hotelTrip>
-                         
+                        v-bind:subTotalIndex="item.dayArray.length"></hotelTrip>
+                       <!---->  
                       <hotelTripV2 v-bind:subItemObj="subItem" v-bind:DefaultList="hotelSameList" v-bind:subIndex="subIndex"
                         v-bind:DinnerList="DinnerList" v-bind:index="index" :isOpenGroup="isOpenGroup"
-                        v-bind:subTotalIndex="item.dayArray.length" style="display:none;"></hotelTripV2>
+                        v-bind:subTotalIndex="item.dayArray.length"  style="display:none;"></hotelTripV2>
                     </span>
                     <span v-else>
                     </span>