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

src/assets/common/lang/zh.js

@@ -58,6 +58,8 @@ export const pub={
   NoPrice:'暂无报价',
   SR:'税入',
   SB:'税别',
+  ApplyYH:'申请优惠',
+  NowPrice:'订单当前单价',
 }
 
 export const login = {
@@ -2110,6 +2112,66 @@ export const salesModule={
   UpOrder:'修改订单',
   SingDNum:'单地接数量',
   JQRS:'拒签人数',
+  ETZCZS:'儿童占床增收',
+  ETBZCJM:'儿童不占床减免',
+  SSJE:'收损金额',
+  BabyPrice:'婴儿价',
+  UpdateRoom:'修改房型',
+  OPjinzhi:' OP已禁止修改订单信息，请联系OP修改备注',
+  AdultPeople:'审核人',
+  ApplyStatus:'付款状态',
+  DSDJ:'待收定金',
+  DSWK:'待收尾款',
+  BMLX:'报名类型',
+  Ypay:'应收款',
+  LJTC:'累计提成',
+  TCmoney:'提成金额',
+  Type:'类型',
+  QRH:'确认函',
+  Commission:'提成',
+  EWJLJE:'额外奖励金额',
+  EWKCJE:'额外扣除金额',
+  LYEWFY:'联运额外返佣',
+  RefuseQ:'拒签',
+  DJNUM:'单据号',
+  Time:'时间',
+  LookMore:'查看更多',
+  QRHXZ:'确认函下载',
+  UpdateYWY:'修改业务员',
+  OrderGroup:'订单转团',
+  LossSheet:'恢复收损单',
+  LossReceipt:'设为收损单',
+  ApplyInvoice:'申请发票',
+  ApplyPhoto:'申请照片',
+  OrderSured:'订单已确认,取消请联系OP',
+  LookTourse:'查看旅客调查',
+  Zhao:'照',
+  NoPhoto:'照片一人',
+  Fen:'份',
+  CancelOrder:"取消名单",
+  RoomInfo:'房间信息',
+  Docments:'单据',
+  GetContract:'领取合同',
+  ComplaintNum:'投诉单号',
+  Invoice:'发票单据',
+  EnterTnum:'请输入团号或团队编号',
+  DontDel:'不要删除',
+  NeedFen:'需要份数',
+  ZhuMeiren:'注：每人每份5元',
+  TourOrder:'跟团游订单',
+  OneDayOrder:'一日游订单',
+  PaymentStatus:'收款状态',
+  Collect:'收齐',
+  NoCollect:'未收齐',
+  AirNum:'机位数',
+  ScoreNUM:'评分',
+  ByProgram:'通过小程序确认单报名',
+  ByB2b:'通过B2B确认单报名',
+  CommissionNum:'提成',
+  Xu:'序',
+  AuditCompleted:'已完成审核',
+  Passport:'护照',
+  Age:'年龄',
 }
 
 
@@ -2339,6 +2401,37 @@ export const sm={
   xiaoshousl:'销售数量',
   fanhuishijain:'返回时间',
   qxzchulizt:'请选择处理状态',
+
+  company:'公司',
+  zonge:'总额',
+  youhuijine:'优惠金额',
+  daifukuan:'待付款',
+  ChName:'中文姓名',
+  EnName:'英文姓名',
+  email:'邮箱',
+  exitOrder:'取消订单',
+  exitsure:'取消确认',
+  exitType:'取消类型',
+  xingchengbghqx:'行程变更或取消',
+  chongfuOrder:'重复订单',
+  Priceyy:'价格原因',
+  gerenys:'个人因素',
+  jiaotongys:'交通因素',
+  exityy:'取消原因',
+  qxzqxlx:'请选择取消类型!',
+  qrhOrderbhzdqx:'确认后，订单不会自动取消',
+  qxhddhzdqx:'取消后，订单会自动取消',
+  quxiaocg:'取消成功',
+  
+  airbianma:'机票编码',
+  Date:'日期',
+  kerenshul:'客人数量',
+  tuikuanz:'退款中',
+  yituikaun:'已退款',
+  huzhaohaoma:'护照号码',
+  haizi:'孩子',
+  laoren:'老人',
+  nianlingType:'年龄类型',
 }
 
 import invoicesManager from './zhCN/invoicesManager'

src/components/BusExport.vue

@@ -70,7 +70,7 @@
             <tbody v-for="item in dataList">
                 <tr v-for="subItem in item.RBobj">
                     <td class="txLeft">{{subItem.BranchName}}</td>
-                    <td class="txLeft">{{subItem.TCNUM}}</td>
+                    <td class="txLeft">{{subItem.TCNUM}}({{subItem.TCID}})</td>
                     <td class="txRight">{{subItem.FrID}}</td>
                     <td class="txRight">{{subItem.CarDistribution}}</td>
                     <td class="txRight">{{subItem.sMoney}}</td>
@@ -123,7 +123,7 @@
             </tr>  
             <tr v-for="subItem in item.RBobj">
                 <td class="txLeft">{{subItem.BranchName}}</td>
-                <td class="txLeft">{{subItem.TCNUM}}</td>
+                <td class="txLeft">{{subItem.TCNUM}}({{subItem.TCID}})</td>
                 <td class="txRight">{{subItem.FrID}}</td>
                 <td class="txRight">{{subItem.CarDistribution}}</td>
                 <td class="txRight">{{subItem.sMoney}}</td>

src/components/Contract/TravelContract.vue

@@ -1265,7 +1265,8 @@
         }
         var msg = {
           configId: 0,
-          tcid: nTCID
+          tcid: nTCID,
+          isClick:1//不算统计
         };
         if (id !== undefined) {
           //根据ID 获取行程内容

src/components/SalesconfirmationOrder.vue

@@ -1029,7 +1029,8 @@
           configId: this.$route.query.configId,
           cityId: this.$route.query.cityId,
           tcid: this.$route.query.tcid,
-          orderId: this.$route.query.orderId
+          orderId: this.$route.query.orderId,
+          isClick:1//不算统计
         }, res => {
           if (res.data.resultCode == 1) {
             let data = (res.data.data);

src/components/TravelContractDetail.vue

@@ -1022,7 +1022,8 @@
         }
         var msg = {
           configId: 0,
-          tcid: nTCID
+          tcid: nTCID,
+          isClick:1//不算统计
         };
         if (id !== undefined) {
           //根据ID 获取行程内容

src/components/TravelContractNew.vue

@@ -1885,7 +1885,8 @@
         }
         var msg = {
           configId: 0,
-          tcid: nTCID
+          tcid: nTCID,
+          isClick:1//不算统计
         };
         if (id !== undefined) {
           //根据ID 获取行程内容

src/components/TravelControlTrip.vue

@@ -553,7 +553,8 @@
           configId: this.$route.query.id,
           cityId: this.$route.query.cityId,
           tcid: this.$route.query.tcid,
-          orderId: this.$route.query.orderId
+          orderId: this.$route.query.orderId,
+          isClick:1//不算统计
         }, res => {
           if (res.data.resultCode == 1) {
             let data = (res.data.data);

src/components/TravelManager/TravelList/OpTripList.vue

@@ -371,6 +371,7 @@
             vshowL: false,
             vshowM: false,
             vshowTCNUM: true,
+            isClick:1,//不计算点击
           }
         })
         window.open(routeData.href, '_blank')

