From 46624ce480a3c14da21f39cc4ad5f7eecea2bb1e Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 17 九月 2026 16:24:28 +0800
Subject: [PATCH] feat(mes): 优化生产批次和袋码管理功能
---
src/views/mes/pro/batch/modules/form.vue | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/src/views/mes/pro/batch/modules/form.vue b/src/views/mes/pro/batch/modules/form.vue
index 2e45243..f08e03d 100644
--- a/src/views/mes/pro/batch/modules/form.vue
+++ b/src/views/mes/pro/batch/modules/form.vue
@@ -1,5 +1,5 @@
<script lang="ts" setup>
- import type { FormType } from "../data";
+ import type { FormType, PalletOption } from "../data";
import type { VxeTableGridOptions } from "#/adapter/vxe-table";
import type { MesProBatchApi } from "#/api/mes/pro/batch";
@@ -15,7 +15,13 @@
import { useVbenForm } from "#/adapter/form";
import { TableAction, useVbenVxeGrid } from "#/adapter/vxe-table";
- import { createBatch, getBatch, updateBatch } from "#/api/mes/pro/batch";
+ import {
+ createBatch,
+ fillBatchInfo,
+ getBatch,
+ updateBatch,
+ } from "#/api/mes/pro/batch";
+ import { getUnboundPalletList } from "#/api/mes/pro/pallet";
import { $t } from "#/locales";
import { UserSelect } from "#/views/system/user/components";
@@ -33,7 +39,7 @@
const formData = ref<MesProBatchApi.Batch>();
const isEditable = computed(() =>
- ["create", "update"].includes(formType.value)
+ ["create", "update", "fill"].includes(formType.value)
);
const getTitle = computed(() => {
@@ -43,6 +49,9 @@
}
case "update": {
return $t("ui.actionTitle.edit", ["鐢熶骇鎵规"]);
+ }
+ case "fill": {
+ return "琛ュ綍鎵规淇℃伅";
}
default: {
return $t("ui.actionTitle.create", ["鐢熶骇鎵规"]);
@@ -177,7 +186,9 @@
modalApi.lock();
try {
const data = (await formApi.getValues()) as MesProBatchApi.Batch;
- if (formData.value?.id) {
+ if (formType.value === "fill") {
+ await fillBatchInfo({ ...data, id: formData.value!.id, workers });
+ } else if (formData.value?.id) {
await updateBatch({ ...data, id: formData.value.id, workers });
} else {
await createBatch({ ...data, workers });
@@ -196,7 +207,20 @@
}
const data = modalApi.getData<{ formType: FormType; id?: number }>();
formType.value = data.formType;
- formApi.setState({ schema: useFormSchema(formType.value) });
+ // 鏂板/琛ュ綍/缂栬緫鎬佸姞杞芥湭缁戝畾鎵规鐨勬墭鐩橈紝渚涖�岀粦瀹氭墭鐩樸�嶅閫変笅鎷変娇鐢�
+ let palletOptions: PalletOption[] = [];
+ if (formType.value !== "detail") {
+ const pallets = await getUnboundPalletList();
+ palletOptions = pallets.map((pallet) => ({
+ label: `${pallet.tempCode ?? `鎵樼洏${pallet.id}`}锛堝凡瑁� ${pallet.bagCount ?? 0} 琚嬶級`,
+ value: pallet.id as number,
+ }));
+ }
+ formApi.setState({ schema: useFormSchema(formType.value, palletOptions) });
+ if (formType.value !== "detail") {
+ // 娓呯┖涓婃鎵撳紑鏃跺嬀閫夌殑鎵樼洏锛岄伩鍏嶆畫鐣欏�艰瑙﹀彂銆屾壒娆¤繘鍏ョ敓浜т腑銆�
+ await formApi.setFieldValue("palletIds", undefined);
+ }
// 鏍规嵁琛ㄥ崟鎬佸垏鎹汉鍛樺瓙琛ㄥ垪
workerGridApi.setGridOptions({
columns: isEditable.value
--
Gitblit v1.9.3