编辑报告

operatingCompany/pages.json

@@ -181,9 +181,15 @@
                 "navigationBarTitleText": "点评",
 				"navigationBarBackgroundColor": "#FFFFFF",
                 "enablePullDownRefresh": false
-            }
-            
-        }
+            }  
+        },
+		{
+			"path": "pages/shop/shopIndex/reply",
+			"style": {
+				"navigationBarTitleText": "回复点评",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		}
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

operatingCompany/pages/entryReport/entered.vue

@@ -76,6 +76,7 @@
 				sheetID:'',
 				type:'',
 				sheetID:'',
+				editType:'',
 			}
 		},
 		onShow() {
@@ -160,6 +161,8 @@
 			goNext(){
 				if(this.type==3){
 					this.goEdit()
+				}else if(this.editType==2){
+					this.gonewEdit()
 				}else{
 					var go=true;
 					var name='';
@@ -229,7 +232,7 @@
 						categoryList:JSON.stringify(categoryList)
 					}, 'POST').then(res => {
 						this.sheetID=res.data;
-						console.log(this.sheetID);
+						this.editType=2;
 						uni.navigateTo({
 							url:'opinion?sheetID='+this.sheetID
 						})
@@ -315,6 +318,87 @@
 					})
 				})
 			},
+			gonewEdit(){
+				var that=this;
+				uni.getLocation({
+					success(res) {
+						that.lng = res.longitude
+						that.lat = res.latitude
+						that.getSuperCheckSheetInfo()
+					},
+					fail() {
+					
+					}
+				})
+				//#ifdef H5
+				
+				that.lng='117.06533'
+				that.lat='36.68013'
+				that.getSuperCheckSheetInfo()
+			},
+			getSuperCheckSheetInfo(){
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'accompany/SuperCheckSheet/querySuperCheckSheetInfo',
+					params = {
+						sheetID: this.sheetID,
+						lat:this.lat,
+						lng:this.lng
+					}
+				this.$http(url, params, 'GET').then(res => {
+					this.info = res.data;
+					this.editBgdata()
+				})
+			},
+			editBgdata(){
+				this.info.categoryList.forEach(item=>{
+					item.sectionList.forEach(v=>{
+						v.check=v.isCheck;
+						v.itemList.forEach(i=>{
+							if(i.keyType==1){
+								
+								i.keyValue=i.keyValue.replace(/，/ig,',')
+								var array= i.keyValue.split(",")
+								var array2=i.itemValue.split(",")
+								var arr=[];
+								console.log(array2)
+								array.forEach(name=>{
+									var index = array2.indexOf(name);
+									console.log(index)
+									if(index!=-1){
+										var obj={
+											name:name,
+											check:true
+										}
+									}else{
+										var obj={
+											name:name,
+											check:false
+										}
+									}
+									
+									arr.push(obj)
+								})
+								i.array=arr
+							}else if(i.keyType==4){
+							   var arr=[];
+								for(var j=0;j<Number(i.keyValue) +1;j++){
+									  arr.push(j)
+								}
+							   i.array=arr.reverse();
+							   i.storeIndex=null;
+							
+							}else if(i.keyType==3){
+								i.imgArr=i.itemValue.split(",")
+							}
+						})
+					})
+				})
+				//console.log(this.info.categoryList)
+				this.list=this.info.categoryList;
+				this.goEdit()
+			}
 		},
 		onUnload(){
 			

operatingCompany/pages/entryReport/entryredItem.vue

@@ -74,7 +74,7 @@
 						  for(var i=0;i<Number(item.keyValue) +1;i++){
 							  arr.push(i)
 						  }
-						   item.array=arr;
+						   item.array=arr.reverse();
 						   item.storeIndex=null;
 						   item.itemValue=null;
 					   }else if(item.keyType==1){
@@ -127,7 +127,7 @@
 		methods: {
 			bindPickerChange(e){
 				console.log(e)
-				this.pickerItem.itemValue=e.detail.value;
+				this.pickerItem.itemValue=this.pickerItem.array[e.detail.value] ;
 				console.log(this.categoryList);
 				this.categoryList.splice(1,0)
 			},
@@ -194,9 +194,9 @@
 						})
 						item.itemValue=arr.join(',');
 					}
-					if(item.itemValue==0){
+					if(item.itemValue===0){
 						
-					}else if(item.itemValue==''){
+					}else if(item.itemValue===''){
 						go=false
 					}
 				})

operatingCompany/pages/entryReport/historyReport.vue

