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

src/components/Hotel/HotelInfo.vue

@@ -42,7 +42,8 @@
             </el-switch>
           </el-form-item>
           <el-form-item label="支付方式">
-            <el-select v-model="addMsg.PayStyle" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')" :disabled="IsHaveAuth==1?false:true">
+            <el-select v-model="addMsg.PayStyle" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')"
+              :disabled="IsHaveAuth==1?false:true">
               <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
               <el-option v-for="item in PayList" :key="item.Id" :label="item.Name" :value="item.Id">
               </el-option>
@@ -214,6 +215,29 @@
             <el-form-item label="停车场">
               <el-switch v-model="addMsg.IsHavearking" :active-value="1" :inactive-value="0"></el-switch>
             </el-form-item>
+            <el-form-item label="停车费" v-if="addMsg.IsHavearking==1">
+              <el-input type="text" v-model="addMsg.ParkFee" class="w300" maxlength="10" @keyup.native="checkPrice(addMsg,'ParkFee')"></el-input>
+            </el-form-item>
+            <el-form-item label="入汤税">
+              <el-input type="text" v-model="addMsg.InTangTax" class="w300" maxlength="10" @keyup.native="checkPrice(addMsg,'InTangTax')"></el-input>
+            </el-form-item>
+            <el-form-item label="城市税">
+              <el-input type="text" v-model="addMsg.CityTax" class="w300" maxlength="10" @keyup.native="checkPrice(addMsg,'CityTax')"></el-input>
+            </el-form-item>
+            <el-form-item label="返佣类型">
+              <el-select v-model="addMsg.RebateType" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')">
+                <el-option :key="0" label="不限" :value="0"> </el-option>
+                <el-option :key="1" label="含税返佣" :value="1"> </el-option>
+                <el-option :key="2" label="不含税返佣" :value="2"> </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="司导房是否返佣">
+              <el-select v-model="addMsg.DriverGuideIsRebate" class='multiple_input w300'
+                :placeholder="$t('pub.pleaseSel')">
+                <el-option :key="0" label="不返佣" :value="0"> </el-option>
+                <el-option :key="1" label="返佣" :value="1"> </el-option>
+              </el-select>
+            </el-form-item>
           </div>
           <span class="resource-lititle">{{$t('hotel.hotel_imgintroduce')}}</span>
           <div class="resource-list">
@@ -223,13 +247,6 @@
                 <div class="imgzhe">
                   <div class="re-delte"><i @click.stop="showImg(item.ShowPath)" class="iconfont icon-img_cz"></i></div>
                   <div class="re-delte" @click="delImg(index)"><i class="iconfont icon-xingzhuang"></i></div>
-
-                  <!-- <div class="re-delte" @click.stop="ExchangeImg(index,0)" v-if="index!=0&&item.ShowPath">
-                    <i class="iconfont icon-zuoyi"></i>
-                  </div>
-                  <div class="re-delte" @click.stop="ExchangeImg(index,1)" v-if="index!=HotelImageArray.length-1&&item.ShowPath">
-                    <i class="iconfont icon-youyi"></i>
-                  </div> -->
                 </div>
               </div>
             </div>
@@ -370,6 +387,16 @@
           PayStyle: 0,
           //是否有停车场
           IsHavearking: 0,
+          //入汤税
+          InTangTax: 0,
+          //城市税
+          CityTax: 0,
+          //停车费
+          ParkFee: 0,
+          //返佣类型：1-含税返佣，2-不含税返佣
+          RebateType: 0,
+          //司导房是否返佣：0-不返佣，1-返佣
+          DriverGuideIsRebate: 0,
         },
         DiscountList: {
           ID: 0,
@@ -426,7 +453,6 @@
           obj.Path = str;
           obj.ShowPath = imgUrl;
           this.HotelImageArray.push(obj);
-          //this.updatePic();
         });
       },
       //更新酒店图片
@@ -455,7 +481,6 @@
         var item = this.HotelImageArray[index];
         this.DeleteImageArray.push(item);
         this.HotelImageArray.splice(index, 1);
