From 57db5f8f59f4fb22b8e181fa45910e787317d7f1 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Mon, 27 May 2024 17:06:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20update=20=E6=95=B0=E9=87=8F=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/mes/workScheduling/waitReport.vue     |  6 +++---
 src/pages/mes/workScheduling/workScheduling.vue | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/pages/mes/workScheduling/waitReport.vue b/src/pages/mes/workScheduling/waitReport.vue
index fee0f50..983e49b 100644
--- a/src/pages/mes/workScheduling/waitReport.vue
+++ b/src/pages/mes/workScheduling/waitReport.vue
@@ -11,14 +11,14 @@
 					<view>报工人员：</view>
 					
 						
-					<view><u-input v-model="formData.reportPersonName" type="select" @click="showWorker = true"  placeholder="请选择人员"/></view>
+					<view><u-input v-model="formData.reportPersonName"  type="select" @click="showWorker = true"  placeholder="请选择人员"/></view>
 				</view>
 				<view class="dec-item">
 					
 					<view>报工数量：</view>
 					<view>
 						
-						<u-number-box v-model="formData.reportCount" @update:modelValue="changeReportCount()"  style="width:120px" :key="rekey" ></u-number-box>
+						<u-number-box v-model="formData.reportCount" :max="planCount" @update:modelValue="changeReportCount()"  style="width:120px" :key="rekey" ></u-number-box>
 						<!-- <u</u-form-item>-input v-model="formData.reportCount" type="number" @update:modelValue="calculatePass()" placeholder="请输入数量" /> -->
 						</view>
 						
@@ -27,7 +27,7 @@
 					<view>报工工时：</view>
 					<view>
 						<!-- <u-input v-model="formData.workTerm" type="number" placeholder="请输入工时" /> -->
-						<u-number-box v-model="formData.workTerm" style="width:120px"></u-number-box>
+						<u-number-box v-model="formData.workTerm"  :max="12" :min="0" style="width:120px"></u-number-box>
 						</view>
 				</view>
 				<view class="dec-item">
diff --git a/src/pages/mes/workScheduling/workScheduling.vue b/src/pages/mes/workScheduling/workScheduling.vue
index 6f6bb20..1f65a7f 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 && item.flagDo != 0" >操作</u-th>
+									<u-th  v-if="item.status==1 && item.flagDo != 1" >操作</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 && item.flagDo != 0">
+									<u-td v-if="detail.nodeCode==item.workingNode && item.status==1 && detail.status==0 && item.flagDo != 1">
 										<u-button  type="success" @click="nodeCodeFinish(detail)" class="tableBtn" >待完成</u-button>
 									</u-td>
-									<u-td v-if="detail.status==2 && item.status==1  && item.flagDo != 0">
+									<u-td v-if="detail.status==2 && item.status==1  && item.flagDo != 1">
 										<u-button type="primary" @click="reportHandle(detail)" class="tableBtn" >待报工</u-button>
 									</u-td>
-									<u-td v-if="detail.status==4 && item.status==1 && item.flagDo != 0">
+									<u-td v-if="detail.status==4 && item.status==1 && item.flagDo != 1">
 										<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 && item.flagDo != 0">
+									<u-td v-if="detail.status==0 && item.status==1 && detail.nodeCode!=item.workingNode && item.flagDo != 1">
 										<u-button type="warning" class="tableBtn" >待执行</u-button>
 									</u-td>
-									<u-td v-if="detail.status==1 && item.status==1 && item.flagDo != 0">
+									<u-td v-if="detail.status==1 && item.status==1 && item.flagDo != 1">
 										<u-button type="warning" class="tableBtn" >已完成</u-button>
 									</u-td>
-									<u-td v-if="detail.status==3 && item.status==1 && item.flagDo != 0">
+									<u-td v-if="detail.status==3 && item.status==1 && item.flagDo != 1">
 										<u-button type="warning" class="tableBtn" >已报工</u-button>
 									</u-td>
 								</u-tr>