From ce13234bf22eeb934807dd28d4ed54c3dbe628da Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 18 七月 2026 10:12:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/api/mes/pro/route/process/index.ts | 3 +++
src/views/mes/pro/task/modules/schedule-form.vue | 2 +-
src/views/mes/process-design/route/modules/process-list.vue | 4 ++++
src/views/mes/process-design/route/data.ts | 15 +++++++++++++++
4 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/api/mes/pro/route/process/index.ts b/src/api/mes/pro/route/process/index.ts
index f25083d..d594e4e 100644
--- a/src/api/mes/pro/route/process/index.ts
+++ b/src/api/mes/pro/route/process/index.ts
@@ -18,6 +18,9 @@
keyFlag?: boolean;
checkFlag?: boolean;
backflushFlag?: boolean;
+ outputItemId?: number;
+ outputItemCode?: string;
+ outputItemName?: string;
remark?: string;
createTime?: Date;
}
diff --git a/src/views/mes/pro/task/modules/schedule-form.vue b/src/views/mes/pro/task/modules/schedule-form.vue
index 499f382..592d470 100644
--- a/src/views/mes/pro/task/modules/schedule-form.vue
+++ b/src/views/mes/pro/task/modules/schedule-form.vue
@@ -129,7 +129,7 @@
<TaskList
:color-code="rp.colorCode"
:disabled="isReadonly"
- :item-id="workOrder.productId"
+ :item-id="rp.outputItemId || workOrder.productId"
:process-id="rp.processId!"
:route-id="currentRouteId"
:work-order-id="workOrder.id!"
diff --git a/src/views/mes/process-design/route/data.ts b/src/views/mes/process-design/route/data.ts
index 39d5405..3c76624 100644
--- a/src/views/mes/process-design/route/data.ts
+++ b/src/views/mes/process-design/route/data.ts
@@ -248,6 +248,15 @@
rules: z.boolean().default(true),
},
{
+ fieldName: "outputItemId",
+ label: "浜у嚭浜у搧",
+ component: markRaw(MdItemSelect),
+ componentProps: {
+ placeholder: "鐣欑┖鍒欓粯璁や负宸ュ崟鎴愬搧",
+ },
+ formItemClass: "col-span-2",
+ },
+ {
fieldName: "prepareTime",
label: "鍑嗗鏃堕棿(鍒�)",
component: "InputNumber",
@@ -326,6 +335,12 @@
props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
},
},
+ {
+ field: "outputItemName",
+ title: "浜у嚭浜у搧",
+ width: 140,
+ slots: { default: "outputItemName" },
+ },
{ field: "prepareTime", title: "鍑嗗鏃堕棿(鍒�)", width: 110 },
{ field: "waitTime", title: "绛夊緟鏃堕棿(鍒�)", width: 110 },
{
diff --git a/src/views/mes/process-design/route/modules/process-list.vue b/src/views/mes/process-design/route/modules/process-list.vue
index 192cb5c..e6a99c1 100644
--- a/src/views/mes/process-design/route/modules/process-list.vue
+++ b/src/views/mes/process-design/route/modules/process-list.vue
@@ -110,6 +110,10 @@
<span>{{ row.colorCode }}</span>
</div>
</template>
+ <template #outputItemName="{ row }">
+ <span v-if="row.outputItemName">{{ row.outputItemName }}</span>
+ <span v-else class="text-gray-400">-</span>
+ </template>
<template #actions="{ row }">
<TableAction
:actions="[
--
Gitblit v1.9.3