From 82e27d0cadbddfc73e8b978e778b802dc8e51fa1 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 29 三月 2024 10:51:36 +0800
Subject: [PATCH] 报工入参修改和工序ID修改
---
src/views/dashboard/components/TaskControl.vue | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/views/dashboard/components/TaskControl.vue b/src/views/dashboard/components/TaskControl.vue
index c9f5cb5..6967381 100644
--- a/src/views/dashboard/components/TaskControl.vue
+++ b/src/views/dashboard/components/TaskControl.vue
@@ -89,8 +89,6 @@
import ReportProductionModal1 from '@/views/dashboard/components/ReportProductionModal1.vue'
import { usePLCStore } from '@/stores/plc'
import { storeToRefs } from 'pinia'
-import { log } from 'console'
-import { isDoStatement } from 'typescript'
const props = defineProps<{
task?: Task
@@ -139,7 +137,7 @@
isProcessing: false,
workOrderProcedureID: Number(task!.value.Procedure.ID)
}).then(
- (res) => {
+ (res: any) => {
ElMessage({
message: '鎿嶄綔鎴愬姛锛�',
type: 'success'
@@ -185,6 +183,7 @@
// 鎶ュ伐
const showReportModal1 = ref(false)
const reprotIds = ref([])
+const passCount = ref(0)
function openReportModal() {
// 鏈変汉鍛樻墠鍙互鎶ュ伐
if (!workers.value || workers.value.length == 0) {
@@ -216,14 +215,15 @@
modelTitle.value = '鐢熶骇鎶ュ伐'
if (task?.value?.ShowCheck) {
getQualityInspection({
- procedureId: task.value?.Procedure.ID,
- workerId: workers.value[0].workerId
- }).then((res) => {
+ procedureId: task.value?.Procedure?.procedure.procedureId,
+ workOrderId: task.value?.Order.workOrderId
+ }).then((res: any) => {
console.log(res, '999999')
passAmount.value = res.data.passAmount
+ passCount.value = res.data.passAmount
reworkAmount.value = res.data.reworkAmount
scrappedAmount.value = res.data.scrappedAmount
- reprotIds.value = res.data.ids
+ reprotIds.value = res.data.ids || []
showReportModal1.value = true
})
} else {
@@ -267,7 +267,7 @@
workerID: workers.value[0].workerId,
workerName: workers.value[0].workerName
})
- .then((res) => {
+ .then((res: any) => {
if (res.code === 200) {
ElMessage({
message: `${tipStr}鎴愬姛`,
@@ -300,19 +300,19 @@
if (workers.value[0].workerId) {
bulletinReport({
workOrderProcedureID: Number(task.value?.Procedure.ID),
- reportAmount: amount,
+ reportAmount: passCount.value,
workerID: workers.value[0].workerId,
workerName: workers.value[0].workerName,
- ids: reprotIds
+ ids: reprotIds.value
})
- .then((res) => {
+ .then((res: any) => {
if (res.code === 200) {
ElMessage({
message: '鎶ュ伐鎴愬姛',
type: 'success',
duration: 2000
})
- showReportModal.value = false
+ showReportModal1.value = false
} else {
ElMessage({
message: '鎶ュ伐澶辫触',
--
Gitblit v1.8.0