From ccf28d1fed1aa2e5437dbe64b5133ba1cbde6ec7 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 03 一月 2025 15:30:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/workOrder/list.vue | 142 ++++++++++++++++++++++++++---------------------
1 files changed, 78 insertions(+), 64 deletions(-)
diff --git a/h5/pages/workOrder/list.vue b/h5/pages/workOrder/list.vue
index 9189109..7d8e1d2 100644
--- a/h5/pages/workOrder/list.vue
+++ b/h5/pages/workOrder/list.vue
@@ -1,50 +1,58 @@
<template>
<view class="main_app">
- <view class="head_wrap">
- <view class="search_wrap">
- <image class="mr12 search" src="@/static/home/ic_search@2x.png" mode="widthFix"></image>
- <input v-model="param.roomName" @confirm="handleQuery" type="text" placeholder="鎼滅储妤煎畤/鎴块棿鍚嶇О"
- placeholder-class="placeholder9" />
- </view>
- </view>
- <!-- -->
- <view class="tabs">
- <view class="tab" :class="{active: activeTab == -1}" @click="tabsClick(-1)">
- <text>寰呭鐞�</text>
- <text class="border"></text>
- </view>
- <view class="tab" :class="{active: activeTab == 2}" @click="tabsClick(2)">
- <text>宸插鐞�</text>
- <text class="border"></text>
- </view>
- <view class="tab" @click="allClick">
- <view class="name">
- <image v-if="selectAll" class="icon" src="@/static/checked.png" mode=""></image>
- <image v-else class="icon" src="@/static/check.png" mode=""></image>
- <text>鏌ョ湅鍏ㄩ儴</text>
+ <div class="main_head">
+ <view class="head_wrap">
+ <view class="search_wrap">
+ <image class="mr12 search" src="@/static/home/ic_search@2x.png" mode="widthFix"></image>
+ <input v-model="param.roomName" @confirm="handleQuery" type="text" placeholder="鎼滅储妤煎畤/鎴块棿鍚嶇О"
+ placeholder-class="placeholder9" />
</view>
- <text class="border"></text>
</view>
- </view>
- <!-- -->
- <view class="list">
- <view class="item" v-for="item in list" @click="itemClick(item)">
- <image v-if="item.dealStatus == 0" src="@/static/side/workordered.png" class="icon"></image>
- <image v-else src="@/static/side/workorder.png" class="icon"></image>
- <view class="content">
- <view class="name_wrap line">
- <view class="name">{{item.buildingName}}/{{item.roomNum || item.floorName}}</view>
- <view class="status gray" v-if="item.dealStatus == 2">宸插鐞�</view>
- <view class="status" v-if="item.dealStatus == 0">寰呭鐞�</view>
- <view class="status" v-if="item.dealStatus == 1">寰呭鐞�</view>
+ <!-- -->
+ <view class="tabs">
+ <view class="tab" :class="{active: activeTab == '0,1'}" @click="tabsClick('0,1')">
+ <text>寰呭鐞�</text>
+ <text class="border"></text>
+ </view>
+ <view class="tab" :class="{active: activeTab == 2}" @click="tabsClick(2)">
+ <text>宸插鐞�</text>
+ <text class="border"></text>
+ </view>
+ <view class="tab" @click="allClick">
+ <view class="name">
+ <image v-if="selectAll" class="icon" src="@/static/checked.png" mode=""></image>
+ <image v-else class="icon" src="@/static/check.png" mode=""></image>
+ <text>鏌ョ湅鍏ㄩ儴</text>
</view>
- <view class="line">浣嶇疆绫诲瀷锛歿{item.areaType == '0' ? '瀹ゅ唴瑁呬慨' : '鍏叡鍖哄煙'}}</view>
- <view class="line">宸ュ崟鍒嗙被锛歿{item.categoryName}}</view>
- <view class="line">涓婃姤鏃堕棿锛歿{item.createDate}}</view>
- <view class="line">涓婇棬鏃堕棿锛歿{item.getDate}}</view>
+ <text class="border"></text>
</view>
</view>
- </view>
+ </div>
+ <!-- -->
+ <scroll-view scroll-y="true" class="scroll_Y" @scrolltolower="scrolltolower">
+ <view class="list">
+ <view class="item" v-for="item in list" @click="itemClick(item)">
+ <image v-if="item.dealStatus == 0 || item.dealStatus == 1" src="@/static/side/workordered.png" class="icon"></image>
+ <image v-else src="@/static/side/workorder.png" class="icon"></image>
+ <view class="content">
+ <view class="name_wrap line">
+ <view class="name">{{item.buildingName}}/{{item.roomNum || item.floorName}}</view>
+ <view class="status gray" v-if="item.dealStatus == 2">宸插鐞�</view>
+ <view class="status" v-if="item.dealStatus == 0">寰呭鐞�</view>
+ <view class="status" v-if="item.dealStatus == 1">寰呭鐞�</view>
+ </view>
+ <view class="line">浣嶇疆绫诲瀷锛歿{item.areaType == '0' ? '瀹ゅ唴瑁呬慨' : '鍏叡鍖哄煙'}}</view>
+ <view class="line">宸ュ崟鍒嗙被锛歿{item.categoryName}}</view>
+ <view class="line">涓婃姤鏃堕棿锛歿{item.createDate}}</view>
+ <view class="line" v-if="item.getDate">涓婇棬鏃堕棿锛歿{item.getDate}}</view>
+ </view>
+ </view>
+ <view v-if="list.length == 0" class="empty_wrap">
+ <image src="@/static/empty.png" mode=""></image>
+ <view class="">鏆傛棤鏁版嵁</view>
+ </view>
+ </view>
+ </scroll-view>
<!-- -->
</view>
</template>
@@ -57,7 +65,7 @@
data() {
return {
param: {},
- activeTab: -1,
+ activeTab: '0,1',
selectAll: false,
list: [],
@@ -65,24 +73,27 @@
page: 1,
};
},
- onShow() {
+ onLoad() {
this.getList()
},
- onReachBottom() {
- const {total,list} = this
- if (list.length < total) {
- this.page = this.page + 1
- this.getList()
- } else {
- this.showToast('鏆傛棤鏇村鏁版嵁')
- }
- },
- methods: {
+ methods: {
+ scrolltolower() {
+ const {
+ total,
+ list
+ } = this
+ if (list.length < total) {
+ this.page = this.page + 1
+ this.getList()
+ } else {
+ this.showToast('鏆傛棤鏇村鏁版嵁')
+ }
+ },
tabsClick(val) {
this.activeTab = val
this.list = []
this.page = 1
- this, getList()
+ this.getList()
},
allClick() {
this.selectAll = !this.selectAll
@@ -94,11 +105,11 @@
uni.navigateTo({
url: `/pages/workOrder/detail?id=${item.id}`
})
- },
- handleQuery() {
- this.list = []
- this.page = 1
- this.getList()
+ },
+ handleQuery() {
+ this.list = []
+ this.page = 1
+ this.getList()
},
getList() {
const {
@@ -106,15 +117,16 @@
total,
list,
activeTab,
- param,
+ param,
selectAll
} = this
ywWorkorder({
page,
capacity: 10,
model: {
- ...param,
- dispatchUserId: selectAll ? '' : uni.getStorageSync('userInfo').id,
+ ...param,
+ queryStatus: activeTab,
+ dealUserId: selectAll ? '' : uni.getStorageSync('userInfo').id,
}
}).then(res => {
this.list = [...this.list, ...res.data.records]
@@ -127,7 +139,7 @@
<style lang="scss" scoped>
.main_app {
- padding: 0 30rpx;
+ padding: 30rpx;
}
.tabs {
@@ -203,14 +215,16 @@
}
}
-
+ .scroll_Y{
+ height: calc(100vh - 250rpx);
+ }
.list {
.item {
display: flex;
// height: 290rpx;
padding: 30rpx 0;
border-bottom: 2rpx solid #E5E5E5;
-
+
.icon {
width: 80rpx;
height: 80rpx;
--
Gitblit v1.9.3