Merge branch 'master' of http://47.98.226.240:3000/twt/operatingCompany

* 'master' of http://47.98.226.240:3000/twt/operatingCompany:
  bug

# Conflicts:
#	operatingCompany/pages/shop/shopIndex/editcomplete.vue

operatingCompany/pages/entryReport/entryReport.vue

@@ -247,33 +247,52 @@
 			},
 			goEntered(item) {
 	            console.log(item)
-				if(item.maxTime<31){
-					var that=this;
-					uni.showModal({
-					    title: '提示',
-					    content: '距上次提交报告：'+item.maxTime+'天，是否继续录入？',
-					    success: function (res) {
-					        if (res.confirm) {
-					          that.$store.commit('mutationsCategoryList', '');
-					          that.$store.commit('mutationssuggestList', '')
-					          uni.navigateTo({
-					          	url: 'entered?shopId=' + item.shopId + '&ShopName=' + item.ShopName + '&Contactor=' + item.Contactor
-					          })
-												 
-					        } else if (res.cancel) {
-					            console.log('用户点击取消');
-					        }
-					    }
-					});
-					
-					
+				if(item.State){
+					if(item.maxTime<30){
+						var that=this;
+						console.log(item.maxTime)
+						if(item.maxTime == null||item.maxTime===''){
+							that.$store.commit('mutationsCategoryList', '');
+							that.$store.commit('mutationssuggestList', '')
+							uni.navigateTo({
+								url: 'entered?shopId=' + item.shopId + '&ShopName=' + item.ShopName + '&Contactor=' + item.Contactor
+							})
+						}else{
+						uni.showModal({
+						    title: '提示',
+						    content: '距上次提交报告：'+item.maxTime+'天，是否继续录入？',
+						    success: function (res) {
+						        if (res.confirm) {
+						          that.$store.commit('mutationsCategoryList', '');
+						          that.$store.commit('mutationssuggestList', '')
+						          uni.navigateTo({
+						          	url: 'entered?shopId=' + item.shopId + '&ShopName=' + item.ShopName + '&Contactor=' + item.Contactor
+						          })
+													 
+						        } else if (res.cancel) {
+						            console.log('用户点击取消');
+						        }
+						    }
+						});	
+						}
+						
+						
+						
+					}else{
+						this.$store.commit('mutationsCategoryList', '');
+						this.$store.commit('mutationssuggestList', '')
+						uni.navigateTo({
+							url: 'entered?shopId=' + item.shopId + '&ShopName=' + item.ShopName + '&Contactor=' + item.Contactor
+						})
+					}
 				}else{
-					this.$store.commit('mutationsCategoryList', '');
-					this.$store.commit('mutationssuggestList', '')
-					uni.navigateTo({
-						url: 'entered?shopId=' + item.shopId + '&ShopName=' + item.ShopName + '&Contactor=' + item.Contactor
-					})
+					uni.showToast({
+						title: '未查询到检测套餐信息',
+						icon: 'none',
+						duration: 2000,
+					});
 				}
+		
 				
 				
 			},

operatingCompany/pages/entryReport/entryredItem.vue

@@ -7,7 +7,7 @@
 					<view class="itemName">{{item.itemName}}</view>
 					<view class="store" 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!=null">{{item.itemValue}} 分</view>
+						     <view class="pickerView" v-if="item.itemValue!==''">{{item.itemValue}} 分</view>
 							 <view class="pickerView" v-else>请选择</view>
 						 </picker>
 						 <view>
@@ -17,7 +17,7 @@
 				</view>
 				<view class="boxlinedescribe">{{item.describe}}</view>
 				<view class="itemCklineBox" v-if="item.keyType==1">
-					<view class="itemCkline" :class="{itemckActive:name.check}" @click="itemXx(name)" v-for="(name,nameIndex) in item.array">{{name.name}}</view> 
+					<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 class="textareaBox" v-if="item.keyType==2">
@@ -76,7 +76,7 @@
 						  }
 						   item.array=arr.reverse();
 						   item.storeIndex=null;
-						   item.itemValue=null;
+						   item.itemValue='';
 					   }else if(item.keyType==1){
 							item.keyValue=item.keyValue.replace(/，/ig,',')
 							var array= item.keyValue.split(",")
@@ -157,9 +157,13 @@
 			pickerClick(item){
 				this.pickerItem=item
 			},
-			itemXx(name){
+			itemXx(name,item){
+				item.forEach(v=>{
+					v.check=false;
+				})
 				console.log(name)
-				name.check=!name.check;
+				//name.check=!name.check;
+				name.check=true;
 				this.categoryList.splice(1,0)
 			},
 			uploadImg(item){

operatingCompany/pages/entryReport/shopEvaStar.vue

@@ -25,7 +25,7 @@
 			</view>
 		</view>
 		
-		<view class="competeCont" v-if="sheetID">
+		<view class="competeCont" v-if="sheetID&&pjShow">
 			<view class="competeContTitle">对该门店上次行动完成情况打分</view>
 			<view class="xxBox">
 				<uni-rate :max="5" v-model="xx" @change="onXXChange"/>
@@ -80,10 +80,15 @@
 				detailid:'',
 				Contactor:'',
 				iStatusBarHeight:'',
+				pjShow:true,
 			}
 		},
 		onLoad(opt) {
 		  this.sheetID=opt.id;
+		  console.log(this.sheetID)
+		  if(this.sheetID=='undefined'){
+			   this.sheetID=''
+		  }
 		  this.detailid=opt.sheetID;
 		  this.Contactor=opt.Contactor;
 		  this.shopName=opt.shopName;
@@ -145,6 +150,7 @@
 					shopEvaContent:this.userEvaContent
 				}, 'POST').then(res => {
 				    //this.submitSuperCheckSheet()
+					this.pjShow=false;
 					uni.showToast({
 					    title: '提交成功',
 						icon:'none',

operatingCompany/pages/reportManage/reportDetail.vue

@@ -121,9 +121,10 @@
 					<image src="../../static/img/_report_yixiugai@2x.png" mode="" class="exeStateImg" v-if="item.exeState==1&&info.state!=1"></image>
 				    <!-- 作业情况-->
 					<view v-if="item.exeState==1">
-						<view class="remarksLineTxt1">
+						<view class="remarksLineTxt1" style="color: #666666;">
 							作业情况
 						</view>
+						<view class="suggestCont" v-if="item.exeContent" style="padding-top: 0;padding-bottom: 0;">{{item.exeContent}}</view>
 						<view class="workqkImgBox">
 							<image class="workqkImg"  @click="previewImage(img,item.exeImg)" v-for="(img,imgIndex) in item.exeImg.split(',')" :src="img"></image>
 						</view> 

operatingCompany/pages/shop/shopIndex/editWork.vue

@@ -79,7 +79,7 @@
 				 }
 				this.$http(url, params, 'GET').then(res => {
 					var list=res.data;
-					var list1=[];
+					/* var list1=[];
 					var list2=[];
 					list.forEach(item=>{
 						if(item.exeState==1){
@@ -89,7 +89,8 @@
 						}
 					})
 					
-                  this.list=list1.concat(list2)
+                  this.list=list1.concat(list2) */
+				  this.list=list
 				})
 			},
 			edit(item){