From e9fb809256cd6e37b076bcff3f1f0e924edf1281 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Mon, 27 May 2024 15:58:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20update=20=E5=BE=85=E9=A2=86=E6=96=99?=
 =?UTF-8?q?=E6=9C=9F=E9=97=B4=E4=B8=8D=E5=85=81=E8=AE=B8=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/workScheduling/workScheduling.vue     | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/pages/mes/workScheduling/workScheduling.vue b/src/pages/mes/workScheduling/workScheduling.vue
index 5bc2c86..3fa8152 100644
--- a/src/pages/mes/workScheduling/workScheduling.vue
+++ b/src/pages/mes/workScheduling/workScheduling.vue
@@ -102,28 +102,28 @@
 								<u-tr>
 									<u-th>步骤</u-th>
 									<u-th>编码</u-th>
-									<u-th  v-if="item.status==1" >操作</u-th>
+									<u-th  v-if="item.status==1 && item.flagDo != 0" >操作</u-th>
 								</u-tr>
 								<u-tr v-for="(detail, detailIndex) in item.detailDOList" :key="detailIndex"
 									class="text">
 									<u-td>{{ detailIndex + 1 }}</u-td>
 									<u-td>{{ detail.nodeCode }}</u-td>
-									<u-td v-if="detail.nodeCode==item.workingNode && item.status==1 && detail.status==0">
+									<u-td v-if="detail.nodeCode==item.workingNode && item.status==1 && detail.status==0 && item.flagDo != 0">
 										<u-button  type="success" @click="nodeCodeFinish(detail)" class="tableBtn" >待完成</u-button>
 									</u-td>
-									<u-td v-if="detail.status==2 && item.status==1">
+									<u-td v-if="detail.status==2 && item.status==1  && item.flagDo != 0">
 										<u-button type="primary" @click="reportHandle(detail)" class="tableBtn" >待报工</u-button>
 									</u-td>
-									<u-td v-if="detail.status==4 && item.status==1">
+									<u-td v-if="detail.status==4 && item.status==1 && item.flagDo != 0">
 										<u-button type="primary" @click="waitCheck(detail)" class="tableBtn" >待质检</u-button>
 									</u-td>
-									<u-td v-if="detail.status==0 && item.status==1 && detail.nodeCode!=item.workingNode">
+									<u-td v-if="detail.status==0 && item.status==1 && detail.nodeCode!=item.workingNode && item.flagDo != 0">
 										<u-button type="warning" class="tableBtn" >待执行</u-button>
 									</u-td>
-									<u-td v-if="detail.status==1 && item.status==1 ">
+									<u-td v-if="detail.status==1 && item.status==1 && item.flagDo != 0">
 										<u-button type="warning" class="tableBtn" >已完成</u-button>
 									</u-td>
-									<u-td v-if="detail.status==3 && item.status==1 ">
+									<u-td v-if="detail.status==3 && item.status==1 && item.flagDo != 0">
 										<u-button type="warning" class="tableBtn" >已报工</u-button>
 									</u-td>
 								</u-tr>
@@ -702,8 +702,11 @@
 	}
 	.tableBtn {
 		margin-left: 8px;
-		width: 35px;
+		width: 55px;
 		height: 25px;
 		font-size: 12px
 	}
+	.u-td{
+		min-height:40px
+	}
 </style>
\ No newline at end of file