From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 19:19:34 +0800
Subject: [PATCH] 开发更新
---
h5/pages/workOrder/wait.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/h5/pages/workOrder/wait.vue b/h5/pages/workOrder/wait.vue
index 7ccd30a..6d0ee7c 100644
--- a/h5/pages/workOrder/wait.vue
+++ b/h5/pages/workOrder/wait.vue
@@ -28,7 +28,7 @@
<view v-if="item.status == 0 && item.param3 == 0 && (item.type == 0 || item.type == 1)" class="status">鏈紑濮�
</view>
<view v-if="item.status == 0 && item.param3 == 1 && (item.type == 0 || item.type == 1)"
- class="status green">杩涜涓�</view>
+ class="status green">{{ item.type == 0 ? '鐩樼偣涓�' : '杩涜涓�' }}</view>
<view v-if="item.status == 1 && item.type == 2" class="status gray">宸插鐞�</view>
<view v-if="item.status == 1 && (item.type == 0 || item.type == 1)" class="status gray">宸插畬鎴�</view>
</view>
@@ -37,7 +37,7 @@
<view class="text">鎵ц鏃堕棿锛歿{item.obj.key3}}</view>
<view class="text">
<view class="">宸℃璐熻矗浜猴細{{item.obj.key4}}</view>
- <view class="btn" @click.stop="openSc(item)">
+ <view v-if="queryStatus == 0" class="btn" @click.stop="openSc(item)">
<image src="@/static/side/ic_saoma@2x.png" mode=""></image>
<view v-if="item.status == 0" class="">鎵爜宸℃</view>
</view>
@@ -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,13 +242,14 @@
.main_app {
padding: 0;
height: 100vh;
- overflow: hidden;
+ overflow: hidden;
+ background-color: #fff;
}
.tabs {
display: flex;
width: 750rpx;
- margin: 12rpx 0rpx 0;
+ margin: 0rpx 0rpx 0;
border-bottom: 1rpx solid #E5E5E5;
background-color: #fff;
@@ -279,7 +279,7 @@
height: 6rpx;
background-color: #fff;
border-radius: 3rpx;
- margin-top: 24rpx;
+ margin-top: 16rpx;
}
}
--
Gitblit v1.9.3