From 5dd6f6e8db684e7dba19fd2ee7bce858f9f14485 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 29 八月 2024 09:02:57 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
h5/pages/staff/task/index.vue | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/h5/pages/staff/task/index.vue b/h5/pages/staff/task/index.vue
index 942d23b..854541f 100644
--- a/h5/pages/staff/task/index.vue
+++ b/h5/pages/staff/task/index.vue
@@ -76,6 +76,23 @@
<view class="info loading">{{ 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>
@@ -245,6 +262,12 @@
// this.dataList = []
this.getList()
},
+ onBackPress(options) {
+ setTimeout(()=>{
+ this.$eventBus.$emit('taskBack')
+ })
+ return false
+ },
onShow() {
this.pagination.page = 0
this.dataList = []
@@ -298,7 +321,6 @@
i.param1 = JSON.parse(i.param1)
}
})
- console.log('dataList', this.dataList)
})
},
getHeadList() {
@@ -337,7 +359,11 @@
uni.navigateTo({
url: `/pages/staff/task/vDangetAppr?id=${objId}&objType=${objType}`
})
- } else {
+ } else if (objType === 6 || objType === 5) {
+ uni.navigateTo({
+ url: `/pages/staff/task/driver?id=${objId}&objType=${objType}`
+ })
+ }else {
uni.navigateTo({
url: `/pages/staff/task/visitorApprove?id=${objId}&objType=${objType}`
})
--
Gitblit v1.9.3