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

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -389,7 +389,9 @@
                     <p>附加说明：  <span class="fr" v-if="GetDetail.ComplainID > 0" @click="goComplain('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>
-                        </p>
+                        <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>
                     <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
                         <tr v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" class="_fujiashuoming_tr">
                             <td :colspan="4" v-if="GetDetail.Is_Merge===1">单据号：{{o.FinanceId}}</td>
@@ -907,7 +909,8 @@ export default {
           isChongDi: false,
           ChongDiList: [],
           danjuType: '',
-          showModel: false
+          showModel: false,
+          CostTypeState:false,
         }
     },components:{
         'my-FlowChartModule': myFlowChartModule,
@@ -931,6 +934,19 @@ export default {
         let userinfo = this.getLocalStorage();
         this.bossID = userinfo.EmployeeId;
     },methods:{
+        GourlCostType(path,num){
+            console.log("path",path);
+            console.log("this.GetDetail",this.GetDetail.CreateBy)
+            this.$router.push({
+                name: path,
+                query: { 
+                    blank: "y", 
+                    EmployeeId:this.GetDetail.CreateBy,
+                }
+            });
+            
+
+            },
         Gourl(){
             this.$router.push({
                 name: 'CommissionManagement',
@@ -1351,6 +1367,15 @@ export default {
                     this.FrID = this.GetDetail.FrID;
                     this.SourceID = this.GetDetail.SourceID;
                     this.Callback = this.GetDetail.Callback;
+                    
+                    if(this.GetDetail.DetailList.length>0){
+                        this.GetDetail.DetailList.forEach(item=>{
+                            if(item.CostTypeName=="差旅费"){
+                                this.CostTypeState=true;
+                            }
+                        })
+                    }
+
                     // 拼接团号显示团信息
                     let str = '';
                     if(data.TCIDList.length>0){

src/components/SalesModule/VisitRecord.vue

@@ -146,7 +146,12 @@ export default {
 	        tripDistance:'',
 	        name:'',
 	        DepartName:'',
-	        PostName:'',
+            PostName:'',
+            visitMsg:{
+                pageIndex:1,
+                pageSize:1000,
+                empId:0,
+            },
         }
     },methods:{
     	getYingyan(){
@@ -176,7 +181,7 @@ export default {
     		console.log(date)
     	},
         getVisitLineList(){
-                this.apipost('app_get_visit_line_list',{},res=>{
+                this.apipost('app_get_visit_line_list',this.visitMsg,res=>{
                     if(res.data.resultCode==1){
                         this.VisitLineList = res.data.data.pageData
                         if(this.VisitLineList.length>0){
@@ -363,6 +368,9 @@ export default {
                 map.style.border = "none"
         },
     },mounted(){
+        if(this.$route.query.EmployeeId){
+			this.visitMsg.empId=this.$route.query.EmployeeId;	
+		}
     	let userInfo=this.getLocalStorage()
     	this.name=userInfo.emName
     	this.headIcon=userInfo.Icon
@@ -370,6 +378,7 @@ export default {
     	this.DepartName=userInfo.DepartName
     	this.PostName=userInfo.PostName
         this.getVisitLineList()
+        
     }
 }
 </script>

src/components/SalesModule/yingyanMap.vue

@@ -76,7 +76,8 @@
 					<p style="margin:14px 0; padding: 0 14px; ">
 						<el-input class='w272' placeholder="请输入员工姓名查询" v-model="filterText"><i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input>
 					</p>
-					<div class="yingyanMetacont">
+					<!--  -->
+					<div v-if="FinalYingYan" class="yingyanMetacont">
 						<div style="margin-bottom:70px;">
 							<el-tree :data='trackTreeData' ref="tree"  :filter-node-method="filterNode" :props="defaultProps">
 							<span class="custom-tree-node" style="width: 100%;" slot-scope="{ node, data }">
@@ -179,6 +180,8 @@
 				onlinePerson: 0,
 				gettrackPageIndex:0,
 				getlistIndex:0,
+				FinalYingYan:true,
+				datainfo:{},
 			}
 		},
 		beforeDestroy() {
@@ -198,8 +201,26 @@
 			FileSizeFormat(value) {
 				return(value / 1000).toFixed(2) + 'Km'
 			}
+		},
+		created(){
+			
 		},
 		methods: {
+			getPerson(id) {
+				this.apipost('admin_get_EmployeeGet', {
+					Id: id
+				}, res => {
+					if(res.data.resultCode == 1) {
+						
+						console.log(res.data.data)
+						this.datainfo=res.data.data;
+						this.filterText=this.datainfo.EmName;
+						let obj={};
+						obj.Phone=this.datainfo.EmLoginMobile
+						this.getPersonList(obj);
+					}
+				}, err => {})
+			},
 			toggleDiv(){
 				if(this.isToggle==1){
 					this.isToggle=2
@@ -465,9 +486,10 @@
 						}
 					});
 			},
-
+			// 轨迹请求
 			getPersonList(obj) {
-				this.entity_name = obj.Phone
+				this.entity_name = obj.Phone;
+				console.log("this.dateTime",this.dateTime)
 				let timestamp = new Date(this.dateTime)
 				let start_time = timestamp.getTime() / 1000
 				let end_time = start_time + 86400
@@ -487,7 +509,7 @@
 				let url = this.keys + '&entity_name=' + obj.Phone + '&start_time=' + start_time + '&end_time=' + end_time +'&page_size=5000&is_processed=' + this.isjiuzheng +
 						'&process_option=' + canshu + ',transport_mode=' + this.transportMode;
 						this.gettrackPage(url);
-						console.log(url);
+				console.log("url",url);
 				this.Point = []
 			},
 			gettrackPage(url){
@@ -513,8 +535,16 @@
 			},
 
 			getPersonListByTime() {
-				this.filterText=''
-				this.getTrackTreeData()
+				
+				if(this.$route.query.EmployeeId){
+					let obj={};
+					obj.Phone=this.datainfo.EmLoginMobile
+					this.getPersonList(obj);
+				}
+				else{
+					this.filterText=''
+					this.getTrackTreeData();
+				}
 				
 			},
 			formatDate(now) {
@@ -566,7 +596,9 @@
 					map.addOverlay(curve);
 				} 
 				if(this.markersList.length > 0&& this.mapType==1) {
+					
 					this.personData.forEach(person => {
+
 						let item = this.markersList.find(markers => markers.entity_name == person.entity_name)
 						if(item) {
 							let myIcon = new BMap.Icon(this.domainManager().ViittoFileUrl+"/Upload/Icon/Common/positioning.png", new BMap.Size(32,40));
@@ -753,6 +785,13 @@
 			this.intervalid = setInterval(() => {
 				this.getlist()
 			}, 60000)
+			if(this.$route.query.EmployeeId){
+				let id=this.$route.query.EmployeeId;
+				this.FinalYingYan=false;
+				this.getPerson(id);
+				this.mapType=2;
+				
+			}
 		}
 	}
 </script>

src/components/dmc/manager/teamRevenueExpenditure.vue

@@ -444,6 +444,10 @@
         } else if (_orderSource === 5 && _type === 2) {
           id = [49, 50, 57, 58]
         }
+        // 门票
+         else if (_orderSource === 3 && _type === 2) {
+          id = [88, 89]
+        }
         TCIDARR.push(this.$route.query.id)
         let orderObj = {
           OrderID: 0,