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

src/components/FinancialModule/CapitalAllocationDetail.vue

@@ -16,7 +16,7 @@
   .CapitalDetail .Ca_title{
     width:190px;
     margin:auto;
-    font-size:14px;
+    font-size:16px;
     margin-top:20px;
     color:#333333;
     text-align: center;
@@ -25,13 +25,15 @@
     width:100%;
     font-size:14px;
     text-align: center;
+    margin-bottom: -8px;
   }
   .CapitalDetail .Ca_line{
     width:110px;
     height:3px;
     margin:8px auto 10px;
-    border-top:1px solid #333333;
-    border-bottom:1px solid #333333;
+    border-top:1px solid #777373;
+    border-bottom:2px solid;
+    /* border-bottom:1px solid #333333; */
   }
   .CapitalDetail .collection_Order{
     width:100%;
@@ -200,7 +202,7 @@
             <div class="Co_oderleft">
               <div class="Ca_leftOrder">
                   <div class="Ca_title">{{dataList.CompanyName}}</div>
-                  <div class="Ca_t2">资金调拨单</div>
+                  <div class="Ca_t2">{{dataList.FinanceName}}</div>
                   <div class="Ca_line"></div>
                   <div class="clearfix collection_Order">
                       <div class="Co_oderleft">
@@ -324,12 +326,12 @@
                   <div class="clearfix Ca_popDiv" v-if="dataList.AuditSteps!=''">
                     <template v-for="(item,index) in dataList.AuditSteps">
                         <p>{{item.AuditDescription}}：
-                            <template v-if="item.AuditRecordList.length>0">
-                                <span class="_r_name" v-for="(s,si) in item.AuditRecordList" v-if="s.AuditStatus==2">{{s.AuditName}} </span>
-                            </template>
+                            <template v-if="item.Status===2">
+                                <span class="_r_name" v-for="(s,si) in item.AuditRecordList">{{s.AuditName}} </span>
+                            </template>                          
                         </p>
                     </template>
-                  </div>
+                  </div>                 
               </div>
               <!-- <div style="margin:20px 0;">
                 <input type="button" class="hollowFixedBtn" value="修改"/>

src/components/FinancialModule/FinancialDocuments.vue

@@ -161,6 +161,7 @@
                             <el-option key="0" value="0" label="不限"></el-option>
                             <el-option key="1" value="1" label="收入"></el-option>
                             <el-option key="2" value="2" label="支出"></el-option>
+                            <el-option key="2" value="4" label="资金调拨"></el-option>
                         </el-select>
                     </span>
                 </li>

src/components/FinancialModule/RecPayQueryTeam.vue

@@ -245,32 +245,49 @@
                     <th>团队编号</th>
                     <th>发团日期</th>
                     <th>订单号</th>
+                    <th>客户信息</th>
                     <th>业务员</th>
                     <th>应收金额</th>
                     <th>实收金额</th>
                     <th>待收金额</th>
                     <th>已退款</th>
                     <th>平台税金</th>
+                    <th>在途金额</th>
                 </tr>
                 <tr v-for=" ( item , index ) in DataList ">
                     <td> <span class="_link_hover" @click="jumpPage('RegistrationList', item.TCID, 1, 0)"> {{ item.TCNUM }} （{{ item.TCID }}） </span> </td>
                     <td> {{ item.StartDate }} </td>
-                    <td colspan="7">
+                    <td colspan="9">
                         <table class="_singeRowTable_two" style="width: 100%;table-layout: fixed;border-collapse: collapse;" cellspacing="0" cellpadding="0"  border="0">
                             <tbody>
                                 <tr  v-for=" ( son , sIndex ) in item.OrderList ">
                                     <td> <span class="_link_hover" @click="jumpPage('RegistrationList', son.OrderId, 2, item.TCID)"> {{ son.OrderId }} </span> </td>
+                                    <td> {{ son.ContactName }} </td>
                                     <td> {{ son.EmName }} </td>
                                     <td> {{ son.PreferPrice }} </td>
-                                    <td> <span :class="son.DaiShou > 0 ? '':'_color_red'"> {{ son.Income }} </span> </td>
+                                    <td> <span :class="son.DaiShou > 0 ? '_color_red':''"> {{ son.Income }} </span> </td>
                                     <td>{{ son.DaiShou}} </td>
                                     <td> {{ son.Refund }} </td>
                                     <td> {{ son.PlatformTax }} </td>
+                                    <td> {{ son.ZaiTuMoney }} </td>
                                 </tr>
                             </tbody>
                         </table>
                     </td>
                 </tr>
+                <tr>
+                    <td>合计</td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td>{{Statistics.PreferPrice}}</td>
+                    <td>{{Statistics.Income}}</td>
+                    <td>{{Statistics.DueinMoney}}</td>
+                    <td>{{Statistics.Refund}}</td>
+                    <td>{{Statistics.PlatformTax}}</td>
+                    <td>{{Statistics.ZaiTuMoney}}</td>
+                </tr>
             </table>
             <div class="noDataNotice" v-if="noData">
                 <i class="iconfont icon-kong"></i>
@@ -332,6 +349,7 @@ export default {
                 IsLeave:0,
             },
             DataList:[],
+            Statistics:{},
             DepartmentList:[],
             EmployeeList:[],
             CompanyList:[],
@@ -485,7 +503,8 @@ export default {
             this.apipost('Financial_post_GetInComePayInfoList',this.msg,res=>{
                 if(res.data.resultCode == 1) {
                     this.total = res.data.data.count;
-                    this.DataList = res.data.data.pageData;
+                    this.DataList = res.data.data.pageData.List;
+                    this.Statistics=res.data.data.pageData.Statistics;
                     if(this.DataList.length==0){
                         this.noData = true;
                     }else{

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -1598,7 +1598,7 @@ export default {
         return this.priceFormat(rowData.YongJinShouRu);
       if (field === "YingFu") return this.priceFormat(rowData.YingFu);
       if (field === "MaoLi") return this.priceFormat(rowData.MaoLi);
-      if (field === "MaoLiRate") return this.priceFormat(rowData.MaoLiRate*100)+'%';
+      if (field === "MaoLiRate") return rowData.MaoLiRate+'%';
       if (field === "ShiJiLiRun") return this.priceFormat(rowData.ShiJiLiRun);
       if (field === "TransportCost")
         return this.priceFormat(rowData.TransportCost);

src/components/FinancialModule/addCapitalAllocation.vue

@@ -156,7 +156,7 @@
   <div class="page_addCapitalAllocation" v-loading="loading">
     <div class="_top">
       <p>四川和平国际旅行社有限公司</p>
-      <p><span>资金调拨单</span></p>
+      <p><span>{{msg.TemplateId==34?'总部':'分公司'}}资金调拨单</span></p>
     </div>
     <div class="_conten">
       <ul v-if="inList.length">
@@ -359,7 +359,7 @@ export default {
     return {
       msg: {
         FrID: 0,
-        TemplateId: 27,
+        TemplateId: 0,
         Status: 1,
         IsPublic: 0,
         RB_Depart_Id: 0,
@@ -404,6 +404,11 @@ export default {
       let userInfo = this.getLocalStorage();
       this.msg.RB_Depart_Id = userInfo.RB_Department_Id;
       this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
+      if(this.msg.RB_Branch_Id===0 || this.msg.RB_Branch_Id===45 || this.msg.RB_Branch_Id===49){
+        this.msg.TemplateId=34;
+      }else{
+        this.msg.TemplateId=35;
+      }
     }
   },
   methods:{

src/components/Hotel/roomReservationsDetails.vue

@@ -11,7 +11,7 @@
 	<div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
 		<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe">
 			<tr>
-				<th class="fz14"  colspan="10">团队信息</th>
+				<th class="fz14"  colspan="10">团队信息(定团号：{{NewCombinationNum}})</th>
 				<th class="fz14"  colspan="12">地接操作信息</th>
 			</tr>
 			<tr>
@@ -306,9 +306,10 @@ export default {
     	
     },
     mounted() {
-        this.TCNUM=this.$route.query.TCNUM
-        this.flightTotal=this.$route.query.flightTotal
-        this.GuestNum=this.$route.query.GuestNum
+        this.TCNUM=this.$route.query.TCNUM;
+        this.flightTotal=this.$route.query.flightTotal;
+		this.GuestNum=this.$route.query.GuestNum;
+		this.NewCombinationNum=this.$route.query.NewCombinationNum;
         this.getList()
      //   this.getHotelList()
     },    

src/components/LeaderManagement/leaderReimbursement.vue

@@ -4,8 +4,9 @@
       <tr>
         <th width="8%">出发地</th>
         <th width="30%">行程名称</th>
-        <th width="15%">团号</th>
-        <th width="15%">出发时间</th>
+        <th width="10%">团号</th>
+        <th width="10%">定团号</th>
+        <th width="10%">出发时间</th>
         <th width="8%">天数</th>
         <th width="8%">出团人数</th>
         <th width="8%">领队</th>
@@ -17,6 +18,7 @@
           <div class="padding10">{{item.Titles}}</div>
         </td>
         <td>{{item.TCNUMS}}</td>
+        <td>{{NewCombinationNum}}</td>
         <td>{{item.FlightDate}}</td>
         <td>{{item.DayNum}}天</td>
         <td>{{item.TotalSeat}}人</td>
@@ -566,6 +568,8 @@
         TravelDayNum:0,
         RealityNum:0,
         UseCount:'',
+        //定团号
+        NewCombinationNum:'',
       }
     },
     methods: {
@@ -736,8 +740,9 @@
       },
     },
     mounted() {
-      this.isUpdate=this.$route.query.isUpdate
-      this.msg.TCIDs=this.$route.query.id
+      this.isUpdate=this.$route.query.isUpdate;
+      this.msg.TCIDs=this.$route.query.id;
+      this.NewCombinationNum = this.$route.query.NewCombinationNum;
       this.getNav()
       this.getList()
     }

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -12,6 +12,7 @@
     <table border="0" cellspacing="1" cellpadding="0" class="bookDinnerStatisticsTalbe">
       <tr>
         <th width="120">公司团号</th>
+        <th width="130">定团号</th>
 	   	  <th width="150">用餐时间</th>
 	    	<th width="200">餐厅名称</th>
         <th width="200">修改餐厅</th>
@@ -34,11 +35,14 @@
       </tr>
       <tr v-for="(item,index) in list">
         <td :rowspan="list.length" v-if="index==0">
-			<div class="w120">
-         		<p class="link" @click="goUrlT('productQuery',TCNUM,'产品查询')">{{TCNUM}}</p>
-			</div>
+          <div class="w120">
+                <p class="link" @click="goUrlT('productQuery',TCNUM,'产品查询')">{{TCNUM}}</p>
+          </div>
         </td>
-	        <td>
+        <td :rowspan="list.length" v-if="index==0">
+          <div class="w120" style="margin:0 5px;">{{NewCombinationNum}}</div>
+        </td>
+        <td>
           <div class="w120">{{item.UseTimeStr}}</div>
         </td>
         <td>
@@ -214,6 +218,7 @@ export default {
       TCNUM: "",
       flightTotal: 0,
       GuestNum: 0,
+      NewCombinationNum:'',
     };
   },
   methods: {
@@ -326,6 +331,7 @@ export default {
   mounted() {
     this.TCNUM = this.$route.query.TCNUM;
     this.GuestNum= this.$route.query.GuestNum;
+    this.NewCombinationNum = this.$route.query.NewCombinationNum;
     this.getList();
   }
 };

src/components/SalesVisa/VisaProductOrder.vue

@@ -304,7 +304,7 @@ export default {
                     this.loading = false;
 					this.dataList.forEach(x=>{
 						this.PreferPrice+=x.TotalPrice;
-						this.IncomePrice+=x.Income;
+						this.IncomePrice+=(x.Income+x.PlatformTax-x.RefundMoney);
 					})
                 }
             },err=>{})

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -179,10 +179,11 @@
                 <div class="Team_firstTitle">
                   <span class="Team_comCoinType Team_lirun">
                     <i class="iconfont icon-qian"></i>
-                  </span>提成
+                  </span>其他
                 </div>
                 <div class="Team_Incontent">
-                  <div>预计提成<span>￥{{DataList.ExpectedCut}}</span></div>
+                  <div>提&nbsp;&nbsp;&nbsp;成<span>￥{{DataList.ExpectedCut}}</span></div>
+                  <div>联运成本<span>￥{{DataList.LYCB}}</span></div>
                 </div>
               </div>
             </el-col>
@@ -209,7 +210,7 @@
             <th width="200">当前审核人</th>
           </tr>
           <template v-for="item in DataList.FiniceReciveList">
-            <tr v-if="isExists(item.CostTypeList,'团费')">
+            <tr v-if="isExists(item.CostTypeList,'团费') || isExists(item.CostTypeList,'团款')">
               <td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td>
               <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
               <td>
@@ -429,7 +430,7 @@
             <th width="200">当前审核人</th>
           </tr>
           <template v-for="item in DataList.FiniceReciveList">
-            <tr v-if="NotExists(item.CostTypeList,'团费') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'小费收入')&& NotExists(item.CostTypeList,'自费收入')&& NotExists(item.CostTypeList,'佣金收入')&& item.OrderSource!==7">
+            <tr v-if="NotExists(item.CostTypeList,'团费') && NotExists(item.CostTypeList,'团款') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'小费收入') && NotExists(item.CostTypeList,'自费') && NotExists(item.CostTypeList,'佣金收入')&& item.OrderSource!==7">
               <td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td>
               <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
               <td>
@@ -1189,7 +1190,7 @@
         this.$router.push({
           name: path,
           query: {
-            id: id
+            id: id,blank: "y"
           }
         });
       },

src/components/dmc/manager/LeaderHander.vue

@@ -84,7 +84,7 @@
   .LH_contentDiv {
     width: 1000px;
     height: 1500px;
-    position: relative;
+    position: absolute;
     background-color: #fff;
     padding: 20px 10px;
   }
@@ -100,26 +100,34 @@
     top: 20px;
     right: 20px;
   }
+  @media print {
+    .LH_btnList,.nav{display:none;}
+  }
 </style>
 
 <template>
   <div class="LH_contentDiv" v-if="isShow" id="print">
     <div class="LH_btnList">
-      <input type="button" v-if="ishowBtn" @click="saveDelivery()" value="保存" class="normalBtn"/>
-      <input type="button" v-if="ishowBtn" value="打印" @click.prevent="doPrint" class="normalBtn"/>
+      <input type="button" @click="saveDelivery()" value="保存" class="normalBtn"/>
+      <input type="button" value="打印" @click.prevent="doPrint" class="normalBtn"/>
     </div>
     <table class="Lh_Toptable">
       <tr>
         <th class="Lh_title" colspan="9">印象之旅 领队/导游/送机交接单（日本线）</th>
       </tr>
+      <tr>
+        <td colspan="9">
+          <div style="float:left;">团名：</div>
+          <div style="float:left;width:95%;">{{sendReceiptData.Title}}</div>
+        </td>
+      </tr>
       <tr>
         <td width="300">
           团号：
           <el-input type="text" class="w160" v-model="sendReceiptData.TCNUM"/>
         </td>
         <td colspan="8">
-          团名：
-          <el-input type="text" class="w160" v-model="sendReceiptData.Title"/>
+          定团号：{{NewCombinationNum}}
         </td>
       </tr>
       <tr>
@@ -185,14 +193,14 @@
       </tr>
       <tr>
         <th width="180">项目</th>
-        <th width="50">操作</th>
-        <th width="50">领队</th>
+        <th width="60">操作</th>
+        <th width="60">领队</th>
         <th with="260">项目</th>
-        <th width="50">操作</th>
-        <th width="50">领队</th>
+        <th width="60">操作</th>
+        <th width="60">领队</th>
         <th width="160">项目</th>
-        <th width="50">操作</th>
-        <th width="50">领队</th>
+        <th width="60">操作</th>
+        <th width="60">领队</th>
       </tr>
       <tr>
         <td>
@@ -387,7 +395,8 @@
       return {
         isShow:false,
         sendReceiptData: "",
-        ishowBtn:true,
+        //定团号
+        NewCombinationNum:'',
       };
     },
     methods: {
@@ -402,6 +411,7 @@
           res => {
             if (res.data.resultCode == 1) {
               this.sendReceiptData = res.data.data;
+              console.log(this.sendReceiptData,'sssssssssssss');
               this.isShow=true;
             }
           },
@@ -424,24 +434,13 @@
           }
         );
       },
