From 8b9372d6e78c68689aa8e027d1d765ad7569371a Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 18 八月 2026 09:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fix/hsy/20260812' into dev_pro2.0
---
src/views/mes/pro/task/modules/schedule-form.vue | 51 +++++++++++++++++++++++++++------------------------
1 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/src/views/mes/pro/task/modules/schedule-form.vue b/src/views/mes/pro/task/modules/schedule-form.vue
index 8f67bd3..c14e0bd 100644
--- a/src/views/mes/pro/task/modules/schedule-form.vue
+++ b/src/views/mes/pro/task/modules/schedule-form.vue
@@ -1,4 +1,4 @@
-锘�<script lang="ts" setup>
+<script lang="ts" setup>
import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
import type { MesProWorkOrderProcessApi } from '#/api/mes/pro/workorder/process';
@@ -50,16 +50,19 @@
message.warning('褰撳墠璁㈠崟鏈厤缃伐搴忥紝璇峰厛鍦ㄥ伐鍗曚腑缁存姢宸ュ簭淇℃伅');
return;
}
+ // 纭畾宸ヨ壓璺嚎ID锛氬伐鍗曡矾绾� 鈫� 浜у搧璺嚎
+ let tempRouteId = 0;
+ if (workOrder.value?.routeId) {
+ tempRouteId = workOrder.value.routeId;
+ } else {
+ const processes = await getRouteProcessListByProduct(productId);
+ tempRouteId = processes?.[0]?.routeId ?? 0;
+ }
+ currentRouteId.value = tempRouteId;
+
routeProcessList.value = [...woProcesses].toSorted(
(a, b) => (a.sort ?? 0) - (b.sort ?? 0),
);
- // 纭畾宸ヨ壓璺嚎ID锛氬伐鍗曡矾绾� 鈫� 浜у搧璺嚎
- if (workOrder.value?.routeId) {
- currentRouteId.value = workOrder.value.routeId;
- } else {
- const processes = await getRouteProcessListByProduct(productId);
- currentRouteId.value = processes?.[0]?.routeId ?? 0;
- }
}
/** 瀹屾垚璁㈠崟 */
@@ -131,22 +134,22 @@
:title="rp.processName"
/>
</Steps>
- <Card
- v-for="(rp, index) in routeProcessList"
- v-show="activeProcessStep === index"
- :key="rp.processId"
- class="mx-4"
- >
- <TaskList
- :color-code="rp.colorCode"
- :disabled="isReadonly"
- :item-id="rp.outputItemId || workOrder.productId"
- :process-id="rp.processId!"
- :route-id="currentRouteId"
- :work-order-id="workOrder.id!"
- :work-order-quantity="workOrder.quantity"
- />
- </Card>
+ <template v-for="(rp, index) in routeProcessList" :key="rp.processId">
+ <Card
+ v-if="activeProcessStep === index"
+ class="mx-4"
+ >
+ <TaskList
+ :color-code="rp.colorCode"
+ :disabled="isReadonly"
+ :item-id="rp.outputItemId || workOrder.productId"
+ :process-id="rp.processId!"
+ :route-id="currentRouteId"
+ :work-order-id="workOrder.id!"
+ :work-order-quantity="workOrder.quantity"
+ />
+ </Card>
+ </template>
</template>
<template #prepend-footer>
<div class="flex flex-auto items-center gap-2">
--
Gitblit v1.9.3