From 6c5165f73c90fbd4e22e4f9a39497b5a25ee37f9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十二月 2024 09:53:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/task/index.vue | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/h5/pages/staff/task/index.vue b/h5/pages/staff/task/index.vue
index 56ed2e0..0636047 100644
--- a/h5/pages/staff/task/index.vue
+++ b/h5/pages/staff/task/index.vue
@@ -293,6 +293,9 @@
},
modalReset() {
this.modelParam = {}
+ this.search = {
+ queryType: 0
+ }
this.pagination.page = 0
this.dataList = []
this.showFilter = false
@@ -319,13 +322,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.total = res.data.total
- this.dataList.forEach(i => {
- if (i.param1) {
- i.param1 = JSON.parse(i.param1)
- }
- })
+
})
},
getHeadList() {
@@ -352,9 +358,13 @@
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&info=${info}`
+ url: `/pages/staff/vehicle/sendACarDetail?id=${objId}&info=${info}`
})
} else if (objType === 1) {
uni.navigateTo({
@@ -364,7 +374,7 @@
uni.navigateTo({
url: `/pages/staff/task/vDangetAppr?id=${objId}&objType=${objType}&info=${info}`
})
- } else if (objType === 6 || objType === 5) {
+ }else if (objType === 6 || objType === 5) {
uni.navigateTo({
url: `/pages/staff/task/driver?id=${objId}&objType=${objType}&info=${info}`
})
@@ -535,6 +545,8 @@
font-size: 26rpx;
font-weight: 400;
color: #999999;
+ width: 120rpx;
+ text-align: right;
}
.loading {
color: $uni-color-primary;
--
Gitblit v1.9.3