bug修改

operatingCompany/pages/entryReport/entryReport.vue

@@ -246,12 +246,36 @@
 				})
 			},
 			goEntered(item) {
-				this.$store.commit('mutationsCategoryList', '');
-				this.$store.commit('mutationssuggestList', '')
-				uni.navigateTo({
-					url: 'entered?shopId=' + item.shopId + '&ShopName=' + item.ShopName + '&Contactor=' + item
-						.Contactor
-				})
+	            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('用户点击取消');
+					        }
+					    }
+					});
+					
+					
+				}else{
+					this.$store.commit('mutationsCategoryList', '');
+					this.$store.commit('mutationssuggestList', '')
+					uni.navigateTo({
+						url: 'entered?shopId=' + item.shopId + '&ShopName=' + item.ShopName + '&Contactor=' + item.Contactor
+					})
+				}
+				
+				
 			},
 			search(val) {
 				// console.log(val);

operatingCompany/pages/entryReport/entryredItem.vue

@@ -25,7 +25,7 @@
 				</view>
 				<view class="imgBox" v-if="item.keyType==3">
 					<view class="imgLine" v-for="(img,imgindex) in item.imgArr">
-						<image @click="previewImage(img)" :class="{img4:(imgindex+1)%4==0}" :src="img" mode="" class="itemImg"></image>
+						<image @click="previewImage(img,item.imgArr)" :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(item,imgindex)"></image>
 					</view>
 					<view class="imgLine" @click="uploadImg(item)">
@@ -125,12 +125,13 @@
 		    console.log(this.categoryList);
 		},
 		methods: {
-			previewImage(img){
-				var arr=[];
-				arr.push(img)
+			previewImage(img,arr){
+				//var arr=[];
+				//arr.push(img)
 				// 预览图片
 				uni.previewImage({
 					urls: arr,
+					current:img,
 					longPressActions: {
 						itemList: ['发送给朋友', '保存图片', '收藏'],
 						success: function(data) {

operatingCompany/pages/entryReport/opinion.vue

@@ -89,7 +89,21 @@
 				this.suggestList.push(obj)
 			},
 			delOp(index){
-				this.suggestList.splice(index,1)
+				var that=this;
+				var num=index+1
+				uni.showModal({
+				    title: '提示',
+				    content: '您确定要删除建议'+ num +'吗？',
+				    success: function (res) {
+				        if (res.confirm) {
+				          that.suggestList.splice(index,1)
+											 
+				        } else if (res.cancel) {
+				            console.log('用户点击取消');
+				        }
+				    }
+				});
+				
 			},
 			zc(){
 				var goname=true;

operatingCompany/pages/reportManage/reportDetail.vue

@@ -99,7 +99,7 @@
 							</view>
 							<view class="itemImgBox" v-if="v.keyType==3">
 								<view  v-for="(itemiMg,i) in v.itemValue.split(',')">
-									<image :src="itemiMg" @click="previewImage(itemiMg)" mode="" class="itemIMg"></image>
+									<image :src="itemiMg" @click="previewImage(itemiMg,v.itemValue)" mode="" class="itemIMg"></image>
 								</view>
 								
 							</view>
@@ -125,7 +125,7 @@
 							作业情况
 						</view>
 						<view class="workqkImgBox">
-							<image class="workqkImg"  @click="previewImage(img)" 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.split(',')" :src="img"></image>
 						</view> 
 						<view class="suggestLineBottom">
 							<view class="suggestLineBottomTxt">实际完成实际:{{item.exeTime.slice(0,item.exeTime.length-8)}}</view>
@@ -268,12 +268,14 @@
 			}
 		},
 		methods: {
-			previewImage(img){
+			previewImage(img,arrstring){
 				var arr=[];
-				arr.push(img)
+				//arr.push(img)
+				arr=arrstring.split(',')
 				// 预览图片
 				uni.previewImage({
 					urls: arr,
+					current:img,
 					longPressActions: {
 						itemList: ['发送给朋友', '保存图片', '收藏'],
 						success: function(data) {
@@ -499,7 +501,7 @@
 		    return {
 		      title: '报告详情',
 		      path: '/pages/reportManage/reportDetail?id='+this.id,
-			   success(res){
+			  success(res){
 				    uni.hideLoading();
 					setTimeout(function(){
 						uni.showToast({
@@ -509,8 +511,11 @@
 						}); 
 					},1000)
 			             	
-							console.log("c成功")
+				console.log("c成功")
 			   },
+			   complete(res){
+				   console.log(res)
+			   }
 		    }
 		 }
 	}
@@ -777,7 +782,7 @@
 	.itemIMg{
 		width: 150rpx;
 		height: 150rpx;
-		margin-right: 20rpx;
+		margin-right: 15rpx;
 		border-radius: 5rpx;
 		margin-top: 10rpx;
 	}

operatingCompany/pages/shop/shopIndex/editWork.vue

@@ -18,7 +18,7 @@
 					<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" @click="previewImage(img)"></image>
+					<image :src="img" mode="" v-for="(img,i) in item.exeImg.split(',')" class="workImg" @click="previewImage(img,item.exeImg)"></image>
 				</view>
 			</view>
 			<view v-if="item.exeState==1" class="suggestLineBottom">实际完成日期:{{item.exeTime.slice(0,item.exeTime.length-8)}}</view>
@@ -50,12 +50,14 @@
 
 		},
 		methods: {
-			previewImage(img){
+			previewImage(img,arrstring){
 				var arr=[];
-				arr.push(img)
+				//arr.push(img)
+				arr=arrstring.split(',')
 				// 预览图片
 				uni.previewImage({
 					urls: arr,
+					current:img,
 					longPressActions: {
 						itemList: ['发送给朋友', '保存图片', '收藏'],
 						success: function(data) {

operatingCompany/pages/shop/shopIndex/editWorkDetail.vue

@@ -4,7 +4,7 @@
 			<view class="title" style="padding-bottom: 0;">上传照片</view>
 			<view class="imgBox" >
 				<view class="imgLine" v-for="(img,imgindex) in imgArr">
-					<image @click="previewImage(img)" :class="{img4:(imgindex+1)%4==0}" :src="img" mode="" class="itemImg"></image>
+					<image @click="previewImage(img,imgArr)" :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">
@@ -46,12 +46,13 @@
 			
 		},
 		methods: {
-			previewImage(img){
-				var arr=[];
-				arr.push(img)
+			previewImage(img,arr){
+				//var arr=[];
+				//arr.push(img)
 				// 预览图片
 				uni.previewImage({
 					urls: arr,
+					current:img,
 					longPressActions: {
 						itemList: ['发送给朋友', '保存图片', '收藏'],
 						success: function(data) {

operatingCompany/pages/shop/shopIndex/editcomplete.vue

@@ -17,7 +17,7 @@
 			</view>
 			<view class="topCont">
 				<view class="topContBtn" @click="goHome">回到首页</view>
-				<view class="topContBtn">查看详情</view>
+				<view class="topContBtn" @click="godetail">查看详情</view>
 			</view>
 		</view>
 		
@@ -63,6 +63,11 @@
 			 	delta:1
 			 })  
 		   },
+		   godetail(){
+			   uni.navigateTo({
+			   	url:'../../reportManage/reportDetail?id='+this.sheetID
+			   })
+		   },
 		   goHome(){
 			 uni.navigateTo({
 			 	url:'index'