@@ -228,7 +228,9 @@
 				})
 			},
 			goAppraise(v) {
-
+                 uni.navigateTo({
+					url:'../reportManage/reportDetail?id='+v.ID
+				})
 			}
 
 		},

operatingCompany/pages/entryReport/opinion.vue

@@ -62,7 +62,8 @@
           //页面加载初始化生命周期函数
 		  this.sheetID=opt.sheetID;
 		  if(opt.type==3){
-			  this.suggestList=this.$store.state.suggestList
+			  this.suggestList=this.$store.state.suggestList;
+			  this.addOp()
 		  }
 		},
 		methods: {
@@ -74,7 +75,6 @@
 				this.pickerItem=item
 			},
 			addOp(){
-				
 				var obj={
 					suggest:'',
 					orderFinishTime:'',

operatingCompany/pages/reportManage/reportDetail.vue

@@ -43,7 +43,7 @@
 			<view class="submitOpBox">
 				<view class="submitOpBoxLeft">
 					<view class="submitOpBoxLeftline">访问人：{{info.managerName}}</view>
-					<view class="submitOpBoxLeftline" style="padding-top: 28rpx;">访问人：{{info.checkTime}}</view>
+					<view class="submitOpBoxLeftline" style="padding-top: 28rpx;">访问时间：{{info.checkTime.slice(0,info.checkTime.length-8)}}</view>
 				</view>
 				<view class="shopScore" v-if="info.shopScore">{{info.shopScore}}分</view>
 			</view>
@@ -178,7 +178,7 @@
 	   		<view class="shoreDz" @click="editWork">修改作业</view>
 	   </view>
 	   <view class="bottom"  v-if="info.state==4&&loginType==2">
-	   		<view class="shoreDz">回复</view>
+	   		<view class="shoreDz" @click="goReply">回复</view>
 	   </view>
 	</view>
 </template>
@@ -275,12 +275,22 @@
 									arr.push(obj)
 								})
 								i.array=arr
+							}else if(i.keyType==4){
+							   var arr=[];
+								for(var j=0;j<Number(i.keyValue) +1;j++){
+									  arr.push(j)
+								}
+							   i.array=arr.reverse();
+							   i.storeIndex=null;
+							
+							}else if(i.keyType==3){
+								i.imgArr=i.itemValue.split(",")
 							}
 						})
 					})
 				})
 				//console.log(this.info.categoryList)
-				this.$store.commit('mutationsCategoryList',this.info.categoryList);
+			   this.$store.commit('mutationsCategoryList',this.info.categoryList);
 				this.$store.commit('mutationssuggestList',this.info.suggestList)
 				uni.navigateTo({
 					url:'../entryReport/entered?type=3&sheetID='+this.id
@@ -316,9 +326,16 @@
 				}); 
 			},
 			goHome(){
-				uni.navigateTo({
-					url:'../index/index'
-				})
+				if(this.loginType==1){
+					uni.navigateTo({
+						url:'../index/index'
+					})
+				}else{
+					uni.navigateTo({
+						url:'../shop/shopIndex/index'
+					})
+				}
+				
 			},
 			tabClick(num){
 				this.tabIndex=num
@@ -328,6 +345,11 @@
 					url:'../entryReport/remarks?id='+this.id
 				})
 			},
