浏览代码

Merge branch 'deploy' of http://git.chelingzhu.com/chelingzhu-web/storeCheck-app into deploy

lilei 4 年之前
父节点
当前提交
0bf319b827

+ 105 - 0
api/checkOrder.js

@@ -0,0 +1,105 @@
+import axios from '@/libs/axios.js'
+// 检测单模糊查询
+export const getCheckResult = params => {
+  return axios.request({
+    url: `checkResult/findList/${params.pageNo}/${params.pageSize}`,
+    method: 'post',
+    data: {
+      queryWord: params.queryWord,
+      resultState: params.resultState,
+      beginDate: params.beginDate,
+      endDate: params.endDate
+    }
+  })
+}
+// 删除检测单
+export const deleteCheckResult = params => {
+  return axios.request({
+    url: `checkResult/delete`,
+    method: 'post',
+    data: {
+      id: params.id
+    }
+  })
+}
+// 查询检测结果明细
+export const findCheckResultDetail = params => {
+  return axios.request({
+    url: `checkResult/findCheckResultDetail/${params.id}`,
+    method: 'post'
+  })
+}
+// 查询第一步详细
+export const findCheckRest = params => {
+  return axios.request({
+    url: `checkResult/findCheckRest/${params.id}`,
+    method: 'post'
+  })
+}
+// 检索客户车辆信息
+export const customerVehicleStore = params => {
+  return axios.request({
+    url: `customerVehicle/findList`,
+    method: 'post',
+    data: {
+      'condition': params.condition
+    }
+  })
+}
+// 查询检测方案
+export const getCheckScheme = params => {
+  return axios.request({
+    url: `checkScheme/findEnableList`,
+    method: 'post',
+    data: {}
+  })
+}
+// 查询技工
+export const findEmployeeList = params => {
+  return axios.request({
+    url: `employee/findOnJobList`,
+    method: 'post',
+    data: {}
+  })
+}
+// 保存车辆信息
+export const saveCheckVehicle = params => {
+  return axios.request({
+    url: `checkResultIn/saveCheckVehicle`,
+    method: 'post',
+    data: params
+  })
+}
+// 保存检测方案
+export const saveCheckScheme = params => {
+  return axios.request({
+    url: `checkResultIn/saveCheckScheme`,
+    method: 'post',
+    data: params
+  })
+}
+// 检测项指标结果录入
+export const saveCheckItemResult = params => {
+  return axios.request({
+    url: `checkResultIn/saveCheckItemResult`,
+    method: 'post',
+    data: params
+  })
+}
+// 一键设为良好
+export const saveCheckItemListResultOk = params => {
+  return axios.request({
+    url: `checkResultIn/saveCheckItemListResultOk`,
+    method: 'post',
+    data: params
+  })
+}
+// 检测结果录入--检测完成
+export const saveCheckResult = params => {
+  return axios.request({
+    url: `checkResultIn/saveCheckResult`,
+    method: 'post',
+    data: params
+  })
+}
+

+ 21 - 2
pages.json

@@ -103,15 +103,27 @@
 		    "style": {
 		    "style": {
 		    	"navigationStyle": "custom" ,// 隐藏系统导航栏
 		    	"navigationStyle": "custom" ,// 隐藏系统导航栏
 		    	"navigationBarTextStyle": "white", // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一
 		    	"navigationBarTextStyle": "white", // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一
-		    	"navigationBarTitleText": "预览"
+		    	"navigationBarTitleText": "我的巡店"
 		    }
 		    }
 		},
 		},
+		{
+		    "path" : "pages/shopTourRecord/shopTourRecord",  //  巡店记录
+		    "style" : {
+				"navigationBarTitleText": "巡店记录"
+			}
+		},
 		{
 		{
 		    "path" : "pages/shopTourDetails/shopTourDetails",  //  现场巡店-巡店详情
 		    "path" : "pages/shopTourDetails/shopTourDetails",  //  现场巡店-巡店详情
 		    "style" : {
 		    "style" : {
 				"navigationBarTitleText": "巡店详情"
 				"navigationBarTitleText": "巡店详情"
 			}
 			}
 		},
 		},
