From 701fdf3e7283e892324bf9eb093e1675d03ea211 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 10 七月 2026 16:37:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/md/workstation/workshop/modules/form.vue | 198 +++++++++++++++++++++++++------------------------
1 files changed, 100 insertions(+), 98 deletions(-)
diff --git a/src/views/mes/md/workstation/workshop/modules/form.vue b/src/views/mes/md/workstation/workshop/modules/form.vue
index 7ae08f9..ba98f53 100644
--- a/src/views/mes/md/workstation/workshop/modules/form.vue
+++ b/src/views/mes/md/workstation/workshop/modules/form.vue
@@ -1,119 +1,121 @@
<script lang="ts" setup>
-import type { FormType } from '../data';
+ import type { FormType } from "../data";
-import type { MesMdWorkshopApi } from '#/api/mes/md/workstation/workshop';
+ import type { MesMdWorkshopApi } from "#/api/mes/md/workstation/workshop";
-import { computed, ref } from 'vue';
+ import { computed, ref } from "vue";
-import { useVbenModal } from '../../../../../../packages/effects/common-ui/src';
-import { BarcodeBizTypeEnum } from '../../../../../../packages/constants/src';
+ import { useVbenModal } from "../../../../../../packages/effects/common-ui/src";
+ import { BarcodeBizTypeEnum } from "../../../../../../packages/constants/src";
-import { Button, message } from 'ant-design-vue';
+ import { Button, message } from "ant-design-vue";
-import { useVbenForm } from '#/adapter/form';
-import {
- createWorkshop,
- getWorkshop,
- updateWorkshop,
-} from '#/api/mes/md/workstation/workshop';
-import { $t } from '#/locales';
-import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
+ import { useVbenForm } from "#/adapter/form";
+ import {
+ createWorkshop,
+ getWorkshop,
+ updateWorkshop,
+ } from "#/api/mes/md/workstation/workshop";
+ import { $t } from "#/locales";
+ import { BarcodeDetail } from "#/views/wls/barcode/components";
-import { useFormSchema } from '../data';
+ import { useFormSchema } from "../data";
-const emit = defineEmits(['success']);
-const formType = ref<FormType>('create'); // 琛ㄥ崟妯″紡
-const formData = ref<MesMdWorkshopApi.Workshop>();
-const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 鏉＄爜璇︽儏寮圭獥
+ const emit = defineEmits(["success"]);
+ const formType = ref<FormType>("create"); // 琛ㄥ崟妯″紡
+ const formData = ref<MesMdWorkshopApi.Workshop>();
+ const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 鏉＄爜璇︽儏寮圭獥
-const isDetail = computed(() => formType.value === 'detail'); // 鏄惁鏌ョ湅妯″紡
-const getTitle = computed(() => {
- if (formType.value === 'detail') {
- return '鏌ョ湅杞﹂棿';
- }
- return formType.value === 'update' ? '淇敼杞﹂棿' : '鏂板杞﹂棿';
-});
+ const isDetail = computed(() => formType.value === "detail"); // 鏄惁鏌ョ湅妯″紡
+ const getTitle = computed(() => {
+ if (formType.value === "detail") {
+ return "鏌ョ湅杞﹂棿";
+ }
+ return formType.value === "update" ? "淇敼杞﹂棿" : "鏂板杞﹂棿";
+ });
-const [Form, formApi] = useVbenForm({
- commonConfig: {
- componentProps: {
- class: 'w-full',
+ const [Form, formApi] = useVbenForm({
+ commonConfig: {
+ componentProps: {
+ class: "w-full",
+ },
+ formItemClass: "col-span-1",
+ labelWidth: 100,
},
- formItemClass: 'col-span-1',
- labelWidth: 100,
- },
- wrapperClass: 'grid-cols-2',
- layout: 'horizontal',
- schema: [],
- showDefaultActions: false,
-});
+ wrapperClass: "grid-cols-2",
+ layout: "horizontal",
+ schema: [],
+ showDefaultActions: false,
+ });
-/** 鏌ョ湅杞﹂棿鏉＄爜 */
-function handleBarcode() {
- if (!formData.value?.id) {
- return;
+ /** 鏌ョ湅杞﹂棿鏉＄爜 */
+ function handleBarcode() {
+ if (!formData.value?.id) {
+ return;
+ }
+ barcodeDetailRef.value?.openByBusiness(
+ formData.value.id,
+ BarcodeBizTypeEnum.WORKSHOP,
+ formData.value.code,
+ formData.value.name
+ );
}
- barcodeDetailRef.value?.openByBusiness(
- formData.value.id,
- BarcodeBizTypeEnum.WORKSHOP,
- formData.value.code,
- formData.value.name,
- );
-}
-const [Modal, modalApi] = useVbenModal({
- async onConfirm() {
- if (isDetail.value) {
- await modalApi.close();
- return;
- }
- const { valid } = await formApi.validate();
- if (!valid) {
- return;
- }
- modalApi.lock();
- // 鎻愪氦琛ㄥ崟
- const data = (await formApi.getValues()) as MesMdWorkshopApi.Workshop;
- try {
- await (formData.value?.id ? updateWorkshop(data) : createWorkshop(data));
- // 鍏抽棴骞舵彁绀�
- await modalApi.close();
- emit('success');
- message.success($t('ui.actionMessage.operationSuccess'));
- } finally {
- modalApi.unlock();
- }
- },
- async onOpenChange(isOpen: boolean) {
- if (!isOpen) {
- formData.value = undefined;
- return;
- }
- // 鍔犺浇鏁版嵁
- const data = modalApi.getData<{ formType: FormType; id?: number }>();
- formType.value = data.formType;
- formApi.setState({ schema: useFormSchema(data.formType, formApi) });
- formApi.setDisabled(formType.value === 'detail');
- modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
- if (!data?.id) {
- return;
- }
- modalApi.lock();
- try {
- formData.value = await getWorkshop(data.id);
- // 璁剧疆鍒� values
- await formApi.setValues(formData.value);
- } finally {
- modalApi.unlock();
- }
- },
-});
+ const [Modal, modalApi] = useVbenModal({
+ async onConfirm() {
+ if (isDetail.value) {
+ await modalApi.close();
+ return;
+ }
+ const { valid } = await formApi.validate();
+ if (!valid) {
+ return;
+ }
+ modalApi.lock();
+ // 鎻愪氦琛ㄥ崟
+ const data = (await formApi.getValues()) as MesMdWorkshopApi.Workshop;
+ try {
+ await (formData.value?.id ? updateWorkshop(data) : createWorkshop(data));
+ // 鍏抽棴骞舵彁绀�
+ await modalApi.close();
+ emit("success");
+ message.success($t("ui.actionMessage.operationSuccess"));
+ } finally {
+ modalApi.unlock();
+ }
+ },
+ async onOpenChange(isOpen: boolean) {
+ if (!isOpen) {
+ formData.value = undefined;
+ return;
+ }
+ // 鍔犺浇鏁版嵁
+ const data = modalApi.getData<{ formType: FormType; id?: number }>();
+ formType.value = data.formType;
+ formApi.setState({ schema: useFormSchema(data.formType, formApi) });
+ formApi.setDisabled(formType.value === "detail");
+ modalApi.setState({ showConfirmButton: formType.value !== "detail" });
+ if (!data?.id) {
+ return;
+ }
+ modalApi.lock();
+ try {
+ formData.value = await getWorkshop(data.id);
+ // 璁剧疆鍒� values
+ await formApi.setValues(formData.value);
+ } finally {
+ modalApi.unlock();
+ }
+ },
+ });
</script>
<template>
- <Modal :title="getTitle" class="w-1/2">
+ <Modal :title="getTitle"
+ class="w-1/2">
<Form class="mx-4" />
- <template v-if="isDetail && formData?.id" #prepend-footer>
+ <template v-if="isDetail && formData?.id"
+ #prepend-footer>
<div class="flex flex-auto items-center">
<Button @click="handleBarcode">鏌ョ湅鏉＄爜</Button>
</div>
--
Gitblit v1.9.3