From b2e8e233d59d107615a8336dce9da36f1f8bcde0 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 03 十二月 2024 16:46:47 +0800
Subject: [PATCH] ll

---
 h5/pages/polling/task.vue |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/h5/pages/polling/task.vue b/h5/pages/polling/task.vue
index ee37c83..e93198f 100644
--- a/h5/pages/polling/task.vue
+++ b/h5/pages/polling/task.vue
@@ -8,11 +8,11 @@
 		</view> -->
 		<!--  -->
 		<view class="tabs">
-			<view class="tab" :class="{active: param.status == 0}" @click="tabsClick(0)">
+			<view class="tab" :class="{active: param.queryStatus == '0,1'}" @click="tabsClick('0,1')">
 				<text>寰呭鐞�</text>
 				<text class="border"></text>
 			</view>
-			<view class="tab" :class="{active: param.status == 3}" @click="tabsClick(3)">
+			<view class="tab" :class="{active: param.queryStatus == 3}" @click="tabsClick(3)">
 				<text>宸插鐞�</text>
 				<text class="border"></text>
 			</view>
@@ -39,10 +39,10 @@
 							gray: item.status == 3 || item.status == 4
 						}">{{statusM[item.status]}}</view>
 					</view>
-					<view class="line" v-if="item.startDate && item.endDate">浠诲姟鏃ユ湡锛歿{ item.startDate.slice(0, 11) }} 鑷� {{ item.endDate.slice(0, 11) }}</view>
-					<view class="line">鎵ц鏃堕棿锛歿{ item.startDate.slice(11, 16) }} - {{ item.endDate.slice(11, 16) }}</view>
+					<view class="line" v-if="item.startDate">浠诲姟鏃ユ湡锛歿{ item.startDate.slice(0, 11) }}</view>
+					<view class="line">鎵ц鏃堕棿锛歿{ item.startDate.slice(11, 16) }} 鑷� {{ item.endDate.slice(11, 16) }}</view>
 					<view class="line">
-						<view>瀹屾垚鎯呭喌锛歿{item.finishNum}}/{{item.patrolNum}}</view>
+						<view>瀹屾垚鎯呭喌锛歿{item.finishNum || 0}}/{{item.patrolNum}}</view>
 						<view class="btn">
 							<image src="@/static/side/ic_saoma@2x.png" class="saoma" mode=""></image>
 							<view>鎵爜宸℃</view>
@@ -61,7 +61,7 @@
 		data() {
 			return {
 				param: {
-					status: 0
+					queryStatus: '0,1'
 				},
 				list: [],
 				activeTab: 0,
@@ -110,7 +110,7 @@
 			getList() {
 				const { page, param, selectAll } = this
 				ywPatrolTaskPost({
-					model: {...param, dispatchUserId: selectAll ? '' : uni.getStorageSync('userInfo').id, },
+					model: {...param, dealUserId: selectAll ? '' : uni.getStorageSync('userInfo').id, },
 					page,
 					capacity: 10
 				}).then(res => {

--
Gitblit v1.9.3