From 5857dfa10b70a061b8e4711dd8f18b585ac6fc23 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 25 二月 2025 17:43:37 +0800
Subject: [PATCH] ll
---
h5/pages/staff/task/index.vue | 117 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 89 insertions(+), 28 deletions(-)
diff --git a/h5/pages/staff/task/index.vue b/h5/pages/staff/task/index.vue
index b0b64bb..275c5e4 100644
--- a/h5/pages/staff/task/index.vue
+++ b/h5/pages/staff/task/index.vue
@@ -70,12 +70,29 @@
>
<view class="box_list_item_head">
<view class="df_ac">
- <text v-if="item.readed == 0" class="readed"></text>
+ <text v-if="item.readed == 0 && search.queryType === 3" class="readed"></text>
<text class="tt">{{ item.title }}</text>
</view>
- <view class="info loading">{{ item.info }}</view>
+ <view class="info" :class="{ loading: search.queryType === 0 }">{{ item.info }}</view>
</view>
<view class="box_list_item_nr">
+ <view v-if="item.param1.arriveDate" class="box_list_item_nr_item">
+ <text></text>
+ <text>{{ item.param1.arriveDate }}</text>
+ </view>
+ <view v-if="item.param1.inType" class="box_list_item_nr_item">
+ <text></text>
+ <text>{{ item.param1.inType }}</text>
+ </view>
+ <view v-if="item.param1.totalNum" class="box_list_item_nr_item">
+ <text></text>
+ <text>{{ item.param1.totalNum }}</text>
+ </view>
+ <view v-if="item.param1.carNum" class="box_list_item_nr_item">
+ <text></text>
+ <text>{{ item.param1.carNum }}</text>
+ </view>
+
<view v-if="item.param1.name" class="box_list_item_nr_item">
<text></text>
<text>{{ item.param1.name }}</text>
@@ -115,7 +132,7 @@
<view class="box_list_item_nr_x"></view>
<view class="box_list_item_nr_text">
<text class="time">{{ item.createDate }}鎻愪氦</text>
- <text v-if="item.param2 == '0'" class="btn">鍘诲鐞�</text>
+ <text v-if="search.queryType === 0" class="btn">鍘诲鐞�</text>
</view>
</view>
</view>
@@ -189,6 +206,7 @@
:show="tiemShow"
v-model="startDate"
mode="date"
+ :formatter="formatter"
@confirm="confirmLeft"
@cancel="tiemShow = false"
></u-datetime-picker>
@@ -199,6 +217,7 @@
"
v-model="startDate"
mode="date"
+ :formatter="formatter"
@confirm="confirmRight"
@cancel="tiemShow1 = false"
></u-datetime-picker>
@@ -225,12 +244,14 @@
},
headData: {},
dataList: [],
+ total: 0,
cateList: [
{ name: '璁垮鐢宠', id: 0 },
{ name: '璁垮鎶ュ', id: 1 },
{ name: '鐢ㄨ溅鐢宠', id: 2 },
{ name: '闅愭偅闅忔墜鎷�', id: 3 },
- { name: '鐗╂祦杞︾敵璇�', id: 4 },
+ { name: '鐗╂祦杞︾敵璇�', id: 6 },
+ { name: '鑰冨嫟浠ｅ姙', id: 7 },
],
startDate: dayjs().format('YYYY-MM-DD'),
}
@@ -241,9 +262,12 @@
// this.getList()
// },
onReachBottom() {
- // this.pagination.page = 0
- // this.dataList = []
- this.getList()
+ const { total, dataList} = this
+ if(dataList.length < total){
+ this.getList()
+ } else {
+ this.showToast('鏆傛棤鏇村鏁版嵁')
+ }
},
onBackPress(options) {
setTimeout(()=>{
@@ -254,10 +278,27 @@
onShow() {
this.pagination.page = 0
this.dataList = []
- this.getHeadList()
- this.getList()
+ this.getHeadList()
},
methods: {
+ formatter(type, value) {
+ if (type === 'year') {
+ return `${value}骞碻
+ }
+ if (type === 'month') {
+ return `${value}鏈坄
+ }
+ if (type === 'day') {
+ return `${value}鏃
+ }
+ if (type === 'hour') {
+ return `${value}鏃禶
+ }
+ if (type === 'minute') {
+ return `${value}鍒哷
+ }
+ return value
+ },
statusClick(val) {
this.pagination.page = 0
this.dataList = []
@@ -272,6 +313,9 @@
},
modalReset() {
this.modelParam = {}
+ this.search = {
+ queryType: 0
+ }
this.pagination.page = 0
this.dataList = []
this.showFilter = false
@@ -298,12 +342,16 @@
...search
}
}).then(res => {
+ if(res.data && res.data.records){
+ res.data.records.forEach(i => {
+ if (i.param1) {
+ i.param1 = JSON.parse(i.param1)
+ }
+ })
+ }
this.dataList = [...this.dataList, ...res.data.records]
- this.dataList.forEach(i => {
- if (i.param1) {
- i.param1 = JSON.parse(i.param1)
- }
- })
+ this.total = res.data.total
+
})
},
getHeadList() {
@@ -311,6 +359,7 @@
isDetail: '1'
}).then(res => {
this.headData = res.data
+ this.getList()
})
},
handleReady() {
@@ -321,8 +370,8 @@
})
},
handleAppr(item) {
- const { objType, objId } = item
- if (this.search.queryType === 3) {
+ const { objType, objId, info, readed } = item
+ if (readed === 0) {
signReadTask({
noticesId: item.id,
signType: 0
@@ -330,21 +379,29 @@
this.getHeadList()
})
}
+ if (item.type == 7) {
+ window.open('https://atwl.ahzyssl.com/dps/web/wxAuth/loginV2?oaId=atwl&redirectId=index')
+ return
+ }
if (objType === 2) {
uni.navigateTo({
- url: `/pages/staff/vehicle/sendACarDetail?id=${objId}&appr=1`
+ url: `/pages/staff/vehicle/sendACarDetail?id=${objId}&info=${info}`
})
} else if (objType === 1) {
uni.navigateTo({
- url: `/pages/staff/task/visitorReport?id=${objId}&objType=${objType}`
+ url: `/pages/staff/task/visitorReport?id=${objId}&objType=${objType}&info=${info}`
})
} else if (objType === 3) {
uni.navigateTo({
- url: `/pages/staff/task/vDangetAppr?id=${objId}&objType=${objType}`
+ url: `/pages/staff/task/vDangetAppr?id=${objId}&objType=${objType}&info=${info}`
})
- } else {
+ }else if (objType === 6 || objType === 5) {
uni.navigateTo({
- url: `/pages/staff/task/visitorApprove?id=${objId}&objType=${objType}`
+ url: `/pages/staff/task/driver?id=${objId}&objType=${objType}&info=${info}`
+ })
+ }else {
+ uni.navigateTo({
+ url: `/pages/staff/task/visitorApprove?id=${objId}&objType=${objType}&info=${info}`
})
}
},
@@ -499,13 +556,21 @@
align-items: center;
justify-content: space-between;
.readed {
- width: 12rpx;
- height: 12rpx;
+ width: 16rpx;
+ height: 16rpx;
border-radius: 50%;
background-color: #e0312a;
+ margin-right: 16rpx;
}
+ .info {
+ font-size: 26rpx;
+ font-weight: 400;
+ color: #999999;
+ width: 120rpx;
+ text-align: right;
+ }
.loading {
- color: #4c99a8;
+ color: $uni-color-primary;
}
.success {
color: #03c68f;
@@ -517,10 +582,6 @@
font-size: 32rpx;
font-weight: 600;
color: #222222;
- }
- .info {
- font-size: 26rpx;
- font-weight: 400;
}
}
.box_list_item_nr {
--
Gitblit v1.9.3