From 364d3221b9a8e6dd3a19701d30c4dc4239ef8abf Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 07 二月 2025 11:48:49 +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 | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/h5/pages/workOrder/wait.vue b/h5/pages/workOrder/wait.vue
index d3fd3e1..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>
@@ -249,7 +249,7 @@
.tabs {
display: flex;
width: 750rpx;
- margin: 12rpx 0rpx 0;
+ margin: 0rpx 0rpx 0;
border-bottom: 1rpx solid #E5E5E5;
background-color: #fff;
--
Gitblit v1.9.3