已标记，批量出场功能调整

pages/parking/parkinglog.vue

@@ -95,6 +95,7 @@
 		<view class="tab-con-wrap" v-show="currentTab==1">
 			<view class="tab-con-header">
 				<view style="display: flex;align-items: center;padding:10rpx 30rpx;">
+					<u-button type="primary" size="medium" style="margin:0rpx 10rpx;padding:0rpx 30rpx;" @tap="batchOff" v-show="true">批量出场未标记车辆</u-button>
 					<u-search shape="round" border-color="#72b2ff" placeholder="输入车牌号模糊查找" v-model="filter.carNum" @search="searchHandler('in')" @custom="searchHandler('in')"></u-search>
 				</view>
 			</view>
@@ -141,10 +142,10 @@
 		<!--未离场列表 end-->
 		
 		<!--已标记列表 start-->
-		<view class="tab-con-wrap" v-show="currentTab==2">
+		<view class="tab-con-wrap" v-show="false">
 			<view class="tab-con-header">
 				<view style="display: flex;align-items: center;padding:10rpx 10rpx;">
-					<u-button type="primary" size="medium" style="margin:0rpx 10rpx;padding:0rpx 30rpx;" @tap="batchOff" v-show="true">批量移出未标记车辆</u-button>
+					<u-button type="primary" size="medium" style="margin:0rpx 10rpx;padding:0rpx 30rpx;" @tap="batchOff" v-show="true">批量出场未标记车辆</u-button>
 					<u-search shape="round" border-color="#72b2ff" placeholder="输入车牌号模糊查找" v-model="filter.carNum" @search="searchHandler('marked')" @custom="searchHandler('marked')"></u-search>
 				</view>
 				
@@ -189,17 +190,13 @@
 		data() {
 			return {
 				showCalendar:false,
-				tablist:[
-					{
-						name:'今日已离场'
-					},
-					{
-						name:'未离场'
-					},
-					{
-						name:'已标记'
-					}
-				],
+				tabTitParam:{
+					offCount:0,
+					inCount:0,
+					markedCount:0,
+					isToday:true
+				},
+				
 				currentTab:0,
 				loadMoreStat:'loadmore',
 				showMoreTip:false,
@@ -242,6 +239,12 @@
 			selectedParkName(){
 				let chk=this.myParkSites && this.selectedParkIdx!=null
 				return chk ? this.myParkSites[this.selectedParkIdx].label:'选择停车场'
+			},
+			tablist(){
+				return [
+					{name:`${this.tabTitParam.isToday?'今日':''}已离场(${this.tabTitParam.offCount})`},
+					{name:`未离场(${this.tabTitParam.inCount}/${this.tabTitParam.markedCount})`}
+				]
 			}
 		},
 		methods: {
@@ -447,8 +450,9 @@
 			
 			
 			renderSortTab(pageMode,offType){  //rptData
-				
-			   let [tab1,tab2,tab3]=this.tablist
+			
+				/**
+			   let [tab1,tab2]=this.tablist
 			   if(offType=="off"){
 				   let tmpname=this.filter.startDate && this.filter.startDate!=''?'已离场':'今日已离场';
 				   tab1={name:`${tmpname}(${pageMode.total!=null?pageMode.total:0})`}
@@ -459,7 +463,17 @@
 			   else if(offType=="marked"){
 				   tab3={name:`已标记(${pageMode.total!=null?pageMode.total:0})`}
 			   }
-			   this.tablist=[tab1,tab2,tab3]
+			   this.tablist=[tab1,tab2]**/
+			   if(offType=="off"){
+				   this.tabTitParam.isToday=this.filter.startDate==null || this.filter.startDate==''
+				   this.tabTitParam.offCount=pageMode.total!=null?pageMode.total:0
+			   }
+			   else if(offType=="in"){
+				   this.tabTitParam.inCount=pageMode.total!=null?pageMode.total:0
+			   }
+			   else if(offType=="marked"){
+			   	   this.tabTitParam.markedCount=pageMode.total!=null?pageMode.total:0
+			   }
 				
 			},
 			parseDatas(respData){
@@ -632,7 +646,7 @@
 				
 				uni.showModal({
 					title:'未标记车辆出场确认',
-					content:`请确认信息：停车场【${selPark.parking_name}】，已完成标记数【${markedCount}】，未标记表示车辆实际已不在场内，将被移出并更新状态`,
+					content:`系统记录的未离场车辆与实际不一致，已标记表示确实在场内，未标记(实际已不在场内)将更新为出场状态。请确认信息：停车场【${selPark.parking_name}】，已完成标记数【${markedCount}】，`,
 					showCancel:true,
 					success:(res)=>{
 						if (res.confirm) {