From 5367b3b4d92588c4e76728e6bd4ad6aae0cbb967 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 七月 2026 13:05:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/pro/workorder/modules/bom-list.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/views/mes/pro/workorder/modules/bom-list.vue b/src/views/mes/pro/workorder/modules/bom-list.vue
index aa0790f..a955312 100644
--- a/src/views/mes/pro/workorder/modules/bom-list.vue
+++ b/src/views/mes/pro/workorder/modules/bom-list.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup>
+锘�<script lang="ts" setup>
import type { FormType } from '../data';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
@@ -7,11 +7,11 @@
import { computed } from 'vue';
-import { useVbenModal } from '..\..\..\..\..\packages\effects\common-ui\src';
+import { useVbenModal } from '@vben/common-ui';
import {
MesProWorkOrderStatusEnum,
MesProWorkOrderTypeEnum,
-} from '..\..\..\..\..\packages\constants\src';
+} from '@vben/constants';
import { message } from 'ant-design-vue';
@@ -43,7 +43,7 @@
);
const isConfirmed = computed(
() =>
- // 宸茬‘璁ゆ�佸彲鐢熸垚瀛愬伐鍗�
+ // 宸茬‘璁ゆ�佸彲鐢熸垚瀛愯鍗�
props.workOrder.status === MesProWorkOrderStatusEnum.CONFIRMED,
);
@@ -93,12 +93,12 @@
}
}
-/** 浠� BOM 琛岀敓鎴愬瓙宸ュ崟锛堥�氱煡鐖剁粍浠讹級 */
+/** 浠� BOM 琛岀敓鎴愬瓙璁㈠崟锛堥�氱煡鐖剁粍浠讹級 */
function handleGenerateWorkOrder(row: MesProWorkOrderBomApi.WorkOrderBom) {
emit('generateWorkOrder', row);
}
-/** 鏄惁灞曠ず鐢熸垚瀛愬伐鍗曟寜閽細宸茬‘璁� + 鑷埗 + 浜у搧绫诲瀷 BOM 琛� */
+/** 鏄惁灞曠ず鐢熸垚瀛愯鍗曟寜閽細宸茬‘璁� + 鑷埗 + 浜у搧绫诲瀷 BOM 琛� */
function showGenerate(row: MesProWorkOrderBomApi.WorkOrderBom) {
return (
isConfirmed.value &&
@@ -140,7 +140,7 @@
<template>
<div>
<BomFormModal @success="handleRefresh" />
- <Grid table-title="宸ュ崟 BOM">
+ <Grid table-title="璁㈠崟 BOM">
<template v-if="isEditable" #toolbar-tools>
<TableAction
:actions="[
@@ -175,7 +175,7 @@
},
},
{
- label: '鐢熸垚宸ュ崟',
+ label: '鐢熸垚璁㈠崟',
type: 'link',
ifShow: showGenerate(row),
onClick: handleGenerateWorkOrder.bind(null, row),
--
Gitblit v1.9.3