From 803033cc4e734ac9eb3062f215b654b4ae9d02c4 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 24 一月 2025 18:16:14 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
h5/pages/workOrder/wait.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/h5/pages/workOrder/wait.vue b/h5/pages/workOrder/wait.vue
index 7ccd30a..d3fd3e1 100644
--- a/h5/pages/workOrder/wait.vue
+++ b/h5/pages/workOrder/wait.vue
@@ -115,17 +115,16 @@
this.getList()
},
itemClick(item) {
- if (item.objType == 0) {
- return
- uni.navigateTo({
- url: `/pages/inventory/detail?id=${item.objId}`
+ if (item.objType == 0 && item.status == 1) {
+ uni.navigateTo({
+ url: `/pages/inventory/detail?id=${item.objId}`
})
} else if (item.objType == 1) {
// return
uni.navigateTo({
url: `/pages/polling/detail?id=${item.objId}`
})
- } else {
+ } else if(item.objType == 2) {
uni.navigateTo({
url: `/pages/workOrder/detail?id=${item.objId}`
})
@@ -243,7 +242,8 @@
.main_app {
padding: 0;
height: 100vh;
- overflow: hidden;
+ overflow: hidden;
+ background-color: #fff;
}
.tabs {
@@ -279,7 +279,7 @@
height: 6rpx;
background-color: #fff;
border-radius: 3rpx;
- margin-top: 24rpx;
+ margin-top: 16rpx;
}
}
--
Gitblit v1.9.3