+			goReply(){
+				uni.navigateTo({
+					url:'../shop/shopIndex/reply?id='+this.id+'&shopEvaContent='+this.info.shopEvaContent+'&shopEvaOpName='+this.info.shopEvaOpName+'&shopEvaTime='+this.info.shopEvaTime+'&shopEvaStar='+this.info.shopEvaStar
+				})
+			},
 			getSuperCheckSheetInfo(){
 				uni.showLoading({
 					title: '加载中'
@@ -339,6 +361,11 @@
 						lng:this.lng
 					}
 				this.$http(url, params, 'GET').then(res => {
+					
+					for (const key in res.data.shopInfo) {
+						 res.data.shopInfo[key] = this.$praseStrEmpty(res.data.shopInfo[key])
+					}
+					
 					this.info = res.data;
 					if(this.userInfoId==res.data.managerID){
 						if(this.mEvaluateLook==0){

operatingCompany/pages/shop/shopIndex/reply.vue

@@ -0,0 +1,176 @@
+<template>
+	<view class="content">
+	    <view class="mdqk">
+			<view class="mdqkTop">
+				<view class="mdqkTopTitle">对门店行动完成情况打分</view>
+				<view class="xxBox">
+					<uni-rate :max="5" v-model="shopEvaStar" :size="16" :readonly="true"/>
+				</view>
+				
+			</view>
+			<view class="mdqkms">补充说明</view>
+			<view class="shopEvaContent">{{shopEvaContent}}</view>
+			<view class="mdqkBottom">
+				<view>{{shopEvaTime}}</view>
+				<view>{{shopEvaOpName}}</view>
+			</view>
+		</view>
+		
+		<view class="competeCont">
+			
+			
+			<view>
+				<textarea placeholder-style="color:#CCCCCC" placeholder="回复陪伴经理的评价~～" v-model="shopEvaReplyContent" class="textareaCont"/>
+			</view>
+			<view class="submitBox">
+				<view class="submit" @click="submit">提交</view>
+			</view>
+			
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	
+	export default {
+		
+		data() {
+			return {
+				sheetID:'',
+			    shopEvaStar:'',
+				shopEvaOpName:'',
+				shopEvaReplyContent:'',
+				shopEvaContent:'',
+				shopEvaTime:'',
+			}
+		},
+		onLoad(opt) {
+		  this.sheetID=opt.id;
+		  this.shopEvaStar=opt.shopEvaStar;
+		  this.shopEvaOpName=opt.shopEvaOpName;
+		  this.shopEvaContent=opt.shopEvaContent;
+		  this.shopEvaTime=opt.shopEvaTime;
+		  
+		},
+		onShow() {
+				
+		},
+		methods: {
+		   
+			
+			submit(){
+				if(this.shopEvaReplyContent==''){
+					uni.showToast({
+					    title: '请填写内容',
+						icon:'none',
+					    duration: 2000,
+					});
+					return false;
+				}
+				uni.showLoading({ });
+				
+				this.$http('accompany/SuperCheckSheet/shopEvaReply', {
+					sheetID:this.sheetID,
+					shopEvaReplyContent:this.shopEvaReplyContent,
+				
+				}, 'POST').then(res => {
+				    //this.submitSuperCheckSheet()
+					uni.showToast({
+					    title: '提交成功',
+						icon:'none',
+					    duration: 2000,
+					});
+					uni.navigateBack({
+						
+					})
+				})
+			}
+			
+		}
+	}
+</script>
+
+<style scoped>
+	.content {
+		background: #F4F5F7;
+		min-height: 100vh;
+		padding-top: 20rpx;
+	}
+
+	/* #ifdef H5 */
+	.content {
+		background: #F4F5F7;
+	
+	}
+
+	/* #endif */
+	
+	.competeCont{
+		background: #FFFFFF;
+		padding: 20rpx 24rpx;
+		margin-top: 20rpx;
+	}
+	.competeContTitle{
+		font-size: 30rpx;
+		color: #3C3C3C;
+		text-align: center;
+	}
+	.textareaCont{
+		width: 662rpx;
+		height: 200rpx;
+		background: #F4F5F7;
+		border-radius: 10rpx;
+		padding: 20rpx;
+		margin-top: 20rpx;
+		font-size: 28rpx;
+	}
+	.submit{
+		width: 420rpx;
+		height: 74rpx;
+		background: #FF4F00;
+		border-radius: 50rpx;
+		line-height: 74rpx;
+		text-align: center;
+		font-size: 30rpx;
+		color: #FFFFFF;
+	}
+	.submitBox{
+		display: flex;
+		justify-content: center;
+		padding-top: 40rpx;
+	}
+	.xxBox{
+		display: flex;
+		justify-content: center;
+	
+	}
+	.mdqk{
+		background: #FFFFFF;
+	}
+	.mdqkTop{
+		display: flex;
+		justify-content: space-between;
+		padding: 30rpx 24rpx;
+		border-bottom: 1px solid #EEEEEE;
+	}
+	.mdqkms{
+		font-size: 28rpx;
+		color: #444444;
+		padding-top: 28rpx;
+		padding-left: 24rpx;
+	}
+	.shopEvaContent{
+		font-size: 26rpx;
+		padding: 16rpx 24rpx;
+		color: #666666;
+	}
+	.mdqkBottom{
+		font-size: 26rpx;
+		color: #999999;
+		display: flex;
+		justify-content: space-between;
+		padding: 24rpx;
+		padding-top: 0;
+	}
+</style>

operatingCompany/pages/upcoming/upcoming.vue

@@ -58,7 +58,9 @@
 		},
 		methods: {
 			goAppraise(v) {
-				console.log('评价');
+				uni.navigateTo({
+					url:'../reportManage/reportDetail?id='+v.ID
+				})
 			},
 			getData() {
 				uni.showLoading({