From 302e8457c8d34a35d7eabbd474d98ebc16120ed2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 12 八月 2026 17:23:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fix/hsy/20260812' into dev_pro2.0
---
src/views/mes/pro/workorder/index.vue | 47 ++++++++++++++++++++++++++++-------------------
1 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index 34b4a20..9a388d0 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/mes/pro/workorder/index.vue
@@ -4,13 +4,12 @@
import { ref } from "vue";
- import { Page, useVbenModal } from "../../../../packages/effects/common-ui/src";
+ import { Page, useVbenModal } from "@vben/common-ui";
import {
- BarcodeBizTypeEnum,
MesProWorkOrderStatusEnum,
MesProWorkOrderTypeEnum,
- } from "../../../../packages/constants/src";
- import { downloadFileFromBlobPart } from "../../../../packages/utils/src";
+ } from "@vben/constants";
+ import { downloadFileFromBlobPart } from "@vben/utils";
import { Button, message } from "ant-design-vue";
@@ -22,7 +21,8 @@
getWorkOrderPage,
} from "#/api/mes/pro/workorder";
import { $t } from "#/locales";
- import { BarcodeDetail } from "#/views/wls/barcode/components";
+ import ArchiveDetail from '#/views/mes/pd/archive/modules/detail.vue';
+// import { BarcodeDetail } from '#/views/wls/barcode/components';
import { useGridColumns, useGridFormSchema } from "./data";
import Form from "./modules/form.vue";
@@ -32,7 +32,8 @@
destroyOnClose: true,
});
- const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 鏉＄爜璇︽儏寮圭獥
+ const archiveDetailRef = ref<InstanceType<typeof ArchiveDetail>>();
+// const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 鏉＄爜璇︽儏寮圭獥
/** 鍒锋柊琛ㄦ牸 */
function handleRefresh() {
@@ -87,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() {
@@ -203,7 +204,9 @@
label: '瀹屾垚',
type: 'link',
auth: ['mes:pro-work-order:update'],
- ifShow: row.status === MesProWorkOrderStatusEnum.CONFIRMED,
+ ifShow:
+ row.status === MesProWorkOrderStatusEnum.CONFIRMED &&
+ !!row.quantityProduced,
onClick: handleFinish.bind(null, row),
},
{
@@ -217,15 +220,21 @@
confirm: handleCancel.bind(null, row),
},
},
+ // {
+ // label: '鏉＄爜',
+ // type: 'link',
+ // auth: ['mes:pro-work-order:query'],
+ // onClick: handleBarcode.bind(null, row),
+ // },
{
- label: '鏉＄爜',
+ label: '褰掓。',
type: 'link',
- auth: ['mes:pro-work-order:query'],
- onClick: handleBarcode.bind(null, row),
+ onClick: () => archiveDetailRef.value?.open(row.productCode),
},
]" />
</template>
</Grid>
- <BarcodeDetail ref="barcodeDetailRef" />
+ <!-- <BarcodeDetail ref="barcodeDetailRef" /> -->
+ <ArchiveDetail ref="archiveDetailRef" />
</Page>
</template>
--
Gitblit v1.9.3