-      //打印
-      doPrint() {
-        this.ishowBtn=false;
-        setTimeout(this.getPrint,500);
-      },
-      getPrint(){
-        let subOutputRankPrint = document.getElementById("print");
-        let newContent = subOutputRankPrint.innerHTML;
-        let oldContent = document.body.innerHTML;
-        document.body.innerHTML = newContent;
+      doPrint(){
         window.print();
-        window.location.reload();
-        document.body.innerHTML = oldContent;
-        return false;
       },
     },
     mounted() {
       this.getLeaderGuideSendReceipt();
+      this.NewCombinationNum = this.$route.query.NewCombinationNum;
     }
   }
 </script>

src/components/dmc/manager/dmcTotalTable.vue

@@ -185,31 +185,31 @@
                 </div>
               </td>
               <td>
-                <div class="fz16 fbold linkspan" @click="goUrlT('LeaderHander',item.TCID,'领队交接表')">
+                <div class="fz16 fbold linkspan" @click="goUrlT('LeaderHander',item.TCID,outItem,'领队交接表')">
                   <span style="color: #4BCA81;" v-if="item.ResultReport.Associate==1">√</span>
                   <span class="colorE95252" v-else>{{item.ResultReport.Associate=='-1'?"x":"O"}}</span>
                 </div>
               </td>
               <td>
