1

src/api/workorder/index.js

@@ -84,4 +84,13 @@ export function getReportWorkRecord(params) {
 		method: 'get',
 		params
 	})
+}
+
+// 获取当前工单的扫码标签信息
+export function getWorkOrderScanCodeInfo(params) {
+	return request({
+		url: 'kanban/workorderProgress/get_scan_code_info',
+		method: 'get',
+		params
+	})
 }

src/views/menu/productwork/index.vue

@@ -161,7 +161,12 @@
 						<el-button :disabled="!workOrderInfo.workorder" class="action-button" type="primary" size="large" @click="handlerStartOrder"
 							>开始工单</el-button
 						>
-						<el-button :disabled="!workOrderInfo.workorder" class="action-button" type="warning" size="large"
+						<el-button
+							:disabled="!workOrderInfo.workorder"
+							class="action-button"
+							type="warning"
+							size="large"
+							@click="handlerShowReportCode"
 							>报工数{{ reportNum }}</el-button
 						>
 						<el-button
@@ -228,6 +233,33 @@
 				</div>
 			</template>
 		</el-dialog>
+		<!-- 工单下的扫描条码信息 -->
+		<el-dialog v-model.sync="reportCodeDialogShow" title="报工标签" width="800px" append-to-body :close-on-click-modal="false">
+			<div style="margin-bottom: 10px; display: flex; justify-content: space-around">
+				<span style="font-size: 18px; font-weight: 600; margin-right: 20px">报工数:{{ store.workOrderTotalTaskNum.value }}</span>
+				<span style="font-size: 18px; font-weight: 600">需求数:{{ store.workOrderRemainTaskNum.value }}</span>
+			</div>
+			<el-table
+				size="large"
+				header-cell-class-name="table-header"
+				stripe
+				border
+				:data="reportCodeDialogList"
+				max-height="500"
+				style="width: 100%"
+			>
+				<el-table-column type="index" width="50" />
+				<el-table-column align="center" prop="fkWorkorder" label="工单号" />
+				<el-table-column align="center" prop="dispatchNum" label="标签" />
+				<el-table-column align="center" prop="finishedNum" label="扫码时间" />
+			</el-table>
+			<template #footer>
+				<div class="dialog-footer">
+					<el-button @click="dialogVisible = false">取消</el-button>
+					<el-button type="primary" @click="dialogVisible = false"> 确认 </el-button>
+				</div>
+			</template>
+		</el-dialog>
 	</div>
 </template>
 
@@ -390,8 +422,10 @@ const handlerWorkReport = () => {
 		handleDate: store.workCheckTime.value,
 	}
 	WorkOrderApi.getReportWorkRecord(params).then((res) => {
-		allWorkOrderReportList.value = res.data
-		dialogVisible.value = true
+		if (res.code === 200) {
+			allWorkOrderReportList.value = res.data
+			dialogVisible.value = true
+		}
 	})
 }
 // ===============================
@@ -503,6 +537,27 @@ function getProgressStatus(num1, num2) {
 		return 'exception'
 	}
 }
+
+// 报工标签数据展示
+const reportCodeDialogShow = ref(false)
+const reportCodeDialogList = ref([])
+function handlerShowReportCode() {
+	reportCodeDialogList.value = []
+	const _workorder = workOrderInfo.value.workorder
+	if(_workorder === null || _workorder === ''){
+		return;
+	}
+	const params = {
+		workorder:_workorder
+	}
+	WorkOrderApi.getWorkOrderScanCodeInfo(params).then((res) => {
+		if (res.code === 200) {
+			reportCodeDialogShow.value = true
+			reportCodeDialogList.value = res.data
+		}
+	})
+}
+
 /// ====================================================
 
 /// ============= 工单边框 ================

src/views/menu/quality/index.vue

@@ -75,7 +75,7 @@
 			<template #footer>
 				<div class="dialog-footer">
 					<el-button @click="updateDialogShow = false">取消</el-button>
-					<el-button type="primary" @click="updateDefectNum"> 确认修改 </el-button>
+					<button class="button-box" type="primary" @click="updateDefectNum"> 确认修改 </button>
 				</div>
 			</template>
 		</el-dialog>
@@ -308,9 +308,9 @@ function showUpdateDialog(item) {
 }
 function updateDefectNum() {
 	// 短按则跳过
-	if (!isLongPress.value) {
-		return
-	}
+	// if (!isLongPress.value) {
+	// 	return
+	// }
 	const workOrder = selectWorkorderInfo.value.workorder
 	if (workOrder === null || workOrder === '') {
 		proxy.$message.error('请选择一个工单！')
@@ -457,4 +457,13 @@ function changeDate(action) {
 .button-left-top {
 	width: 30%;
 }
+.button-box{
+	margin-left: 20px;
+	width: 100px;
+	height: 40px;
+	border:1px solid #eeeeee;
+	border-radius: 10%;
+	background:#0055ff;
+	color: white;
+}
 </style>