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

operatingCompany/pages/entryReport/entryReport.vue

@@ -83,7 +83,10 @@
 					<view class="tijao">
 						<view class="time" v-if="item.maxTime">距上次提交：<text
 								style='color: #FF4F00;'>{{item.maxTime}}</text>天</view>
-						<view class="time" v-else>暂无提交记录</view>
+						<view class="time" v-else-if="item.maxTime === 0">距上次提交：当天</view>
+						<view class="time" v-else-if="!item.maxTime">暂无提交记录</view>
+
+
 
 						<view class="xiangmu"><text style='color: #FF4F00;'>{{item.checkCount}}</text>项需要检测</view>
 					</view>
@@ -91,8 +94,11 @@
 					<!-- btns -->
 					<view class="btns">
 						<view class="lishi" @click="goHistory(item)">历史记录</view>
-						<view class="qiandao">签到</view>
-						<view class="baogao" @click="goEntered(item)">录入报告</view>
+						<view class="qiandao" @click="sinnIn(item)">签到</view>
+						<view class="baogao" @click="goEntered(item)" v-if="item.levelName">录入报告</view>
+						<view class="baogao" @click="showLeveError" v-else-if="!item.levelName">录入报告</view>
+						<view class="baogao" @click="showCheckError" v-else-if="!item.PackageName || itme.State == 0">
+							录入报告</view>
 					</view>
 				</view>
 
@@ -128,7 +134,10 @@
 					<view class="tijao">
 						<view class="time" v-if="item.maxTime">距上次提交：<text
 								style='color: #FF4F00;'>{{item.maxTime}}</text>天</view>
-						<view class="time" v-else>暂无提交记录</view>
+						<view class="time" v-else-if="item.maxTime === 0">距上次提交：当天</view>
+						<view class="time" v-else-if="!item.maxTime">暂无提交记录</view>
+
+
 
 						<view class="xiangmu"><text style='color: #FF4F00;'>{{item.checkCount}}</text>项需要检测</view>
 					</view>
@@ -137,7 +146,11 @@
 					<view class="btns">
 						<view class="lishi" @click="goHistory(item)">历史记录</view>
 						<view class="qiandao" @click="sinnIn(item)">签到</view>
-						<view class="baogao" @click="goEntered(item)">录入报告</view>
+
+						<view class="baogao" @click="goEntered(item)" v-if="item.levelName">录入报告</view>
+						<view class="baogao" @click="showLeveError" v-else-if="!item.levelName">录入报告</view>
+						<view class="baogao" @click="showCheckError" v-else-if="!item.PackageName || itme.State == 0">
+							录入报告</view>
 					</view>
 				</view>
 
@@ -203,6 +216,20 @@
 			// #endif
 		},
 		methods: {
+			showLeveError() {
+				uni.showToast({
+					title: '该门店未设置门店类型',
+					icon: 'none',
+					duration: 2000,
+				});
+			},
+			showCheckError() {
+				uni.showToast({
+					title: '未查询到检测套餐信息',
+					icon: 'none',
+					duration: 2000,
+				});
+			},
 			back() {
 				uni.navigateTo({
 					url: '../index/index'
@@ -213,9 +240,9 @@
 					url: 'historyReport?shopId=' + item.shopId
 				})
 			},
-			sinnIn(item){
+			sinnIn(item) {
 				uni.navigateTo({
-					url:'signIn?shopId=' + item.shopId
+					url: 'signIn?shopId=' + item.shopId
 				})
 			},
 			goEntered(item) {
@@ -292,6 +319,7 @@
 					})
 					this.shopData = list
 
+					console.log(this.shopData);
 
 
 					// if (this.page == 1) {