+		{
+		    "path" : "pages/spotCheckDetails/spotCheckDetails",  //  点检详情
+		    "style" : {
+				"navigationBarTitleText": "点检详情"
+			}
+		},
 		{
 		{
 		    "path" : "pages/spotCheckConfigure/spotCheckList",
 		    "path" : "pages/spotCheckConfigure/spotCheckList",
 		    "style": {
 		    "style": {
@@ -159,7 +171,14 @@
             "style" : {
             "style" : {
 				"navigationBarTitleText": "可点检门店"
 				"navigationBarTitleText": "可点检门店"
 			}
 			}
-        }
+        },
+		{
+			"path": "pages/toDoList/toDoList",		//  待办单>待办单列表
+			"style": {
+				"navigationStyle": "custom" ,// 隐藏系统导航栏
+				"navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一
+			}
+		}
     ],
     ],
 	"globalStyle": {
 	"globalStyle": {
 		"navigationBarTitleText": "智能巡店",
 		"navigationBarTitleText": "智能巡店",

+ 7 - 5
pages/myShopTour/myShopTour.vue

@@ -107,6 +107,7 @@
 				},
 				},
 				tabList: [  //  tab切换  类型
 				tabList: [  //  tab切换  类型
 					{ dispName: '全部', code:'' },
 					{ dispName: '全部', code:'' },
+					{ dispName: '待处理', code:'0' },
 					{ dispName: '进行中', code:'1' },
 					{ dispName: '进行中', code:'1' },
 					{ dispName: '已完成', code:'2' },
 					{ dispName: '已完成', code:'2' },
 					{ dispName: '已过期', code:'3' }
 					{ dispName: '已过期', code:'3' }
@@ -121,9 +122,9 @@
 				noDataText: '暂无数据',  //  列表数据为空时提示文字
 				noDataText: '暂无数据',  //  列表数据为空时提示文字
 				list: [  //  数据列表
 				list: [  //  数据列表
 					{ name: '常青二店', creatTime: '2020-09-08 09:16', orderStatus: 'haveInHand', completionTime: '2020-09-08 09:16', timeConsuming: '5小时18分钟', inspectionItems: 18, qualified: 14, unqualified: 2, notApplicable: 2 },
 					{ name: '常青二店', creatTime: '2020-09-08 09:16', orderStatus: 'haveInHand', completionTime: '2020-09-08 09:16', timeConsuming: '5小时18分钟', inspectionItems: 18, qualified: 14, unqualified: 2, notApplicable: 2 },
-					{ name: '常青二店', creatTime: '2020-09-08 09:16', orderStatus: 'invalid', completionTime: '2020-09-08 09:16', timeConsuming: '5小时18分钟', inspectionItems: 18, qualified: 14, unqualified: 2, notApplicable: 2 },
-					{ name: '常青二店', creatTime: '2020-09-08 09:16', orderStatus: 'haveInHand', completionTime: '2020-09-08 09:16', timeConsuming: '5小时18分钟', inspectionItems: 18, qualified: 14, unqualified: 2, notApplicable: 2 },
-					{ name: '常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店', creatTime: '2020-09-08 09:16', orderStatus: 'completed', completionTime: '2020-09-08 09:16', timeConsuming: '5小时18分钟', inspectionItems: 18, qualified: 14, unqualified: 2, notApplicable: 2 },
+					// { name: '常青二店', creatTime: '2020-09-08 09:16', orderStatus: 'invalid', completionTime: '2020-09-08 09:16', timeConsuming: '5小时18分钟', inspectionItems: 18, qualified: 14, unqualified: 2, notApplicable: 2 },
+					// { name: '常青二店', creatTime: '2020-09-08 09:16', orderStatus: 'haveInHand', completionTime: '2020-09-08 09:16', timeConsuming: '5小时18分钟', inspectionItems: 18, qualified: 14, unqualified: 2, notApplicable: 2 },
+					// { name: '常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店常青二店', creatTime: '2020-09-08 09:16', orderStatus: 'completed', completionTime: '2020-09-08 09:16', timeConsuming: '5小时18分钟', inspectionItems: 18, qualified: 14, unqualified: 2, notApplicable: 2 },
 					{ name: '常青二店', creatTime: '2020-09-08 09:16', orderStatus: 'completed', completionTime: '2020-09-08 09:16', timeConsuming: '5小时18分钟', inspectionItems: 18, qualified: 14, unqualified: 2, notApplicable: 2 },
 					{ name: '常青二店', creatTime: '2020-09-08 09:16', orderStatus: 'completed', completionTime: '2020-09-08 09:16', timeConsuming: '5小时18分钟', inspectionItems: 18, qualified: 14, unqualified: 2, notApplicable: 2 },
 				],
 				],
 				openScreen: false,  //  是否打开筛选
 				openScreen: false,  //  是否打开筛选
@@ -303,17 +304,18 @@ page {
 					height: 100%;
 					height: 100%;
 					// 列表
 					// 列表
 					.record-con{
 					.record-con{
+						padding-top: 20upx;
 						.alert-tips{
 						.alert-tips{
 							font-size: 24upx;
 							font-size: 24upx;
 							padding: 4upx 10upx;
 							padding: 4upx 10upx;
-							margin: 20upx 30upx 10upx;
+							margin: 0upx 30upx 10upx;
 							border: 1upx solid #fcbd71;
 							border: 1upx solid #fcbd71;
 							background-color: #fdf6ec;
 							background-color: #fdf6ec;
 							border-radius: 6upx;
 							border-radius: 6upx;
 						}
 						}
 						.record-item{
 						.record-item{
 							background-color: #fff;
 							background-color: #fff;
-							margin: 20upx 30upx 20upx;
+							margin: 0upx 30upx 20upx;
 							padding: 14upx 30upx 20upx;
 							padding: 14upx 30upx 20upx;
 							border-radius: 12upx;
 							border-radius: 12upx;
 							.item-head{
 							.item-head{

+ 90 - 0
pages/shopTourDetails/commentPopup.vue

@@ -0,0 +1,90 @@
+<template>
+	<u-popup v-model="isShow" mode="center" border-radius="14" :closeable="true" length="80%" class="commentPopup-wrap">
+		<view class="popup-con">
+			<view class="popup-tit">查看评论</view>
+			<view class="popup-main">
+				<u-swiper :list="list" class="popup-swiper" @click="clickSwiper"></u-swiper>
+				<view class="popup-des">未按规则着装,上班时间玩手机抽烟等不良影响上班时间玩手机抽烟等不良影响上班时间玩手机抽烟等不良影响上班时间玩手机抽烟等不良影响上班时间玩手机抽烟等不良影响上班时间玩手机抽烟等不良影响上班时间玩手机抽烟等不良影响上班时间玩手机抽烟等不良影响上班时间玩手机抽烟等不良影响上班时间玩手机抽烟等不良影响上班时间玩手机抽烟等不良影响</view>
+			</view>
+		</view>
+	</u-popup>
+</template>
+
+<script>
+	export default{
+		name: 'CommentPopup',
+		props: {
+			openPopup: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data(){
+			return{
+				isShow: this.openPopup,  //  是否显示弹框
+				list: [{
+						image: 'https://cdn.uviewui.com/uview/swiper/1.jpg',
+						title: '昨夜星辰昨夜风,画楼西畔桂堂东'
+					},
+					{
+						image: require('@/static/defaultMe.png'),
+						title: '身无彩凤双飞翼,心有灵犀一点通'
+					},
+					{
+						image: 'https://cdn.uviewui.com/uview/swiper/3.jpg',
+						title: '谁念西风独自凉,萧萧黄叶闭疏窗,沉思往事立残阳'
+					}
+				],
+			}
+		},
+		methods: {
+			//  查看评论大图
+			clickSwiper(e){
+				// 预览图片
+				uni.previewImage({
+					current: e,
+					urls: this.list[e],
+					longPressActions: {
+						itemList: ['发送给朋友', '保存图片', '收藏'],
+						success: function(data) {
+							console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+						},
+						fail: function(err) {
+							console.log(err.errMsg);
+						}
+					}
+				})
+			}
+		},
+		watch: {
+			openPopup(val){
+				this.isShow = val
+			},
+			isShow(val){
+				if(!val){
+					this.$emit('close')
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.commentPopup-wrap{
+		.popup-con{
+			padding: 26upx 0 10upx;
+			.popup-tit{
+				padding: 10upx 30upx 26upx;
+				border-bottom: 1upx solid #f8f8f8;
+			}
+			.popup-main{
+				.popup-swiper{
+					margin: 20upx 30upx 0;
+				}
+				.popup-des{
+					padding: 20upx 30upx;
+				}
+			}
+		}
+	}
+</style>

+ 123 - 8
pages/shopTourDetails/shopTourDetails.vue

@@ -1,19 +1,63 @@
 <template>
 <template>
 	<view class="shopTourDetails-wrap">
 	<view class="shopTourDetails-wrap">
 		<scroll-view scroll-y class="scroll-con-l">
 		<scroll-view scroll-y class="scroll-con-l">
-			432
+			<view class="item-con" v-for="(item, index) in itemList" :key="index">
+				<view :class="['item-tit', nowInd==index ? 'active' : '']" @click="changeType(index)">{{item.name}}</view>
+			</view>
 		</scroll-view>
 		</scroll-view>
 		<scroll-view scroll-y class="scroll-con-r" @scrolltolower="onreachBottom">
 		<scroll-view scroll-y class="scroll-con-r" @scrolltolower="onreachBottom">
-			24
+			<view class="item-con" v-for="(item, index) in evaluationItemsList" :key="index">
+				<view class="item-tit">{{item.name}}</view>
+				<view class="item-main">
+					<view class="item-state">状态:
+						<text v-if="item.state == 0" class="green">合格</text>
+						<text v-if="item.state == 1" class="red">不合格</text>
+						<text v-if="item.state == 2" class="yellow">不适用</text>
+					</view>
+					<text class="item-btn" @click="openPopup=true">查看评论</text>
+				</view>
+				<view class="item-footer">
+					考核时间:2020-09-09 14:29
+				</view>
+			</view>
 		</scroll-view>
 		</scroll-view>
+		<!-- 查看评论 -->
+		<comment-popup :openPopup="openPopup" @close="closePopup" />
 	</view>
 	</view>
 </template>
 </template>
 
 
 <script>
 <script>
+	import CommentPopup from './commentPopup.vue'
 	export default{
 	export default{
+		components: { CommentPopup },
 		data(){
 		data(){
 			return{
 			return{
-				
+				itemList: [  //  考评项目
+					{ name: '工作态度' },
+					{ name: '办事效率' },
+					{ name: '正常营业' },
+					{ name: '工作态度' },
+				],
+				evaluationItemsList: [  //  考评项
+					{ name: '按时完成工作', state: 0 },
+					{ name: '待人接物礼貌', state: 1 },
+					{ name: '按时完成工作', state: 2 },
+					{ name: '待人接物礼貌', state: 1 },
+					{ name: '按时完成工作', state: 0 },
+					{ name: '待人接物礼貌', state: 1 },
+					{ name: '按时完成工作', state: 2 },
+					{ name: '待人接物礼貌', state: 1 },
+					{ name: '按时完成工作', state: 0 },
+					{ name: '待人接物礼貌', state: 1 },
+					{ name: '按时完成工作', state: 2 },
+					{ name: '待人接物礼貌', state: 1 },
+					{ name: '按时完成工作', state: 0 },
+					{ name: '待人接物礼貌', state: 1 },
+					{ name: '按时完成工作', state: 2 },
+					{ name: '待人接物礼貌', state: 1 },
+				],
+				nowInd: 0,  //  当前考评分类
+				openPopup: false,  //  查看评论
 			}
 			}
 		},
 		},
 		methods: {
 		methods: {
@@ -26,25 +70,96 @@
 				// 	this.status = "nomore"
 				// 	this.status = "nomore"
 				// }
 				// }
 			},
 			},
+			//  切换分类
+			changeType(ind){
+				this.nowInd = ind
+			},
+			//  关闭   查看评论
+			closePopup(){
+				this.openPopup = false
+			}
 		}
 		}
 	}
 	}
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 	page {
 	page {
-		height: calc(100vh - 56px);
+		background-color: #f8f8f8;
+		height: calc(100vh - 48px);
 	}
 	}
 	.shopTourDetails-wrap{
 	.shopTourDetails-wrap{
 		height: 100%;
 		height: 100%;
+		background-color: #f8f8f8;
 		.scroll-con-l{
 		.scroll-con-l{
 			display: inline-block;
 			display: inline-block;
-			width: 30%;
-			height: 100%;
+			width: 28%;
+			height: 99%;
+			margin: 1% 1% 0;
+			box-sizing: border-box;
+			.item-con{
+				.item-tit{
+					text-align: center;
+					padding: 26upx 0;
+					margin-bottom: 12upx;
+					background-color: #fff;
+					position: relative;
+					&:before{
+						content: '';
+						background-color: #fff;
+						width: 8upx;
+						height: 50upx;
+						display: block;
+						position: absolute;
+						right: 0;
+						top: 18upx;
+					}
+				}
+				.item-tit.active{
+					&:before{
+						background-color: #fa3534;
+					}
+				}
+			}
 		}
 		}
 		.scroll-con-r{
 		.scroll-con-r{
 			display: inline-block;
 			display: inline-block;
-			width: 70%;
-			height: 100%;
+			width: 69%;
+			height: 99%;
+			margin: 1% 1% 0 0;
+			.item-con{
+				padding: 14upx 30upx;
+				margin-bottom: 18upx;
+				border-radius: 12upx;
+				background-color: #fff;
+				.item-tit{
+					font-weight: bold;
+				}
+				.item-main{
+					padding: 14upx 0;
+					display: flex;
+					justify-content: space-between;
+					.item-state{
+						font-size: 26upx;
+						text.green{
+							color: #19be6b;
+						}
+						text.yellow{
+							color: #ff9900;
+						}
+						text.red{
+							color: #fa3534;
+						}
+					}
+					.item-btn{
+						font-size: 24upx;
+						color: #2979ff;
+					}
+				}
+				.item-footer{
+					font-size: 24upx;
+					color: #464646;
+				}
+			}
 		}
 		}
 	}
 	}
 </style>
 </style>

+ 67 - 0
pages/shopTourRecord/shopTourRecord.vue

@@ -0,0 +1,67 @@
+<template>
+	<view class="shopTourRecord-wrap">
+		<!-- 顶部筛选条件 -->
+		<u-dropdown ref="uDropdown" class="uDropdown">
+			<u-dropdown-item v-model="searchForm.isAll" title="全部" :options="options1"></u-dropdown-item>
+			<u-dropdown-item v-model="searchForm.inspectionMethod" title="检查方式" :options="options2"></u-dropdown-item>
+			<u-dropdown-item v-model="searchForm.state" title="状态" :options="options2"></u-dropdown-item>
+			<u-dropdown-item title="筛选">
+				<view class="slot-content" style="background-color: #FFFFFF;">
+					<scroll-view scroll-y="true" style="height: 200upx;">
+						<view class="u-text-center u-content-color u-m-t-20 u-m-b-20">无言独上西楼</view>
+						<view class="u-text-center u-content-color u-m-t-20 u-m-b-20">月如钩</view>
+						<view class="u-text-center u-content-color u-m-t-20 u-m-b-20">寂寞梧桐深院锁清秋</view>
+						<view class="u-text-center u-content-color u-m-t-20 u-m-b-20">剪不断</view>
+						<view class="u-text-center u-content-color u-m-t-20 u-m-b-20">理还乱</view>
+						<view class="u-text-center u-content-color u-m-t-20 u-m-b-20">是离愁</view>
+						<view class="u-text-center u-content-color u-m-t-20 u-m-b-20">别是一般滋味在心头</view>
+					</scroll-view>
+					<u-button type="primary" @click="closeDropdown">确定</u-button>
+				</view>
+			</u-dropdown-item>
+		</u-dropdown>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				value1: 1,
+				value2: 2,
+				options1: [
+					{ label: '默认排序', value: 1, },
+					{ label: '距离优先', value: 2, },
+					{ label: '价格优先', value: 3, }
+				],
+				options2: [
+					{ label: '去冰', value: 1, },
+					{ label: '加冰', value: 2, },
+				],
+				searchForm: {
+					isAll: '',
+					inspectionMethod: '',
+					state: '',
+					screen: ''
+				}
+			}
+		},
+		methods: {
+			closeDropdown() {
+				this.$refs.uDropdown.close()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: #f8f8f8;
+		height: calc(100vh - 44px);
+	}
+	.shopTourRecord-wrap{
+		.uDropdown{
+			
+		}
+	}
+</style>

+ 158 - 0
pages/spotCheckDetails/spotCheckDetails.vue

@@ -0,0 +1,158 @@
+<template>
+	<view class="spotCheckDetails-wrap">
+		<view class="item-con" v-for="(item,index) in list" :key="index">
+			<view class="item-header">
+				<view class="header-l">
+					<text class="item-sub">{{index + 1}}、</text>
+					<view class="item-c">
+						<text class="item-c-tit">{{item.name}}:</text>
+						<text class="item-c-txt">{{item.content}}</text>
+					</view>
+				</view>
+				<text v-if="item.state == 0" class="header-r green">合格</text>
+				<text v-if="item.state == 1" class="header-r red">不合格</text>
+				<text v-if="item.state == 2" class="header-r yellow">不适用</text>
+			</view>
+			<view class="comment-con">
+				<u-row gutter="16" class="pic-con">
+					<u-col span="3" v-for="(pic, ind) in item.picList" :key="ind">
+						<u-image class="pic" width="100%" height="150upx" :src="pic" @click="clickPic(index, ind)"></u-image>
+					</u-col>
+				</u-row>
+				<view class="comment-main">
+					<text class="comment-tit">{{item.userName}}:</text>
+					<text class="comment-txt">{{item.remarks}}</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				list: [  //  列表数据
+					{ 
+						name: '着装标准',
+						content: '服装干净、整洁、无污渍服装干净、整',
+						picList: [
+							'', '', ''
+						],
+						userName: '测试账号',
+						remarks: '未穿工服、办公桌面不整洁',
+						state: 0
+					},
+					{
+						name: '着装标准',
+						content: '服装干净、整洁、无污渍服装干净、整洁、无污渍服装干净、整洁、无污渍服装干净、整洁、无污渍服装干净、整洁、无污渍服装干净、整洁、无污渍',
+						picList: [
+							'', '', ''
+						],
+						userName: '测试账号',
+						remarks: '未穿工服、办公桌面不整洁,未穿工服、办公桌面不整洁,未穿工服、办公桌面不整洁,未穿工服、办公桌面不整洁',
+						state: 1
+					},
+					{
+						name: '着装标准',
+						content: '服装干净、整洁、无污渍服装干净、整',
+						picList: [
+							'', '', ''
+						],
+						userName: '测试账号',
+						remarks: '未穿工服、办公桌面不整洁',
+						state: 2
+					},
+				]
+			}
+		},
+		methods: {
+			//  查看评论大图
+			clickPic(index,ind){
+				// 预览图片
+				uni.previewImage({
+					current: ind,
+					urls: this.list[index].picList[ind],
+					longPressActions: {
+						itemList: ['发送给朋友', '保存图片', '收藏'],
+						success: function(data) {
+							console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+						},
+						fail: function(err) {
+							console.log(err.errMsg);
+						}
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: #f8f8f8;
+		height: calc(100vh - 44px);
+	}
+	.spotCheckDetails-wrap{
+		padding-top: 20upx;
+		.item-con{
+			background-color: #fff;
+			margin: 0 20upx 20upx;
+			padding: 16upx 20upx 20upx;
+			.item-header{
+				display: flex;
+				justify-content: space-between;
+				.header-l{
+					flex-grow: 1;
+					position: relative;
+					.item-sub{
+						position: absolute;
+						left: 0;
+						top: 0;
+						width: 66upx;
+						text-align: center;
+					}
+					.item-c{
+						padding-left: 66upx;
+						.item-c-tit{
+							font-weight: bold;
+						}
+						.item-c-txt{
+							
+						}
+					}
+				}
+				.header-r{
+					flex-shrink: 0;
+				}
+				.header-r.green{
+					color: #19be6b;
+				}
+				.header-r.yellow{
+					color: #ff9900;
+				}
+				.header-r.red{
+					color: #fa3534;
+				}
+			}
+			.comment-con{
+				.pic-con{
+					margin: 20upx 0;
+				}
+				.comment-main{
+					font-size: 26upx;
+					padding: 16upx 20upx;
+					line-height: 1.5em;
+					border-radius: 12upx;
+					background-color: #f8f8f8;
+					.comment-tit{
+						font-weight: bold;
+					}
+					.comment-txt{
+						
+					}
+				}
+			}
+		}
+	}
+</style>

+ 425 - 0
pages/toDoList/toDoList.vue

@@ -0,0 +1,425 @@
+<template>
+	<view class="pagesCons">
+		<!-- 自定义标题 -->
+		<u-navbar :is-back="false" :border-bottom="false" :background="background" id="navbar">
+			<view class="slot-wrap">
+				<view class="back-icon" @click="goBack">
+					<u-icon name="arrow-left" color="#fff" size="32"></u-icon>
+				</view>
+				<view class="left-icon">待办单</view>
+				<view class="right-icon">
+					<u-icon name="plus-circle" color="#fff" size="32"></u-icon>新增
+				</view>
+			</view>
+		</u-navbar>
+		<view class="tab-body">
+			    <view>
+					<u-tabs-swiper ref="uTabs" :list="tabList" name="dispName" :current="current" @change="tabsChange" :is-scroll="false"
+					 swiperWidth="750"></u-tabs-swiper>
+				</view>
+				<swiper class="check-list" :current="swiperCurrent" @transition="transition" @change="swiperChange" @animationfinish="animationfinish">
+					<swiper-item class="swiper-item" style="height: 100%;width: 100%;overflow: hidden;" v-for="(tabs, index) in tabList" :key="index">
+						<scroll-view scroll-y style="height: 100%;width: 100%;overflow: auto;" @scrolltolower="onreachBottom">
+							<view  
+							class="check-order-list" 
+							v-for="(item,index) in list" 
+							:key="item.id"
+							>
+								 <view class="check-row" @click="viewRow(item)">
+									 <view>{{item.carModelName}}</view>
+									 <view class="createDate">{{item.createDate}}</view>
+								 </view>
+								 <view class="check-row" @click="viewRow(item)">
+									 <view>
+										 {{item.vehicleNumber}}
+									</view>
+									 <view style="text-align: right;">
+										 <uni-font-icons size="14" type="icon-phone"></uni-font-icons>
+										 <text>{{item.customMobile}}</text>
+									 </view>
+									 <view style="width: 40upx;text-align: right;" v-if="item.resultState != 10">
+									 	 <uni-font-icons type="icon-xiangyoujiantou"></uni-font-icons>
+									 </view>
+								 </view>
+								 <view class="check-row">
+									 <view>
+										{{item.orderSource}}
+									 </view>
+									 <view style="text-align: right;">
+										 
+									 </view>
+								 </view>
+							 </view>
+							 <u-empty :text="noDataText" img-width="120" v-if="list.length==0 && status!='loading'" mode="list"></u-empty>
+							 <view style="padding: 20upx;">
+								 <u-loadmore v-if="total>pageSize || status=='loading'" :status="status" />
+							 </view>
+						</scroll-view>
+					</swiper-item>
+				</swiper>
+		</view>
+		<!-- 工单查询 -->
+		<u-popup v-model="showSearch" class="search-popup" mode="right" :custom-style="{top:'var(--status-bar-height)'}" length="80%">
+				<view class="search-title">工单查询</view>
+				<view class="uni-list">
+					<view class="uni-list-cell">
+						<view class="uni-list-cell-left">
+							关键词:
+						</view>
+						<view class="uni-list-cell-db">
+							<input class="uni-input" v-model="queryWord" placeholder="工单、客户姓名、手机号、车牌号" />
+						</view>
+					</view>
+				</view>
+				<view class="uni-list">
+					<view class="uni-list-cell">
+						<view class="uni-list-cell-left">
+							开始时间:
+						</view>
+						<view class="uni-list-cell-db">
+							<picker mode="date" v-model="beginDate" :end="endDate" @change="bindBeginDateChange">
+								<view class="uni-input">{{beginDate}}</view>
+							</picker>
+						</view>
+					</view>
+				</view>
+				<view class="uni-list">
+					<view class="uni-list-cell">
+						<view class="uni-list-cell-left">
+							结束时间:
+						</view>
+						<view class="uni-list-cell-db">
+							<picker mode="date" v-model="endDate" :start="beginDate" @change="bindEndDateChange">
+								<view class="uni-input">{{endDate}}</view>
+							</picker>
+						</view>
+					</view>
+				</view>
+				<view class="uni-list-btns">
+					<button type="primary" @click="pageInit(false)">查询</button>
+					<button type="info" @click="resetForm">重置</button>
+				</view>
+			</u-popup>
+	</view>
+</template>
+
+<script>
+	import {getCheckResult, deleteCheckResult} from '@/api/checkOrder'
+	import { getLookUpDatas, listLookUp } from '@/api/data'
+	import { orderQueryLike, deleteOrder, finishOrder, smAddSerPerson } from '@/api/order'
+	import { clzConfirm } from '@/libs/tools.js'
+	export default {
+		components: {
+		},
+		data() {
+			return {
+				showSearch: false,
+				status: 'loadmore',
+				canEdit: false, 
+				canFinish: false, 
+				canDel: false, 
+				canView: false, 
+				canPay: false, 
+				noDataText: '暂无数据',
+				background: {
+					// 渐变色
+					backgroundImage: 'linear-gradient(45deg, rgb(85, 170, 255), rgb(21, 102, 223))'
+				},
+				tabList: [
+					  {
+						  dispName: '发给我的',
+						  typeId: 3
+					   },
+					  {
+					    dispName: '我创建的',
+					  	typeId: 1
+					  },
+					  {
+					    dispName: '全部',
+					  	typeId: 2
+					  },
+				  ],
+				current: 0,
+				swiperCurrent: 0,
+				// 查询条件
+				queryWord: '',
+				beginDate: '',
+				endDate: '',
+				typeId: '',
+				finishFlag: '',
+				orderFlag: '',
+				orderFlags: [],
+				pageNo: 1,
+				pageSize: 10,
+				list: [],
+				total: 0,
+				openAddServerStaff: false,  //  是否打开选择服务人员弹框
+				smOrderId: '',  //  移动扫码洗车服务id
+			}
+		},
+		onLoad() {
+			this.getRow()
+		},
+		methods:{
+			message(title){
+				uni.showToast({
+					icon:'none',
+					title: title
+				})
+			},
+			// tabs通知swiper切换
+			tabsChange(index) {
+				this.swiperCurrent = index;
+				this.list = []
+				this.status = "loading"
+			},
+			swiperChange(event){
+				console.log(event.detail)
+				this.list = []
+				this.status = "loading"
+			},
+			// swiper-item左右移动,通知tabs的滑块跟随移动
+			transition(e) {
+				let dx = e.detail.dx;
+				this.$refs.uTabs.setDx(dx);
+			},
+			// 由于swiper的内部机制问题,快速切换swiper不会触发dx的连续变化,需要在结束时重置状态
+			// swiper滑动结束,分别设置tabs和swiper的状态
+			animationfinish(e) {
+				let current = e.detail.current;
+				if(current != this.current){
+					this.$refs.uTabs.setFinishCurrent(current);
+					this.swiperCurrent = current;
+					this.current = current;
+					this.getRow()
+				}
+			},
+			// scroll-view到底部加载更多
+			onreachBottom() {
+				console.log(this.list.length, this.total)
+				if(this.list.length < this.total){
+					this.pageNo += 1
+					this.getRow()
+				}else{
+					this.status = "nomore"
+				}
+			},
+			// 查询列表
+			getRow (pageNo) {
+			  let _this = this
+			  if (pageNo) {
+			    this.pageNo = pageNo
+			  }
+			  
+			  let params = {
+			    pageNo: this.pageNo,
+			    pageSize: this.pageSize,
+			    queryWord: this.queryWord,
+			    queryBeginDate: this.beginDate,
+			    queryEndDate: this.endDate,
+			    typeId: this.typeId,
+			    finishFlag: this.finishFlag,
+			    orderFlag: this.orderFlag,
+				orderFlags: this.orderFlags,
+			    orderSource: this.orderSource
+			  }
+			  this.status = "loading"
+			  orderQueryLike(params).then(res => {
+				if (res.code == 200 || res.status == 204 || res.status == 200) {
+				  if(_this.pageNo>1){
+					  _this.list = _this.list.concat(res.data.list || [])
+				  }else{
+					  _this.list = res.data.list || []
+				  }
+				  _this.total = res.data.count || 0
+				} else {
+				  _this.list = []
+				  _this.total = 0
+				  _this.noDataText = res.message
+				}
+				_this.status = "loadmore"
+			  })
+			},
+			// 查询条件
+			openSearch(){
+				this.showSearch = true
+			},
+			bindBeginDateChange(e){
+				this.beginDate = e.target.value
+			},
+			bindEndDateChange(e){
+				this.endDate = e.target.value
+			},
+			// 重置
+			resetForm(){
+				this.queryWord = ''
+				this.beginDate = ''
+				this.endDate = ''
+				this.pageInit(true)
+			},
+			// 详细页
+			viewRow(item){
+				// 已完成的
+				uni.navigateTo({
+					url: "/pages/workOrder/orderDetails?id="+item.id
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		height: 100%;
+	}
+	/* 自定义导航栏样式 */
+	.slot-wrap {
+		display: flex;
+		align-items: center;
+		/* 如果您想让slot内容占满整个导航栏的宽度 */
+		flex: 1;
+		/* 如果您想让slot内容与导航栏左右有空隙 */
+		padding: 0 30rpx;
+		color: #fff;
+		font-size: 28upx;
+		.left-icon {
+			flex-grow: 1;
+			font-size: 32upx;
+			margin-right: 10upx;
+			text-align: center;
+		}
+		.right-icon {
+			padding-left: 50upx;
+		}
+		.uni-icons {
+			margin-right: 10upx;
+		}
+	}
+	.pagesCons{
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		.tab-body{
+			.check-list{
+				height: calc(100vh - 120px);
+			}
+			.check-order-list{
+				background: #ffffff;
+				padding: 10upx 20upx;
+				margin: 25upx;
+				border-radius: 6upx;
+				box-shadow: 1px 1px 3px #EEEEEE;
+				.check-row{
+					display: flex;
+					align-items: center;
+					padding: 20upx 10upx;
+					font-size: 28upx;
+					&:first-child{
+						border-bottom: 1px dashed #F8F8F8;
+						font-size: 26upx;
+						.createDate{
+							color: #666;
+						}
+					}
+					&:last-child{
+						border-top: 1px dashed #F8F8F8;
+					}
+					> view{
+						&:first-child{
+							flex-grow: 1;
+						}
+					}
+					.action{
+						margin: 0 6rpx;
+						padding: 0 20rpx;
+						color: #fff;
+					}
+					.edit{
+						background-color: #f9ba09;
+					}
+					.view{
+						background-color: #ff7801;
+					}
+					.del{
+						background-color: #f72525;
+					}
+					.finish{
+						background-color: #2d8cf0;
+					}
+					.pay{
+						background-color: #10c71e;
+					}
+					.check-btns{
+						width: '50%';
+						display: flex;
+						align-items: center;
+						justify-content: flex-end;
+						> view{
+							margin-left: 35upx;
+							font-size: 28upx;
+						}
+					}
+					.u-tag{
+						border-radius: 0;
+					}
+					.uni-icons{
+						margin: 0 5upx;
+					}
+				}
+			}
+		}
+	}
+   .slot-wrap {
+		display: flex;
+		align-items: center;
+		/* 如果您想让slot内容占满整个导航栏的宽度 */
+		flex: 1;
+		/* 如果您想让slot内容与导航栏左右有空隙 */
+		padding: 0 30rpx 0 0;
+		color: #fff;
+		font-size: 28upx;
+		.left-icon{
+			flex-grow: 1;
+			font-size: 32upx;
+		}
+		.right-icon{
+			padding-left:50upx;
+		}
+		.uni-icons{
+			margin-right: 10upx;
+		}
+	}
+	.search-popup{
+		.search-title{
+			text-align: center;
+			padding: 22upx;
+			color: #333;
+			border-bottom: 1px solid #eee;
+		}
+		.uni-list{
+			margin: 20upx;
+			.uni-list-cell{
+				display: flex;
+				align-items: center;
+				border-bottom: 1px dashed #EEEEEE;
+				.uni-list-cell-db{
+					flex: 1;
+				}
+				.uni-input{
+					height: 2.5em;
+					line-height: 2.5em;
+				}
+			}
+		}
+		.uni-list-btns{
+			display: flex;
+			padding: 20upx;
+			uni-button{
+				font-size: 28upx;
+				margin: 0 30upx;
+				flex:1;
+			}
+		}
+		
+	}
+</style>

+ 9 - 0
pages/work/work.vue

@@ -37,6 +37,15 @@
 						target: 'page',
 						target: 'page',
 						auth: true
 						auth: true
 					},
 					},
+					{
+						id: 'tcgl',
+						icon: 'daiban',
+						color: '#ffaf69',
+						name: '待办单',
+						url:'/pages/toDoList/toDoList',
+						target: 'page',
+						auth: true
+					},
 				],
 				],
 			}
 			}
 		},
 		},