From b6d6885ab99b3c00897d379b4645aeb92dbafa27 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 23 十二月 2024 19:49:39 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 h5/pages/staff/task/index.vue |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/h5/pages/staff/task/index.vue b/h5/pages/staff/task/index.vue
index 00a8fb0..cd48fd1 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() {
@@ -354,7 +360,7 @@
       }
       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,6 +370,8 @@
         uni.navigateTo({
           url: `/pages/staff/task/vDangetAppr?id=${objId}&objType=${objType}&info=${info}`
         })
+      }else if (objType === 7) {
+        window.open('https://atwl.ahzyssl.com/dps/web/wxAuth/loginV2?oaId=atwl&redirectId=index')
       } else if (objType === 6 || objType === 5) {
         uni.navigateTo({
           url: `/pages/staff/task/driver?id=${objId}&objType=${objType}&info=${info}`
@@ -536,6 +544,7 @@
 				  font-weight: 400;
 					color: #999999;
 					width: 120rpx;
+					text-align: right;
 				}
         .loading {
           color: $uni-color-primary;

--
Gitblit v1.9.3