From 4f79012a98aeb12c06a04791d23939473fcbc455 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 29 三月 2024 09:59:37 +0800
Subject: [PATCH] 获取质检信息入参修改
---
src/views/dashboard/components/TaskControl.vue | 16 +++++++---------
src/api/index.ts | 6 +++---
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/api/index.ts b/src/api/index.ts
index 97242ac..728aae3 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -309,8 +309,8 @@
}
export interface getQualityParams {
- workerId: string
- procedureId: string
+ workOrderId: string
+ procedureId: number
}
/**
* 鐪嬫澘鑾峰彇璐ㄦ淇℃伅
@@ -328,7 +328,7 @@
workOrderProcedureID: number
workerID: string
workerName: string
- ids: number[]
+ ids: any[]
}
/**
* 鐪嬫澘鎶ュ伐
diff --git a/src/views/dashboard/components/TaskControl.vue b/src/views/dashboard/components/TaskControl.vue
index c9f5cb5..21dcf14 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'
@@ -217,13 +215,13 @@
if (task?.value?.ShowCheck) {
getQualityInspection({
procedureId: task.value?.Procedure.ID,
- workerId: workers.value[0].workerId
- }).then((res) => {
+ workOrderId: task.value?.Order.workOrderId
+ }).then((res: any) => {
console.log(res, '999999')
passAmount.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 +265,7 @@
workerID: workers.value[0].workerId,
workerName: workers.value[0].workerName
})
- .then((res) => {
+ .then((res: any) => {
if (res.code === 200) {
ElMessage({
message: `${tipStr}鎴愬姛`,
@@ -303,9 +301,9 @@
reportAmount: amount,
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: '鎶ュ伐鎴愬姛',
--
Gitblit v1.8.0