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

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -1786,7 +1786,7 @@
             name: 'TradeTicketDetails',
             query: {
               PeriodId: GetDetail.ReFinanceId,
-              RB_Branch_Id: GetDetail.RB_Branch_Id,
+              OutBranchId: GetDetail.RB_Branch_Id,
               blank: "y",
               tab: "同业提成详情"
             }

src/components/FinancialModule/ImpressionTicketCommissionConfiguration.vue

@@ -26,6 +26,7 @@
           <tr>
             <th width="100" style="min-width: 100px;max-width: 100px;">方案名称</th>
             <th width="100%" class="left-text-indent">提成人员</th>
+            <th width="240" style="min-width: 240px;max-width: 240px;">公司所有国内出发线路(单团.散拚)</th>
             <th width="150" style="min-width: 150px;max-width: 150px;">创建时间</th>
             <th width="150" style="min-width: 150px;max-width: 150px;">操作</th>
           </tr>
@@ -47,6 +48,11 @@
                 <el-button slot="reference" style="border: none;" type="text">查看更多</el-button>
               </el-popover>
             </td>
+            <td>
+              <span>
+                {{item.SalesRate}}%
+              </span>
+            </td>
             <td style="padding: 0 10px;">
               <span>
                 {{item.UpdateTime}}
@@ -134,17 +140,24 @@
     </template>
     <el-dialog :title="titleName" :visible.sync="ruleVisible" width="750px" @close="resetForm('form')">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <div class="ImpressionTicketing-msgbox bottom0">
+        <div class="ImpressionTicketing-msgboxtop">
           <el-form-item label="规则名称" prop="Name">
             <el-input v-model="form.Name" clearable></el-input>
           </el-form-item>
           <el-form-item label="人员" prop="EmployeeId">
             <el-select class="multiple_input" filterable multiple v-model="form.EmployeeId"
-            @change="personnel">
+            @change="personnel" collapse-tags>
               <el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
                 :key="item.EmployeeId"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="销售额" prop="SalesRate">
+            <div class="Impression-ratio-box">
+              <el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999" 
+            v-model="form.SalesRate"></el-input>
+              <span class="Impression-ratio-right">%</span>
+            </div>
+          </el-form-item>
         </div>
         <el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px">
           <p class="ImpressionTicketing-title">基本工资({{msg.EmpType==1?'自然季度平均利润业绩金额':'自然季度平均引流条数'}})</p>
@@ -351,6 +364,11 @@
             message: "请输入限制",
             trigger: "blur"
           }],
+          SalesRate: [{
+            required: true,
+            message: "请输入销售额",
+            trigger: "blur"
+          }],
         },
         EmpList:[//参与人
             {EmployeeId:''}
@@ -379,6 +397,7 @@
           Name:'',//规则名称
           EmpType:'',//类型 1销售 2引流
           EmployeeId:'',
+          SalesRate: null,
           EmpList:[//参与人
             {EmployeeId:''}
           ],
@@ -549,6 +568,7 @@
           Id:item.Id,
           Name:item.Name,//规则名称
           EmpType:item.EmpType,//类型 1销售 2引流
+          SalesRate:item.SalesRate,
           EmployeeId:item.EmpList.map(x=>x.EmployeeId),
           EmpList:list,
           WageRateList:item.WageRateList,
@@ -585,6 +605,7 @@
               Id:this.form.Id,
               Name:this.form.Name,//规则名称
               EmpType:this.form.EmpType,//类型 1销售 2引流
+              SalesRate:this.form.SalesRate,
               EmpList:this.form.EmpList,
               WageRateList:this.form.WageRateList,
               CommissionRateList:this.form.CommissionRateList,
@@ -721,6 +742,11 @@
     padding: 10px 20px 20px 20px;
     box-shadow: 0 1px 8px rgb(0 0 0 / 20%), 0 3px 4px rgb(0 0 0 / 14%), 0 3px 3px -2px rgb(0 0 0 / 12%);
   }
