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

src/components/SalesModule/VisitRecord.vue

@@ -3,7 +3,7 @@
     .page_VisitRecord ._scrollbar::-webkit-scrollbar-thumb{border-radius: 4px;-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);background: #c9c9c9;}
     .page_VisitRecord ._scrollbar::-webkit-scrollbar-track{-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);border-radius: 4px;background: #EDEDED;}
     .page_VisitRecord>div>ul{height: 650px;margin: 20px 20px;background-color: #FFFFFF;border: 1px solid #F1F2F5;padding: 20px;border-radius: 4px;padding-right: 16px;margin-bottom: 5px}
-    .page_VisitRecord ._vr_left{width: 510px;}
+    .page_VisitRecord ._vr_left{width: 630px;}
     .page_VisitRecord ._vr_right{width: 1110px;}
     .page_VisitRecord ._tit{padding-left: 10px;border-left: 3px solid #E95252; font-size: 14px;color: #000000;margin: 20px 0 0 20px;}
     .page_VisitRecord .icon-ditu{color: #E95252;cursor: pointer;}
@@ -59,6 +59,7 @@
                         <div class="_info">
                             <div><i class="iconfont icon-xinzengkehu-copy"></i>&nbsp;新增客户&nbsp;&nbsp;&nbsp;{{item.addNewCustomerCount}}</div>
                             <div><i class="iconfont el-icon-view"></i>&nbsp;拜访客户&nbsp;&nbsp;&nbsp;{{item.visitOldCustomerCount}}</div>
+                            <div style="margin-left:10px;"><i class="iconfont icon-qianming"></i>&nbsp;签到&nbsp;&nbsp;&nbsp;{{item.signInCount}}</div>
                         </div>
                     </div>
                 </li>
@@ -163,7 +164,6 @@ export default {
 //  		console.log(end_time)
     		let url='?ak=ZzGBZF6L0sgFDLlDohyvYhCnWy4dwksX&service_id=203768&entity_name='+this.account+'&start_time='+start_time+'&end_time='+end_time+'&is_processed=1&process_option=need_denoise=1,need_vacuate=1,need_mapmatch=1';
             this.$http.get('https://bird.ioliu.cn/v1?url=http://yingyan.baidu.com/api/v3/track/gettrack'+url).then(res=>{
-             console.log(res.data.points)
                let xy=res.data.points
                this.Point=[]
                xy.forEach(x=>{
@@ -179,10 +179,12 @@ export default {
                 this.apipost('app_get_visit_line_list',{},res=>{
                     if(res.data.resultCode==1){
                         this.VisitLineList = res.data.data.pageData
+                        if(this.VisitLineList.length>0){
                             this.getTodayVisitList(this.VisitLineList[0].date)
                             this.thisDay = this.VisitLineList[0].dateStr
+                        }
                     }else{
-                        this.$message.error(res.data.message)
+                        this.Error(res.data.message)
                     }
                 },err=>{})
         },
@@ -192,7 +194,7 @@ export default {
                 if(res.data.resultCode==1){
                     this.TodayVisitList = res.data.data;
                 }else{
-                    this.$message.error(res.data.message)
+                    this.Error(res.data.message)
                 }
             },err=>{})
         },
@@ -208,7 +210,6 @@ export default {
                         this.Point.forEach(x=>{
                             x.xy = x.point.split(',')
                         })
-                        console.log(this.Point)
                         this.creatMap()
                     }else{
                         let div = document.createElement("div")

src/components/administrative/myDocuments.vue

@@ -94,6 +94,10 @@
 
 		<el-dialog custom-class='w800 shareDocumentDialog' :title="dialogTitle3" :visible.sync="outerVisible3" center>
 			<div class="documentDialogNav">
+				<div @click="shareGroup">
+					<i class="iconfont icon-user11"></i>集团
+					<div v-if='shareMsg.shareType==4' class="checkIcon"></div>
+				</div>
 				<div @click="shareDeparment">
 					<i class="iconfont icon-user11"></i>{{$t('admin.admin_Department')}}
 					<div v-if='shareMsg.shareType==1' class="checkIcon"></div>
@@ -108,6 +112,11 @@
 					<div v-if='shareMsg.shareType==3' class="checkIcon"></div>
 				</div>
 			</div>
+			<div v-if="shareMsg.shareType==4" class="myDocumentShareDiv">
+				<div style="height:200px;">
+
+				</div>
+			</div>
 			<div v-if='shareMsg.shareType==1' class="myDocumentShareDiv">
 				<div class="myDocumentShareTree">
 					<el-tree
@@ -754,6 +763,7 @@
 				}
 				this.outerVisible3 = true
 				this.dialogTitle3 = '分享文件/文件夹'
+				this.shareMsg.shareType=1;
 				this.getDepartment()
 				this.getRole()
 				this.getMenber()
@@ -761,10 +771,24 @@
 			openShareDialog() {
 				this.outerVisible3 = true
 				this.dialogTitle3 = '分享文件/文件夹'
+				this.shareMsg.shareType=1;
 				this.getDepartment()
 				this.getRole()
 				this.getMenber()
 			},
+			//按照集团分享
+			shareGroup(){
+				this.shareMsg.shareType=4
+				this.$confirm('是否分享到集团?', '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning'
+					}).then(() => {
+						this.saveShareDocument();
+						this.outerVisible3=false;
+					}).catch(() => {
+				});
+			},
 			shareDeparment(){
 				this.shareMsg.shareType=1
 				this.ckdRoleList=[]
@@ -876,6 +900,10 @@
 				}else{
 					this.shareMsg.targetIds=this.ckdMenberListId.join(',')
 				}
+				if(this.shareMsg.shareType==4){
+					let userInfo = this.getLocalStorage();
+					this.shareMsg.targetIds = userInfo.RB_Group_id;
+				}
 				this.shareMsg.fileIds=this.notFileList
 				this.shareMsg.folderIds=this.fileList
 				this.apipost('user_cloud_file_share',this.shareMsg,res=>{

src/components/administrative/myShareDocuments.vue

@@ -150,6 +150,10 @@
 
 		<el-dialog custom-class='w800 shareDocumentDialog' :title="dialogTitle3" :visible.sync="outerVisible3" center>
 			<div class="documentDialogNav">
+				<div @click="shareGroup">
+					<i class="iconfont icon-user11"></i>集团
+					<div v-if='shareMsg.shareType==4' class="checkIcon"></div>
+				</div>
 				<div @click="shareDeparment">
 					<i class="iconfont icon-user11"></i>{{$t('admin.admin_Department')}}
 					<div v-if='shareMsg.shareType==1' class="checkIcon"></div>
@@ -230,6 +234,11 @@
 					</ul>
 				</div>	
 			</div>
+			<div v-if="shareMsg.shareType==4" class="myDocumentShareDiv">
+				<div style="height:200px;">
+
+				</div>
+			</div>
 			<div slot="footer" class="dialog-footer">
 				<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="outerVisible3=false" />
 				<input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="saveShareDocument" />
@@ -858,6 +867,19 @@
 				this.getRole()
 				this.getMenber()
 			},
+			//按照集团分享
+			shareGroup(){
+				this.shareMsg.shareType=4
+				this.$confirm('是否分享到集团?', '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning'
+					}).then(() => {
+						this.saveShareDocument();
+						this.outerVisible3=false;
+					}).catch(() => {
+				});
+			},
 			shareDeparment(){
 				this.shareMsg.shareType=1
 				this.ckdRoleList=[]
@@ -987,6 +1009,11 @@
 					targetIds=this.ckdMenberListId
 				}
 				this.shareMsg.targetIds = targetIds.join(",")
+				if(this.shareMsg.shareType==4){
+					let userInfo = this.getLocalStorage();
+					this.shareMsg.targetIds = userInfo.RB_Group_id;
+				}
+
 				//this.shareMsg.fileIds=this.notFileList
 				//this.shareMsg.folderIds=this.fileList
 				this.apipost('user_cloud_update_file_share_target',this.shareMsg,res=>{