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 | 8 +++++---
src/api/index.ts | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/api/index.ts b/src/api/index.ts
index 728aae3..185ed66 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -310,7 +310,7 @@
export interface getQualityParams {
workOrderId: string
- procedureId: number
+ procedureId: string
}
/**
* 鐪嬫澘鑾峰彇璐ㄦ淇℃伅
diff --git a/src/views/dashboard/components/TaskControl.vue b/src/views/dashboard/components/TaskControl.vue
index 21dcf14..6967381 100644
--- a/src/views/dashboard/components/TaskControl.vue
+++ b/src/views/dashboard/components/TaskControl.vue
@@ -183,6 +183,7 @@
// 鎶ュ伐
const showReportModal1 = ref(false)
const reprotIds = ref([])
+const passCount = ref(0)
function openReportModal() {
// 鏈変汉鍛樻墠鍙互鎶ュ伐
if (!workers.value || workers.value.length == 0) {
@@ -214,11 +215,12 @@
modelTitle.value = '鐢熶骇鎶ュ伐'
if (task?.value?.ShowCheck) {
getQualityInspection({
- procedureId: task.value?.Procedure.ID,
+ 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 || []
@@ -298,7 +300,7 @@
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.value
@@ -310,7 +312,7 @@
type: 'success',
duration: 2000
})
- showReportModal.value = false
+ showReportModal1.value = false
} else {
ElMessage({
message: '鎶ュ伐澶辫触',
--
Gitblit v1.8.0