+  .ImpressionTicketing-msgboxtop{
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+  }
   .ImpressionTicketing-msgbox{
     display: flex;
     flex-direction: row;

src/components/FinancialModule/TradeCommission/TicketCommission.vue

@@ -95,7 +95,7 @@
                             icon="iconfont icon-chakan" circle></el-button>
                     </el-tooltip>
                     <el-tooltip v-if="cMaker==true" class="item" effect="dark" content="提成制单" placement="top">
-                        <el-button @click="YijianZD(item,1)" type="danger" class="CM_look" v-if="cMaker==true"
+                        <el-button @click="YijianZD(item)" type="danger" class="CM_look" v-if="cMaker==true"
                             icon="iconfont icon-mui-icon-add" circle></el-button>
                     </el-tooltip>
                     <!-- <el-tooltip class="item" effect="dark" content="当期利润" placement="top">
@@ -231,24 +231,15 @@
                 );
             },
             // 点击制单
-            YijianZD(item,type) {
+            YijianZD(item) {
                 let Money 
                 if(this.msg.OutBranchId>-1){
-                    if(type==1){
-                        if(item.BranchCommission>0){
+                    if(item.BranchCommission>0){
                             Money=item.BranchCommission
                         }else{
                             this.Error("公司提成为0,不能制单!")
                             return;
                         }
-                    }if(type==2){
-                        if(item.BranchCommission>0){
-                            Money=item.BranchCommission
-                        }else{
-                            this.Error("公司提成为0,不能制单!")
-                            return;
-                        }
-                    }
                     
                 }else{
                     Money=item.SumPrice
@@ -260,6 +251,7 @@
                         XSTC: 1,
                         OtherType:72,
                         ReFinanceId:item.Id,
+                        isRB_Branch_Id: true
                     }
                     let query = {
                         blank: "y",

src/components/FinancialModule/TradeCommission/TicketDetails.vue

@@ -278,13 +278,14 @@
         }
         this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):-1
         this.msg.OrderId = this.$route.query.OrderId?this.$route.query.OrderId:''
+        this.msg.OutBranchId = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1
         this.msg.RB_Branch_Id = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
         this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId) 
         if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1
             ||ActionMenuCode.indexOf('S_CheckAllOrder')!=-1
             ||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1) {//是否有看所有人的权限
                 this.disabled = false;
-                this.msg.OutBranchId = -1
+                this.msg.OutBranchId = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1
                 this.msg.RB_Branch_Id = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):-1
                 // this.msg.RB_Department_Id = -1
                 this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):-1

src/components/FinancialModule/TradeCommission/TicketUserDetails.vue

@@ -193,7 +193,7 @@
         </div>
         <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
             <tr>
-                <th>所属公司</th>
+                <th>公司</th>
                 <th>部门</th>
                 <th>员工姓名</th>
                 <th>日本线及其他人数</th>
@@ -333,57 +333,6 @@
                         this.companyList=res.data.data;
                     }else{}
                 },err=>{})