-                <div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderReimbursement',item,'用款计划')">
+                <div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderReimbursement',item,outItem,'用款计划')">
                   <span style="color: #4BCA81;" v-if="item.ResultReport.UseMoney==1">√</span>
                   <span class="colorE95252" v-else>{{item.ResultReport.UseMoney=='-1'?"x":"O"}}</span>
                 </div>
               </td>
               <td>
-                <div class="fz16 fbold linkspan" @click="goUrl('roomReservationsDetails',item,'订房详情')">
+                <div class="fz16 fbold linkspan" @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')">
                   <span style="color: #4BCA81;" v-if="item.ResultReport.HotelResult==1">√</span>
                   <span class="colorE95252" v-else>{{item.ResultReport.HotelResult=='-1'?"x":"O"}}</span>
                 </div>
               </td>
               <td>
-                <div class="fz16 fbold linkspan" @click="goUrl('admissionStatisticsDetails',item,'门票详情')">
+                <div class="fz16 fbold linkspan" @click="goUrl('admissionStatisticsDetails',item,outItem,'门票详情')">
                   <span style="color: #4BCA81;" v-if="item.ResultReport.TicketsResult==1">√</span>
                   <span class="colorE95252" v-else>{{item.ResultReport.TicketsResult=='-1'?"x":"O"}}</span>
                 </div>
               </td>
               <td>
