From c8b32b8bca79a116cfab70eb8c389907b664c9ca Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 23 四月 2025 10:43:14 +0800
Subject: [PATCH] 提交

---
 h5/pages/workOrder/workOrder.vue |   35 ++++++++++++++++++++++++++---------
 1 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/h5/pages/workOrder/workOrder.vue b/h5/pages/workOrder/workOrder.vue
index f511bc1..eaf750a 100644
--- a/h5/pages/workOrder/workOrder.vue
+++ b/h5/pages/workOrder/workOrder.vue
@@ -10,11 +10,11 @@
 				<u-icon name="arrow-down-fill" color="#666666" size="13"></u-icon>
 			</view>
 			<view class="report_search_row" @click="$refs.pengTree._show()" v-if="['3'].includes(typeId)">
-				<text>{{locationName ? locationName : '鍙戠敓鍦扮偣'}}</text>
+				<text>{{localtionId ? locationName : '鍙戠敓鍦扮偣'}}</text>
 				<u-icon name="arrow-down-fill" color="#666666" size="13"></u-icon>
 			</view>
 			<view class="report_search_row" @click="$refs.pengTree1._show()" v-if="['1'].includes(typeId)">
-				<text>{{locationName ? locationName : '浣嶇疆'}}</text>
+				<text>{{localtionId ? locationName : '浣嶇疆'}}</text>
 				<u-icon name="arrow-down-fill" color="#666666" size="13"></u-icon>
 			</view>
 		</view>
@@ -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
@@ -147,6 +163,7 @@
 			async getLocation() {
 				let res = await this.$u.api.categoryTree({ categoryType: 2 })
 				if (res.code === 200) {
+					res.data.unshift({ name: '鍏ㄩ儴', id: '', childList: [] })
 					this.address = res.data
 				}
 			},
@@ -154,6 +171,7 @@
 			async getLocation1() {
 				let res = await this.$u.api.categoryTree({ categoryType: 3 })
 				if (res.code === 200) {
+					res.data.unshift({ name: '鍏ㄩ儴', id: '', childList: [] })
 					this.address1 = res.data
 				}
 			},
@@ -164,7 +182,6 @@
 					page: this.search.page,
 					model: {
 						myWorkOrder: 1,
-						memberId: this.userInfo.id,
 						type: this.typeId,
 						dealStatus: this.statusId,
 						localtionId: this.localtionId
@@ -232,7 +249,7 @@
 				if (type === 0) {
 					return 'SHE浜嬩欢涓婃姤'
 				} else if (type === 3) {
-					return '璺岀粖婊戜簨浠�'
+					return '璺岀粖婊戜簨浠朵笂鎶�'
 				}
 			}
 		}

--
Gitblit v1.9.3