-            },	
-            clickUrl(item,type){
-                if(type==2){//线索
-                    this.clueManagement(item)
-                }else{//当月利润成交订单
-                    this.planeTicketOrder(item)
-                }
-            },
-            // crm核算统计
-            planeTicketOrder(item){
-                let data = [
-                    {
-                        path: "planeTicketOrder",
-                        EmpType: item.EmpType,
-                        PeriodId: item.Month,
-                        EmName: item.EmName,
-                        EmpId: item.EmpId,
-                    },
-                ];
-              let href = this.domainManager().crmRoutingUrl +
-                "automaticLogin?token=" +
-                this.getLocalStorage().token +
-                "&data=" +
-                JSON.stringify(data);
-                window.open(href);
-            },
-            // crm线索
-            clueManagement(item){
-                let data = [
-                    {
-                        path: "clueManagement",
-                        EmpType: item.EmpType,
-                        PeriodId: item.Month,
-                        EmName: item.EmName,
-                        EmpId: item.EmpId,
-                    },
-                ];
-              let href = this.domainManager().crmRoutingUrl +
-                "automaticLogin?token=" +
-                this.getLocalStorage().token +
-                "&data=" +
-                JSON.stringify(data);
-                window.open(href);
-            },
-            // 获取员工生成比例
-            GenerateScale(item){
-                if(!item.WageReId){
-                    return
-                }
-                this.objNew = item
-                this.outerVisible = true
             },
             GetCommissionPeroidsList() { //期数下拉
                 this.apipost(
@@ -428,7 +377,7 @@
                     path: path,
                     query: {
                         PeriodId: this.$route.query.PeriodId,
-                        RB_Branch_Id: item.RB_Branch_Id,
+                        OutBranchId: item.RB_Branch_Id,
                         UserId: item.UserId,  
                         blank: 'y',
                         tab: '同业提现详情'

src/components/FinancialModule/addFinancialDocuments.vue

@@ -171,7 +171,7 @@
                    (<el-select  filterable  v-model='msg.RB_Branch_Id'  ref='CostTypeId' 
                    @change="admin_get_DepartmentGetList(msg.RB_Branch_Id)"  
                    class="w120 _border_b_1"
-                   :disabled="orderObj&&orderObj.Rate?true:false">
+                   :disabled="orderObj&&(orderObj.Rate||orderObj.isRB_Branch_Id)?true:false">
                            <el-option v-for='item in companyList'
                                :label='item.BName'
                                :value='item.Id'

src/components/Hotel/singleProduct/HotelOrder.vue

-<style>
-    
-
-  </style>
-
   <template>
     <div>
         <HotelOrderList :pagesTitle="pagesTitle"></HotelOrderList>

src/components/Hotel/singleProduct/HotelOrderOP.vue

-<style>
-    .HotelWorkList .has-gutter tr th,
-    .el-table th.is-leaf {
-      background-color: #EAEAEA !important;
-    }
-
-    .HotelWorkList .HW_hotelDialog {
-      width: 900px;
-    }
-
-    .HotelWorkList .Hw_tableOne {
-      width: 100%;
-      height: 40px;
-      background-color: #EAEAEA;
-    }
-
-    .HotelWorkList .Hw_tableOne th {
-      text-align: center;
-    }
-
-    .HotelWorkList .HotelWorkInput .el-input {
-      width: 223px;
-    }
-
-    .HotelWorkList .HworkInput .el-input {
-      width: 110px;
-    }
-
-  </style>
-
   <template>
     <div>
         <HotelOrderList :pagesTitle="pagesTitle"></HotelOrderList>

src/components/SingleAirTicket/components/OrderList.vue

@@ -510,7 +510,7 @@
               </div>
             </div>
             <div class="c9e fz12">
-              <span>客人信息：{{ item.GuestName }}/{{ item.MobilePhone }}</span>
+              <span>客人信息：{{ item.GuestName }}<template v-if="item.MobilePhone">/{{ item.MobilePhone }}</template> </span>
             </div>
             <div class="row c9e fz12">
               <span class="mr" v-if="item.LureEmpName">引流人：{{ item.CreateByName }}</span>
@@ -603,7 +603,7 @@
                     <span :class="{'cF1416C':scope.row.DueinMoney>0}">{{ scope.row.DueinMoney }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column v-if="item.commissionMoney&&item.commissionMoney>0" label="提成" style="background:#EAEAEA">
+                <el-table-column v-if="item.SellCommission&&item.SellCommission>0" label="提成" style="background:#EAEAEA">
                   <template slot-scope="scope">
                     <commissionDialog :objNew="scope.row"></commissionDialog>
                   </template>

src/components/SingleAirTicket/components/TicketOrder.vue

@@ -58,7 +58,7 @@
             <em>{{$t('OrderList.search.status')}}</em>
             <el-select v-model="msg.OrderStatus" class="w200 HworkInput">
               <el-option :key="0" :value="0" :label="$t('OrderList.orderStatus.normal')"></el-option>
-              <el-option v-for="item in OrderStatusType" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
+              <el-option v-for="item in OrderStatusList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
             </el-select>
           </span>
         </li>
@@ -698,7 +698,7 @@
         this.getEmployee()
       }
       this.msg.StartTime = this.getBeforeDate(31, new Date())
-      this.msg.EndTime = this.$calendarUtils.formatDate(new Date(), "YYYY-MM-dd", 0)
+      this.msg.EndTime = this.getBeforeDate(0,new Date().Format("yyyy-MM-dd"))
       this.DatelistBM = [new Date(this.msg.StartTime), new Date()]
       this.GetOrderStatusEnumList()
       this.GetTicketStatusEnumList()

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -317,11 +317,61 @@
 
           </el-row>
         </div>
-        <div style="font-size: 15px;margin-top: 10px;"
-        v-if="auditCoun>0">当前有<span style="color: red;margin: 0 2px;">{{auditCoun}}</span>条数据不计入利润</div>
+        
       </div>
       
       <div class="Team_collection" v-loading="loading">
+        <div class="clearfix TB_PrintDiv">
+          <div style="font-size: 15px;margin-top: 10px;"
+          v-if="auditCoun>0">当前有<span style="color: red;margin: 0 2px;">{{auditCoun}}</span>条数据不计入利润</div>
+          <div class="TB_comtitle TB-Title">驳回：
+          </div>
+        </div>
+        <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
+          <tr>
+            <th width="180">单号</th>
+            <th width="200">费用类型</th>
+            <th width="500">交易明细</th>
+            <th width="300">金额</th>
+            <th width="200">交易日期</th>
+            <th width="250">制单人员</th>
+            <th width='180'>审核状态</th>
+            <th width="200">当前审核人</th>
+          </tr>
+          <template v-for="item in auditList">
+            <tr
+              v-if="NotExists(item.CostTypeList,'领队奖励金')&&NotExists(item.CostTypeList,'机票折让费')&&NotExists(item.CostTypeList,'签证费')&&NotExists(item.CostTypeList,'签证佣金') && NotExists(item.CostTypeList,'地接费（领取）') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'名单表费') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 &&  NotExists(item.CostTypeList,'国际段机票')  && NotExists(item.CostTypeList,'机票退税') && NotExists(item.CostTypeList,'机票罚金') && NotExists(item.CostTypeList,'机票税金') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿') && NotExists(item.CostTypeList,'保险费') && NotExists(item.CostTypeList,'旅游责任险')&& NotExists(item.CostTypeList,'团队保险')">
+              <td>
+                <!-- <el-checkbox v-model="item.checked"></el-checkbox> -->
+                <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}}<br /></span></td>
+              <td>
+                <div class="Team_ComCoin" v-for="childItem in item.TradeWayList">
+                  支付方式：{{childItem.Alias}}&nbsp;币种：{{childItem.CurrencyName}}
+                  <span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
+                  <span class="TB_Rate">汇率 {{childItem.Rate}}</span>
+                </div>
+              </td>
+              <td style="font-size:14px;">
+                应付：{{item.Money}}<br />
+                实付：{{item.PayMoney}}
+              </td>
+              <td>{{item.TradeDate}}</td>
+              <td>
+                <div>{{item.EmName}}</div>
+                <div class="Team_btmDiv">{{item.CreateDate}}</div>
+              </td>
+              <td>{{item.StatusStr}}</td>
+              <td>
+                <div v-for="AuditItem in item.AuditList">
+                  {{AuditItem.EmName}}
+                  <span class="TB_Rate">{{AuditItem.AuditDate}}</span>
+                </div>
+              </td>
+            </tr>
+          </template>
+        </table>
         <div class="clearfix TB_PrintDiv">
           <div class="TB_comtitle TB-Title">收入</div>
           <template v-if="IsHaveAuth">
@@ -1542,6 +1592,7 @@
   export default {
     data() {
       return {
+        auditList: [],
         auditCoun:0,
         ticketList:[],
         tipdialog:false,
@@ -1692,6 +1743,7 @@
           this.apipost('Financial_post_GetALLPageList',msg,res=>{
                 if(res.data.resultCode == 1) {
                   let data = res.data.data.pageData.list;
+                  this.auditList = data
                   this.auditCoun = res.data.data.count;
                     
                 }else{

src/router/config.js

@@ -2382,11 +2382,11 @@ export default {
               },
             },
             {
-              path: '/oneDayTrip', //一日游
+              path: '/oneDayTrip', //当地游团控列表
               name: 'oneDayTrip',
               component: resolve => require(['@/components/TravelManager/TravelList/oneDayTrip'], resolve),
               meta: {
-                title: '一日游'
+                title: '当地游团控列表'
               },
             },
             {
@@ -2452,7 +2452,7 @@ export default {
               name: 'oneDayTripList',
               component: resolve => require(['@/components/TravelManager/TravelList/oneDayTripList'], resolve),
               meta: {
-                title: '一日游行程列表'
+                title: '当地游行程列表'
               },
             }, { //行程列表
               path: '/SaleTripList',