-        //this.updatePic();
       },
       inited(viewer) {
         this.$viewer = viewer

src/components/Hotel/roomQuery.vue

@@ -119,66 +119,98 @@
       <div style="font-size:12px;padding:2px 4px 3px 4px; color:red">注意事项:每次导出数据最好不要超过一个月。</div>
       <table border="0" cellspacing="1" cellpadding="0" class="roomQueryTalbe" v-loading='loading'>
         <tr>
-          <th width="w100">序号</th>
-          <th width="120">出发地</th>
+          <th width="120">序号</th>
+          <th width="100">出发地</th>
           <th width="80">公司团号</th>
+          <th width="150">航班</th>
           <th width="100">系列</th>
-          <th width="120">机位总数<br />(Y/E/F)</th>
-          <th>使用时间&酒店情况</th>
+          <th width="80">机位总数<br />(Y/E/F)</th>
+          <th width="100">使用时间</th>
+          <th width="120">酒店名称</th>
+          <th width="120">更换酒店</th>
+          <th width="100">OP状态</th>
+          <th width="100">地接状态</th>
         </tr>
         <tr v-if="dataList.length==0">
-          <td colspan="10">暂无数据</td>
+          <td colspan="11">暂无数据</td>
         </tr>
-        <tbody v-for="(outItem,outindex) in dataList" :class="{roomQuerySplitTrCss:outindex%2!=0}">
-          <template v-for="(item,index) in outItem.StaticsReportList">
+        <template v-for="(outItem,outindex) in dataList">
+          <tbody :class="{roomQuerySplitTrCss:outindex%2!=0}">
+            <template v-for="(item,index) in outItem.PriceCommonList">
+              <template v-for="(subItem,subIndex) in item.PriceHotelResult">
+                <template v-for="(thirdItem,thirdIndex) in subItem.SubList">
                   <tr>
-              <td :rowspan="outItem.StaticsReportList.length" v-if='index==0'>
-                <div style="max-width: 100px; min-width: 50px;margin:auto;">{{outindex+1}}</div>
-                <div v-if='outItem.StaticsReportList.length>0' class="w150">{{outItem.NewCombinationNum}}</div>
+                    <td :rowspan="outItem.rootRowspan" v-if='index==0&&subIndex==0&&thirdIndex==0'>
+                      {{outItem.NewCombinationNum}}
                     </td>
-              <td>
-                <div class="w80">
-                  {{item.StartCityNames}}
-                </div>
+                    <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
+                      {{item.StartCityName}}
                     </td>
-              <td>
+                    <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
                       <div class="w120 link">
                         <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}</p>
                       </div>
                     </td>
-              <td>
-                <div class="w120 link">
-                  {{item.LineteamIdNames}}
-                </div>
+                    <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0' style="white-space:nowrap;">
+                      <template v-for="(fItem,fIndex) in item.FlightList">
+                        <span style="height:25px; line-height:25px;">
+                          <a style="color: #ff0066;font-weight: bold;">{{fItem.Flight_number}}</a>
+                          {{fItem.FlightDateStr}}
+                          {{fItem.Departure_time}} {{fItem.dName}} {{fItem.TicketArrivalTime}} {{fItem.aName}}
+                        </span><br />
+                      </template>
                     </td>
-              <td>
+                    <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
+                      {{item.LineteamName}}
+                    </td>
+                    <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
                       <div class="w120 link">
                         <p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')">
-                    {{item.TotalSeat}}/{{item.CommonReport.HouseStatistics.RealityYSeatNum}}/{{item.CommonReport.HouseStatistics.RealityESeatNum}}/{{item.CommonReport.HouseStatistics.RealityFSeatNum}}
+                          {{item.TotalSeat}}/{{item.YSeatNum}}/{{item.ESeatNum}}/{{item.FSeatNum}}
                         </p>
                       </div>
                     </td>
-              <td style="vertical-align: top;">
-                <div :style="{width:150*item.CommonReport.newHotel.length+'px'}">
-                  <div class="w150" v-for="childItem in item.CommonReport.newHotel"
-                    style="float:left;border-right:1px solid #d1d1d1;">
-                    <p class="pDateStyle">{{childItem.CheckInDateStr}}</p>
-                    <p @click="goUrlR('HotelManagement',childItem.HotelId,'酒店管理')"
-                      class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;">
-                      {{childItem.NewHotelName}}
-                      <span class="colorE95252">
-                        <template v-if="childItem.OPState==1">[OP-指定]</template>
-                        <template v-else-if="childItem.OPState==2&&childItem.DMCState==0">[OP-暂定]</template>
-                        <template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[地接-未操作]":"[地接-暂定]")}}
+                    <td :rowspan="subItem.SubList.length" v-if='thirdIndex==0'>
+                      {{subItem.UseDay}}
+                    </td>
+                    <td style="text-align:left;padding-left:2px;">
+                      <template v-if="thirdItem.HotelName!=thirdItem.NewHotelName && thirdItem.NewHotelName!=''">
+                        <span style="text-decoration:line-through"> {{thirdItem.HotelName}}</span>
+                      </template>
+                      <template v-else>
+                        {{thirdItem.HotelName}}
+                      </template>
+                    </td>
+                    <td style="text-align:left;padding-left:2px;">
+                      <template v-if="thirdItem.HotelName!=thirdItem.NewHotelName">
+                        <span style="color:red;">{{thirdItem.NewHotelName}}</span>
+                      </template>
+                    </td>
+                    <td>
+                      <template v-if="thirdItem.OPState==1">
+                        <span style="color: green;">OP-指定</span>
+                      </template>
+                      <template v-else-if="thirdItem.OPState==2">
+                        <span style="color:red;">OP-暂定</span>
+                      </template>
+                    </td>
+                    <td>
+                      <template v-if="thirdItem.DMCState==1">
+                        <span style="color: green;">地接-OK</span>
+                      </template>
+                      <template v-else-if="thirdItem.DMCState==2">
+                        <span style="color:red;">地接-暂定</span>
+                      </template>
+                      <template v-else-if="thirdItem.DMCState==0">
+                        <span style="color:red;">地接-未操作</span>
                       </template>