src/components/TravelManager/TravelList/RegistrationStatistics_Sale.vue

@@ -43,8 +43,8 @@
       <ul>
         <li>
           <span>
-            <em>公司</em>
-            <el-select class="w150" filterable placeholder="公司" v-model="queryMsg.OutBranchId">
+            <em>{{$t('system.table_company')}}</em>
+            <el-select class="w150" filterable :placeholder="$t('system.table_company')" v-model="queryMsg.OutBranchId">
               <el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue2'></el-option>
               <el-option v-for='item in queryCommonData.BranchList' :key="item.Id" :label="item.BName" :value="item.Id">
               </el-option>
@@ -53,7 +53,7 @@
         </li>
         <li>
           <span>
-            <em>线路</em>
+            <em>{{$t('advmanager.v_line')}}</em>
             <el-select class='w150' v-model="queryMsg.LineID" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()">
               <el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
               <el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
@@ -63,7 +63,7 @@
         </li>
         <li>
           <span>
-            <em>系列</em>
+            <em>{{$t('advmanager.v_xilie')}}</em>
             <el-select class='w150' v-model="queryMsg.ltID" filterable :placeholder="$t('pub.pleaseSel')">
               <el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
               <el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
@@ -73,7 +73,7 @@
         </li>
         <li>
           <span>
-            <em>团期</em>
+            <em>{{$t('fnc.tuanqi')}}</em>
             <el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder="" v-model="queryMsg.QStartDate">
             </el-date-picker>
             <el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder="" v-model="queryMsg.QEndDate">
@@ -81,26 +81,26 @@
           </span>
         </li>
         <li>
-          <input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" /> &nbsp;
-          <button class="hollowFixedBtn" @click="DownLoadFile()">下载</button>
+          <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" /> &nbsp;
+          <button class="hollowFixedBtn" @click="DownLoadFile()">{{$t('adm.adm_download')}}</button>
         </li>
       </ul>
     </div>
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='queryCommonData.loading'>
       <tr>
