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/basicData/mdm/modules/form.vue | 75 ++++++++-----------------------------
1 files changed, 16 insertions(+), 59 deletions(-)
diff --git a/src/views/basicData/mdm/modules/form.vue b/src/views/basicData/mdm/modules/form.vue
index 83aa7a6..c1f5eb7 100644
--- a/src/views/basicData/mdm/modules/form.vue
+++ b/src/views/basicData/mdm/modules/form.vue
@@ -1,37 +1,23 @@
<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, watch } from 'vue';
+import { ref } from 'vue';
- import { useVbenModal } from "#/packages/effects/common-ui/src";
+import { useVbenModal } from "#/packages/effects/common-ui/src";
- import { message } from "ant-design-vue";
+import { message } from "ant-design-vue";
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';
+import { useFormSchema, clearUnitListCache, buildCategoryTree } from '../data';
+import { getItemTypeSimpleList } from '#/api/mes/md/item/type';
- defineOptions({ name: "ItemForm" });
+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', ['鐗╂枡'])
- : $t('ui.actionTitle.create', ['鐗╂枡']);
-});
const [Form, formApi] = useVbenForm({
commonConfig: {
@@ -41,13 +27,9 @@
labelWidth: 110,
},
layout: 'horizontal',
- schema: useFormSchema(),
+ schema: [],
showDefaultActions: false,
wrapperClass: 'grid-cols-2',
- // 鐩戝惉琛ㄥ崟鍊煎彉鍖�
- handleValuesChange: (values: any) => {
- currentIsBatchManaged.value = values?.isBatchManaged === true;
- },
});
const [Modal, modalApi] = useVbenModal({
@@ -59,18 +41,7 @@
modalApi.lock();
const data = (await formApi.getValues()) as MdmItemApi.Item;
try {
- // 淇濆瓨鐗╂枡鍩烘湰淇℃伅
- 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 (formData.value?.id ? updateItem(data) : createItem(data));
await modalApi.close();
emit('success');
message.success($t('ui.actionMessage.operationSuccess'));
@@ -81,22 +52,22 @@
async onOpenChange(isOpen: boolean) {
if (!isOpen) {
formData.value = undefined;
- batchConfig.value = {};
- currentIsBatchManaged.value = false;
return;
}
const data = modalApi.getData<MdmItemApi.Item>();
+ // 娓呴櫎鍗曚綅缂撳瓨锛岀‘淇濊幏鍙栨渶鏂版暟鎹�
+ clearUnitListCache();
+ // 鍔犺浇鏈�鏂板垎绫绘暟鎹�
+ const categoryRes = await getItemTypeSimpleList();
+ const categoryTreeData = buildCategoryTree(categoryRes || []);
+ // 璁剧疆 schema锛坒ormApi 宸插垵濮嬪寲锛�
+ formApi.setState({ schema: useFormSchema(formApi, categoryTreeData) });
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();
}
@@ -104,27 +75,13 @@
// 鏂板妯″紡
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">
+ <Modal class="w-[1000px]" :title="formData?.id ? $t('ui.actionTitle.edit', ['鐗╂枡']) : $t('ui.actionTitle.create', ['鐗╂枡'])">
<Form class="mx-4" />
- <ItemBatchConfig
- ref="batchConfigRef"
- :item-id="formData?.id"
- :is-batch-managed="currentIsBatchManaged"
- @change="handleBatchConfigChange"
- />
</Modal>
</template>
--
Gitblit v1.9.3