-                <div class="fz16 fbold linkspan" @click="goUrl('bookDinnerStatisticsDetails',item,'餐厅详情')">
+                <div class="fz16 fbold linkspan" @click="goUrl('bookDinnerStatisticsDetails',item,outItem,'餐厅详情')">
                   <span style="color: #4BCA81;" v-if="item.ResultReport.FoodsResult==1">√</span>
                   <span class="colorE95252" v-else>{{item.ResultReport.FoodsResult=='-1'?"x":"O"}}</span>
                 </div>
@@ -221,7 +221,7 @@
                 </div>
               </td>
               <td>
-                <div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderPay',item,'领队报账')">
+                <div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderPay',item,outItem,'领队报账')">
                   <span style="color: #4BCA81;" v-if="item.ResultReport.LeaderIsApply==2">√</span>
                   <span class="colorE95252" v-else>{{item.ResultReport.LeaderIsApply=='0'?"x":"O"}}</span>
                 </div>
@@ -389,17 +389,18 @@
           }
         })
       },
-      goUrlT(path, obj, title) {
+      goUrlT(path, obj,outItem, title) {
         this.$router.push({
           name: path,
           query: {
             "id": obj,
+            NewCombinationNum:outItem.NewCombinationNum,
             blank: 'y',
             tab: title
           }
         })
       },
-      goUrl(path, obj, title) {
+      goUrl(path, obj,outItem, title) {
         this.$router.push({
           name: path,
           query: {
@@ -407,7 +408,7 @@
             'TCNUM': obj.TCNUMS,
             'flightTotal': obj.TotalSeat,
             'GuestNum': obj.CommonReport.HouseStatistics.RealityNum,
-            'NewCombinationNum': obj.NewCombinationNum,
+            'NewCombinationNum': outItem.NewCombinationNum,
             blank: 'y',
             tab: title
           }
@@ -426,11 +427,13 @@
           }
         })
       },
-      goUrlLeaderIsApply(path, obj, title) {
+      goUrlLeaderIsApply(path, obj,outItem, title) {
+        console.log(outItem,'outItem');
         this.$router.push({
           name: path,
           query: {
             "id": obj.TCIDS,
+            NewCombinationNum:outItem.NewCombinationNum,
             isUpdate: false,
             blank: 'y',
             tab: title
@@ -560,7 +563,6 @@
   }
 
   .dmcTotalTable tr td .pMsgStyle {
-    ;
     padding: 0 10px;
     line-height: 20px;
   }

src/components/newTravelmanager/TravelGroupControl/TravelConfig.vue

@@ -151,7 +151,7 @@
             <div class="Travel_ImgList clearfix">
               <div class="TFimgList" v-for="(item,index) in PostConfig.fileList" :key="item.subCode">
                 <img v-if="!item.Url" src="../../../assets/img/bg_c3@3x.png">
-                <img v-else :src="item.Url">
+                <img v-else :src=" item.Url">
                 <div class="TFIMGzhe">
                   <div class="TFreupload" @click="updateTFimg(index)">
                     <el-upload :file-list="PostConfig.fileList" :http-request="reUpload" :multiple="true"

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -209,9 +209,9 @@
           this.FeatureData.FeatureHtmlJson.d &&
           this.FeatureData.FeatureHtmlJson.d.length > 0
         ) {
-          // console.log("to do something");
+          //to do something
         } else {
-          // this.$set(this.FeatureData, "DayList", data);
+          //this.$set(this.FeatureData, "DayList", data);
           this.$refs.TravelFeature.setNewDate(data);
         }
       },
@@ -589,7 +589,6 @@
             res => {
               if (res.data.resultCode == 1) {
                 var tempData = res.data.data;
-                console.log("tempData",tempData);
                 if (tempData.Feature != null) {
                   this.FeatureData.ID = tempData.Feature.ID;
                   this.FeatureData.ConfigId = tempData.Feature.ConfigId;

src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature2.vue

@@ -1666,11 +1666,6 @@
     watch:{
       data:{
         handler: function (val, oldVal) {
-          // console.log(val.DayList.length);
-          // console.log(oldVal.DayList.length);
-          // if (val && (val.DayList.length !== oldVal.DayList.length)) {
-          //   console.log('ssss')
-          // }
         },
         deep: true
       }

src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue

@@ -1170,7 +1170,6 @@
     },
     methods: {
       DataComparison: function () {  // 数据对比
-        console.log("DataComparison")
         let newVal = this.newVal;
         let newRestaurantObj = {
           title:{
@@ -1201,14 +1200,9 @@
           deleteRestaurantHistory = [];
         //json 历史数据 jsonDelete 历史删除数据
         let json = this.FeatureData.FeatureHtmlJson ? JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) : '';
-        console.log(json)
         let jsonDelete = this.FeatureData.FeatureHtmlJsonDelete ? JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete)) : '';
-        // console.log("json",json)
-        // console.log("jsonDelete",jsonDelete)
         // 历史数据组装
-        // console.log("json",json)
         if (JSON.stringify(json) !== '{}' && json && json.hotelObj.list && json.hotelObj.list.length>0 && this.theFirstTime) {
-          // console.log("json.travelFeature2",json)
           this.jsonTravelFeature2 = json;
           newHtelObj = json.hotelObj;
           newViewSpotObj = json.viewSpotObj;
@@ -1238,9 +1232,6 @@
           })
           newRestaurantObj = restaurantObj;
         }
-        // console.log('1newViewSpotObj',newViewSpotObj)
-        // console.log('1restaurantObj',newRestaurantObj)
-        // console.log('1newHtelObj',newHtelObj)
         // 获取并组装历史删除数据
         if (jsonDelete && jsonDelete.length>0) {
           jsonDelete.forEach(x=>{
@@ -1264,23 +1255,18 @@
           newViewSpotObj.list.push(...viewSpotObj);
         }
         // 对比景点 newViewSpotObj this.viewSpotObj.list
-
         let DalateView = travelFeatureTwo.getArrDifference(newViewSpotObj.list, this.viewSpotObj.list);
         if (deleteViewSpotHistory.length>0) {
           DalateView.push(...deleteViewSpotHistory)
         }
-        // console.log("newViewSpotObj.list",newViewSpotObj.list)
         let VSobj = {};
-        console.log(this.viewSpotObj.list)
         let ov = JSON.parse(JSON.stringify(this.viewSpotObj))
         ov.list.push(...newViewSpotObj.list)
-        // newViewSpotObj.list.push(...this.viewSpotObj.list)  //1-24 因为保存后特色已更改的刷新后变为上一次保存结果,所以调换顺序进行测试
 
         ov.list = ov.list.reduce(function(item, next) {  //根据MD5Sign数组对象去重
           VSobj[next.MD5Sign] ? '' : VSobj[next.MD5Sign] = true && item.push(next);
           return item;
         }, []);
-        // console.log("newViewSpotObj.list",newViewSpotObj.list)
         DalateView.forEach((x, index)=>{  // 根据MD5Sign过滤删除数据
           ov.list.filter((val, vIndex)=>{
             if(x.MD5Sign === val.MD5Sign)
@@ -1298,7 +1284,6 @@
         let HTobj = {};
         let hv = JSON.parse(JSON.stringify(this.hotelObj))
         hv.list.push(...newHtelObj.list)
-        // newHtelObj.list.push(...this.hotelObj.list)
         hv.list = hv.list.reduce(function(item, next) {  //数组对象去重
           HTobj[next.MD5Sign] ? '' : HTobj[next.MD5Sign] = true && item.push(next);
           return item;
@@ -1320,8 +1305,6 @@
         let RTobj = {};
         let rv = JSON.parse(JSON.stringify(this.restaurantObj))
         rv.list.push(...newRestaurantObj.list)
-        console.log("rvrvrvrvrv",rv.list)
-        // newRestaurantObj.list.push(...this.restaurantObj.list)
         rv.list = rv.list.reduce(function(item, next) {  //数组对象去重
           RTobj[next.MD5Sign] ? '' : RTobj[next.MD5Sign] = true && item.push(next);
           return item;
@@ -1332,9 +1315,7 @@
               rv.list.splice(vIndex,1)
           })
         })
-        // console.log('2newViewSpotObj',newViewSpotObj)
-        // console.log('2restaurantObj',newRestaurantObj)
-        // console.log('2newHtelObj',newHtelObj)
+
         // 餐饮对比结束
         this.hotelObj.list = hv.list;
         this.viewSpotObj.list = ov.list;
@@ -1344,7 +1325,6 @@
         this.pageCount('restaurant');
         this.Refresh = false;
         this.RenderingOk = false;
-        // console.log(this.viewSpotObj.list)
         this.$forceUpdate()
       },
       UpDateInfo: function () {  // 防止组件改动一直渲染数据造成卡顿 添加点击更新视图
@@ -1363,9 +1343,6 @@
         let dataList = JSON.parse(JSON.stringify(this.FeatureData));
         let deleteDataList = JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete));
         this.deleteArray = !deleteDataList ? [] : deleteDataList;
-        // console.log("this.deleteArray", this.deleteArray)
-        // console.log("dataList",dataList,!this.$route.query.configId,dataList.switch4or5)
-        // console.log("this.$route.query.configId && this.FeatureData.FeatureType<4",this.$route.query.configId && this.FeatureData.FeatureType<4)  || (this.$route.query.configId && this.FeatureData.FeatureType<4)
         if (!this.$route.query.configId || (this.$route.query.configId && dataList.switch4or5) || (this.$route.query.configId && this.FeatureData.lastFeatureType)){
           for (let i = 0; i < dataList.DayList.length; i++) {  //组装数据
             let restaurantObj = travelFeatureTwo.DinnerInit(i, dataList.DayList) // 餐饮
@@ -1421,7 +1398,6 @@
           }
         }
         let json = this.FeatureData.FeatureHtmlJson ? JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) : '';
-        // console.log("jsonjsonjson",json)
         this.hotelObj.title = json.hotelObj ? json.hotelObj.title : this.hotelObj.title;
         this.restaurantObj.title = json.restaurantObj ? json.restaurantObj.title : this.restaurantObj.title;
         this.viewSpotObj.title = json.viewSpotObj ? json.viewSpotObj.title : this.viewSpotObj.title;
@@ -1868,7 +1844,6 @@
       },
       // 版块删除
       bolckToDelete: function (name, index1, index2) {
-        console.log(name, index1)
         let blockList = [];
         if (name === 'hotel') {
           blockList = this.hotelObj.list
@@ -1877,10 +1852,8 @@
         } else if (name === 'restaurant') {
           blockList = this.restaurantObj.list
         }
-        console.log(blockList)
         this.imgTopReset(name, index1, index2);
         this.deleteArray.push(blockList[index1]);
-        console.log("删除",blockList[index1])
         blockList.splice(index1,1);
         this.pageCount(name)
       },
@@ -1896,7 +1869,6 @@
           basicData:travelFeature2,
           deleteArray:this.deleteArray
         }
-        console.log(obj)
         return obj;
       },
       // 设置编辑状态
@@ -1924,17 +1896,13 @@
     watch:{
       FeatureData:{
         handler: function (val, oldVal) {
-          console.log('2019年2月12日10:53:11',oldVal)
-          console.log('2019年2月12日10:53:22',val)
           if (this.ReadOnly) return;
           if (val && this.oldVal != null) {
-            // console.log("watch_if_FeatureData",11111)
             this.newVal = JSON.parse(JSON.stringify(val));
             this.Refresh = true;
             this.theFirstTime = false
             return
           } else {
-            // console.log("watch_else_FeatureData",333)
             this.oldVal = JSON.parse(JSON.stringify(this.FeatureData));
             this.init()
           }

src/components/scenicSpot/admissionStatisticsDetails.vue

@@ -12,6 +12,7 @@
 			<table border="0" cellspacing="1" cellpadding="0" class="admissionStatisticsDetailsTalbe">
 				<tr>
 					<th width="120">公司团号</th>
+					<th width="120">定团号</th>
 					<th width="120">游览时间</th>
 					<th width="200">景点名称</th>
 					<th width="100">总人数</th>
@@ -30,6 +31,7 @@
 				</tr>
 				<tr v-for="(item,index) in list">
 					<td :rowspan="list.length" v-if="index==0"><div class="w120">{{TCNUM}}</div></td>
+					<td :rowspan="list.length" v-if="index==0"><div class="w120">{{NewCombinationNum}}</div></td>
 					<td>
 						<div class="w120">
 							{{item.UseTimeStr}}
@@ -146,7 +148,8 @@ export default {
         	roomList:[],
         	TCNUM:'',
         	flightTotal:0,
-        	GuestNum:0
+			GuestNum:0,
+			NewCombinationNum:''
         }
  	},
     methods: {
@@ -228,7 +231,8 @@ export default {
     mounted() {
         this.TCNUM=this.$route.query.TCNUM
         this.flightTotal=this.$route.query.flightTotal
-        this.GuestNum=this.$route.query.GuestNum
+		this.GuestNum=this.$route.query.GuestNum
+		this.NewCombinationNum = this.$route.query.NewCombinationNum
         this.getList()
     },
 }