-        <th width="50">序</th>
-        <th width="80">出团</th>
-        <th width='200'>团名</th>
-        <th width="80">团期</th>
-        <th width="80">进出点</th>
-        <th width="100">抵离时间</th>
-        <th width="50">价格</th>
-        <th width="100">机位</th>
-        <th width="80">报名</th>
-        <th width="80">收订人数</th>
-        <th width="100">领队</th>
-        <th width="100">导游</th>
-        <th>备注</th>
+        <th width="50">{{$t('salesModule.Xu')}}</th>
+        <th width="80">{{$t('Operation.Op_chutuan')}}</th>
+        <th width='200'>{{$t('Operation.Op_TeamName')}}</th>
+        <th width="80">{{$t('fnc.tuanqi')}}</th>
+        <th width="80">{{$t('Operation.Op_jinchudian')}}</th>
+        <th width="100">{{$t('Operation.Op_ArriveTime')}}</th>
+        <th width="50">{{$t('Operation.Op_price')}}</th>
+        <th width="100">{{$t('Airticket.Air_reservation')}}</th>
+        <th width="80">{{$t('Operation.Op_signUp')}}</th>
+        <th width="80">{{$t('Operation.Op_orderNum')}}</th>
+        <th width="100">{{$t('leader.leader_Leader')}}</th>
+        <th width="100">{{$t('leader.leader_Guide')}}</th>
+        <th>{{$t('pub.pubRemark')}}</th>
       </tr>
       <tbody v-for="item in DataList">
         <tr>
@@ -127,7 +127,7 @@
       </tbody>
     </table>
 
-    <div class="noDataNotice" v-if="DataList.length<1"><i class="iconfont icon-kong"></i> <p>没有找到你需要的数据</p></div>
+    <div class="noDataNotice" v-if="DataList.length<1"><i class="iconfont icon-kong"></i> <p>{{$t('active.ld_noData')}}</p></div>
     <div v-if="DataList.length>0">
       <el-pagination
         background

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -860,7 +860,7 @@
                 <div class="TCL_Content">{{item.DMCNum}}</div>
               </div>
               <div class="clearfix TCL-redType"
-                v-if="item.DmcRemarkLast ||  item.HotelDiningBus.HotelChangeState>0 || item.HotelDiningBus.DiningChangeState>0 || item.HotelDiningBus.ResultBusTypeStr!='' ">
+                v-if="(item.DmcRemarkLast&&item.DmcRemarkLast.DMCRemark!='') ||  item.HotelDiningBus.HotelChangeState>0 || item.HotelDiningBus.DiningChangeState>0 || item.HotelDiningBus.ResultBusTypeStr!='' ">
                 <div class="TCL_remarkTitle">{{$t('Operation.Op_dijieRemark')}}：</div>
                 <div class="TCL_Content">{{item.DmcRemarkLast!=null? item.DmcRemarkLast.DMCRemark:''}}
                   <a v-if="item.HotelDiningBus.HotelChangeState>0" @click="goHotelDiningBus(item,item.HotelDiningBus,1)"
@@ -1547,6 +1547,7 @@
             vshowL: false,
             vshowM: false,
             vshowTCNUM: true,
+            isClick:1,//不计算点击
           }
         })
         window.open(routeData.href, '_blank')

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -1112,6 +1112,7 @@
             vshowL: false,
             vshowM: false,
             vshowTCNUM: true,
+            isClick:1,//不计算点击
           }
         })
         window.open(routeData.href, '_blank')

src/components/administrative/ClausesOrder.vue

@@ -7,13 +7,13 @@
 </style>
 <template>
   <div class="flexOne">
-    <!-- <div class="query-box">
+    <div class="query-box">
       <ul>
         <li>
-            <input type="button" class="normalBtn" @click="generateTable" value="生成提成报表"/>
+               <input type="button" class="normalBtn" value="订单信息下载" @click="exportExcel()">
         </li>
       </ul>
-    </div> -->
+    </div>
     <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
       <tr>
         <th>订单号</th>
@@ -78,6 +78,14 @@
           }
         });
       },
