111

operatingCompany/common/request.js

@@ -1,10 +1,11 @@
  //const baseUrl = 'http://58.56.15.138:20189/' 
+//const baseUrl = 'https://api.dms.66km.com/'
 const baseUrl = 'https://crm.eurorepar.cn/'
- //const baseUrl = 'https://api.dms.66km.com/'
 
 import md5 from './MD5.js'
 
 
+
 const http = (url = '', date = {}, type = 'POST', header = {
 }) => {
     return new Promise((resolve, reject) => {
@@ -31,12 +32,12 @@ const http = (url = '', date = {}, type = 'POST', header = {
             let [error, res] = response;
 			
 			if(res.data.code==1){
-				 uni.showToast({
+				/* uni.showToast({
 				     title: res.data.msg ? res.data.msg : '接口错误',
 				 	 icon:'none',
 				     duration: 2000,
-				 });
-				
+				 }); */
+				 resolve(res.data);
 			}
 			else if(res.data.code==401){
 				 uni.showToast({

operatingCompany/pages/entryReport/entered.vue

@@ -452,7 +452,22 @@
 							   i.storeIndex=null;
 							
 							}else if(i.keyType==3){
-								i.imgArr=i.itemValue.split(",")
+								var arr1=i.itemValue.split(",")
+								var arr2=[]
+								arr1.forEach(img=>{
+									var imgObj={
+										url:img.split('+')[0],
+										
+									}
+									console.log(img.split('+'))
+									if(img.split('+').length>1){
+										imgObj.textarea=img.split('+')[1]
+									}else{
+										imgObj.textarea=''
+									}
+									arr2.push(imgObj)
+								})
+								i.imgArr=arr2
 							}
 						})
 					})

operatingCompany/pages/entryReport/entryredItem.vue

@@ -25,9 +25,9 @@
 				</view>
 			</view>
 			<view class="boxLine" v-for="(item,index) in categoryList[index1].sectionList[index2].itemList">
-				<view class="boxLineTop">
+				<view class="boxLineTop xzstoreBox">
 					<view class="itemName">{{item.itemName}}</view>
-					<view class="store" v-if="item.keyType==4" @click="pickerClick(item)">
+					<view class="store xzstore" v-if="item.keyType==4" @click="pickerClick(item)">
 						 <picker @change="bindPickerChange($event)" :value="item.storeIndex" :item="item" :range="item.array">
 						     <view class="pickerView" v-if="item.itemValue!==''">{{item.itemValue}} 分</view>
 							 <view class="pickerView" v-else>请选择</view>
@@ -36,21 +36,28 @@
 							 <image src="../../static/img/jiantou.png" mode="" class="storeJtimg"></image>
 						 </view>
 					</view>
+					
 				</view>
 				<view class="boxlinedescribe" v-if="item.describe">{{item.describe}}</view>
 				<view class="itemCklineBox" v-if="item.keyType==1">
 					<view class="itemCkline" :class="{itemckActive:name.check}" @click="itemXx(name,item.array)" v-for="(name,nameIndex) in item.array">{{name.name}}</view> 
 					<!-- <view class="itemCkline itemckActive">张杰</view> -->
 				</view>
+				<view v-if="item.keyType==5" class="textareaBox">
+					<input placeholder-style="color:#CCCCCC" class="numbershuru" placeholder="请输入~" type="digit" pattern="number" v-model="item.itemValue"
+					@oninput="numberxz"
+					/>
+				</view>
 				<view class="textareaBox" v-if="item.keyType==2">
 					   <textarea placeholder-style="color:#CCCCCC" placeholder="请输入~" v-model="item.itemValue" class="textareaCont"/>
 				</view>
 				<view class="imgBox" v-if="item.keyType==3">
 					<view class="imgLine" v-for="(img,imgindex) in item.imgArr">
-						<image @click="previewImage(img,item.imgArr)" :class="{img4:(imgindex+1)%4==0}" :src="img" mode="" class="itemImg"></image>
+						<image @click="previewImage(img.url,item.imgArr)" :class="{img4:(imgindex+1)%4==0}" :src="img.url" mode="" class="itemImg"></image>
 					    <image src="../../static/img/icon_delpic@2x.png" mode=""  class="delImg" @click="delimg(item,imgindex)"></image>
+					   <textarea placeholder-style="color:#CCCCCC" v-model="img.textarea" placeholder="请输入备注" class="imgtextarea"/>
 					</view>
-					<view class="imgLine" @click="uploadImg(item)">
+					<view class="imgLine2" @click="uploadImg(item)">
 						<image src="../../static/img/icon_addpic@2x.png" mode="" class="itemImg" style="margin-right: 0;"></image>
 					</view>
 				</view>
@@ -121,7 +128,13 @@
 							})
 							item.array=arr
 					   }else if(item.keyType==3){
-						   item.imgArr=[]
+						   item.imgArr=[
+							  /* {
+								   url:'',
+								   textarea:'',
+							   } */
+						   ];
+						   //item.textarea='';
 					   }
 				   })
 			   }
