guo 3 år sedan
förälder
incheckning
ee816fcf8e

+ 14 - 13
operatingCompany/pages/entryReport/historyReport.vue

@@ -8,7 +8,7 @@
 						<view class="tabLine" :class="{tabactive:tabIndex==0}" @click="tabClick(0)">全部</view>
 						<view class="tabLine" :class="{tabactive:tabIndex==1}" @click="tabClick(1)">待提交</view>
 						<view class="tabLine" :class="{tabactive:tabIndex==2}" @click="tabClick(2)">待作业</view>
-						<view class="tabLine" :class="{tabactive:tabIndex==3}" @click="tabClick(3)">待评</view>
+						<view class="tabLine" :class="{tabactive:tabIndex==3}" @click="tabClick(3)">待评</view>
 						<view class="tabLine" :class="{tabactive:tabIndex==4}" @click="tabClick(4)">待回复</view>
 
 					</view>
@@ -52,12 +52,12 @@
 
 						<view class="shopName">{{item.ShopName}}</view>
 
-						<!-- 订单状态 1 待提交 草稿 2 已提交 待作业 3 已作业 待点评 4 已评价 待回复,5 已回复 已完成 -->
-						<view class="type" v-if="item.State == 1">待提交</view>
-						<view class="type" v-if="item.State == 2">已提交</view>
-						<view class="type" v-if="item.State == 3">已作业</view>
-						<view class="type" v-if="item.State == 4">已评价</view>
-						<view class="type" v-if="item.State == 5">已回复</view>
+						<!-- 订单状态 1 待提交 2 待作业 3 待点评 4 待回复 5 已完成 -->
+						<view class="type" v-if="item.State == 1">待提交</view>
+						<view class="type" v-if="item.State == 2">待作业</view>
+						<view class="type" v-if="item.State == 3">待点评</view>
+						<view class="type" v-if="item.State == 4">待回复</view>
+						<view class="type" v-if="item.State == 5">已完成</view>
 
 					</view>
 
