From 696e85cf6422c703fbba63df097320bd813d9926 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 14 七月 2026 15:40:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/basicData/mdm/modules/form.vue | 160 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 104 insertions(+), 56 deletions(-)
diff --git a/src/views/basicData/mdm/modules/form.vue b/src/views/basicData/mdm/modules/form.vue
index fd08771..83aa7a6 100644
--- a/src/views/basicData/mdm/modules/form.vue
+++ b/src/views/basicData/mdm/modules/form.vue
@@ -1,82 +1,130 @@
<script lang="ts" setup>
- import type { MdmItemApi } from "#/api/mdm/item";
+import type { MdmItemApi } from '#/api/mdm/item';
+import type { MdmItemBatchConfigApi } from '#/api/mes/md/item-batch-config';
+import type { VbenFormApi } from '#/adapter/form';
- import { computed, ref } from "vue";
+import { computed, ref, watch } from 'vue';
import { useVbenModal } from "#/packages/effects/common-ui/src";
import { message } from "ant-design-vue";
- import { useVbenForm } from "#/adapter/form";
- import { createItem, getItem, updateItem } from "#/api/mdm/item";
- import { $t } from "#/locales";
+import { useVbenForm } from '#/adapter/form';
+import { createItem, getItem, updateItem } from '#/api/mdm/item';
+import { saveItemBatchConfig } from '#/api/mes/md/item-batch-config';
+import { $t } from '#/locales';
- import { useFormSchema } from "../data";
+import { useFormSchema } from '../data';
+import ItemBatchConfig from '../components/batch-config.vue';
defineOptions({ name: "ItemForm" });
- const emit = defineEmits(["success"]);
- const formData = ref<MdmItemApi.Item>();
- const getTitle = computed(() => {
- return formData.value?.id
- ? $t("ui.actionTitle.edit", ["鐗╂枡"])
- : $t("ui.actionTitle.create", ["鐗╂枡"]);
- });
+const emit = defineEmits(['success']);
+const formData = ref<MdmItemApi.Item>();
+const batchConfigRef = ref<InstanceType<typeof ItemBatchConfig>>();
+const batchConfig = ref<Partial<MdmItemBatchConfigApi.ItemBatchConfig>>({});
- const [Form, formApi] = useVbenForm({
- commonConfig: {
- componentProps: {
- class: "w-full",
- },
- labelWidth: 110,
- },
- layout: "horizontal",
- schema: useFormSchema(),
- showDefaultActions: false,
- wrapperClass: "grid-cols-2",
- });
+// 褰撳墠琛ㄥ崟涓殑鎵规绠＄悊寮�鍏冲�硷紙鐢ㄤ簬鎺у埗鎵规閰嶇疆鏄剧ず锛�
+const currentIsBatchManaged = ref<boolean>(false);
- const [Modal, modalApi] = useVbenModal({
- async onConfirm() {
- const { valid } = await formApi.validate();
- if (!valid) {
- return;
- }
- modalApi.lock();
- const data = (await formApi.getValues()) as MdmItemApi.Item;
- try {
- await (formData.value?.id ? updateItem(data) : createItem(data));
- await modalApi.close();
- emit("success");
- message.success($t("ui.actionMessage.operationSuccess"));
- } finally {
- modalApi.unlock();
- }
+const getTitle = computed(() => {
+ return formData.value?.id
+ ? $t('ui.actionTitle.edit', ['鐗╂枡'])
+ : $t('ui.actionTitle.create', ['鐗╂枡']);
+});
+
+const [Form, formApi] = useVbenForm({
+ commonConfig: {
+ componentProps: {
+ class: 'w-full',
},
- async onOpenChange(isOpen: boolean) {
- if (!isOpen) {
- formData.value = undefined;
- return;
+ labelWidth: 110,
+ },
+ layout: 'horizontal',
+ schema: useFormSchema(),
+ showDefaultActions: false,
+ wrapperClass: 'grid-cols-2',
+ // 鐩戝惉琛ㄥ崟鍊煎彉鍖�
+ handleValuesChange: (values: any) => {
+ currentIsBatchManaged.value = values?.isBatchManaged === true;
+ },
+});
+
+const [Modal, modalApi] = useVbenModal({
+ async onConfirm() {
+ const { valid } = await formApi.validate();
+ if (!valid) {
+ return;
+ }
+ modalApi.lock();
+ const data = (await formApi.getValues()) as MdmItemApi.Item;
+ try {
+ // 淇濆瓨鐗╂枡鍩烘湰淇℃伅
+ const itemId = await (formData.value?.id ? updateItem(data) : createItem(data));
+ const savedItemId = typeof itemId === 'number' ? itemId : data.id;
+
+ // 濡傛灉鍚敤鎵规绠＄悊锛屼繚瀛樻壒娆￠厤缃�
+ if (data.isBatchManaged && savedItemId) {
+ await saveItemBatchConfig({
+ ...batchConfig.value,
+ itemId: savedItemId,
+ });
}
- const data = modalApi.getData<MdmItemApi.Item>();
- if (!data || !data.id) {
- return;
- }
+
+ await modalApi.close();
+ emit('success');
+ message.success($t('ui.actionMessage.operationSuccess'));
+ } finally {
+ modalApi.unlock();
+ }
+ },
+ async onOpenChange(isOpen: boolean) {
+ if (!isOpen) {
+ formData.value = undefined;
+ batchConfig.value = {};
+ currentIsBatchManaged.value = false;
+ return;
+ }
+ const data = modalApi.getData<MdmItemApi.Item>();
+ if (data?.id) {
+ // 缂栬緫妯″紡
modalApi.lock();
try {
formData.value = await getItem(data.id);
- // 缂栬緫鍥炴樉鏃讹紝syncMes 榛樿涓� false
- await formApi.setValues({ ...formData.value, syncMes: false });
+ await formApi.setValues(formData.value);
+ currentIsBatchManaged.value = formData.value?.isBatchManaged === true;
+ // 鍔犺浇鎵规閰嶇疆
+ if (batchConfigRef.value && currentIsBatchManaged.value) {
+ await batchConfigRef.value.loadConfig();
+ }
} finally {
modalApi.unlock();
}
- },
- });
+ } else {
+ // 鏂板妯″紡
+ formData.value = undefined;
+ await formApi.resetForm();
+ // 鑾峰彇琛ㄥ崟榛樿鍊硷紙isBatchManaged 榛樿 true锛�
+ const defaultValues = await formApi.getValues();
+ currentIsBatchManaged.value = defaultValues?.isBatchManaged === true;
+ }
+ },
+});
+
+/** 澶勭悊鎵规閰嶇疆鍙樺寲 */
+function handleBatchConfigChange(config: Partial<MdmItemBatchConfigApi.ItemBatchConfig>) {
+ batchConfig.value = config;
+}
</script>
<template>
- <Modal class="w-[1000px]"
- :title="getTitle">
+ <Modal class="w-[1000px]" :title="getTitle">
<Form class="mx-4" />
+ <ItemBatchConfig
+ ref="batchConfigRef"
+ :item-id="formData?.id"
+ :is-batch-managed="currentIsBatchManaged"
+ @change="handleBatchConfigChange"
+ />
</Modal>
-</template>
\ No newline at end of file
+</template>
--
Gitblit v1.9.3