@@ -156,6 +169,27 @@
 		    console.log(this.categoryList);
 		},
 		methods: {
+			numberxz(event){
+				console.log(event)
+				/* this.categoryList[this.index1].sectionList[this.index2].itemList[index].itemValue=2
+				console.log(this.categoryList[this.index1].sectionList[this.index2].itemList[index].itemValue)
+				this.categoryList.slice(0,1) */
+				 /* this.$nextTick(() => {
+				         this.categoryList[this.index1].sectionList[this.index2].itemList[index].itemValue=2           
+				  })
+			 */
+				let i = event.target.value
+				return i.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')
+			  /* let i = event.target.value
+			   		let num = i.charAt(i.length-1)
+			   		var reg=new RegExp("^[0-9]*$")
+			   		if(!reg.test(num)) {
+			   			return i.slice(0,-1)
+			   		} else {
+			   			return i
+			   		} */
+			
+			},
 			previewImage(img,arr){
 				//var arr=[];
 				//arr.push(img)
@@ -213,7 +247,7 @@
 				var num=10-length;
 				uni.chooseImage({
 					sourceType: ['album','camera'],
-					count:num, 
+					count:1, 
 				    success: (chooseImageRes) => {
 				        const tempFilePaths = chooseImageRes.tempFilePaths;
 						tempFilePaths.forEach(v=>{
@@ -225,9 +259,15 @@
 							        'user': 'test'
 							    },
 							    success: (uploadFileRes) => {
-							        console.log(JSON.parse(uploadFileRes.data).data );
-									console.log(item.imgArr)
-									item.imgArr=item.imgArr.concat(JSON.parse(uploadFileRes.data).data) ;
+							        console.log(JSON.parse(uploadFileRes.data).data[0] );
+									
+									var i= {
+									   url:JSON.parse(uploadFileRes.data).data[0],
+									   textarea:'',
+								   }
+								   item.imgArr.push(i)
+								 console.log(item.imgArr)
+									//item.imgArr=item.imgArr.concat() ;
 									that.categoryList.splice(1,0)
 							    }
 							}); 
@@ -242,9 +282,21 @@
 			sub(){
 				console.log(this.categoryList);
 				var go=true;
+				var gonum=true;
+				var gonumTxt=''
+				//return false;
 				this.categoryList[this.index1].sectionList[this.index2].itemList.forEach(item=>{
 					if(item.keyType==3){
-						item.itemValue=item.imgArr.join(',');
+						//item.itemValue=item.imgArr.join(',')//+'+'+item.;
+						item.itemValue='',
+						 item.imgArr.forEach((img,imgIndex)=>{
+							if(item.imgArr.length-1 == imgIndex){
+								item.itemValue+=img.url+'+'+img.textarea
+							}else{
+								item.itemValue+=img.url+'+'+img.textarea+','
+							}
+							
+						}) 
 						console.log(item.itemValue)
 					}else if(item.keyType==1){
 						var arr=[]
@@ -255,7 +307,21 @@
 							}
 						})
 						item.itemValue=arr.join(',');
+					}else if(item.keyType==5){
+						var num5=Number(item.itemValue)
+						if(num5){
+							console.log(typeof(num5))
+							if(typeof(num5)!='number'){
+								gonum=false;
+								gonumTxt=item.itemName
+							}
+						}else{
+							gonum=false;
+							gonumTxt=item.itemName
+						}
+						
 					}
+					
 					if(item.itemValue===0){
 						
 					}else if(item.itemValue===''){
@@ -273,6 +339,14 @@
 					});
 					return false;
 				}
+				if(!gonum){
+					uni.showToast({
+					    title:gonumTxt+'必须为数字',
+						 icon:'none',
+					    duration: 3000,
+					});
+					return false;
+				}
 				//return false;
 				this.categoryList[this.index1].sectionList[this.index2].check=true;
 				if(this.yuedu){
@@ -300,6 +374,11 @@
 					this.yueduData=res.data
 				})
 			}