@@ -98,12 +98,12 @@
 		data() {
 			return {
 				tabIndex: 0,
-				status: '', //订单状态 1 待提交 草稿 2 已提交 待作业 3 已作业 待点评 4 已评价 待回复,5 已回复 已完成
+				status: '', 
 				searchValue: '',
 				
 				thirdIndex: null,
 				thirdArr: ['请选择'],
-				managerId: '',
+				managerName: '',
 				shopData: [],
 				page: 1,
 				noMoreShow: false,
@@ -164,9 +164,10 @@
 			
 			bindPickerChange3(e) {
 				this.thirdIndex = e.target.value
-				this.managerId = this.thirdArr[this.thirdIndex].ID
+				this.managerName = this.thirdArr[this.thirdIndex]
 				if(e.target.value == 0){
 					this.thirdIndex = null
+					this.managerName = '请选择'
 				}
 				this.page = 1
 				this.getShopData()
@@ -176,9 +177,9 @@
 				uni.showLoading({
 					title: '加载中'
 				})
-				let url = 'accompany/SuperCheckSheet/myShopCheckManagerPage',
+				let url = 'accompany/SuperAccounts/shopCheckManagerHistory',
 					params = {
-						
+						shopId:this.shopId
 					}
 				this.$http(url, params, 'GET').then(res => {
 					this.thirdArr = this.thirdArr.concat(res.data)
@@ -192,7 +193,7 @@
 					params = {
 						page: this.page,
 						limit: 20,
-						managerID: this.managerId,
+						managerName: this.managerName,
 						shopName: this.searchValue,
 						starTime: this.starTime,
 						endTime: this.endTime,

+ 8 - 7
operatingCompany/pages/reportManage/reportManage.vue

@@ -8,7 +8,7 @@
 						<view class="tabLine" :class="{tabactive:tabIndex==0}" @click="tabClick(0)">全部</view>
 						<view class="tabLine" :class="{tabactive:tabIndex==1}" @click="tabClick(1)">待提交</view>
 						<view class="tabLine" :class="{tabactive:tabIndex==2}" @click="tabClick(2)">待作业</view>
-						<view class="tabLine" :class="{tabactive:tabIndex==3}" @click="tabClick(3)">待评</view>
+						<view class="tabLine" :class="{tabactive:tabIndex==3}" @click="tabClick(3)">待评</view>
 						<view class="tabLine" :class="{tabactive:tabIndex==4}" @click="tabClick(4)">待回复</view>
 
 					</view>
@@ -59,12 +59,13 @@
 
 						<view class="shopName">{{item.ShopName}}</view>
 
-						<!-- 订单状态 1 待提交 草稿 2 已提交 待作业 3 已作业 待点评 4 已评价 待回复,5 已回复 已完成 -->
+						<!-- 订单状态 1 待提交 2 待作业 3 待点评 4 待回复 5 已完成 -->
 						<view class="type" v-if="item.State == 1">待提交</view>
-						<view class="type" v-if="item.State == 2">已提交</view>
-						<view class="type" v-if="item.State == 3">已作业</view>
-						<view class="type" v-if="item.State == 4">已评价</view>
-						<view class="type" v-if="item.State == 5">已回复</view>
+						<view class="type" v-if="item.State == 2">待作业</view>
+						<view class="type" v-if="item.State == 3">待点评</view>
+						<view class="type" v-if="item.State == 4">待回复</view>
+						<view class="type" v-if="item.State == 5">已完成</view>
+						
 
 					</view>
 
@@ -104,7 +105,7 @@
 		data() {
 			return {
 				tabIndex: 0,
-				status: '', //订单状态 1 待提交 草稿 2 已提交 待作业 3 已作业 待点评 4 已评价 待回复,5 已回复 已完成
+				status: '', 
 				searchValue: '',
 				data: {
 					provinceCode: '',

+ 8 - 6
operatingCompany/pages/shop/shopIndex/index.vue

@@ -30,7 +30,7 @@
 
 					<!-- 得分 -->
 					<view class="scoreBg">
-						<view class="scoreCount count">{{storeMess.ShopScore == '' ? '暂无' :storeMess.ShopScore}}</view>
+						<view class="scoreCount count">{{storeMess.ShopScore == '' ? '--' :storeMess.ShopScore}}</view>
 						<view class="title">上次得分</view>
 					</view>
 				</view>
@@ -103,9 +103,11 @@
 
 						<view class="shopName">{{item.ShopName}}</view>
 
-						<!-- 订单状态 1 待提交 草稿 2 已提交 待作业 3 已作业 待点评 4 已评价 待回复,5 已回复 已完成 -->
-						<view class="type" v-if="item.State == 2">待作业</view>
-						<view class="type" v-if="item.State == 4">待回复</view>
+						<!-- 订单状态 1 待提交 2 待作业 3 待点评 4 待回复 5 已完成 -->
+						<view class="type" v-if="item.State == 1">待提交</view>
+						<view class="type" v-if="item.State == 2">待作业</view>
+						<view class="type" v-if="item.State == 3">待点评</view>
+						<view class="type" v-if="item.State == 4">待回复</view>
 						<view class="type" v-if="item.State == 5">已完成</view>
 
 					</view>
@@ -146,7 +148,7 @@
 			return {
 				iStatusBarHeight: '',
 				tabIndex: 0,
-				status: '', //订单状态 1 待提交 草稿 2 已提交 待作业 3 已作业 待点评 4 已评价 待回复,5 已回复 已完成
+				status: '', 
 				storeMess: {},
 				thirdIndex: null,
 				thirdArr: ['请选择'],
@@ -414,7 +416,7 @@
 		text-align: center;
 		height: 80rpx;
 	}
-
+	
 	.title {
 		font-size: 24rpx;
 		color: #555555;

+ 38 - 125
operatingCompany/pages/shop/shopIndex/reviews.vue

@@ -5,8 +5,8 @@
 			<view class="tabBox">
 				<scroll-view scroll-x="true" class="scroll">
 					<view class="tabCotn">
-						<view class="tabLine" :class="{tabactive:tabIndex==1}" @click="tabClick(1)">待点评</view>
-						<view class="tabLine" :class="{tabactive:tabIndex==2}" @click="tabClick(2)">历史点评</view>
+						<view class="tabLine" :class="{tabactive:tabIndex==0}" @click="tabClick(0)">待点评</view>
+						<view class="tabLine" :class="{tabactive:tabIndex==1}" @click="tabClick(1)">历史点评</view>
 						
 
 					</view>
@@ -25,12 +25,12 @@
 
 						<view class="shopName">{{item.ShopName}}</view>
 
-						<!-- 订单状态 1 待提交 草稿 2 已提交 待作业 3 已作业 待点评 4 已评价 待回复,5 已回复 已完成 -->
-						<view class="type" v-if="item.State == 1">待提交</view>
-						<view class="type" v-if="item.State == 2">已提交</view>
-						<view class="type" v-if="item.State == 3">已作业</view>
-						<view class="type" v-if="item.State == 4">已评价</view>
-						<view class="type" v-if="item.State == 5">已回复</view>
+						<!-- 订单状态 1 待提交 2 待作业 3 待点评 4 待回复 5 已完成 -->
+						<view class="type" v-if="item.State == 1">待提交</view>
+						<view class="type" v-if="item.State == 2">待作业</view>
+						<view class="type" v-if="item.State == 3">待点评</view>
+						<view class="type" v-if="item.State == 4">待回复</view>
+						<view class="type" v-if="item.State == 5">已完成</view>
 
 					</view>
 
@@ -43,8 +43,10 @@
 						<!-- 评分 -->
 						<view class="score" v-if="item.ShopScore">{{item.ShopScore}}分</view>
 					</view>
-
-
+					
+					<!-- 点评 -->
+					<view class="reviews" @click="goReviews(item)">点评</view>
+					
 				</view>
 			</view>
 		</view>
@@ -68,148 +70,45 @@
 		data() {
 			return {
 				tabIndex: 0,
-				status: '', //订单状态 1 待提交 草稿 2 已提交 待作业 3 已作业 待点评 4 已评价 待回复,5 已回复 已完成
-				searchValue: '',
-				data: {
-					provinceCode: '',
-					province: '',
-					cityCode: '',
-					city: '',
-					areaCode: '',
-					area: '',
-					address: null,
-				},
-				thirdIndex: null,
-				thirdArr: [{
-					name: '请选择',
-					ID: ''
-				}],
-				managerId: '',
+				status: '', 
 				shopData: [],
 				page: 1,
 				noMoreShow: false,
-				timeShow: false,
-				starTime: '',
-				endTime: '',
-				dateTime: null,
-				isDirector:'',
+				
 			}
 		},
 		onShow() {
-			this.isDirector = this.$common.isDirector()
 			
-			if(this.isDirector) {
-				this.getManager()
-			}
-
 			this.page = 1
 			this.getShopData()
 		},
 		methods: {
-			timeClick() {
-				
-				this.$refs.timepop.father();
-			},
+			
 			goAppraise(item){
 				uni.navigateTo({
 					url:'reportDetail?id='+item.ID
 				})
 			},
-			returnDate(e) {
-				console.log(e)
-				this.starTime = e.startTime
-				this.endTime = e.endTime
-				if (e.startTime) {
-					this.dateTime = e.startTime + '-' + e.endTime
-				} else {
-					this.dateTime = null
-				}
-
-				this.page = 1;
-				this.getShopData()
-			},
+			
 			tabClick(num) {
 				this.tabIndex = num;
 
-				if (num == 0) {
-					this.status = ''
-				} else {
-					this.status = num;
-				}
+				
+				this.status = num;
+				
 				this.page = 1;
 				this.getShopData()
 			},
-			searchDone(e) {
-				this.searchValue = e.target.value
-				this.page = 1
-				this.getShopData()
-			},
-
-			bindChange: function(e) {
-				console.log(e)
-				this.data.address = '区域筛选';
-				this.data.provinceCode = '';
-				this.data.cityCode = '';
-				this.data.areaCode = ''
-				if (e.detail.code[0]) {
-					this.data.provinceCode = e.detail.code[0];
-					this.data.province = e.detail.value[0];
-					if (e.detail.code[1]) {
-						this.data.cityCode = e.detail.code[1];
-						this.data.city = e.detail.value[1]
-						if (e.detail.code[2]) {
-							this.data.areaCode = e.detail.code[2];
-							this.data.area = e.detail.value[2]
-						}
-					}
-					this.data.address = this.data.province + this.data.city + this.data.area
-				} 
-
-
-
-
-
-				this.page = 1
-				this.getShopData()
-			},
-			bindPickerChange3(e) {
-				this.thirdIndex = e.target.value
-				this.managerId = this.thirdArr[this.thirdIndex].ID
-				if(e.target.value == 0){
-					this.thirdIndex = null
-				}
-				this.page = 1
-				this.getShopData()
-			},
-
-			getManager() {
-				uni.showLoading({
-					title: '加载中'
-				})
-				let url = 'accompany/SuperAccounts/queryManagerListByDept',
-					params = {
-						name: '',
-					}
-				this.$http(url, params, 'GET').then(res => {
-					this.thirdArr = this.thirdArr.concat(res.data)
-				})
-			},
+			
 			getShopData() {
 				uni.showLoading({
 					title: '加载中'
 				})
-				let url = 'accompany/SuperAccounts/listShopInfoByDeptCheckPage',
+				let url = 'accompany/SuperCheckSheet/listMyStayCheckPage',
 					params = {
 						page: this.page,
 						limit: 20,
-						provinceCode: this.data.provinceCode,
-						cityCode: this.data.cityCode,
-						areaCode: this.data.areaCode,
-						managerID: this.managerId,
-						shopName: this.searchValue,
-						starTime: this.starTime,
-						endTime: this.endTime,
-						state: this.status,
+						userEvaState: this.status,
 
 					}
 				this.$http(url, params, 'GET').then(res => {
@@ -304,7 +203,7 @@
 	.shopList {
 		background-color: #F4F5F7;
 		padding: 0rpx 24rpx;
-		padding-top: 290rpx;
+		padding-top: 105rpx;
 	}
 
 	.shopBox {
@@ -337,7 +236,8 @@
 	.bottomView {
 		padding: 28rpx 20rpx;
 		display: flex;
-		justify-content: space-between;
+		justify-content: space-between;
+		border-bottom: 1rpx #EEEEEE solid;
 	}
 
 	.manager {
@@ -348,6 +248,19 @@
 	.score {
 		font-size: 28rpx;
 		color: #B98B5D;
+	}
+	.reviews{
+		width: 150rpx;
+		height: 56rpx;
+		color: #FF4F00;
+		font-size: 28rpx;
+		line-height: 56rpx;
+		text-align: center;
+		border-radius: 28rpx;
+		border: 2rpx #FF4F00 solid;
+		position: relative;
+		right: 20rpx;
+		top: 20rpx;
 	}
 
 	/* 空白页css */