From 8064a77af2faf5bf080be0c4347a3a975225453b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 14 七月 2026 15:38:12 +0800
Subject: [PATCH] 银川 1.物料管理页面批次属性功能联调 2.库存现有量添加自定义出库入库功能
---
src/views/basicData/mdm/modules/form.vue | 74 +++++++++++++++++++++++++++++++------
1 files changed, 62 insertions(+), 12 deletions(-)
diff --git a/src/views/basicData/mdm/modules/form.vue b/src/views/basicData/mdm/modules/form.vue
index 27b8097..8335105 100644
--- a/src/views/basicData/mdm/modules/form.vue
+++ b/src/views/basicData/mdm/modules/form.vue
@@ -1,7 +1,9 @@
<script lang="ts" setup>
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';
@@ -9,14 +11,22 @@
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 ItemBatchConfig from '../components/batch-config.vue';
defineOptions({ name: 'ItemForm' });
const emit = defineEmits(['success']);
const formData = ref<MdmItemApi.Item>();
+const batchConfigRef = ref<InstanceType<typeof ItemBatchConfig>>();
+const batchConfig = ref<Partial<MdmItemBatchConfigApi.ItemBatchConfig>>({});
+
+// 褰撳墠琛ㄥ崟涓殑鎵规绠$悊寮�鍏冲�硷紙鐢ㄤ簬鎺у埗鎵规閰嶇疆鏄剧ず锛�
+const currentIsBatchManaged = ref<boolean>(false);
+
const getTitle = computed(() => {
return formData.value?.id
? $t('ui.actionTitle.edit', ['鐗╂枡'])
@@ -34,6 +44,10 @@
schema: useFormSchema(),
showDefaultActions: false,
wrapperClass: 'grid-cols-2',
+ // 鐩戝惉琛ㄥ崟鍊煎彉鍖�
+ handleValuesChange: (values: any) => {
+ currentIsBatchManaged.value = values?.isBatchManaged === true;
+ },
});
const [Modal, modalApi] = useVbenModal({
@@ -45,7 +59,18 @@
modalApi.lock();
const data = (await formApi.getValues()) as MdmItemApi.Item;
try {
- await (formData.value?.id ? updateItem(data) : createItem(data));
+ // 淇濆瓨鐗╂枡鍩烘湰淇℃伅
+ 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,
+ });
+ }
+
await modalApi.close();
emit('success');
message.success($t('ui.actionMessage.operationSuccess'));
@@ -56,25 +81,50 @@
async onOpenChange(isOpen: boolean) {
if (!isOpen) {
formData.value = undefined;
+ batchConfig.value = {};
+ currentIsBatchManaged.value = false;
return;
}
const data = modalApi.getData<MdmItemApi.Item>();
- if (!data || !data.id) {
- return;
- }
- modalApi.lock();
- try {
- formData.value = await getItem(data.id);
- await formApi.setValues(formData.value);
- } finally {
- modalApi.unlock();
+ if (data?.id) {
+ // 缂栬緫妯″紡
+ modalApi.lock();
+ try {
+ formData.value = await getItem(data.id);
+ 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">
<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