+		},
+		filters:{
+			numInput(value){
+				console.log(value)
+			}
 		}
 	}
 </script>
@@ -310,6 +389,15 @@
 		 min-height: 100vh;
 		
 	}
+	.numbershuru{
+		 background: #F4F5F7;
+		 padding: 0rpx 20rpx;
+		 border-radius: 10rpx;
+		 font-size: 28rpx;
+		 color: #3C3C3C;
+		 line-height: 88rpx;
+		 height: 88rpx;
+	}
 	/* #ifdef H5 */
 		.content{
 			 background: #F4F5F7;
@@ -378,15 +466,14 @@
 	}
 	.imgBox{
 		/* padding-top: 10rpx; */
-		display: flex;
-		flex-wrap: wrap;
+	/* 	display: flex;
+		flex-wrap: wrap; */
 		
 	}
 	.itemImg{
 		width:150rpx;
 		height: 150rpx;
-		margin-right: 35rpx;
-		margin-top: 30rpx;
+		
 	}
 	.img4{
 		margin-right: 0;
@@ -395,11 +482,26 @@
 		width: 32rpx;
 		height: 32rpx;
 		position: absolute;
-		left: 135rpx;
-		top: 10rpx;
+		right:20rpx;
+		top: 20rpx;
+		z-index: 11;
 	}
 	.imgLine{
 		position: relative;
+		width: 662rpx;
+		height: 150rpx;
+		background: #F4F5F7;
+		border-radius: 10rpx;
+		padding: 20rpx;
+		margin-top: 20rpx;
+		display: flex;
+	}
+	.imgtextarea{
+		height: 120rpx;font-size: 28rpx;padding-left: 20rpx;
+		width:520rpx ;
+	}
+	.imgLine2{
+		padding-top: 20rpx;
 	}
 	.bottom{
 		width: 750rpx;
@@ -455,4 +557,11 @@
 		width: 500rpx;
 		text-align: right;
 	}
+	.xzstore{
+		position: absolute;
+		right: 0;
+	}
+	.xzstoreBox{
+		position: relative;
+	}
 </style>

operatingCompany/pages/entryReport/signIn.vue

@@ -20,9 +20,39 @@
 			 </view>
 			</scroll-view>
 			<view class="bottom">
-				<view class="bottomBtn" @click="signin">签到</view>
+				<view class="bottomBtn" @click="getsignDistance">签到</view>
 			</view>
 		</view>
+		<!-- 签到弹框 -->
+		<view class="qdTk" v-if="qdtkShow" @click="qdtkClose">
+			<view class="qdTkBox" @click.stop="kkk">
+				<image src="../../static/img/gaunbi.png" mode="" class="qdTkclose" @click="qdtkClose"></image>
+				<view class="qdTkBoxTitle" v-if="anomaly==0">上传照片</view>
+				<view class="qdTkBoxTitle" v-if="anomaly==1">提示</view>
+				<view class="qdTkImgBox" v-if="anomaly==0">
+					<image :src="img" mode="" v-if="img" class="additemImg"></image>
+					<image v-else src="../../static/img/icon_addpic@2x.png" mode="" class="additemImg" @click="upImage"></image>
+				    <image v-if="img"  src="../../static/img/icon_delpic@2x.png" mode=""  class="delImg" @click="delimg()"></image>
+				</view>
+				<view class="qdtis" v-if="anomaly==1">距门店大于{{settingDistance}}米，请重新签到或填写原因</view>
+				<view class="reasonID" v-if="anomaly==1">
+					<picker @change="bindPickerChange($event)" range-key="reason" :range="anomalySignList">
+						<view class="pickerV">
+							<view class="pickerView" v-if="reasonID">{{reasonIDTxt}}</view>
+							<view class="pickerView" v-else>请选择</view>
+							 <image src="../../static/img/jiantou.png" mode="" class="storeJtimg"></image>
+						</view>
+					  
+					</picker>
+				</view>
+				<view class="other" v-if="otherShow&&anomaly==1">
+					<textarea v-model="comment" placeholder-style="color:#CCCCCC" placeholder="其他说明" class="qdtextarea"/>
+				</view>
+				<view class="wcQd" @click="signin">完成签到</view>
+			</view>
+			
+		</view>
+		<!-- 签到弹框 -->
 	</view>
 </template>
 