-                      </span>
-                    </p>
-                  </div>
-                </div>
                     </td>
                   </tr>
                 </template>
+              </template>
+            </template>
           </tbody>
+        </template>
       </table>
     </div>
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
@@ -194,7 +226,7 @@
         total: 0,
         msg: {
           pageIndex: 1,
-          pageSize: 8,
+          pageSize: 5,
           SelectType: 1,
           StartDate: '',
           EndDate: '',
@@ -319,29 +351,28 @@
       },
       getList() {
         this.loading = true;
-        this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => {
+        this.apipost('dmcstatistics_get_GetDmcHotelPageList', this.msg, res => {
           this.loading = false;
           if (res.data.resultCode == 1) {
             this.total = res.data.data.count;
-            this.dataList = res.data.data.pageData.data;
-            this.thLengthTitle = [];
-            for (let i = 1; i <= res.data.data.pageData.columnsCount; i++) {
-              this.thLengthTitle.push('第' + i + '晚')
-            }
-            this.dataList.forEach(x => {
-              x.StaticsReportList.forEach(y => {
-                y.CommonReport.newHotel = [];
-                if (y.CommonReport.HotelOrderListReport != null && y.CommonReport.HotelOrderListReport
-                  .length > 0) {
-                  y.CommonReport.HotelOrderListReport.forEach(z => {
-                    z.HotelOrderList.forEach(q => {
-                      y.CommonReport.newHotel.push(q);
-                    })
-                  })
-                }
-                y.colNum = 9 + y.CommonReport.newHotel.length;
+            var sourceData = res.data.data.pageData;
+            if (sourceData) {
+              sourceData.forEach(rootItem => {
+                var rootRowspan = 0; //合团跨行
+                rootItem.PriceCommonList.forEach(subItem => {
+                  var itemRowSpan = 0; //酒店跨行
+                  subItem.PriceHotelResult.forEach(thirdItem => {
+                    thirdItem.SubList.forEach(lastItem => {
+                      rootRowspan++;
+                      itemRowSpan++;
                     });
-            })
+                  });
+                  subItem.itemRowSpan = itemRowSpan;
+                });
+                rootItem.rootRowspan = rootRowspan;
+              });
+            }
+            this.dataList = sourceData;
           } else {
             this.$message.error(res.data.message)
           }

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -137,8 +137,8 @@
                   <p v-for="(img, imgIndex) in subItem.dmcImageList" title="点击下载" @click="downLoadPZ(img)"
                     v-if="img !== ''" style="cursor: pointer;color:blue;">{{ '凭证' + (imgIndex + 1)}}</p>
                 </td>
-                <td :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'>
-                  <div>
+                <td :rowspan="item.ShopDetailsList.length" v-if='subIndex==0' style="">
+                  <div style="display:none;">
                     <p style="cursor: pointer;color:blue;" @click="CreateBill(item.ShopDetailsList)">生成单据</p>
                     <p style="cursor: pointer;color:blue;" @click="CreateHandBill(outItem)">手动生成单据</p>
                   </div>
@@ -404,8 +404,6 @@
         "-" +
         myDate.getDate();
       this.msg.StartDate = nowDate;
-      // this.msg.StartDate = '2019-01-01';
-      // this.msg.EndDate = '2019-02-01'
       this.getLineList();
       this.getList();
     },

src/components/busManagement/BusInfo.vue

@@ -195,13 +195,17 @@
       <tfoot>
         <tr>
           <td>车辆类型</td>
-          <td colspan="7" align="left" style="padding-left:5px;">
+          <td align="left" style="padding-left:5px;">
             <el-select class="w150" placeholder="请选择" v-model="PostData.BusType">
               <el-option :key="0" :value="0" label="请选择"></el-option>
               <el-option v-for="item in BusTypeList" :key="item.Id" :label="item.newName" :value="item.Id">
               </el-option>
             </el-select>
           </td>
+           <td>回送费</td>
+           <td colspan="4" align="left" style="padding-left:5px;">
+              <el-input v-model="PostData.BackFee" @keyup.native="checkPrice(PostData,'BackFee')" placeholder="请输入回送费"  maxlength="10" class='w135'></el-input>
+           </td>
         </tr>
       </tfoot>
     </table>
@@ -432,7 +436,7 @@
           DayNum: 0,
           TotalNumber: 0
         },
-        PostData: [],
+        PostData: {},
         //公用信息
         CommonList: [],
         //禁用文本框

src/components/commonPage/commonHotelInfo.vue

@@ -51,6 +51,7 @@
           <th width="120" v-if="showHotelObj.showPay">付款方式<br/>返佣比例</th>
           <th width="130" v-if="showHotelObj.showZhan">占房时间</th>
           <th width="100" v-if="showHotelObj.showZhan">确认时间</th>
+          <th width="100" v-if="showHotelObj.showZhan">供应商</th>
           <th width="70" v-if="showHotelObj.showPrice">
             日志
           </th>
@@ -120,6 +121,9 @@
             <td v-if="showHotelObj.showZhan">
               {{hotelSubItem.SureTimeStr}}
             </td>
+            <td v-if="showHotelObj.showZhan">
+              {{hotelSubItem.SupplierName}}
+            </td>
             <td v-if="showHotelObj.showPrice">
               <el-popover width="200" trigger="click" popper-class="Bus_HotelPop">
                 <commonHotelLog :ref="'comHotelLog'+index+hotelSubIndex+''"> </commonHotelLog>

src/components/confirmationOrderDownLoad.vue

@@ -942,6 +942,8 @@
           isPc: 2,
           //模板参数
           templateId: this.showType,
+          //用户Id
+          UId:this.getLocalStorage().EmployeeId
         };
         this.$http({
           headers: {

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -1053,6 +1053,7 @@
             var objItem = "";
             if (this.returnPriceList.length > 0) {
               objItem = JSON.parse(JSON.stringify(this.returnPriceList[0]));
+              console.log("objItem",objItem);
               objItem.OPRemark = "";
               objItem.AirTicketId = 0;
               objItem.AirticketBindList = [];

src/components/newTravelmanager/oldTravelGroupControl/TravelDaysTrip_Direct.vue

@@ -161,16 +161,9 @@
 </template>
 <script>
 import trifficTrip from "../oldTravelGroupControl/trifficTrip";
-
 import scienTrip from "../oldTravelGroupControl/scienTrip_Direct";
-
-
 import hotelTrip from "../oldTravelGroupControl/hotelTrip_Direct";
-
-
 import dinnerTrip from "../oldTravelGroupControl/dinnerTrip_Direct";
-
-
 import freedomTrip from "../oldTravelGroupControl/freedomTrip";
 import warmtipTrip from "../oldTravelGroupControl/warmtipTrip";
 import titleTrip from "../oldTravelGroupControl/titleTrip";

src/components/newTravelmanager/oldTravelGroupControl/TravelManager5.vue

@@ -392,8 +392,6 @@
               TripFeature.ConfigId = res.data.data
               TripFeature.isfromManager = true
               this.$refs.TravelFeature.getHtml(TripFeature, SaveType, this.TeamType)
-              // this.$refs.TravelPrice.closeHotelDialog();
-              // this.$refs.TravelPrice.initStatus();
             } else if (res.data.resultCode == 10009) {
               this.FeatureData.IsSave = false
               //表单重复提交
@@ -487,7 +485,6 @@
         if (uploadConfig != undefined) {
           var configData = JSON.parse(uploadConfig)
           //基础数据组装
-          //this.PostConfig.Title = "";
           this.PostConfig.IsDirect = 0
           //线路行程组装
           let dayList = []

src/components/newTravelmanager/oldTravelGroupControl/hotelTrip_Direct.vue

@@ -31,6 +31,7 @@
             <div class="TDLeftPlan">
               <span>入住酒店</span>
               <span>
+                
                 <el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.HotelId'" :rules="hotelTripRules.HotelId">
                   <el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable v-model="subItemObj.childItem.HotelId"
                   @visible-change="getHotelList($event)" @change="changeHotelList()">