From 14817696a26eb142ccae03fa7c43050840e057f5 Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 09:35:03 +0800
Subject: [PATCH] feat(mes): 优化生产订单与排产任务列表显示，新增启停工及校验逻辑 1. 生产订单列表展示优化 (WorkOrder) - 新增「生产状态」列，全局注册 `ORDER_PRODUCTION_STATUS` 常量并绑定系统动态字典。 - 彻底重构「工序生产进度」单元格显示：弃用臃肿的 Steps 组件，改为极简横向布局（彩色状态圆点 + 进度百分比），解决表格行高被强行撑开及内容截断问题，支持横向滚动。 - 优化「完成进度」列宽及展示样式，将百分比数值外置同行显示，更加直观。 2. 排产任务列表改造 (Task) - 顶部表头重构，由单一标题重构为「全部 / 未完成 / 已完成」的 Tabs 标签页切换结构。 - 重写数据过滤逻辑，剥离写死的 status 查询，改为使用 `scheduleStatus` 字段动态响应 Tabs 切换 (0: 未完成, 1: 已完成)。 3. 工单业务逻辑增强与状态流转 - 落实「工单查询逻辑设计方案」，优化底层的工单条件检索逻辑。 - 实现「添加工单启停功能」与「停工状态」，支持工单在执行过程中的暂停与恢复业务流转。 - 强化容错与防呆设计：操作「完成订单」时增加前置校验 `handleCheckFinish`，若生产状态为未完成，强制弹出二次确认 Modal，避免误操作。 # 相关讨论/参考方案 # - 添加工单启停功能 # - 停工状态功能设计方案 # - 工单查询逻辑设计方案 # - 工单完成进度显示优化
---
src/views/mes/md/workstation/workshop/modules/form.vue | 204 +++++++++++++++++++++++++-------------------------
1 files changed, 103 insertions(+), 101 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..ec8f682 100644
--- a/src/views/mes/md/workstation/workshop/modules/form.vue
+++ b/src/views/mes/md/workstation/workshop/modules/form.vue
@@ -1,123 +1,125 @@
<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 "@vben/common-ui";
+ // import { BarcodeBizTypeEnum } from "@vben/constants";
-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;
- }
- barcodeDetailRef.value?.openByBusiness(
- formData.value.id,
- BarcodeBizTypeEnum.WORKSHOP,
- formData.value.code,
- formData.value.name,
- );
-}
+ /** 鏌ョ湅杞﹂棿鏉＄爜 */
+ // function handleBarcode() {
+ // if (!formData.value?.id) {
+ // return;
+ // }
+ // 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>
+ <!-- <Button @click="handleBarcode">鏌ョ湅鏉＄爜</Button> -->
</div>
</template>
</Modal>
- <BarcodeDetail ref="barcodeDetailRef" />
+ <!-- <BarcodeDetail ref="barcodeDetailRef" /> -->
</template>
--
Gitblit v1.9.3