From 015b4f31cebbecf6f6da760ed2f8af3da721e802 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 四月 2025 16:17:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/workOrder/workOrder.vue | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/h5/pages/workOrder/workOrder.vue b/h5/pages/workOrder/workOrder.vue
index f511bc1..d89a3cb 100644
--- a/h5/pages/workOrder/workOrder.vue
+++ b/h5/pages/workOrder/workOrder.vue
@@ -23,16 +23,21 @@
<view class="report_list_row_icon">
<image src="/static/tabbar/nav_gongdan_sel@2x.png" mode="widthFix"></image>
</view>
- <view class="report_list_row_info" v-if="[0,3].includes(item.type)">
+ <view class="report_list_row_info" v-if="[0].includes(item.type)">
<text>{{titleType(item.type)}}</text>
- <text>{{userType(item.memberType)}}-{{item.memberNames}} {{item.happenTime}}/{{item.locationName}}/{{item.typeName}}</text>
+ <text>{{userType(item.memberType)}}-{{item.memberNames}} {{item.happenTime.substring(0, 16)}}/{{item.locationName}}/{{item.typeName}}</text>
+ <text>{{item.submitDate.substring(0, 16)}}</text>
+ </view>
+ <view class="report_list_row_info" v-else-if="[3].includes(item.type)">
+ <text>{{titleType(item.type)}}</text>
+ <text>{{item.happenTime.substring(0, 16)}}/{{item.locationName}}/{{item.typeName}}</text>
<text>{{item.submitDate.substring(0, 16)}}</text>
</view>
<view class="report_list_row_info1" v-else>
<text>DCA</text>
<text>{{item.typeName || '-'}}/{{item.categoryName || '-'}}</text>
<text>绗﹀悎锛歿{item.dcaYesNum}} 涓嶇鍚堬細{{item.dcaNoNum}}</text>
- <text>{{item.createDate}}</text>
+ <text>{{item.createDate.substring(0, 16)}}</text>
</view>
<view class="report_list_row_dian success" v-if="[3,4,5].includes(item.status)"></view>
<view class="report_list_row_dian error" v-else-if="[0,1,2].includes(item.status)"></view>
@@ -115,9 +120,20 @@
};
},
onLoad() {
- this.getList()
this.getLocation()
this.getLocation1()
+ },
+ onShow() {
+ this.$nextTick(() => {
+ this.$refs.pengTree._hide()
+ this.$refs.pengTree1._hide()
+ })
+ this.show = false
+ this.show1 = false
+ this.search.page = 1
+ this.search.next = true
+ this.list = []
+ this.getList()
},
onReachBottom() {
this.getList()
@@ -134,7 +150,7 @@
this.$refs.pengTree._hide()
},
// 浣嶇疆
- selectAddress(e) {
+ selectAddress1(e) {
this.localtionId = e[0].id
this.locationName = e[0].name
this.search.page = 1
@@ -164,7 +180,6 @@
page: this.search.page,
model: {
myWorkOrder: 1,
- memberId: this.userInfo.id,
type: this.typeId,
dealStatus: this.statusId,
localtionId: this.localtionId
@@ -232,7 +247,7 @@
if (type === 0) {
return 'SHE浜嬩欢涓婃姤'
} else if (type === 3) {
- return '璺岀粖婊戜簨浠�'
+ return '璺岀粖婊戜簨浠朵笂鎶�'
}
}
}
--
Gitblit v1.9.3