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

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,7 +101,8 @@
                 <span class="spanlink" v-if='childItem.PeoplePrice==0'
                   @click="goUrl('RestaurantPackage',subItem,'套餐查询')">设置</span>
                 <template v-else>
-                  {{childItem.PeoplePrice}}
+                  <el-input class='w50 tcenter' @input='calculationPrice(subItem)' v-model='childItem.PeoplePrice'
+                    @keyup.native="checkInteger(childItem,'PeoplePrice')"></el-input>
                 </template>
               </td>
               <td>
@@ -141,7 +141,6 @@
                       付款方式：
                     </td>
                     <td style="text-align:left;">
-
                       <el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
                         <el-option label='请选择' :value='0'></el-option>
                         <el-option label='现付' :value='1' v-if="subItem.PayStyleExt==1"></el-option>
@@ -150,7 +149,6 @@
                         <el-option label='预付' :value='4' v-if="subItem.PayStyleExt==4"></el-option>
                         <el-option label='预付款抵扣' :value='5' v-if="subItem.PayStyleExt==5"></el-option>
                         <el-option label='公司合团支付' :value='6'></el-option>
-
                       </el-select>
                     </td>
                   </tr>
@@ -186,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>
@@ -195,7 +208,6 @@
     </div>
   </div>
 </template>
-
 <script>
   export default {
     data() {
@@ -301,7 +313,7 @@
             return item.ID === obj.CurrencyId; //筛选出匹配数据
           });
         }
-        
+
         //日元
         let jpaObj = this.allCurrencyList.find(item => {
           return item.ID === 3; //筛选出匹配数据
@@ -309,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);
@@ -322,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/Ticketing/flightPerformance.vue

@@ -41,8 +41,15 @@
         <th>操作人员</th>
       </tr>
       <tr v-for="item in dataList">
-        <td> <a style="color:blue;cursor:pointer" @click='goUrlT("RegistrationList",item.TCID,"报名清单")'>
-            ({{item.TCID}}){{item.TCNUM}} </a></td>
+        <td>
+          <template v-if="item.TCID>0">
+            <a style="color:blue;cursor:pointer" @click='goUrlT("RegistrationList",item.TCID,"报名清单")'>
+              ({{item.TCID}}){{item.TCNUM}} </a>
+          </template>
+          <template v-else>
+            {{item.TCNUM}}
+          </template>
+        </td>
         <td>{{item.OutBranchName}}</td>
         <td>{{item.LineName}}</td>
         <td>{{item.TicketNum}}</td>

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -373,7 +373,8 @@
             :class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
             <div class="TC_remarkContent TC_teamName">
               <div class="clearfix">
-                <div class="TCL_remarkTitle" style="width:105px;"><span style="font-weight: 100;text-decoration:underline;cursor:pointer;color: #e95252;"
+                <div class="TCL_remarkTitle" style="width:105px;"><span
+                    style="font-weight: 100;text-decoration:underline;cursor:pointer;color: #e95252;"
                     v-if="item.ScoreNum >= 0"
                     @click='goInvetig("investigationList", item.TCID, 0)'>(评分{{item.ScoreNum}})</span>
                   {{$t('Operation.Op_TeamName')}}：</div>
@@ -445,7 +446,8 @@
                           <div>{{fItem.FlightArrivalTime}} {{fItem.Arrival_time}}</div>
                           <div style="margin-top:5px;">({{fItem.AIATA}}){{fItem.aName}}</div>
                         </td>
-                        <td><template v-if="fItem.StopoverIATA">({{fItem.StopoverIATA}})</template>{{fItem.StopoverName}}</td>
+                        <td><template
+                            v-if="fItem.StopoverIATA">({{fItem.StopoverIATA}})</template>{{fItem.StopoverName}}</td>
                       </tr>
                     </table>
                     <div class="FlightDiv-TCL" slot="reference">
@@ -501,11 +503,11 @@
                       <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
                         :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
                         @SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
-                        <div slot="reference" >
-                          <span class="price"
-                        style="cursor:pointer;text-decoration:underline;">酒店预订状况</span> <span style="color: #e95252">op{{item.OpSureHouse==2 ? '已确认' : '未确认'}}分房</span>
-                        </div>
-                      
+                      <div slot="reference">
+                        <span class="price" style="cursor:pointer;text-decoration:underline;">酒店预订状况</span> <span
+                          style="color: #e95252">op{{item.OpSureHouse==2 ? '已确认' : '未确认'}}分房</span>
+                      </div>
+
                     </el-popover>
                   </p>
                   <p class="travelnowrap" v-if="item.LineID==14 && item.IsOpenHotel==1">
@@ -782,6 +784,10 @@
                       <el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">
                         {{$t('Operation.Op_xiajia')}}
                       </el-dropdown-item>
+                      <!--酒店下架-->
+                      <el-dropdown-item v-if="item.LineID==14" @click.native="RemoveHotelJourneyOrder(item.TCID)">
+                        酒店下架
+                      </el-dropdown-item>
                       <el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">
                         {{$t('Operation.Op_jietuan')}}
                       </el-dropdown-item>
@@ -1077,15 +1083,15 @@
         //当前登录用户信息
         CurrentUserInfo: {},
         showHotelObj: {
-          showPrice: true,//是否显示价格
-          showPay: false,//是否显示支付方式
-          showZhan: true,//占房时间
-          showBtnList: false,//是否下载、确认按钮
+          showPrice: true, //是否显示价格
+          showPay: false, //是否显示支付方式
+          showZhan: true, //占房时间
+          showBtnList: false, //是否下载、确认按钮
           ShowTaxType: false, //显示税入税别
           ShowRebateRatio: false, //显示返佣比列
-          ShowSupplier:false,//是否显示供应商
-          showCaozuoTime:true,//操作时间
-          colspanLength:4//跨行
+          ShowSupplier: false, //是否显示供应商
+          showCaozuoTime: true, //操作时间
+          colspanLength: 4 //跨行
         },
         IsModifyTravelControl: 0, //分公司是否有修改团控权限
         pickerBeginDateBefore: {
@@ -1427,6 +1433,24 @@
           }
         }
       },