+      exportExcel() {
+        //导出报表
+        let msgexport = {
+         StartDate:this.$route.query.StartDate
+        };
+        var fileName =  "【" + this.$route.query.StartDate + "订单信息.xls";
+        this.GetLocalFile("OPCommission_GetCommissionOrderExport", msgexport, fileName);
+      },
       //获取数据
       getList() {
         this.loading = true;

src/components/administrative/empBankAccount.vue

@@ -89,7 +89,7 @@
 					<br/>{{item.AccountHolder}}</td>
 				<td>
 					<span v-if='item.Status!=0' style="color: #E95252;">{{$t('pub.fressSel')}}</span>
-					<span v-if='item.Status==0' style="color: #09D49D;">{{$t(pub.normalSel)}}</span>
+					<span v-if='item.Status==0' style="color: #09D49D;">{{$t('pub.normalSel')}}</span>
 				</td>
 				<td style="color: #FF9C00;">￥{{moneyFormat(item.PayMoney)}}</td>
 				<td class="empBankAccountIcon">

src/components/clientConfirm.vue

@@ -1678,7 +1678,8 @@
         }
         var msg = {
           configId: 0,
-          tcid: nTCID
+          tcid: nTCID,
+          isClick:1//不算统计
         };
         if (id !== undefined) {
           //根据ID 获取行程内容

src/components/commonPage/commonTeamInfo.vue

@@ -67,7 +67,8 @@
         }
         var msg = {
           configId: id,
-          tcid: nTCID
+          tcid: nTCID,
+          isClick:1//不算统计
         };
         if (id !== undefined) {
           //根据ID 获取行程内容

src/components/confirmationOrderDownLoad - 副本.vue

@@ -955,7 +955,8 @@
           configId: this.$route.query.configId,
           cityId: this.$route.query.cityId,
           tcid: this.$route.query.tcid,
-          orderId: this.$route.query.orderId
+          orderId: this.$route.query.orderId,
+          isClick:1//不算统计
         }, res => {
           if (res.data.resultCode == 1) {
             let data = (res.data.data);

src/components/confirmationOrderDownLoad.vue

@@ -40,6 +40,7 @@
           <el-option label="邂逅北海道的雪" :value="-4"></el-option>
           <el-option label="日本趣味滑雪乐" :value="-5"></el-option>
           <el-option label="湄公之畔，悠哉老挝" :value="-6"></el-option>
+          <el-option label="印象日本·严选酒店<舒适体验·品质服务>" :value="-7"></el-option>
           <el-option
             v-for="item in titleList"
             :key="item.subCode"
@@ -712,6 +713,7 @@
         orderTripdiff: {},
         title: '',
         isDirect: 1, //是否是直采 0：否，1：是
+        isClick: this.$route.query.isClick === undefined ? 0 : 1//不算统计
       }
     },
     mounted() {
@@ -746,6 +748,10 @@
         if(this.Typevalue==-6){
           title+="湄公之畔，悠哉老挝"
         }
+        if(this.Typevalue==-7){
+          title+="印象日本·严选酒店<舒适体验·品质服务>"
+        }
+
         if(this.Typevalue>0){
           this.titleList.forEach(item=>{
             if(item.id==this.Typevalue){
@@ -802,6 +808,9 @@
        else if(this.Typevalue==-6){
           window.open("http://www.oytour.com/#/Laowo");
         }
+      else if(this.Typevalue==-7){
+          window.open("http://www.oytour.com/#/JapanHotel");
+        }
         else{
           window.open("http://www.oytour.com/#/JuanDetails?id="+this.Typevalue);
         }
@@ -1222,7 +1231,8 @@
           configId: this.$route.query.configId,
           cityId: this.$route.query.cityId,
           tcid: this.$route.query.tcid,
-          orderId: this.$route.query.orderId
+          orderId: this.$route.query.orderId,
+          isClick:this.isClick//不算统计
         }, res => {
           if (res.data.resultCode == 1) {
             let data = (res.data.data);

src/components/dmc/manager/tripsManager.vue

@@ -470,7 +470,7 @@
           </li>
         </ul>
       </div>
-      <table class="TravelControlListTable TravelQueryList">
+      <table class="TravelControlListTable TravelQueryList" v-loading="loading">
         <tbody v-for="(outItem,i) in queryCommonData.dataList" :key="i">
           <template v-for="(item,index) in outItem.TravelPriceList">
             <tr height="40">
@@ -624,6 +624,7 @@
           //分公司列表
           BranchList: [],
         },
+        loading: false,
         //查询参数
         queryMsg: {
           pageIndex: 1,
@@ -752,10 +753,13 @@
       },
       //新获取列表数据
       getControlList() {
+        this.loading = true;
+        this.queryCommonData.dataList = [];
         this.apipost(
           "travel_get_GetUniteDmcPageList",
           this.queryMsg,
           res => {
+            this.loading = false;
             if (res.data.resultCode == 1) {
               this.queryMsg.total = res.data.data.count;
               this.queryMsg.noData = !this.queryMsg.total > 0;