bug修改

operatingCompany/pages/entryReport/opinion.vue

@@ -16,7 +16,7 @@
 			<view class="lineCont">
 				<view class="lineContLeft">预计完成时间</view>
 				<view class="lineContRight" @click="pickerClick(item)">
-					<picker mode="date" :value="item.orderFinishTime" @change="bindTimeChange">
+					<picker mode="date" :value="item.orderFinishTime" @change="bindTimeChange" :start="nowDate">
 					      <view class="uni-picker">
 						     <span v-if='item.orderFinishTime'>{{item.orderFinishTime}}</span>
 							 <span v-else class="timeNoSpan">请选择预计完成时间</span>
@@ -58,6 +58,7 @@
 				sheetID:'',
 				shopName:'',
 				Contactor:'',
+				nowDate:'',
 			}
 		},
 		onLoad(opt) {
@@ -69,6 +70,7 @@
 			  this.suggestList=this.$store.state.suggestList;
 			  this.addOp()
 		  }
+		  this.getTime()
 		},
 		methods: {
 			bindTimeChange(e){
@@ -205,19 +207,37 @@
 				    	 icon:'success',
 				        duration: 2000,
 				    });
-					console.log(res.data)
-					if(res.data){
-						uni.navigateTo({
-							url:'shopEvaStar?id='+res.data+'&sheetID='+this.sheetID+'&shopName='+this.shopName+'&Contactor='+this.Contactor
-						})
-					}else{
-						uni.navigateBack({
-							delta:2
-						})
-					} 
+					setTimeout(function(){
+						if(res.data){
+							uni.navigateTo({
+								url:'shopEvaStar?id='+res.data+'&sheetID='+this.sheetID+'&shopName='+this.shopName+'&Contactor='+this.Contactor
+							})
+						}else{
+							uni.navigateBack({
+								delta:2
+							})
+						}
+					},1000)
+					
+				 
 					
 				})
-			}
+			},
+			getTime(){
+				var date = new Date(),
+				year = date.getFullYear(),
+				month = date.getMonth() + 1,
+				day = date.getDate(),
+				hour = date.getHours() < 10 ? "0" + date.getHours() : date.getHours(),
+				minute = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes(),
+				second = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
+				month >= 1 && month <= 9 ? (month = "0" + month) : "";
+				day >= 0 && day <= 9 ? (day = "0" + day) : "";
+				var timer = year + '-' + month + '-' + day //+ ' ' + hour + ':' + minute + ':' + second;
+				this.date=timer;
+				this.nowDate=timer;
+				return timer;
+			},
            
 		}
 	}

operatingCompany/pages/entryReport/remarks.vue

