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/modules/form.vue | 249 +++++++++++++++++++++++++------------------------
1 files changed, 126 insertions(+), 123 deletions(-)
diff --git a/src/views/mes/md/workstation/modules/form.vue b/src/views/mes/md/workstation/modules/form.vue
index c8070f9..5abf364 100644
--- a/src/views/mes/md/workstation/modules/form.vue
+++ b/src/views/mes/md/workstation/modules/form.vue
@@ -1,151 +1,154 @@
<script lang="ts" setup>
-import type { FormType } from '../data';
+ import type { FormType } from "../data";
-import type { MesMdWorkstationApi } from '#/api/mes/md/workstation';
+ import type { MesMdWorkstationApi } from "#/api/mes/md/workstation";
-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, Tabs } from 'ant-design-vue';
+ import { Button, message, Tabs } from "ant-design-vue";
-import { useVbenForm } from '#/adapter/form';
-import {
- createWorkstation,
- getWorkstation,
- updateWorkstation,
-} from '#/api/mes/md/workstation';
-import { $t } from '#/locales';
-import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
+ import { useVbenForm } from "#/adapter/form";
+ import {
+ createWorkstation,
+ getWorkstation,
+ updateWorkstation,
+ } from "#/api/mes/md/workstation";
+ import { $t } from "#/locales";
+ import { BarcodeDetail } from "#/views/wls/barcode/components";
-import { useFormSchema } from '../data';
-import MachineList from './machine-list.vue';
-import ToolList from './tool-list.vue';
-import WorkerList from './worker-list.vue';
+ import { useFormSchema } from "../data";
+ import MachineList from "./machine-list.vue";
+ import ToolList from "./tool-list.vue";
+ import WorkerList from "./worker-list.vue";
-const emit = defineEmits(['success']);
-const formType = ref<FormType>('create'); // 琛ㄥ崟妯″紡
-const subTabsName = ref('machine'); // 褰撳墠璧勬簮椤电
-const formData = ref<MesMdWorkstationApi.Workstation>();
-const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 鏉＄爜璇︽儏寮圭獥
+ const emit = defineEmits(["success"]);
+ const formType = ref<FormType>("create"); // 琛ㄥ崟妯″紡
+ const subTabsName = ref("machine"); // 褰撳墠璧勬簮椤电
+ const formData = ref<MesMdWorkstationApi.Workstation>();
+ 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: 110,
},
- formItemClass: 'col-span-1',
- labelWidth: 110,
- },
- wrapperClass: 'grid-cols-3',
- layout: 'horizontal',
- schema: [],
- showDefaultActions: false,
-});
+ wrapperClass: "grid-cols-3",
+ 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.WORKSTATION,
+ formData.value.code,
+ formData.value.name
+ );
}
- barcodeDetailRef.value?.openByBusiness(
- formData.value.id,
- BarcodeBizTypeEnum.WORKSTATION,
- 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 MesMdWorkstationApi.Workstation;
- try {
- if (formType.value === 'create') {
- const id = await createWorkstation(data);
- formData.value = { ...data, id };
- await formApi.setFieldValue('id', id);
- formType.value = 'update';
- } else {
- await updateWorkstation(data);
- formData.value = { ...formData.value, ...data };
+ const [Modal, modalApi] = useVbenModal({
+ async onConfirm() {
+ if (isDetail.value) {
+ await modalApi.close();
+ return;
}
- emit('success');
- message.success($t('ui.actionMessage.operationSuccess'));
- } finally {
- modalApi.unlock();
- }
- },
- async onOpenChange(isOpen: boolean) {
- if (!isOpen) {
- formData.value = undefined;
- return;
- }
- subTabsName.value = 'machine';
- // 鍔犺浇鏁版嵁
- 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 getWorkstation(data.id);
- // 璁剧疆鍒� values
- await formApi.setValues(formData.value);
- } finally {
- modalApi.unlock();
- }
- },
-});
+ const { valid } = await formApi.validate();
+ if (!valid) {
+ return;
+ }
+ modalApi.lock();
+ // 鎻愪氦琛ㄥ崟
+ const data = (await formApi.getValues()) as MesMdWorkstationApi.Workstation;
+ try {
+ if (formType.value === "create") {
+ const id = await createWorkstation(data);
+ formData.value = { ...data, id };
+ await formApi.setFieldValue("id", id);
+ formType.value = "update";
+ } else {
+ await updateWorkstation(data);
+ formData.value = { ...formData.value, ...data };
+ }
+ emit("success");
+ message.success($t("ui.actionMessage.operationSuccess"));
+ } finally {
+ modalApi.unlock();
+ }
+ },
+ async onOpenChange(isOpen: boolean) {
+ if (!isOpen) {
+ formData.value = undefined;
+ return;
+ }
+ subTabsName.value = "machine";
+ // 鍔犺浇鏁版嵁
+ 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 getWorkstation(data.id);
+ // 璁剧疆鍒� values
+ await formApi.setValues(formData.value);
+ } finally {
+ modalApi.unlock();
+ }
+ },
+ });
</script>
<template>
- <Modal :title="getTitle" class="w-4/5">
+ <Modal :title="getTitle"
+ class="w-4/5">
<Form class="mx-4" />
- <Tabs
- v-if="formType !== 'create' && formData?.id"
- v-model:active-key="subTabsName"
- class="mx-4 mt-4"
- >
- <Tabs.TabPane key="machine" tab="璁惧璧勬簮">
- <MachineList :form-type="formType" :workstation-id="formData.id" />
+ <Tabs v-if="formType !== 'create' && formData?.id"
+ v-model:active-key="subTabsName"
+ class="mx-4 mt-4">
+ <Tabs.TabPane key="machine"
+ tab="璁惧璧勬簮">
+ <MachineList :form-type="formType"
+ :workstation-id="formData.id" />
</Tabs.TabPane>
- <Tabs.TabPane key="tool" tab="宸ヨ澶瑰叿">
- <ToolList :form-type="formType" :workstation-id="formData.id" />
+ <Tabs.TabPane key="tool"
+ tab="宸ヨ澶瑰叿">
+ <ToolList :form-type="formType"
+ :workstation-id="formData.id" />
</Tabs.TabPane>
- <Tabs.TabPane key="worker" tab="浜哄姏璧勬簮">
- <WorkerList :form-type="formType" :workstation-id="formData.id" />
+ <Tabs.TabPane key="worker"
+ tab="浜哄姏璧勬簮">
+ <WorkerList :form-type="formType"
+ :workstation-id="formData.id" />
</Tabs.TabPane>
</Tabs>
<template #prepend-footer>
<div class="flex flex-auto items-center">
- <Button
- v-if="isDetail && formData?.id"
- type="primary"
- @click="handleBarcode"
- >
+ <Button v-if="isDetail && formData?.id"
+ type="primary"
+ @click="handleBarcode">
鏌ョ湅鏉＄爜
</Button>
</div>
--
Gitblit v1.9.3