From 04e8e3a312ed1f2d9dc40354ae5847ef9cc11360 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 29 八月 2026 16:22:35 +0800
Subject: [PATCH] fix: 新疆-绿能 1.报工等待时长倒计时 + 报工数量可选 2.报工自动生成产品入库单 + 勾选入库 + 不合格仓库兜底
---
src/views/mes/pro/feedback/modules/form.vue | 73 +++++++++++++++++++++++++++++++-----
1 files changed, 62 insertions(+), 11 deletions(-)
diff --git a/src/views/mes/pro/feedback/modules/form.vue b/src/views/mes/pro/feedback/modules/form.vue
index 9e5a9a3..baf93c8 100644
--- a/src/views/mes/pro/feedback/modules/form.vue
+++ b/src/views/mes/pro/feedback/modules/form.vue
@@ -25,14 +25,24 @@
updateFeedback,
} from '#/api/mes/pro/feedback';
import { getRouteProcessByRouteAndProcess } from '#/api/mes/pro/route/process';
+import { getTask } from '#/api/mes/pro/task';
import { getWorkOrder } from '#/api/mes/pro/workorder';
import { $t } from '#/locales';
import { useFormSchema } from '../data';
-import { findMissingRequiredParams, loadParamDetails, paramDetails } from '../param-state';
+import {
+ findMissingRequiredParams,
+ loadParamDetails,
+ paramDetails,
+ resetWaitConfig,
+ waitDuration,
+ waitStartTime,
+ waitTaskId,
+} from '../param-state';
import BatchInputDialog from './batch-input-dialog.vue';
import ItemConsumeList from './item-consume-list.vue';
import ProductProduceList from './product-produce-list.vue';
+import WaitCountdown from './wait-countdown.vue';
const emit = defineEmits(['success']);
const formType = ref<FormType>('create');
@@ -88,7 +98,13 @@
});
/** 鎻愪氦鍓嶅榻愭暟閲忥細鎶ュ伐鍙～鍐欐姤宸ユ暟閲忥紝鍚堟牸/涓嶈壇/搴熷搧鏁伴噺鐢辫川妫�纭畾锛屾姤宸ョ幆鑺備笉閲囬泦 */
-function alignQuantity(data: MesProFeedbackApi.Feedback) {
+function alignQuantity(
+ data: MesProFeedbackApi.Feedback,
+ needReportQuantity: boolean,
+) {
+ if (!needReportQuantity) {
+ data.feedbackQuantity = 0;
+ }
data.uncheckQuantity = data.checkFlag ? data.feedbackQuantity : 0;
delete data.qualifiedQuantity;
delete data.unqualifiedQuantity;
@@ -99,9 +115,12 @@
/** 璇诲彇骞舵寜鎻愪氦瑙勫垯瀵归綈鍚庣殑琛ㄥ崟鏁版嵁锛岀敤浜庡揩鐓у拰淇濆瓨 */
async function getAlignedData(): Promise<MesProFeedbackApi.Feedback> {
- const data = (await formApi.getValues()) as MesProFeedbackApi.Feedback;
+ const data = (await formApi.getValues()) as MesProFeedbackApi.Feedback & {
+ needReportQuantity?: boolean;
+ };
syncParamValues(data);
- alignQuantity(data);
+ alignQuantity(data, data.needReportQuantity !== false);
+ delete data.needReportQuantity;
return data;
}
@@ -292,19 +311,24 @@
}
}
-/** 鍔犺浇宸ュ簭鐨� checkFlag 鐢ㄤ簬鍥炴樉鏁伴噺鍖哄煙 */
-async function resolveCheckFlag(routeId?: number, processId?: number) {
+/** 鍔犺浇宸ュ簭閰嶇疆锛坈heckFlag / 绛夊緟鏃堕暱 / 鎶ュ伐鏁伴噺瑙勫垯锛夌敤浜庡洖鏄� */
+async function resolveRouteProcessConfig(routeId?: number, processId?: number) {
if (!routeId || !processId) {
- return true;
+ return { checkFlag: true, needReportQuantity: true };
}
try {
const routeProcess = await getRouteProcessByRouteAndProcess(
routeId,
processId,
);
- return routeProcess?.checkFlag ?? false;
+ waitDuration.value = routeProcess?.waitDuration;
+ return {
+ checkFlag: routeProcess?.checkFlag ?? false,
+ needReportQuantity: routeProcess?.needReportQuantity ?? true,
+ };
} catch {
- return true;
+ waitDuration.value = undefined;
+ return { checkFlag: true, needReportQuantity: true };
}
}
@@ -322,6 +346,7 @@
subTabsName.value = 'itemConsume';
originalSnapshot.value = '';
paramDetails.value = [];
+ resetWaitConfig();
return;
}
// 鍔犺浇鏁版嵁
@@ -357,12 +382,26 @@
try {
formData.value = await getFeedback(data.id);
await loadParamDetails(formData.value.taskId);
- const checkFlag = await resolveCheckFlag(
+ const config = await resolveRouteProcessConfig(
formData.value.routeId,
formData.value.processId,
);
+ waitTaskId.value = formData.value.taskId;
+ waitStartTime.value = undefined;
+ if (formData.value.taskId) {
+ try {
+ const task = await getTask(formData.value.taskId);
+ waitStartTime.value = task?.waitStartTime;
+ } catch {
+ // 浠诲姟涓嶅瓨鍦ㄦ椂蹇界暐鍊掕鏃跺洖鏄�
+ }
+ }
// 璁剧疆鍒� values
- await formApi.setValues({ ...formData.value, checkFlag });
+ await formApi.setValues({
+ ...formData.value,
+ checkFlag: config.checkFlag,
+ needReportQuantity: config.needReportQuantity,
+ });
// 璁板綍鍒濆蹇収锛堝惈鏁伴噺瀵归綈缁撴灉锛夛紝submit 鏃剁敤浜庤烦杩囨棤鍙樻洿鐨勪繚瀛樿姹�
originalSnapshot.value = JSON.stringify(await getAlignedData());
} finally {
@@ -375,6 +414,18 @@
<template>
<Modal :title="getTitle" class="w-3/5">
<Form class="mx-4" />
+ <div
+ v-if="waitDuration"
+ class="mx-4 mt-4 rounded border border-gray-200 p-4"
+ >
+ <div class="mb-2 font-medium">鎶ュ伐鍊掕鏃�</div>
+ <WaitCountdown
+ :task-id="waitTaskId"
+ :wait-duration="waitDuration"
+ :wait-start-time="waitStartTime"
+ :disabled="!isEditable"
+ />
+ </div>
<div v-if="paramDetails.length" class="mx-4 mt-4 rounded border border-gray-200 p-4">
<div class="mb-3 font-medium">宸ヨ壓鍙傛暟</div>
<div class="grid grid-cols-2 gap-3">
--
Gitblit v1.9.3