From 21a2d6f813f3d58b494fde010f66bd84ce2f1d41 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 12 八月 2026 13:06:04 +0800
Subject: [PATCH] fix: MOM 1.修改物料弹框的SIP与SOP改为中文
---
src/views/mes/md/item/index.vue | 6
src/views/mes/pro/workorder/modules/form.vue | 33 ++++----
src/views/mes/md/workstation/modules/form.vue | 34 ++++----
src/views/mes/pro/workorder/index.vue | 35 ++++----
src/views/mes/md/item/modules/form.vue | 4
src/views/mes/md/workstation/index.vue | 42 +++++-----
src/views/mes/md/workstation/workshop/modules/form.vue | 32 ++++----
src/views/mes/md/item/modules/product-media-list.vue | 4
8 files changed, 95 insertions(+), 95 deletions(-)
diff --git a/src/views/mes/md/item/index.vue b/src/views/mes/md/item/index.vue
index 66c6421..f8855f6 100644
--- a/src/views/mes/md/item/index.vue
+++ b/src/views/mes/md/item/index.vue
@@ -25,7 +25,7 @@
} from "#/api/mes/md/item";
import { $t } from "#/locales";
import { MdItemTypeTree } from "#/views/mes/md/item/type/components";
- import { PrinterLabel } from "#/views/wls/barcode/components";
+ // import { PrinterLabel } from "#/views/wls/barcode/components";
import { useGridColumns, useGridFormSchema } from "./data";
import Form from "./modules/form.vue";
@@ -203,9 +203,9 @@
},
},
]" />
- <PrinterLabel :biz-id="row.id"
+ <!-- <PrinterLabel :biz-id="row.id"
:biz-code="row.code"
- biz-type="ITEM" />
+ biz-type="ITEM" /> -->
</div>
</template>
</Grid>
diff --git a/src/views/mes/md/item/modules/form.vue b/src/views/mes/md/item/modules/form.vue
index db322fd..7f1f865 100644
--- a/src/views/mes/md/item/modules/form.vue
+++ b/src/views/mes/md/item/modules/form.vue
@@ -141,10 +141,10 @@
<Tabs.TabPane key="substitute" tab="鏇夸唬鍝�">
<Empty description="鏇夸唬鍝侊紙寰呭疄鐜帮級" />
</Tabs.TabPane>
- <Tabs.TabPane key="sip" tab="SIP">
+ <Tabs.TabPane key="sip" tab="妫�楠屾寚瀵间功(SIP)">
<ProductSipForm :form-type="formType" :item-id="formData.id" />
</Tabs.TabPane>
- <Tabs.TabPane key="sop" tab="SOP">
+ <Tabs.TabPane key="sop" tab="浣滀笟鎸囧涔�(SOP)">
<ProductSopForm :form-type="formType" :item-id="formData.id" />
</Tabs.TabPane>
</Tabs>
diff --git a/src/views/mes/md/item/modules/product-media-list.vue b/src/views/mes/md/item/modules/product-media-list.vue
index 777e9fd..06563c7 100644
--- a/src/views/mes/md/item/modules/product-media-list.vue
+++ b/src/views/mes/md/item/modules/product-media-list.vue
@@ -48,7 +48,9 @@
);
const isReadOnly = computed(() => props.formType === 'detail'); // 鏄惁鍙
-const title = computed(() => props.kind); // 褰撳墠濯掍綋绫诲瀷鏍囬
+const title = computed(() =>
+ props.kind === 'SIP' ? '妫�楠屾寚瀵间功(SIP)' : '浣滀笟鎸囧涔�(SOP)',
+);
/** 灏嗗畬鏁� URL 杞负鐩稿璺緞锛岀‘淇濊蛋鍓嶇浠ｇ悊 */
function resolveImageUrl(url?: string): string {
diff --git a/src/views/mes/md/workstation/index.vue b/src/views/mes/md/workstation/index.vue
index 6f505e4..8baf7e2 100644
--- a/src/views/mes/md/workstation/index.vue
+++ b/src/views/mes/md/workstation/index.vue
@@ -5,7 +5,7 @@
import { ref } from 'vue';
import { Page, useVbenModal } from '@vben/common-ui';
-import { BarcodeBizTypeEnum } from '@vben/constants';
+// import { BarcodeBizTypeEnum } from '@vben/constants';
import { downloadFileFromBlobPart } from '@vben/utils';
import { Button, message } from 'ant-design-vue';
@@ -17,12 +17,12 @@
getWorkstationPage,
} from '#/api/mes/md/workstation';
import { $t } from '#/locales';
-import { BarcodeDetail } from '#/views/wls/barcode/components';
+// import { BarcodeDetail } from '#/views/wls/barcode/components';
import { useGridColumns, useGridFormSchema } from './data';
import Form from './modules/form.vue';
-const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 鏉＄爜璇︽儏寮圭獥
+// const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 鏉＄爜璇︽儏寮圭獥
const [FormModal, formModalApi] = useVbenModal({
connectedComponent: Form,
@@ -65,17 +65,17 @@
}
/** 鏌ョ湅宸ヤ綔绔欐潯鐮� */
-function handleBarcode(row: MesMdWorkstationApi.Workstation) {
- if (!row.id) {
- return;
- }
- barcodeDetailRef.value?.openByBusiness(
- row.id,
- BarcodeBizTypeEnum.WORKSTATION,
- row.code,
- row.name,
- );
-}
+// function handleBarcode(row: MesMdWorkstationApi.Workstation) {
+// if (!row.id) {
+// return;
+// }
+// barcodeDetailRef.value?.openByBusiness(
+// row.id,
+// BarcodeBizTypeEnum.WORKSTATION,
+// row.code,
+// row.name,
+// );
+// }
/** 瀵煎嚭宸ヤ綔绔� */
async function handleExport() {
@@ -116,7 +116,7 @@
<template>
<Page auto-content-height><FormModal @success="handleRefresh" />
- <BarcodeDetail ref="barcodeDetailRef" />
+ <!-- <BarcodeDetail ref="barcodeDetailRef" /> -->
<Grid table-title="宸ヤ綔绔欏垪琛�">
<template #toolbar-tools>
@@ -165,12 +165,12 @@
confirm: handleDelete.bind(null, row),
},
},
- {
- label: '鏉＄爜',
- type: 'link',
- auth: ['mes:md-workstation:query'],
- onClick: handleBarcode.bind(null, row),
- },
+ // {
+ // label: '鏉＄爜',
+ // type: 'link',
+ // auth: ['mes:md-workstation:query'],
+ // onClick: handleBarcode.bind(null, row),
+ // },
]"
/>
</template>
diff --git a/src/views/mes/md/workstation/modules/form.vue b/src/views/mes/md/workstation/modules/form.vue
index 0c47ba3..0258a32 100644
--- a/src/views/mes/md/workstation/modules/form.vue
+++ b/src/views/mes/md/workstation/modules/form.vue
@@ -6,7 +6,7 @@
import { computed, ref } from "vue";
import { useVbenModal } from "@vben/common-ui";
- import { BarcodeBizTypeEnum } from "@vben/constants";
+ // import { BarcodeBizTypeEnum } from "@vben/constants";
import { Button, message, Tabs } from "ant-design-vue";
@@ -17,7 +17,7 @@
updateWorkstation,
} from "#/api/mes/md/workstation";
import { $t } from "#/locales";
- import { BarcodeDetail } from "#/views/wls/barcode/components";
+ // import { BarcodeDetail } from "#/views/wls/barcode/components";
import { useFormSchema } from "../data";
import MachineList from "./machine-list.vue";
@@ -28,7 +28,7 @@
const formType = ref<FormType>("create"); // 琛ㄥ崟妯″紡
const subTabsName = ref("machine"); // 褰撳墠璧勬簮椤电
const formData = ref<MesMdWorkstationApi.Workstation>();
- const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 鏉＄爜璇︽儏寮圭獥
+ // const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 鏉＄爜璇︽儏寮圭獥
const isDetail = computed(() => formType.value === "detail"); // 鏄惁鏌ョ湅妯″紡
const getTitle = computed(() => {
@@ -53,17 +53,17 @@
});
/** 鏌ョ湅宸ヤ綔绔欐潯鐮� */
- function handleBarcode() {
- if (!formData.value?.id) {
- return;
- }
- barcodeDetailRef.value?.openByBusiness(
- formData.value.id,
- BarcodeBizTypeEnum.WORKSTATION,
- formData.value.code,
- formData.value.name
- );
- }
+ // function handleBarcode() {
+ // if (!formData.value?.id) {
+ // return;
+ // }
+ // barcodeDetailRef.value?.openByBusiness(
+ // formData.value.id,
+ // BarcodeBizTypeEnum.WORKSTATION,
+ // formData.value.code,
+ // formData.value.name
+ // );
+ // }
const [Modal, modalApi] = useVbenModal({
async onConfirm() {
@@ -146,13 +146,13 @@
</Tabs>
<template #prepend-footer>
<div class="flex flex-auto items-center">
- <Button v-if="isDetail && formData?.id"
+ <!-- <Button v-if="isDetail && formData?.id"
type="primary"
@click="handleBarcode">
鏌ョ湅鏉＄爜
- </Button>
+ </Button> -->
</div>
</template>
- <BarcodeDetail ref="barcodeDetailRef" />
+ <!-- <BarcodeDetail ref="barcodeDetailRef" /> -->
</Modal>
</template>
diff --git a/src/views/mes/md/workstation/workshop/modules/form.vue b/src/views/mes/md/workstation/workshop/modules/form.vue
index 2dd8b84..ec8f682 100644
--- a/src/views/mes/md/workstation/workshop/modules/form.vue
+++ b/src/views/mes/md/workstation/workshop/modules/form.vue
@@ -6,7 +6,7 @@
import { computed, ref } from "vue";
import { useVbenModal } from "@vben/common-ui";
- import { BarcodeBizTypeEnum } from "@vben/constants";
+ // import { BarcodeBizTypeEnum } from "@vben/constants";
import { Button, message } from "ant-design-vue";
@@ -17,14 +17,14 @@
updateWorkshop,
} from "#/api/mes/md/workstation/workshop";
import { $t } from "#/locales";
- import { BarcodeDetail } from "#/views/wls/barcode/components";
+ // import { BarcodeDetail } from "#/views/wls/barcode/components";
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 barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 鏉＄爜璇︽儏寮圭獥
const isDetail = computed(() => formType.value === "detail"); // 鏄惁鏌ョ湅妯″紡
const getTitle = computed(() => {
@@ -49,17 +49,17 @@
});
/** 鏌ョ湅杞﹂棿鏉＄爜 */
- 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() {
@@ -117,9 +117,9 @@
<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>
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index e3c8248..9a388d0 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/mes/pro/workorder/index.vue
@@ -6,7 +6,6 @@
import { Page, useVbenModal } from "@vben/common-ui";
import {
- BarcodeBizTypeEnum,
MesProWorkOrderStatusEnum,
MesProWorkOrderTypeEnum,
} from "@vben/constants";
@@ -23,7 +22,7 @@
} from "#/api/mes/pro/workorder";
import { $t } from "#/locales";
import ArchiveDetail from '#/views/mes/pd/archive/modules/detail.vue';
-import { BarcodeDetail } from '#/views/wls/barcode/components';
+// import { BarcodeDetail } from '#/views/wls/barcode/components';
import { useGridColumns, useGridFormSchema } from "./data";
import Form from "./modules/form.vue";
@@ -34,7 +33,7 @@
});
const archiveDetailRef = ref<InstanceType<typeof ArchiveDetail>>();
-const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 鏉＄爜璇︽儏寮圭獥
+// const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 鏉＄爜璇︽儏寮圭獥
/** 鍒锋柊琛ㄦ牸 */
function handleRefresh() {
@@ -89,14 +88,14 @@
}
/** 鏌ョ湅璁㈠崟鏉＄爜 */
- function handleBarcode(row: MesProWorkOrderApi.WorkOrder) {
- barcodeDetailRef.value?.openByBusiness(
- row.id!,
- BarcodeBizTypeEnum.WORKORDER,
- row.code,
- row.name
- );
- }
+ // function handleBarcode(row: MesProWorkOrderApi.WorkOrder) {
+ // barcodeDetailRef.value?.openByBusiness(
+ // row.id!,
+ // BarcodeBizTypeEnum.WORKORDER,
+ // row.code,
+ // row.name
+ // );
+ // }
/** 瀵煎嚭琛ㄦ牸 */
async function handleExport() {
@@ -221,12 +220,12 @@
confirm: handleCancel.bind(null, row),
},
},
- {
- label: '鏉＄爜',
- type: 'link',
- auth: ['mes:pro-work-order:query'],
- onClick: handleBarcode.bind(null, row),
- },
+ // {
+ // label: '鏉＄爜',
+ // type: 'link',
+ // auth: ['mes:pro-work-order:query'],
+ // onClick: handleBarcode.bind(null, row),
+ // },
{
label: '褰掓。',
type: 'link',
@@ -235,7 +234,7 @@
]" />
</template>
</Grid>
- <BarcodeDetail ref="barcodeDetailRef" />
+ <!-- <BarcodeDetail ref="barcodeDetailRef" /> -->
<ArchiveDetail ref="archiveDetailRef" />
</Page>
</template>
diff --git a/src/views/mes/pro/workorder/modules/form.vue b/src/views/mes/pro/workorder/modules/form.vue
index 5da9d79..2a51ec9 100644
--- a/src/views/mes/pro/workorder/modules/form.vue
+++ b/src/views/mes/pro/workorder/modules/form.vue
@@ -8,7 +8,6 @@
import { confirm, useVbenModal } from "@vben/common-ui";
import {
- BarcodeBizTypeEnum,
MesProWorkOrderStatusEnum,
} from "@vben/constants";
@@ -24,7 +23,7 @@
} from "#/api/mes/pro/workorder";
import { batchSaveWorkOrderProcess, getWorkOrderProcessListByWorkOrderId } from "#/api/mes/pro/workorder/process";
import { $t } from "#/locales";
- import { BarcodeDetail } from "#/views/wls/barcode/components";
+ // import { BarcodeDetail } from "#/views/wls/barcode/components";
import { useFormSchema } from "../data";
import PredictDelivery from "./ai/predict-delivery.vue";
@@ -39,7 +38,7 @@
const formData = ref<MesProWorkOrderApi.WorkOrder>();
const originalSnapshot = ref("");
const subTabsName = ref("process");
- const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>();
+ // const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>();
const processListRef = ref<InstanceType<typeof ProcessList>>();
const currentProductId = ref<number>(); // 褰撳墠閫変腑鐨勪骇鍝� ID锛堢敤浜庡伐搴忓姞杞斤級
const tempProcessList = ref<MesProWorkOrderProcessApi.WorkOrderProcess[]>([]); // 涓存椂宸ュ簭鍒楄〃
@@ -147,17 +146,17 @@
}
/** 鏌ョ湅璁㈠崟鏉＄爜 */
- function handleBarcode() {
- if (!formData.value?.id) {
- return;
- }
- barcodeDetailRef.value?.openByBusiness(
- formData.value.id,
- BarcodeBizTypeEnum.WORKORDER,
- formData.value.code,
- formData.value.name
- );
- }
+ // function handleBarcode() {
+ // if (!formData.value?.id) {
+ // return;
+ // }
+ // barcodeDetailRef.value?.openByBusiness(
+ // formData.value.id,
+ // BarcodeBizTypeEnum.WORKORDER,
+ // formData.value.code,
+ // formData.value.name
+ // );
+ // }
/** 宸ュ簭鍒楄〃鍙樺寲鍥炶皟 */
function handleProcessListChange(list: MesProWorkOrderProcessApi.WorkOrderProcess[]) {
@@ -384,13 +383,13 @@
@click="handleSave">
淇濆瓨淇敼
</Button>
- <Button v-if="formType === 'detail' && formData?.id"
+ <!-- <Button v-if="formType === 'detail' && formData?.id"
@click="handleBarcode">
鏌ョ湅鏉＄爜
- </Button>
+ </Button> -->
<Button @click="modalApi.close()">鍙栨秷</Button>
</div>
</template>
</Modal>
- <BarcodeDetail ref="barcodeDetailRef" />
+ <!-- <BarcodeDetail ref="barcodeDetailRef" /> -->
</template>
--
Gitblit v1.9.3