From 5f3dea3fd930afde720677fba10b6bfb2e836a18 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期五, 24 七月 2026 09:54:17 +0800
Subject: [PATCH] Merge branch 'dev_pro2.0' of http://114.132.189.42:9002/r/mom-pro2-before into dev_pro2.0
---
src/views/wls/itemreceipt/modules/form.vue | 54 +++++++++++++++++++++++-------------------------------
1 files changed, 23 insertions(+), 31 deletions(-)
diff --git a/src/views/wls/itemreceipt/modules/form.vue b/src/views/wls/itemreceipt/modules/form.vue
index a0fae09..cf2eac3 100644
--- a/src/views/wls/itemreceipt/modules/form.vue
+++ b/src/views/wls/itemreceipt/modules/form.vue
@@ -5,8 +5,8 @@
import { computed, ref } from 'vue';
-import { confirm, useVbenModal } from '../../../../packages/effects/common-ui/src';
-import { MesWmItemReceiptStatusEnum } from '../../../../packages/constants/src';
+import { confirm, useVbenModal } from '@vben/common-ui';
+import { MesWmItemReceiptStatusEnum } from '@vben/constants';
import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
@@ -27,16 +27,14 @@
const emit = defineEmits(['success']);
const formType = ref<FormType>('create');
const formData = ref<MesWmItemReceiptApi.ItemReceipt>();
-const originalSnapshot = ref(''); // 琛ㄥ崟鍘熷鏁版嵁蹇収锛岀敤浜庢彁浜ゆ椂璺宠繃鏈彉鏇寸殑淇濆瓨璇锋眰
+const originalSnapshot = ref('');
const isEditable = computed(() =>
- // 鏄惁涓虹紪杈戞ā寮忥紙鍙繚瀛橈級
['create', 'update'].includes(formType.value),
);
-const isStock = computed(() => formType.value === 'stock'); // 鏄惁涓轰笂鏋舵ā寮�
-const isFinish = computed(() => formType.value === 'finish'); // 鏄惁涓烘墽琛屽叆搴撴ā寮�
+const isStock = computed(() => formType.value === 'stock');
+const isFinish = computed(() => formType.value === 'finish');
const canSubmit = computed(
() =>
- // 鏄惁鍙彁浜�
formType.value === 'update' &&
formData.value?.status === MesWmItemReceiptStatusEnum.PREPARE,
);
@@ -69,7 +67,7 @@
wrapperClass: 'grid-cols-3',
});
-/** 鎻愪氦鍏ュ簱鍗曪細琛ㄥ崟鏈変慨鏀规椂鍏堜繚瀛橈紝鍐嶈皟鐢ㄦ彁浜ゆ帴鍙� */
+/** 鎻愪氦鍏ュ簱鍗� */
async function handleSubmit() {
const { valid } = await formApi.validate();
if (!valid || !formData.value?.id) {
@@ -95,9 +93,7 @@
/** 鎵ц涓婃灦 */
async function handleStock() {
- if (!formData.value?.id) {
- return;
- }
+ if (!formData.value?.id) return;
modalApi.lock();
try {
await stockItemReceipt(formData.value.id);
@@ -111,9 +107,7 @@
/** 鎵ц鍏ュ簱 */
async function handleFinish() {
- if (!formData.value?.id) {
- return;
- }
+ if (!formData.value?.id) return;
modalApi.lock();
try {
await finishItemReceipt(formData.value.id);
@@ -132,27 +126,28 @@
return;
}
const { valid } = await formApi.validate();
- if (!valid) {
- return;
- }
+ if (!valid) return;
modalApi.lock();
- // 鎻愪氦琛ㄥ崟
const data = (await formApi.getValues()) as MesWmItemReceiptApi.ItemReceipt;
try {
if (formData.value?.id) {
await updateItemReceipt({ ...formData.value, ...data });
formData.value = { ...formData.value, ...data };
- } else {
- const id = await createItemReceipt(data);
- formData.value = {
- ...data,
- id,
- status: MesWmItemReceiptStatusEnum.PREPARE,
- };
- await formApi.setFieldValue('id', id);
- await formApi.setFieldValue('status', formData.value.status);
- formType.value = 'update';
+ emit('success');
+ message.success($t('ui.actionMessage.operationSuccess'));
+ await modalApi.close();
+ return;
}
+ // 鏂板锛氫繚鎸佸脊绐楁墦寮�锛屽垏鎹㈠埌缂栬緫妯″紡
+ const id = await createItemReceipt(data);
+ formData.value = {
+ ...data,
+ id,
+ status: MesWmItemReceiptStatusEnum.PREPARE,
+ };
+ await formApi.setFieldValue('id', id);
+ await formApi.setFieldValue('status', formData.value.status);
+ formType.value = 'update';
originalSnapshot.value = JSON.stringify(await formApi.getValues());
emit('success');
message.success($t('ui.actionMessage.operationSuccess'));
@@ -166,7 +161,6 @@
originalSnapshot.value = '';
return;
}
- // 鍔犺浇鏁版嵁
const data = modalApi.getData<{ formType: FormType; id?: number }>();
formType.value = data.formType;
formApi.setState({ schema: useFormSchema(formType.value, formApi) });
@@ -176,7 +170,6 @@
modalApi.lock();
try {
formData.value = await getItemReceipt(data.id);
- // 璁剧疆鍒� values
await formApi.setValues(formData.value);
} finally {
modalApi.unlock();
@@ -210,7 +203,6 @@
<template>
<Modal :title="getTitle" class="w-3/5">
<Form class="mx-4" />
- <!-- 闈炴柊寤烘ā寮忓睍绀虹墿鏂欎俊鎭� -->
<template v-if="formData?.id">
<Divider>鐗╂枡淇℃伅</Divider>
<div class="mx-4">
--
Gitblit v1.9.3