bug 提交

operatingCompany/pages/entryReport/entered.vue

@@ -194,6 +194,7 @@
 							
 							
 							v.itemList.forEach(i=>{
+								//if()
 								var itemObj={
 									itemName:i.itemName,
 									sectionItemID:i.sectionItemID,
@@ -202,6 +203,9 @@
 									keyType:i.keyType,
 									keyValue:i.keyValue,
 								}
+								if(!itemObj.itemValue&&itemObj.itemValue!==0){
+									itemObj.itemValue=''
+								}
 								sectionListobj.itemList.push(itemObj)
 							})
 							obj.sectionList.push(sectionListobj)
@@ -299,6 +303,9 @@
 								keyValue:i.keyValue,
 								id:i.id,
 							}
+							if(!itemObj.itemValue&&itemObj.itemValue!==0){
+								itemObj.itemValue=''
+							}
 							sectionListobj.itemList.push(itemObj)
 						})
 						obj.sectionList.push(sectionListobj)

operatingCompany/pages/reportManage/reportDetail.vue

@@ -79,18 +79,18 @@
 			</view>
 			<!-- 检测情况 -->
 			<view class="categoryList" v-if="tabIndex==1">
-				<view class="categoryListLine" v-for="(item,index) in info.categoryList">
+				<view class="categoryListLine" v-for="(item,index) in info.categoryList" :key="item.id">
 					<view class="categoryName">{{item.categoryName}}</view>
-					<view class="sectionList" v-for="(list,index2) in item.sectionList">
+					<view class="sectionList" v-for="(list,index2) in item.sectionList" :key="list.id">
 						<view class="checkName">{{list.checkName}}</view>
-						<view class="itemList" v-for="(v,index3) in list.itemList">
+						<view class="itemList" v-for="(v,index3) in list.itemList" :key="v.id" >
 							<view class="itemTOp">
 								<view class="itemName">{{v.itemName}}</view>
 								<view class="itemSorce" v-if="v.keyType==4">{{v.itemValue}}分</view>
 							</view>
 							<view class="itemdescribe" v-if="v.describe">{{v.describe}}</view>
 							<view class="ckImemBox" v-if="v.keyType==1">
-								<view class="ckItemLIne" v-for="(ckv,i) in v.itemValue.split(',')">
+								<view class="ckItemLIne" v-for="(ckv,i) in v.itemValue.split(',')" >
 									{{ckv}}
 								</view>
 							</view>
@@ -98,7 +98,7 @@
 								{{v.itemValue}}
 							</view>
 							<view class="itemImgBox" v-if="v.keyType==3">
-								<view  v-for="(itemiMg,i) in v.itemValue.split(',')">
+								<view  v-for="(itemiMg,i) in v.itemValue" :key="itemiMg">
 									<image :src="itemiMg" @click="previewImage(itemiMg,v.itemValue)" mode="" class="itemIMg"></image>
 								</view>
 								
@@ -126,7 +126,7 @@
 						</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>
+							<image class="workqkImg"  @click="previewImage(img,item.exeImg)" v-for="(img,imgIndex) in item.exeImg" :src="img"></image>
 						</view> 
 						<view class="suggestLineBottom">
 							<view class="suggestLineBottomTxt">实际完成实际:{{item.exeTime.slice(0,item.exeTime.length-8)}}</view>
@@ -198,9 +198,14 @@
 	   <view class="bottom"  v-if="info.state==2&&loginType==2">
 	   		<view class="shoreDz" @click="editWork">修改作业</view>
 	   </view>
-	   <view class="bottom"  v-if="info.state==4&&loginType==2">
+	   <view class="bottom"  v-if="info.state==4&&loginType==2&&info.userEvaState!=0">
 	   		<view class="shoreDz" @click="goReply">回复</view>
 	   </view>
+	   <view class="bottom" v-if="info.state==4&&loginType==2&&info.userEvaState==0">
+	   		    <view class="Submit" @click="goReply">回复</view>
+	   		    <view class="editBtn"@click="goremarks2">点评</view>
+	   			
+	   </view>
 	   <view class="bottom"  v-if="info.state==3&&loginType==2" @click="goremarks2">
 	   		<view class="shoreDz">点评</view>
 	   </view>
@@ -272,10 +277,13 @@
 			}
 		},
 		methods: {
+			
 			previewImage(img,arrstring){
 				var arr=[];
 				//arr.push(img)
-				arr=arrstring.split(',')
+				console.log(img)
+				//return false;
+				arr=arrstring//.split(',')
 				// 预览图片
 				uni.previewImage({
 					urls: arr,
@@ -429,6 +437,30 @@
 						 res.data.shopInfo[key] = this.$praseStrEmpty(res.data.shopInfo[key])
 					}
 					
+					
+					
+						if(res.data.categoryList.length>0){
+							res.data.categoryList.forEach(item2=>{
+								if(item2.sectionList.length>0){
+									item2.sectionList.forEach(item3=>{
+										if(item3.itemList.length>0){
+											item3.itemList.forEach(item4=>{
+												if(item4.keyType==3){
+													item4.itemValue=item4.itemValue.split(',')
+												}
+											})
+										}
+									})
+								}
+							})
+						}
+						
+						if(res.data.suggestList.length>0){
+							res.data.suggestList.forEach(item=>{
+								item.exeImg=item.exeImg.split(',')
+							})
+						}
+					
 					this.info = res.data;
 					if(this.userInfoId==res.data.managerID){
 						if(this.mEvaluateLook==0){