Explorar o código

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

1004749546@qq.com %!s(int64=4) %!d(string=hai) anos
pai
achega
08d3c8c7e4

+ 22 - 0
api/backLog.js

@@ -0,0 +1,22 @@
+import axios from '@/libs/axios.js'
+// 待办列表查询
+export const getBackLogList = params => {
+  return axios.request({
+    url: `taskTarget/comments/save`,
+    method: 'post'
+  })
+}
+// 待办详情
+export const getBackLogDetail = params => {
+  return axios.request({
+    url: `backlog/find/${params.id}`,
+    method: 'get'
+  })
+}
+// 指标评分保存
+export const getTaskItem = params => {
+  return axios.request({
+    url: `taskTarget/save`,
+    method: 'post'
+  })
+}

+ 2 - 3
api/banner.js

@@ -1,10 +1,9 @@
 import axios from '@/libs/axios.js'
 
-// banner图片列表
+// 查询启用的banner列表
 export const bannerList = (params) => {
-  const url = `zycar-mgr/banner/query`
   return axios.request({
-    url: url,
+    url: 'banner/query',
     data: params,
     method: 'post'
   })

+ 0 - 105
api/checkOrder.js

@@ -1,105 +0,0 @@
-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
-  })
-}
-

+ 1 - 1
api/data.js

@@ -52,7 +52,7 @@ export const downloadFile = (params) => {
 // 查询最新版本信息
 export const getSysVersion = (params) => {
   return axios.request({
-    url: `zycar-mgr/sysVersion/getLatest`,
+    url: `sysVersion/getLatest`,
     method: 'post',
 	data: {applyCode:'zyit'}
   }, true)

+ 79 - 0
api/task.js

@@ -0,0 +1,79 @@
+import axios from '@/libs/axios.js'
+// 巡店详情
+export const getTaskDetail = params => {
+  return axios.request({
+    url: `task/${params.id}`,
+    method: 'get'
+  })
+}
+// 重置任务项目(重新选择方案)
+export const updateTaskItem = params => {
+  return axios.request({
+    url: `task/changeTaskItem/${params.taskId}/${params.schemeId}`,
+    method: 'get'
+  })
+}
+// 巡店任务过期处理
+export const taskExpire = params => {
+  return axios.request({
+    url: `task/expire`,
+    method: 'get'
+  })
+}
+// 提交巡店任务
+export const submitTask = params => {
+  return axios.request({
+    url: `task/finish`,
+    method: 'post',
+    data: params
+  })
+}
+// 巡店列表,type 任务类型(视频巡店,现场巡店,点检任务)
+export const getTaskList = params => {
+  return axios.request({
+    url: `task/query/${params.pageNo}/${params.pageSize}`,
+    method: 'post',
+    data: params
+  })
+}
+// 查询门店当前任务是否进行
+export const queryCurrentTaskUsing = params => {
+  return axios.request({
+    url: `task/queryCurrentTask/${params.storeId}`,
+    method: 'get'
+  })
+}
+// 我的巡店列表
+export const queryMyTask = params => {
+  return axios.request({
+    url: `task/queryMyTask/${params.pageNo}/${params.pageSize}`,
+    method: 'post',
+    data: params
+  })
+}
+// (重新)开始巡店
+export const taskStart = params => {
+  return axios.request({
+    url: `task/save`,
+    method: 'post',
+    data: params
+  })
+}
+// 提交点检任务
+export const savePointTask = params => {
+  return axios.request({
+    url: `task/savePointTask`,
+    method: 'post',
+    data: params
+  })
+}
+// 校验当前门店是否在范围内位置;(入参{storeId:XXX,lat:XXX,lng:XXX})
+export const validTaskPosition = params => {
+  return axios.request({
+    url: `task/validPosition`,
+    method: 'post',
+    data: params
+  })
+}
+
+

+ 15 - 0
api/taskItem.js

@@ -0,0 +1,15 @@
+import axios from '@/libs/axios.js'
+// 巡店考评项目明细(继续巡店)
+export const getTaskItem = params => {
+  return axios.request({
+    url: `taskItem/${params.id}`,
+    method: 'post'
+  })
+}
+// 删除任务项目
+export const delTaskItem = params => {
+  return axios.request({
+    url: `taskItem/del/${params.id}`,
+    method: 'get'
+  })
+}

+ 22 - 0
api/taskTarget.js

@@ -0,0 +1,22 @@
+import axios from '@/libs/axios.js'
+// 指标评论更新、拍照保存
+export const taskTargetSave = params => {
+  return axios.request({
+    url: `taskTarget/comments/save`,
+    method: 'post'
+  })
+}
+// 查询点检任务列表根据任务ID
+export const getTaskTargetById = params => {
+  return axios.request({
+    url: `taskTarget/queryList/${params.taskId}`,
+    method: 'get'
+  })
+}
+// 指标评分保存
+export const getTaskItem = params => {
+  return axios.request({
+    url: `taskTarget/save`,
+    method: 'post'
+  })
+}

+ 12 - 0
pages.json

@@ -179,6 +179,18 @@
 				"navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一
 			}
 		}
