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

src/components/FinancialModule/BasicDocuments.vue

@@ -328,7 +328,7 @@
                 
                 <p>附加说明：<span class="fr" v-if="GetDetail.ComplainID > 0" @click="goUrl('ComplaintsDetail', GetDetail.ComplainID,GetDetail.OrderID)"> <span style="color:#000">投诉单号：</span> 
                  <span class="cursorpointer text-decoration">{{GetDetail.ComplainID}}</span></span>
-                <span v-if="GetDetail.TemplateId==28 || GetDetail.TemplateId==30" @click="Gourl" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
+                <span v-if="GetDetail.TemplateId==28 || GetDetail.TemplateId==30" @click="Gourl(GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
                 <span v-if="CostTypeState" @click="GourlCostType('VisitRecord',1)" style="margin:0 10px;cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">拜访记录</span>
                 <span v-if="CostTypeState" @click="GourlCostType('yingyanMap',2)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">鹰眼轨迹</span>
                  </p>
@@ -1507,16 +1507,17 @@ export default {
             
 
             },
-        Gourl(){
+        Gourl(GetDetail){
             this.$router.push({
-                name: 'CommissionManagement',
+                name: 'CommissionDetail',
                 query: { 
+                    periods:GetDetail.Periods,
+                    companyID:GetDetail.RB_Branch_Id,
                     blank: "y", 
-                    tab: "提成管理" 
+                    tab: "提成详情" 
                 }
             });
-
-            },
+        },
         // 单选计算
         checkdIteam(item){
             if (item.checked) {

src/components/LeaderManagement/leaderStateDetails.vue

@@ -160,51 +160,28 @@
           <img v-if="!EmPhoto" src="../../assets/img/default_head_img.jpg" alt="">
           <img v-else :src="EmPhoto" :onerror="defaultImg">
         </div>
-        <span class="leaderName">{{LeaderName}}</span>
-        <!-- <span class="jixiao" v-if="msg.Type==2"><i class="iconfont icon-money"></i>本月绩效￥<span
-            class="totalNum">{{totalSum}}</span></span>
-        <span class="jixiao" v-else-if="msg.Type==3"><i class="iconfont icon-money"></i>本年绩效￥<span
-            class="totalNum">{{totalSum}}</span></span>
-        <span class="jixiao" v-else><i class="iconfont icon-money"></i>总绩效￥<span
-            class="totalNum">{{totalSum}}</span></span> -->
+        <span class="leaderName">{{LeaderName}} &nbsp;&nbsp;总提成:<span style="color:red;">&nbsp;{{totalSum}}</span></span>
       </div>
-      <input type="button" class="hollowFixedBtn backBtn" @click="goUrl('guideManagement')" :value="$t('pub.returnBack')" />
-      <!-- <input type="button" class="normalBtn backBtn" @click="showStatis(1)" v-if="isShow==false" value="绩效走势" />
-      <input type="button" class="normalBtn backBtn" @click="showStatis(2)" v-else value="列表" /> -->
-    </div>
-    <div class="mainInfo" :class="{'hidDiv':isShow}" v-loading="loading">
-      <div class="infoTitle">
-        <span>{{$t('ground.gouwudian')}}</span>
-        <span>{{$t('ground.jindianriqi')}}</span>
-        <span>{{$t('ground.guanliantuanhao')}}</span>
-        <span>{{$t('ground.zongjiaoyie')}}</span>
-        <span>{{$t('ground.lvxingshetc')}}</span>
-        <span>{{$t('ground.daoyouticheng')}}</span>
-        <span>{{$t('ground.lingduiticheng')}}</span>
-        <span>{{$t('hotel.hotel_CurrentRate')}}</span>
-      </div>
-      <div class="listInfo" v-for="item in DataList" :key="item.subCode">
-        <span style="width:200px;">{{item.ShopName}}</span>
-        <span>{{item.StoreTime}}</span>
-        <span>{{item.TCNUM}}({{item.TCID}})</span>
-        <span class="totalPrice">
-          ￥{{item.TotalMoney}}
-        </span>
-        <span class="totalPrice">
-         ￥{{item.CompanyCommission}}
-        </span>
-        <span class="totalPrice">
-          ￥{{item.GuideCommission}}
-        </span>
-        <span class="totalPrice">
-          ￥{{item.LeaderCommission}}
-        </span>
-        <span>{{item.Rate}}</span>
-      </div>
-      <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
-        layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
-      </el-pagination>
+      <input type="button" class="hollowFixedBtn backBtn" @click="goUrl('leaderManagement')" :value="$t('pub.returnBack')" />
     </div>
+    
+    <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
+      <tr>
+        <th width="25%">购物店</th>
+        <th width="25%">进店日期</th>
+        <th width="25%" >关联团号</th>
+        <th width="25%">提成</th>
+      </tr>
+      <tr v-for="item in DataList" :key="item.subCode">
+        <td>{{item.ShopName}}</td>
+        <td>{{item.StoreTime}}</td>
+        <td>{{item.TCNUM}}({{item.TCID}})</td>
+        <td>￥{{item.LeaderCommission}}</td>
+      </tr>
+    </table>
+    <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
+      layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
+    </el-pagination>
     <div class="statistical" :class="{'disDiv':isShow}">
       <div class="charts">
         <el-col :span='24'>
@@ -223,7 +200,7 @@
       return {
         msg: {
           pageIndex: 1,
-          pageSize: 10,
+          pageSize: 15,
           LeaderID: "",
           Type: 0
         },

src/components/SalesModule/CustomerCertification.vue

@@ -150,8 +150,11 @@
         <th width="10%">{{$t('admin.admin_address')}}</th>
         <th width="10%">{{$t('salesModule.belongUnion')}}</th>
         <th width="10%">{{$t('salesModule.ApplyTime')}}</th>
-        <th width="10%">{{$t('salesModule.ApplyStatus')}}</th>
+        <th width="10%">{{$t('fnc.shzhuangtai')}}</th>
+         <th width="10%">{{$t('ground.glxiaoshou')}}</th>
+           <th width="10%">{{$t('pub.mbPhoneNum')}}</th>
         <th width="10%">{{$t('system.table_operation')}}</th>
+        
       </tr>
       <tr>
         <td colspan="9" align="center" v-show="list.length==0">{{$t('system.content_noData')}}</td>
@@ -169,6 +172,8 @@
           <span v-if="item.ApplyState == 1||item.ApplyState === 3" class="_status_str _status_str_g">{{$t('fnc.ytongguo')}}</span>
           <span v-if="item.ApplyState === 2" class="_status_str _status_str_r">{{$t('salesModule.HasRefused')}}</span>
         </td>
+          <td>{{item.SellName}}</td>
+        <td>{{item.SellPhone}}</td>
         <td>
           <input
             type="button"

src/components/SalesModule/customerTransfer.vue

@@ -483,6 +483,7 @@ export default {
         CreateBy: "-1",
         DepartmentId: "-1",
         Brand:-1,
+        allDepartment:0,
       },
       RecipientMsg: {
         CustomerIdArr: [],
@@ -980,6 +981,9 @@ export default {
     },
     getList() {
       this.loading = true;
+       if(this.departState){
+        this.msg.allDepartment=1
+      }
       this.apipost(
         "app_customer_GetCustomerListForCareOf",
         this.msg,
@@ -1015,6 +1019,7 @@ export default {
       let msg={};
       if(this.departState){
         msg={allDepartment:1};
+        this.msg.allDepartment=1
       }
       this.apipost(
         "Advertising_get_GetNowDepartmentAndSubordinate",msg,

src/components/TravelManager/Ticket/TravelticketManager.vue

@@ -920,6 +920,7 @@
           PNR: "",
           //票务人员
           CreateBy: 0,
+          SellType:0,//只查询团队机票
         },
         //线路列表
         LineList: [],

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -42,7 +42,7 @@
       <div class="query-box">
         <div class="TC_companyList" v-if="queryCommonData.IsParentCompany==1">
           <span :class="{'TC_checked':queryCommonData.checkCompanyAll}" @click="getCompanyCheckAll()">{{$t('advmanager.v_all')}}</span>
-          <span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}" @click="getCompanyCheck(item)">{{item.BName}}</span>
+          <span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}" @click="getCompanyCheck(item)" :key="bindex">{{item.BName}}</span>
         </div>
         <ul>
           <li>
@@ -444,7 +444,7 @@
                   </p>
                   <p>
                     <span>{{$t('visa.v_currentseat')}}</span>
-                    <i>{{item.SurplusSeat=item.SurplusSeat < 0 ? 0:item.SurplusSeat}}</i> </p> <p>
+                    <i>{{item.SurplusSeat=(item.SurplusSeat<0) ? 0:item.SurplusSeat}}</i> </p> <p>
                         <span>{{$t('visa.v_yibaoru')}}</span>
                         <i>
                           {{item.OrderGuestNum}}
@@ -457,7 +457,7 @@
                   </p>
                   <p class="travelnowrap">
                     <span>{{$t('visa.v_houbu')}}</span>
-                    <span v-if="item.IsSubstitution==1" class="TCL-greenType">{{$t('Operation.v_yxhoubu')}}</span>
+                    <span v-if="item.IsSubstitution==1" class="TCL-greenType">{{$t('visa.v_yxhoubu')}}</span>
                     <span v-else class="TCL-redType">{{$t('Operation.v_byxhoubu')}}</span>
                   </p>
                   <p>
@@ -546,7 +546,7 @@
                     </el-dropdown-menu>
                   </el-dropdown>
                   <el-button @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary" style="background:#67c23a; border-color:#67c23a">广告&nbsp;{{item.AdvertCount}}</el-button>
-                  <el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C">{{$t('Operation.Op_childNobed')}}OP备注</el-button>
+                  <el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C">{{$t('Operation.Op_remark')}}</el-button>
                   <el-dropdown trigger="click">
                     <span class="el-dropdown-link">{{$t('Operation.Op_moreOperation')}}
                       <i class="el-icon-arrow-down el-icon--right"></i>
@@ -580,7 +580,7 @@
               <div class="clearfix TCL-redType" v-if="item.PriceTagList.length>0">
                 <div class="TCL_remarkTitle">{{$t('sm.biaoqian')}}：</div>
                 <div class="TCL_Content">
-                  <span v-for="chidItem in item.PriceTagList">{{chidItem.Content}}</span>
+                  <span v-for="(chidItem,childIndex) in item.PriceTagList" :key="childIndex">{{chidItem.Content}}</span>
                 </div>
               </div>
             </div>
@@ -1377,9 +1377,9 @@
       this.queryMsg.StartGroupDate = nowDate;
       if (
             this.queryCommonData.IsParentCompany != 1 &&
-            this.CurrentUserInfo.RB_Branch_id != 49
+            userInfo.RB_Branch_id != 49
         ) {
-            this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id);
+            this.queryMsg.OutBranchIds.push(userInfo.RB_Branch_id);
         }
       //默认查询全部团队状态
       this.$tripUtils.TeamStatesList.TeamStates.forEach(states=>{

src/components/sale/sale.vue

@@ -515,7 +515,7 @@
                 </el-form-item>
 			    	</el-form>	
             <span class="Sale_UnlessWords">
-                不能少于4个字
+                不能少于10个字
             </span>
 			    	<div slot="footer" class="dialog-footer">
 			    		<button class="hollowFixedBtn" @click="tichengDialog=false">取消</button>
@@ -791,7 +791,7 @@
       //锅炉除开标点符号的字数
       getFilteredNum(val){
         //var pattern=new RegExp("[`~%!@#$^=''?~！@#￥……&——‘”“'？*()（），,。.、<>《》\\[\\]【】\\“\\”{}=+-|\/:;；：]"); 
-        var pattern=new RegExp("[`~%!@#$^=''?~！@#￥……&——‘”“'？*()（），,。.、<>《》:;； +-=]"); 
+        var pattern=new RegExp("[`~%!@#$^=''?~！@#￥……&——‘”“'？*()（），,。.、<>《》:;； +-=\\s]"); 
         //[]内输入你要过滤的字符，这里基本包含全部的标点符号，\\是转义字符
         var rs="";
         for(var i=0;i<val.length;i++){