+      //单团酒店下架
+      RemoveHotelJourneyOrder(TCID) {
+        var that = this;
+        this.Confirm("是否要下架酒店?下架过后将释放酒店库存!", function () {
+          let msg = {
+            TCID: TCID,
+          }
+          that.apipost('travel_post_RemoveHotelJourneyOrderService', msg, res => {
+            if (res.data.resultCode == 1) {
+              that.Success(res.data.message)
+              that.getControlList()
+            } else {
+              that.Info(res.data.message)
+            }
+          })
+        });
+
+      },
       //单团设置下架
       Setshelves(TCID) {
         let msg = {
@@ -1881,7 +1905,7 @@
       if (this.$route.query.IsUnionCked) {
         this.queryMsg.IsShowUnion = this.$route.query.IsUnionCked;
       }
-      
+
       if (this.CurrentUserInfo.RB_Branch_id == 0 || this.CurrentUserInfo.RB_Branch_id == 1216 || this.CurrentUserInfo
         .RB_Branch_id == 49) {
         this.IsModifyTravelControl = 1;

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>
@@ -541,7 +541,6 @@
           res => {
             if (res.data.resultCode == 1) {
               this.sendReceiptData = res.data.data;
-              console.log("sendReceiptData",this.sendReceiptData);
               this.isShow=true;
             }else{
               this.Error(res.data.message);

src/components/dmc/manager/groundOperation.vue

@@ -37,14 +37,17 @@
   .GD_comPad {
     padding: 0 !important;
   }
-  .groundLastTable{
-    margin:20px 0;
-    font-size:12px;
+
+  .groundLastTable {
+    margin: 20px 0;
+    font-size: 12px;
   }
-  .gdBtn{
+
+  .gdBtn {
     position: relative;
-    top:-45px;
+    top: -45px;
   }
+
 </style>
 
 <template>
@@ -88,14 +91,14 @@
           </td>
           <td>机票负责人</td>
           <td>
-              <template v-if="PrincipalList.length>0">
-                  {{PrincipalList[0].CreateByName}}
-              </template>
+            <template v-if="PrincipalList.length>0">
+              <el-input v-model='PrincipalList[0].CreateByName' class='w200'></el-input>
+            </template>
           </td>
           <td>联系电话</td>
           <td colspan="5">
             <template v-if="PrincipalList.length>0">
-              {{PrincipalList[0].CreateByMobile}}
+              <el-input v-model='PrincipalList[0].CreateByMobile' class='w200'></el-input>
             </template>
           </td>
         </tr>
@@ -103,13 +106,13 @@
           <td>订房负责人</td>
           <td>
             <template v-if="PrincipalList.length>0">
-              {{PrincipalList[0].HConfirmName}}
+              <el-input v-model='PrincipalList[0].HConfirmName' class='w200'></el-input>
             </template>
           </td>
           <td>联系电话</td>
           <td colspan="5">
             <template v-if="PrincipalList.length>0">
-              {{PrincipalList[0].HConfirmMobile}}
+              <el-input v-model='PrincipalList[0].HConfirmMobile' class='w200'></el-input>
             </template>
           </td>
         </tr>
@@ -117,27 +120,27 @@
           <td>车辆负责人</td>
           <td>
             <template v-if="PrincipalList.length>0">
-              {{PrincipalList[0].BConfirmName}}
+              <el-input v-model='PrincipalList[0].BConfirmName' class='w200'></el-input>
             </template>
           </td>
           <td>联系电话</td>
           <td colspan="5">
-              <template v-if="PrincipalList.length>0">
-                {{PrincipalList[0].BConfirmMobile}}
-              </template>
+            <template v-if="PrincipalList.length>0">
+              <el-input v-model='PrincipalList[0].BConfirmMobile' class='w200'></el-input>
+            </template>
           </td>
         </tr>
         <tr>
           <td>订餐负责人</td>
           <td>
             <template v-if="PrincipalList.length>0">
-                {{PrincipalList[0].DConfirmName}}
+              <el-input v-model='PrincipalList[0].DConfirmName' class='w200'></el-input>
             </template>
           </td>
           <td>联系电话</td>
           <td colspan="5">
             <template v-if="PrincipalList.length>0">
-              {{PrincipalList[0].DConfirmMobile}}
+              <el-input v-model='PrincipalList[0].DConfirmMobile' class='w200'></el-input>
             </template>
           </td>
         </tr>
@@ -145,13 +148,13 @@
           <td>门票负责人</td>
           <td>
             <template v-if="PrincipalList.length>0">
-              {{PrincipalList[0].TConfirmName}}
+              <el-input v-model='PrincipalList[0].TConfirmName' class='w200'></el-input>
             </template>
-            </td>
+          </td>
           <td>联系电话</td>
           <td colspan="5">
             <template v-if="PrincipalList.length>0">
-              {{PrincipalList[0].TConfirmMobile}}
+              <el-input v-model='PrincipalList[0].TConfirmMobile' class='w200'></el-input>
             </template>
           </td>
         </tr>
@@ -198,8 +201,8 @@
             <td>{{subItem.ReserveNo}}</td>
             <td style="text-align:left;">{{subItem.HotelName}}</td>
             <td>{{subItem.CheckInDateStr}}</td>
-            <td>{{DMCStaticsCommon.HouseStatistics.NeedBed}}/{{DMCStaticsCommon.HouseStatistics.NoNeedBed}}</td>
-            <td>{{DMCStaticsCommon.HouseStatistics.RealityRoomNum}}</td>
+            <td>{{getHotelTotalNum(subItem)}}</td>
+            <td>{{getHotelTotal(subItem)}}</td>
             <td>{{subItem.Tel}}</td>
             <td style="text-align:left;">{{subItem.Address}}</td>
             <td style="text-align:left;">{{subItem.Remarks}}</td>
@@ -225,10 +228,11 @@
           <tr v-for="subItem in item.DiningSummaryList">
             <td>{{subItem.ReserveNo}}</td>
             <td>{{subItem.UseTimeStr}}</td>
-            <td>{{subItem.DiningName}}</td>
+            <td style="text-align:left;">{{subItem.DiningName}}</td>
             <td>{{subItem.UseDinnerTypeStr}}</td>
             <td>{{subItem.MealName}}</td>
-            <td>{{DMCStaticsCommon.HouseStatistics.RealityNum>0?(DMCStaticsCommon.HouseStatistics.RealityNum-1):0}}+1</td>
+            <td>{{getDinnerTotal(subItem)}}
+            </td>
             <td>{{subItem.Tel}}</td>
             <td style="text-align:left;">{{subItem.Address}}</td>
             <td style="text-align:left;">{{subItem.Remarks}}</td>
@@ -250,8 +254,10 @@
         <tbody v-for="item in DMCStaticsCommon.ScenicList">
           <tr v-for="subItem in item.ScenicStatisticsList">
             <td>{{subItem.UseTimeStr}}</td>
-            <td>{{subItem.ScenicName}}</td>
-            <td>{{DMCStaticsCommon.HouseStatistics.RealityNum>0?(DMCStaticsCommon.HouseStatistics.RealityNum-1):0}}+1</td>
+            <td style="text-align:left;">{{subItem.ScenicName}}</td>
+            <td>
+              {{getScenicTotal(subItem)}}
+            </td>
             <td>{{subItem.Tel}}</td>
             <td style="text-align:left;">{{subItem.Address}}</td>
             <td style="text-align:left;">{{subItem.Remarks}}</td>
@@ -308,8 +314,8 @@
             注意事项：
           </td>
           <td>
-            <el-input v-model="PostConfig.PlanDescription" type="textarea" class="w700" :autosize="{minRows: 3, maxRows: 3 }"
-              resize="none" placeholder="注意事项" maxlength="300"></el-input>
+            <el-input v-model="PostConfig.PlanDescription" type="textarea" class="w700"
+              :autosize="{minRows: 3, maxRows: 3 }" resize="none" placeholder="注意事项" maxlength="300"></el-input>
             <input type="button" class="normalBtn gdBtn" @click="UpdateLeaderPay" value="保存" />
             <input type="button" class="normalBtn gdBtn" @click="DownLoadLeaderPay" value="下载" />
           </td>
@@ -344,10 +350,49 @@
           TCIDs: "",
           PlanDescription: ""
         },
-        loading2:false,
+        loading2: false,
       };
     },
     methods: {
+      //酒店统计（用房数）
+      getHotelTotal(item) {
+        var totalCount = 0;
+        item.OrderDetailsList.forEach(subItem => {
+           totalCount+= subItem.HouseTypeCount;
+        });
+        return totalCount;
+      },
+      getHotelTotalNum(item) {
+        var totalCount = 0;
+        var noBed=0;
+        item.OrderDetailsList.forEach((subItem,subIndex) => {
+           if(subItem.HouseType<=4)
+           {
+              totalCount+= subItem.BookNum;
+           }
+           else if(subItem.HouseType==6)
+           {
+              noBed+= subItem.BookNum;
+           }
+        });
+        return totalCount+"/"+noBed;
+      },
+      //景点统计
+      getScenicTotal(item) {
+        var totalCount = 0;
+        item.TicketPriceList.forEach(subItem => {
+          totalCount += subItem.UsePeopleNum - subItem.Discount;
+        });
+        return totalCount;
+      },
+      //餐厅人数统计
+      getDinnerTotal(item) {
+        var totalCount = 0;
+        item.DiningPriceList.forEach(subItem => {
+          totalCount += subItem.UsePeopleNum - subItem.Discount;
+        });
+        return totalCount;
+      },
       //根据团号获取负责人的信息
       getConfirmName() {
         let msg = {
@@ -355,9 +400,9 @@
           NewCombinationNum: '',
         };
         //更新酒店图片
-        this.loading2=true;
-        this.apipost( "dmcstatistics_post_GetExtendLeaderAllStatics",msg,res => {
-            this.loading2=false;
+        this.loading2 = true;
+        this.apipost("dmcstatistics_post_GetExtendLeaderAllStatics", msg, res => {
+            this.loading2 = false;
             if (res.data.resultCode == 1) {
               this.BaseInfo = res.data.data.BaseInfo;
               this.PrincipalList = res.data.data.PrincipalList;
@@ -366,6 +411,7 @@
               this.DMCStaticsCommon = res.data.data.DMCStaticsCommon;
               this.shopList = res.data.data.shopList;
               this.PostConfig = res.data.data.DMCStaticsCommon.LeaderApply;
+            
             } else {
               this.Error(res.data.message);
             }
@@ -400,7 +446,10 @@
       },
       UpdateLeaderPay() {
         this.PostConfig.TCIDs = this.TCIDs;
-        this.apipost('dmcstatistics_post_AuditLeaderapply', this.PostConfig, res => {
+        this.apipost('dmcstatistics_post_AuditLeaderapply', {
+          LeaderApply: this.PostConfig,
+          LeaderGuidePlan: this.PrincipalList[0]
+        }, res => {
           if (res.data.resultCode == 1) {
             this.Success(res.data.message);
           } else {
@@ -415,12 +464,12 @@
           uid: this.getLocalStorage().EmployeeId
         };
         let fileName = "导游计划表" + this.$commonUtils.getCurrentDate() + ".xls";
-        this.loading=true;
+        this.loading = true;
         this.GetLocalFile("dmcstatistics_get_DwonLoadLeaderapply", msg, fileName,
           res => {
-            this.loading=false;
+            this.loading = false;
           });
-        }
+      }
     },
     mounted() {
       this.TCIDs = this.$route.query.id;
@@ -428,4 +477,5 @@
       this.getConfirmName();
     }
   };
-</script>
+
\ No newline at end of file
+</script>

src/components/leaderPay2.vue

@@ -1270,7 +1270,7 @@ export default {
       }, null)
     },
     goZhiDan: function(obj) { 
-      let id = [59,63];
+      let id = [59,63,78];
       let TCIDARR = [obj.TCIDS];
       let orderObj = {
         OrderID: 0,

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 => {}
           );