@@ -40,6 +70,17 @@
 				addressList:'',
 				ckIndex:0,
 				address:'',
+				settingDistance:'',
+				distance:'',
+				qdtkShow:false,
+				img:'',
+				anomaly:'',//是否异常签到 1是 0不是
+				reason:'',
+				comment:'',
+				reasonID:'',
+				anomalySignList:[],
+				reasonIDTxt:'',
+				otherShow:false,
 			}
 		},
 		onLoad(opt) {
@@ -56,7 +97,8 @@
 					 longitude: that.lng,
 				}
 				that.covers.push(obj)
-				that.getaddress()
+				that.getaddress();
+				//that.getsignDistance()
 		   	},
 		   	fail() {
 		   
@@ -72,14 +114,83 @@
 		   }
 		   that.covers.push(obj)
 		   that.getaddress()
+		   //this.getsignDistance()
 		   // #endif
+		  
+		  this.queryAnomalySignList()
 		},
 		methods: {
+			kkk(){},
+			qdtkClose(){
+				this.qdtkShow=false;
+			},
 			ckSignin(index,item){
 				this.ckIndex=index;
 				this.address=item.name;
 			},
+			bindPickerChange(e){
+				console.log(e)
+				var index=e.detail.value
+				this.reasonIDTxt=this.anomalySignList[index].reason;
+				this.reasonID=this.anomalySignList[index].id
+				if(this.reasonIDTxt=='其他'){
+					this.otherShow=true
+				}else{
+					this.comment='';
+					this.otherShow=false
+				}
+			},
+			upImage(){
+				var that=this;
+				uni.chooseImage({
+					sourceType: ['camera'],
+					count:1, 
+				    success: (chooseImageRes) => {
+				        const tempFilePaths = chooseImageRes.tempFilePaths[0];
+						
+							uni.uploadFile({
+							    url: that.$request.baseUrl+'accompany/SuperCheckSheet/uploadFile', //仅为示例，非真实的接口地址
+							    filePath: tempFilePaths,
+							    name: 'file',
+							    formData: {
+							        'user': 'test'
+							    },
+							    success: (uploadFileRes) => {
+							        console.log(JSON.parse(uploadFileRes.data).data );
+									that.img=JSON.parse(uploadFileRes.data).data[0]
+									/* console.log(item.imgArr)
+									item.imgArr=item.imgArr.concat(JSON.parse(uploadFileRes.data).data) ;
+									that.categoryList.splice(1,0) */
+							    }
+							}); 
+						
+				     
+						/* that.$http('accompany/SuperCheckSheet/uploadFile', tempFilePaths[0], 'POST').then(res => {
+							
+						}) */
+				    }
+				});
+			},
 			signin(){
+				if(this.anomaly==0){
+					if(this.img==''){
+						uni.showToast({
+						    title: '请上传图片',
+							icon:'none',
+						    duration: 2000,
+						});
+						return false;
+					}
+				}else{
+					if(this.reasonID==''){
+						uni.showToast({
+						    title: '请选择签到原因',
+							icon:'none',
+						    duration: 2000,
+						});
+						return false;
+					}
+				}
 				uni.showLoading({ });
 				var that=this;
 				this.$http('accompany/SuperAccounts/queryManagerTodaySign', {
@@ -89,7 +200,7 @@
 					 if(res.data.today){
 						 uni.showModal({
 						     title: '提示',
-						     content: '是否更新签到位置？',
+						     content: '是否更新签到信息？',
 						     success: function (res) {
 						         if (res.confirm) {
 						           that.gotoQd()
@@ -105,13 +216,52 @@
 				})
 			
 			},
+			delimg(){
+				this.img=''
+			},
+			getsignDistance(){
+				uni.showLoading({ });
+				this.$http('accompany/SuperAccounts/signDistance', {
+					shopId:this.shopId,
+					
+					lat:this.lat,
+					lng:this.lng
+				}, 'GET').then(res => {
+					console.log(res)
+					if(res.code!=0){
+						
+						uni.showToast({
+						    title: '该门店未设置位置信息，请维护门店信息或联系总部',
+							 icon:'none',
+						    duration: 2000,
+						});
+					}else{
+						this.settingDistance=res.data.settingDistance;
+						this.distance=res.data.distance*1000;
+						if(this.distance>this.settingDistance){
+							this.anomaly=1
+						}else{
+						    this.anomaly=0
+						}
+						this.qdtkShow=true
+					}
+				    
+					
+				})
+			},
 			gotoQd(){
 				uni.showLoading({ });
 				this.$http('accompany/SuperAccounts/addSuperSignIn', {
 					shopId:this.shopId,
 					address:this.address,
 					lat:this.lat,
-					lng:this.lng
+					lng:this.lng,
+					distance:this.distance,
+					anomaly:this.anomaly,
+					img:this.img,
+					reason:this.reasonIDTxt,
+					comment:this.comment,
+					reasonID:this.reasonID
 				}, 'POST').then(res => {
 				     uni.showToast({
 				         title: '签到成功',
@@ -127,12 +277,21 @@
 					
 				})
 			},
+			queryAnomalySignList(){
+				this.$http('accompany/SuperAccounts/queryAnomalySignList', {
+					
+				}, 'GET').then(res => {
+				     this.anomalySignList=res.data;
+					 console.log(this.anomalySignList)
+					
+				})
+			},
 			labeltap(e){
 				console.log(e);
-				this.lat=e.detail.latitude;
+				/* this.lat=e.detail.latitude;
 				this.lng=e.detail.longitude;
 				this.addressName=e.detail.name;
-				this.getcovers()
+				this.getcovers() */
 			},
 			getcovers(){
 				this.covers=[]
@@ -196,6 +355,107 @@
 		 min-height: 100vh;
 		
 	}
+	.reasonID{
+		border-bottom: 1px solid #EEEEEE;
+		padding: 30rpx;
+	}
+	.storeJtimg{
+		width: 14rpx;
+		height: 26rpx;
+		margin-top: 8rpx;
+		margin-left: 10rpx;
+	}
+	.qdtextarea{
+		width: 526rpx;
+		height: 120rpx;
+		background: #F4F5F7;
+		border-radius: 10rpx;
+		margin-top: 30rpx;
+		margin-left: 30rpx;
+		padding: 20rpx;
+		font-size: 28rpx;
+	}
+	.qdTk{
+		width: 100vw;
+		height: 100vh;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 111;
+		background: rgb(0,0,0,0.5);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.qdtis{
+		width: 566rpx;
+		height: 60rpx;
+		background: rgba(255, 79, 0,0.1);
+		border-radius: 30rpx;
+		font-size: 24rpx;
+		color: #FF4F00;
+		line-height: 60rpx;
+		text-align: center;
+		margin-top: 18rpx;
+		margin-left: 30rpx;
+	}
+	.additemImg{
+		width:150rpx;
+		height: 150rpx;
+	}
+	.qdTkImgBox{
+		padding: 30rpx;
+		position: relative;
+		width:150rpx ;
+	}
+	.qdTkBox{
+		width: 626rpx;
+		height: 640rpx;
+		background: #FFFFFF;
+		border-radius: 24rpx;
+		position: relative;
+	}
+	.qdTkBoxTitle{
+		font-size: 32rpx;
+		color: #3C3C3C;
+		text-align: center;
+		padding: 30rpx 0;
+		border-bottom: 1px solid #EEEEEE;
+	}
+	.qdTkclose{
+		width: 32rpx;
+		height: 32rpx;
+		position: absolute;
+		top: 36rpx;
+		right: 30rpx;
+	}
+	.pickerV{
+		display: flex;
+		justify-content: space-between;
+		width: 560rpx;
+		color: #3C3C3C;
+		font-size: 28rpx;
+	}
+	.delImg{
+		width:36rpx;
+		height: 36rpx;
+		position: absolute;
+		top: 10rpx;
+		right: 10rpx;
+	}
+	.wcQd{
+		width: 566rpx;
+		height: 74rpx;
+		background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
+		border-radius: 50rpx;
+		text-align: center;
+		line-height: 74rpx;
+		color: #FFFFFF;
+		font-size: 30rpx;
+		position: absolute;
+		bottom: 30rpx;
+		left: 30rpx;
+	}
 	/* #ifdef H5 */
 		.content{
 			 background: #F4F5F7;

operatingCompany/pages/logIn/home.vue

@@ -114,15 +114,11 @@
 			uni.showLoading({
 				title: '请稍等'
 			})
-			console.log(this.wxCode)
-			/* uni.navigateTo({
-			 	url: '../logIn/logIn'
-			 }) */
 			 this.$http('accompany/superusers/getWxOpenID', {
 			   code:this.wxCode,
 			 },'GET').then(res => {
-				console.log(res)
-				this.openID=res.data.openid;
+				//console.log(res)
+				//this.openID=res.data.openid;
 				//this.session_key=res.data.session_key;
 				console.log(this.openID)
 				uni.setStorage({

operatingCompany/pages/reportManage/reportDetail.vue

@@ -122,8 +122,12 @@
 								{{v.itemValue}}
 							</view>
 							<view class="itemImgBox" v-if="v.keyType==3">
-								<view  v-for="(itemiMg,i) in v.itemValue" :key="itemiMg">
-									<image :src="itemiMg" @click="previewImage(itemiMg,v.itemValue)" mode="" class="itemIMg"></image>
+								<view  v-for="(itemiMg,i) in v.imgArr" :key="itemiMg.url">
+									<view class="imgTTT">
+										<image :src="itemiMg.url" @click="previewImage(itemiMg.url,v.itemValue)" mode="" class="itemIMg"></image>
+									    <view class="imgTTTxt">{{itemiMg.textarea}}</view>
+									</view>
+									
 								</view>
 								
 							</view>
@@ -415,7 +419,18 @@
 							   i.storeIndex=null;
 							
 							}else if(i.keyType==3){
-								i.imgArr=i.itemValue//。split(",")
+								//i.imgArr=i.itemValue//。split(",")
+								/* console.log(i)
+								var arr1=i.itemValue.split(",")
+								var arr2=[]
+								arr1.forEach(img=>{
+									var imgObj={
+										url:img.split('+')[0],
+										textarea:img.split('+')[1]
+									}
+									arr2.push(imgObj)
+								})
+								i.imgArr=arr2 */
 							}
 						})
 					})
@@ -517,7 +532,24 @@
 											item3.itemList.forEach(item4=>{
 												if(item4.keyType==3){
 													if(item4.itemValue){
-														item4.itemValue=item4.itemValue.split(',')
+														//item4.itemValue=item4.itemValue.split(',')
+														var arr1=item4.itemValue.split(",")
+														var arr2=[]
+														arr1.forEach(img=>{
+															var imgObj={
+																url:img.split('+')[0],
+																textarea:img.split('+')[1]
+															}
+														    //console.log(img.split('+'))
+															/* if(img.split('+')[1]){
+																imgObj.textarea=img.split('+')[1]
+															}else{
+																imgObj.textarea='asfsz'
+															} */
+															arr2.push(imgObj)
+														})
+														item4.imgArr=arr2
+														console.log(item4.imgArr)
 													}
 													
 												}
@@ -639,6 +671,18 @@
 		 min-height: 100vh;
 		
 	}
+	.imgTTT{
+		display: flex;
+		width: 680rpx;
+		padding-top: 20rpx;
+	}
+	.imgTTTxt{
+		width: 500rpx;
+		font-size: 26rpx;
+		font-family: PingFangSC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #666666;
+	}
 	
 	.zdyNav{
 		background: linear-gradient(132deg, #FF8635 0%, #FF4828 100%);