Prechádzať zdrojové kódy

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

lilei 4 rokov pred
rodič
commit
0208fd4e2a
2 zmenil súbory, kde vykonal 174 pridanie a 159 odobranie
  1. 115 0
      pages/toDoList/searchModal.vue
  2. 59 159
      pages/toDoList/toDoList.vue

+ 115 - 0
pages/toDoList/searchModal.vue

@@ -0,0 +1,115 @@
+<template>
+	<!-- 待办单查询 -->
+	<u-popup v-model="isshow" class="search-popup" mode="right" @close="handleClose" :custom-style="{top:'var(--status-bar-height)'}" length="80%">
+		<view class="search-title">待办单查询</view>
+		<u-form class="form-content" :model="form" ref="uForm" label-width="150">
+			<u-form-item label="发起时间" prop="time">
+				<u-input v-model="form.time" disabled placeholder="请选择发起时间区间" @click="showPicker=true"/>
+			</u-form-item>
+			<u-form-item label="门店" prop="storeName">
+				<u-input v-model="form.storeName" placeholder="请输入门店名称" />
+			</u-form-item>
+			<u-form-item label="巡店人" prop="userName">
+				<u-input v-model="form.userName" placeholder="请输入巡店人名称" />
+			</u-form-item>
+			<u-form-item label="单据状态" prop="status"> 
+				<u-input v-model="form.status" placeholder="请输入巡店人名称" />
+			</u-form-item>
+			<u-form-item label="检查方式" prop="status">
+				<u-input v-model="form.status" placeholder="请输入巡店人名称" />
+			</u-form-item>
+			<u-form-item label="过期状态" prop="status">
+				<u-input v-model="form.status" placeholder="请输入巡店人名称" />
+			</u-form-item>
+		</u-form>
+		<view class="uni-list-btns">
+			<button type="primary" @click="pageInit(false)">查询</button>
+			<button type="info" @click="resetForm">重置</button>
+		</view>
+		<!-- 时间选择器 -->
+		<mx-date-picker :show="showPicker" type="range" :value="form.time" :show-tips="true" @confirm="onSelected" @cancel="onSelected" />
+	</u-popup>
+</template>
+
+<script>
+	import MxDatePicker from "@/components/mx-datepicker/mx-datepicker.vue"
+	export default {
+		components: {
+			MxDatePicker
+		},
+		props: {
+			visible: {
+				type: Boolean,
+				default: false
+			}
+		},
+		watch: {
+			visible (newValue, oldValue) {
+				if (newValue) {
+					this.isshow = newValue
+				} else {
+				}
+			},
+			isshow (newValue, oldValue) {
+				if (newValue) {
+				} else {
+					this.$emit('close')
+				}
+			}
+		},
+		data() {
+			return {
+				isshow: this.visible,  // 显示隐藏
+				showPicker: false, // 是否显示时间弹窗
+				form: {
+					time: null,
+				},
+			}
+		},
+		methods: {
+			// 关闭弹窗
+			handleClose () {
+				this.isshow = false
+			}
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.search-popup{
+		.search-title{
+			text-align: center;
+			padding: 22upx;
+			color: #333;
+			border-bottom: 1px solid #eee;
+		}
+		.form-content {
+			padding: 0 20upx;
+		}
+		.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>

+ 59 - 159
pages/toDoList/toDoList.vue

@@ -29,7 +29,7 @@
 							<u-icon name="arrow-down-fill" color="#888888" size="24"></u-icon>
 						</view>
 					</u-row>
-					<view >
+					<view @click="showSearch=true">
 						<text>筛选</text>
 						<u-icon name="shaixuan" custom-prefix="xd-icon" size="32" color="#888888"></u-icon>
 					</view>
@@ -43,15 +43,15 @@
 							:key="item.id"
 							>
 								 <view class="check-row" @click="viewRow(item)">
-									 <view class="ellipsis-one">{{item.carModelName}}</view>
+									 <view class="ellipsis-one">{{item.storeName}}</view>
 									 <view class="createDate">{{item.createDate}}</view>
 								 </view>
 								 <view class="check-row" @click="viewRow(item)">
 									 <view class="ellipsis-one">
-										 {{item.vehicleNumber}}
+										 {{item.clsName}}
 									</view>
 									 <view class="text-right">
-										 <text>{{item.customMobile}}</text>
+										 <text>{{item.userName}}</text>
 									 </view>
 									 <view class="icon-xian" >
 										 <u-icon name="icon-xian-11" custom-prefix="xd-icon" size="30" color="#888888"></u-icon>
@@ -59,13 +59,13 @@
 								 </view>
 								 <view class="check-row">
 									 <view>
-										{{item.orderSource}}
+										{{item.sourceType}}
 									 </view>
 									 <view class="text-right">
 										 <text class="mark">
 										 	抄送
 										 </text>
-										 <view class="status">待整改</view>
+										 <view class="status">{{item.status}}</view>
 									 </view>
 								 </view>
 							 </view>
@@ -77,68 +77,22 @@
 					</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>
+		<search-modal :visible="showSearch" @close="showSearch=false"></search-modal>
 	</view>
 </template>
 
 <script>
-	import {getCheckResult, deleteCheckResult} from '@/api/backLog.js'
+	import { getBackLogList } from '@/api/backLog.js'
 	import { getLookUpDatas, listLookUp } from '@/api/data'
-	import { orderQueryLike, deleteOrder, finishOrder, smAddSerPerson } from '@/api/backLog'
-	import { clzConfirm } from '@/libs/tools.js'
+	import searchModal from './searchModal.vue'
 	export default {
 		components: {
+			searchModal
 		},
 		data() {
 			return {
 				showSearch: false,
 				status: 'loadmore',
-				canEdit: false, 
-				canFinish: false, 
-				canDel: false, 
-				canView: false, 
-				canPay: false, 
 				noDataText: '暂无数据',
 				background: {
 					// 渐变色
@@ -160,20 +114,35 @@
 				  ],
 				current: 0,
 				swiperCurrent: 0,
-				// 查询条件
-				queryWord: '',
-				beginDate: '',
-				endDate: '',
-				typeId: '',
-				finishFlag: '',
-				orderFlag: '',
-				orderFlags: [],
 				pageNo: 1,
 				pageSize: 10,
-				list: [],
+				list: [
+					{
+						storeName: '常青二路店',
+						createDate: '2020-08-08 16:12:00',
+						clsName: '正常营业',
+						userName: '张三',
+						sourceType: '视频巡店',
+						status: '待整改'
+					},
+					{
+						storeName: '常青二路店',
+						createDate: '2020-08-08 16:12:00',
+						clsName: '正常营业',
+						userName: '张三',
+						sourceType: '视频巡店',
+						status: '待整改'
+					},
+					{
+						storeName: '常青二路店',
+						createDate: '2020-08-08 16:12:00',
+						clsName: '正常营业',
+						userName: '张三',
+						sourceType: '视频巡店',
+						status: '待整改'
+					}
+				],
 				total: 0,
-				openAddServerStaff: false,  //  是否打开选择服务人员弹框
-				smOrderId: '',  //  移动扫码洗车服务id
 			}
 		},
 		onLoad() {
@@ -189,13 +158,13 @@
 			// tabs通知swiper切换
 			tabsChange(index) {
 				this.swiperCurrent = index;
-				this.list = []
-				this.status = "loading"
+				// this.list = []
+				// this.status = "loading"
 			},
 			swiperChange(event){
 				console.log(event.detail)
-				this.list = []
-				this.status = "loading"
+				// this.list = []
+				// this.status = "loading"
 			},
 			// swiper-item左右移动,通知tabs的滑块跟随移动
 			transition(e) {
@@ -232,42 +201,24 @@
 			  
 			  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
+			    pageSize: this.pageSize
 			  }
-			  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
+			  // 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"
+			 //  })
 			},
 			// 重置
 			resetForm(){
@@ -402,57 +353,6 @@
 			}
 		}
 	}
-   .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>