@@ -43,16 +43,19 @@
 				this.shopEvaStar=e.value
 			},
 			submit(){
-				if(this.shopEvaContent.length<10){
-					uni.showToast({
-					    title: '请填写十字以上的评价内容',
-						icon:'none',
-					    duration: 2000,
-					})
-					return false;
+				if(this.shopEvaStar<5){
+					if(this.shopEvaContent.length<10){
+						uni.showToast({
+						    title: '请填写十字以上的评价内容',
+							icon:'none',
+						    duration: 2000,
+						})
+						return false;
+					}
 				}
 				
 				
+				
 				uni.showLoading({ });
 				
 				this.$http('accompany/SuperCheckSheet/shopEvaStar', {

operatingCompany/pages/entryReport/shopEvaStar.vue

@@ -126,14 +126,17 @@
 				this.userEvaStar=e.value
 			},
 			submit(){
-				if(this.userEvaContent.length<10){
-					uni.showToast({
-					    title: '请填写十字以上的评价内容',
-						icon:'none',
-					    duration: 2000,
-					})
-					return false;
+				if(this.userEvaStar<5){
+					if(this.userEvaContent.length<10){
+						uni.showToast({
+						    title: '请填写十字以上的评价内容',
+							icon:'none',
+						    duration: 2000,
+						})
+						return false;
+					}
 				}
+				
 				uni.showLoading({ });
 				
 				this.$http('accompany/SuperCheckSheet/shopEvaStar', {

operatingCompany/pages/reportManage/reportDetail.vue

@@ -22,9 +22,13 @@
 			  <image src="../../static/img/report_icon_daizuoye@2x.png" mode="" class="topContImg2"></image>
 			  <view class="topContTxt">待作业</view>
 		  </view>
-		  <view class="topCont" v-if="info.state==3">
+		  <view class="topCont" v-if="info.state==3&&loginType==1">
 			  <image src="../../static/img/report_icon_dianping@2x.png" mode="" class="topContImg3"></image>
-			  <view class="topContTxt">待点评</view>
+			  <view class="topContTxt">待运营经理点评</view>
+		  </view>
+		  <view class="topCont" v-if="info.state==3&&loginType==2">
+		  			  <image src="../../static/img/report_icon_dianping@2x.png" mode="" class="topContImg3"></image>
+		  			  <view class="topContTxt">待点评</view>
 		  </view>
 		  <view class="topCont" v-if="info.state==4">
 			  <image src="../../static/img/report_icon_daihuifu@2x.png" mode="" class="topContImg4"></image>
@@ -111,10 +115,22 @@
 					<view class="suggestCont">{{item.suggest}}</view>
 					<view class="suggestLineBottom">
 						<view class="suggestLineBottomTxt">预计完成日期:{{item.orderFinishTime.slice(0,item.orderFinishTime.length-8)}}</view>
-						<view class="suggestLineBottomTxt">{{item.managerName}}</view>
+						<view class="suggestLineBottomTxt">负责人:{{item.managerName}}</view>
 					</view>
 					<image src="../../static/img/report_weixiugai@2x.png" mode="" class="exeStateImg" v-if="item.exeState==0"></image>
 					<image src="../../static/img/_report_yixiugai@2x.png" mode="" class="exeStateImg" v-if="item.exeState==1"></image>
+				    <!-- 作业情况-->
+					<view v-if="item.exeState==1">
+						<view class="remarksLineTxt1">
+							作业情况
+						</view>
+						<view class="workqkImgBox">
+							<image class="workqkImg"  @click="previewImage(img)" v-for="(img,imgIndex) in item.exeImg.split(',')" :src="img"></image>
+						</view> 
+						<view class="suggestLineBottom">
+							<view class="suggestLineBottomTxt">实际完成实际:{{item.exeTime.slice(0,item.exeTime.length-8)}}</view>
+						</view>
+					</view>
 				</view>
 				
 				
@@ -138,7 +154,7 @@
 						<view v-if="info.shopEvaOpName">{{info.shopEvaOpName}}</view>
 					</view>
 					<!-- 店主回复 -->
-					<view class="shopEvaReplyBox">
+					<view class="shopEvaReplyBox" v-if="shopEvaReplyContent">
 						<view class="shopEvaReplyContent">{{info.shopEvaReplyContent}}</view>
 						<view class="shopEvaReplyTime">{{info.shopEvaReplyTime}}</view>
 					</view>
@@ -248,6 +264,23 @@
 			}
 		},
 		methods: {
+			previewImage(img){
+				var arr=[];
+				arr.push(img)
+				// 预览图片
+				uni.previewImage({
+					urls: arr,
+					longPressActions: {
+						itemList: ['发送给朋友', '保存图片', '收藏'],
+						success: function(data) {
+							console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+						},
+						fail: function(err) {
+							console.log(err.errMsg);
+						}
+					}
+				});
+			},
 			back(){
 				uni.navigateBack({
 					delta:1
@@ -437,7 +470,12 @@
 					sheetID:this.id,
 					
 				}, 'POST').then(res => {
-				  this.getSuperCheckSheetInfo()
+				  this.getSuperCheckSheetInfo();
+				  uni.showToast({
+				       title: '提交成功',
+				  	   icon:'success',
+				       duration: 3000,
+				  }); 
 				})
 			},
 			shareDz(){
@@ -829,4 +867,14 @@
 		color: #999999;
 		
 	}
+	.workqkImgBox{
+		display: flex;
+		flex-wrap: wrap;
+	}
+	.workqkImg{
+		width: 150rpx;
+		height: 150rpx;
+		margin: 12rpx;
+		border-radius: 5rpx;
+	}
 </style>

operatingCompany/pages/shop/shopIndex/editWork.vue

@@ -5,7 +5,7 @@
 			<view class="suggestCont">{{item.suggest}}</view>
 			<view class="suggestLineBottom">
 				<view class="suggestLineBottomTxt">预计完成日期:{{item.orderFinishTime.slice(0,item.orderFinishTime.length-8)}}</view>
-				<view class="suggestLineBottomTxt">{{item.managerName}}</view>
+				<view class="suggestLineBottomTxt">负责人:{{item.managerName}}</view>
 			</view>
 			<image src="../../../static/img/report_weixiugai@2x.png" mode="" class="exeStateImg" v-if="item.exeState==0"></image>
 			<image src="../../../static/img/_report_yixiugai@2x.png" mode="" class="exeStateImg" v-if="item.exeState==1"></image>
@@ -18,9 +18,10 @@
 					<view class="exeContent" v-if="item.exeContent">{{item.exeContent}}</view>
 				</view>
 				<view class="workImgBox">
-					<image :src="img" mode="" v-for="(img,i) in item.exeImg.split(',')" class="workImg"></image>
+					<image :src="img" mode="" v-for="(img,i) in item.exeImg.split(',')" class="workImg" @click="previewImage(img)"></image>
 				</view>
 			</view>
+			<view v-if="item.exeState==1" class="suggestLineBottom">实际完成日期:{{item.exeTime.slice(0,item.exeTime.length-8)}}</view>
 		</view>
 	</view>
 </template>
@@ -49,6 +50,23 @@
 
 		},
 		methods: {
+			previewImage(img){
+				var arr=[];
+				arr.push(img)
+				// 预览图片
+				uni.previewImage({
+					urls: arr,
+					longPressActions: {
+						itemList: ['发送给朋友', '保存图片', '收藏'],
+						success: function(data) {
+							console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+						},
+						fail: function(err) {
+							console.log(err.errMsg);
+						}
+					}
+				});
+			},
 			getData() {
 				uni.showLoading({
 					title: '加载中'
@@ -58,7 +76,18 @@
 				  sheetID:this.sheetID
 				 }
 				this.$http(url, params, 'GET').then(res => {
-                  this.list=res.data
+					var list=res.data;
+					var list1=[];
+					var list2=[];
+					list.forEach(item=>{
+						if(item.exeState==1){
+							list2.push(item)
+						}else{
+							list1.push(item)
+						}
+					})
+					
+                  this.list=list1.concat(list2)
 				})
 			},
 			edit(item){
@@ -166,7 +195,7 @@
 	.workImg{
 		width: 150rpx;
 		height: 150rpx;
-		margin-right: 20rpx;
+		margin-right: 16rpx;
 		margin-top: 20rpx;
 	}
 	.workImgBox{

operatingCompany/pages/shop/shopIndex/editWorkDetail.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="content">
 		<view class="main">
-			<view class="title">上传照片</view>
+			<view class="title" style="padding-bottom: 0;">上传照片</view>
 			<view class="imgBox" >
 				<view class="imgLine" v-for="(img,imgindex) in imgArr">
-					<image :class="{img4:(imgindex+1)%4==0}" :src="img" mode="" class="itemImg"></image>
+					<image @click="previewImage(img)" :class="{img4:(imgindex+1)%4==0}" :src="img" mode="" class="itemImg"></image>
 				    <image src="../../../static/img/icon_delpic@2x.png" mode=""  class="delImg" @click="delimg(imgindex)"></image>
 				</view>
 				<view class="imgLine" @click="uploadImg">
@@ -47,11 +47,28 @@
 			
 		},
 		methods: {
+			previewImage(img){
+				var arr=[];
+				arr.push(img)
+				// 预览图片
+				uni.previewImage({
+					urls: arr,
+					longPressActions: {
+						itemList: ['发送给朋友', '保存图片', '收藏'],
+						success: function(data) {
+							console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+						},
+						fail: function(err) {
+							console.log(err.errMsg);
+						}
+					}
+				});
+			},
 		    uploadImg(){
 				var that=this;
 				uni.chooseImage({
 					sourceType: ['album'],
-					count:1, 
+					count:9, 
 				    success: (chooseImageRes) => {
 				        const tempFilePaths = chooseImageRes.tempFilePaths;
 				       /* uni.uploadFile({

operatingCompany/pages/shop/shopIndex/editcomplete.vue

@@ -73,14 +73,17 @@
 				this.userEvaStar=e.value
 			},
 			submit(){
-				if(this.userEvaContent.length<10){
-					uni.showToast({
-					    title: '请填写十字以上的评价内容',
-						icon:'none',
-					    duration: 2000,
-					})
-					return false;
+				if(this.userEvaStar<5){
+					if(this.userEvaContent.length<10){
+						uni.showToast({
+						    title: '请填写十字以上的评价内容',
+							icon:'none',
+						    duration: 2000,
+						})
+						return false;
+					}
 				}
+				
 				uni.showLoading({ });
 				
 				this.$http('accompany/SuperCheckSheet/userEva', {

operatingCompany/uni_modules/uni-rate/components/uni-rate/uni-rate.vue

@@ -3,7 +3,9 @@
 		<view
 		    ref="uni-rate"
 		    class="uni-rate"
+			style="margin-left: 10px;"
 		>
+		    <!-- :style="{ 'margin-right': marginNumber + 'px' }"-->
 			<view
 					class="uni-rate__icon"
 					:class="{'uni-cursor-not-allowed': disabled}"
@@ -120,7 +122,7 @@
 			margin: {
 				// 星星的间距
 				type: [Number, String],
-				default: 0
+				default: 10
 			},
 			disabled: {
 				// 是否可点击