+        ,{
+            "path" : "pages/spotCheckCenter/spotChecking",
+            "style" : {
+				"navigationBarTitleText": "点检中心"
+			}
+        }
+        ,{
+            "path" : "pages/spotCheckCenter/spotCheckResult",
+            "style" : {
+				"navigationBarTitleText": "点检结果"
+			}
+        }
     ],
 	"globalStyle": {
 		"navigationBarTitleText": "智能巡店",

+ 2 - 2
pages/index/index.vue

@@ -67,7 +67,7 @@ export default {
 					icon: 'dianjian',
 					color: '#ff5500',
 					name: '点检中心',
-					url:'/pages/welcomeVehicle?orderType=2&title=保养开单',
+					url:'/pages/spotCheckCenter/spotChecking',
 					target: 'page',
 					auth: true
 				},
@@ -85,7 +85,7 @@ export default {
 					icon: 'tubiaokuwenjian-gengxin-',
 					color: '#d0527e',
 					name: '巡店记录',
-					url:'/pages/more',
+					url:'/pages/shopTourRecord/shopTourRecord',
 					target: 'page',
 					auth: true
 				}

+ 105 - 0
pages/spotCheckCenter/spotCheckResult.vue

@@ -0,0 +1,105 @@
+<template>
+	<view class="result-pages">
+		<view class="results">
+			<view class="results-head">
+				<view>夏季活夏季活动布置动布置-长青长青二路店二路店-2020-05-26</view>
+				<view>任务的点检结果</view>
+				<view>
+					<view class="r-totals">113</view>
+					<view>点检总数</view>
+				</view>
+			</view>
+			<view class="results-items">
+				<view>
+					<view class="hg">6</view>
+					<view>合格项数</view>
+				</view>
+				<view>
+					<view class="bhg">2</view>
+					<view>不合格项数</view>
+				</view>
+				<view>
+					<view class="bsy">5</view>
+					<view>不适用项数</view>
+				</view>
+			</view>
+		</view>
+		<view class="result-back">
+			<u-button type="primary" @click="goBack">返回任务列表</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				pageData: null
+			}
+		},
+		methods: {
+			goBack(){
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.result-pages{
+		.results{
+			padding: 20upx;
+			background: #fff;
+			margin-bottom: 25upx;
+			.results-head{
+				text-align: center;
+				padding: 20upx 0;
+				.r-totals{
+					width: 160upx;
+					height: 160upx;
+					display: inline-block;
+					line-height: 160upx;
+					background: #ff5500;
+					border-radius: 100%;
+					color: #fff;
+					font-size: 60upx;
+					margin: 20upx 0;
+				}
+			}
+			.results-items{
+				display: flex;
+				align-items: center;
+				border-top: 1px solid #eee;
+				border-bottom: 1px solid #eee;
+				padding: 20upx 0;
+				margin-top: 20upx;
+				> view{
+					width: 33.3%;
+					border-right: 1px solid #eee;
+					text-align: center;
+					&:last-child{
+						border: 0;
+					}
+					>view{
+						&:first-child{
+							font-size: 40upx;
+							margin-bottom: 10upx;
+						}
+					}
+					.hg{
+						color: #55aa00;
+					}
+					.bhg{
+						color: #FF0000;
+					}
+					.bsy{
+						color: #007AFF;
+					}
+				}
+			}
+		}
+		.result-back{
+			padding: 20upx 50upx;
+		}
+	}
+</style>

+ 276 - 0
pages/spotCheckCenter/spotChecking.vue

@@ -0,0 +1,276 @@
+<template>
+	<view class="pagesCons">
+		<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 class="createDate">{{item.createDate}}</view>
+									 <view>待处理</view>
+								 </view>
+								 <view class="check-row" @click="viewRow(item)">
+									 <view>
+										 <view style="font-size: 30upx;margin-bottom: 10upx;">夏季活动布置</view>
+										 <view style="color: #666666;">长青二路店</view>
+									</view>
+									 <view>
+										 <text style="color: #007AFF;">开始点检</text>
+									 	 <u-icon name="icon-xian-11" custom-prefix="xd-icon" size="28" color="#888888"></u-icon>
+									 </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>
+	</view>
+</template>
+
+<script>
+	import {getCheckResult, deleteCheckResult} from '@/api/task.js'
+	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: 4
+					   },
+					  {
+					    dispName: '已完成',
+					  	typeId: 3
+					  },
+					  {
+					    dispName: '已过期',
+					  	typeId: 2
+					  },
+					  {
+					    dispName: '全部',
+					  	typeId: 1
+					  },
+				  ],
+				current: 0,
+				swiperCurrent: 0,
+				pageNo: 1,
+				pageSize: 10,
+				list: [],
+				total: 0,
+			}
+		},
+		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/spotCheckCenter/spotCheckResult?id="+item.id
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		height: 100%;
+	}
+	.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;
+					}
+					&: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;
+					}
+				}
+			}
+		}
+	}
+</style>

+ 1 - 1
pages/toDoList/toDoList.vue

@@ -126,7 +126,7 @@
 </template>
 
 <script>
-	import {getCheckResult, deleteCheckResult} from '@/api/checkOrder'
+	import {getCheckResult, deleteCheckResult} from '@/api/backLog.js'
 	import { getLookUpDatas, listLookUp } from '@/api/data'
 	import { orderQueryLike, deleteOrder, finishOrder, smAddSerPerson } from '@/api/order'
 	import { clzConfirm } from '@/libs/tools.js'

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
unpackage/dist/dev/app-plus/app-config-service.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 14 - 9
unpackage/dist/dev/app-plus/app-view.js


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio