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/index.vue | 279 +++++++++++++++++++++++++++----------------------------
1 files changed, 139 insertions(+), 140 deletions(-)
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index 3bc1a53..6510afd 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/mes/pro/workorder/index.vue
@@ -1,154 +1,153 @@
<script lang="ts" setup>
-import type { VxeTableGridOptions } from '#/adapter/vxe-table';
-import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+ import type { VxeTableGridOptions } from "#/adapter/vxe-table";
+ import type { MesProWorkOrderApi } from "#/api/mes/pro/workorder";
-import { ref } from 'vue';
+ import { ref } from "vue";
-import { Page, useVbenModal } from '../../../../packages/effects/common-ui/src';
-import {
- BarcodeBizTypeEnum,
- MesProWorkOrderStatusEnum,
- MesProWorkOrderTypeEnum,
-} from '../../../../packages/constants/src';
-import { downloadFileFromBlobPart } from '../../../../packages/utils/src';
+ import { Page, useVbenModal } from "@vben/common-ui";
+ import {
+ BarcodeBizTypeEnum,
+ MesProWorkOrderStatusEnum,
+ MesProWorkOrderTypeEnum,
+ } from "@vben/constants";
+ import { downloadFileFromBlobPart } from "@vben/utils";
-import { Button, message } from 'ant-design-vue';
+ import { Button, message } from "ant-design-vue";
-import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
-import {
- cancelWorkOrder,
- deleteWorkOrder,
- exportWorkOrder,
- getWorkOrderPage,
-} from '#/api/mes/pro/workorder';
-import { $t } from '#/locales';
-import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
+ import { ACTION_ICON, TableAction, useVbenVxeGrid } from "#/adapter/vxe-table";
+ import {
+ cancelWorkOrder,
+ deleteWorkOrder,
+ exportWorkOrder,
+ getWorkOrderPage,
+ } from "#/api/mes/pro/workorder";
+ import { $t } from "#/locales";
+ import { BarcodeDetail } from "#/views/wls/barcode/components";
-import { useGridColumns, useGridFormSchema } from './data';
-import Form from './modules/form.vue';
+ import { useGridColumns, useGridFormSchema } from "./data";
+ import Form from "./modules/form.vue";
-const [FormModal, formModalApi] = useVbenModal({
- connectedComponent: Form,
- destroyOnClose: true,
-});
-
-const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 鏉＄爜璇︽儏寮圭獥
-
-/** 鍒锋柊琛ㄦ牸 */
-function handleRefresh() {
- gridApi.query();
-}
-
-/** 鍒涘缓宸ュ崟 */
-function handleCreate() {
- formModalApi.setData({ formType: 'create' }).open();
-}
-
-/** 鏂板瀛愬伐鍗� */
-function handleAddChild(row: MesProWorkOrderApi.WorkOrder) {
- formModalApi.setData({ formType: 'create', parentRow: row }).open();
-}
-
-/** 鏌ョ湅宸ュ崟璇︽儏 */
-function handleDetail(row: MesProWorkOrderApi.WorkOrder) {
- formModalApi.setData({ formType: 'detail', id: row.id }).open();
-}
-
-/** 缂栬緫宸ュ崟 */
-function handleEdit(row: MesProWorkOrderApi.WorkOrder) {
- formModalApi.setData({ formType: 'update', id: row.id }).open();
-}
-
-/** 瀹屾垚宸ュ崟 */
-function handleFinish(row: MesProWorkOrderApi.WorkOrder) {
- formModalApi.setData({ formType: 'finish', id: row.id }).open();
-}
-
-/** 鍒犻櫎宸ュ崟 */
-async function handleDelete(row: MesProWorkOrderApi.WorkOrder) {
- const hideLoading = message.loading({
- content: $t('ui.actionMessage.deleting', [row.code]),
- duration: 0,
+ const [FormModal, formModalApi] = useVbenModal({
+ connectedComponent: Form,
+ destroyOnClose: true,
});
- try {
- await deleteWorkOrder(row.id!);
- message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
- handleRefresh();
- } finally {
- hideLoading();
+
+ const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 鏉＄爜璇︽儏寮圭獥
+
+ /** 鍒锋柊琛ㄦ牸 */
+ function handleRefresh() {
+ gridApi.query();
}
-}
-/** 鍙栨秷宸ュ崟 */
-async function handleCancel(row: MesProWorkOrderApi.WorkOrder) {
- await cancelWorkOrder(row.id!);
- message.success('宸ュ崟宸插彇娑�');
- handleRefresh();
-}
+ /** 鍒涘缓璁㈠崟 */
+ function handleCreate() {
+ formModalApi.setData({ formType: "create" }).open();
+ }
-/** 鏌ョ湅宸ュ崟鏉＄爜 */
-function handleBarcode(row: MesProWorkOrderApi.WorkOrder) {
- barcodeDetailRef.value?.openByBusiness(
- row.id!,
- BarcodeBizTypeEnum.WORKORDER,
- row.code,
- row.name,
- );
-}
+ /** 鏂板瀛愯鍗� */
+ function handleAddChild(row: MesProWorkOrderApi.WorkOrder) {
+ formModalApi.setData({ formType: "create", parentRow: row }).open();
+ }
-/** 瀵煎嚭琛ㄦ牸 */
-async function handleExport() {
- const data = await exportWorkOrder(await gridApi.formApi.getValues());
- downloadFileFromBlobPart({ fileName: '鐢熶骇宸ュ崟.xls', source: data });
-}
+ /** 鏌ョ湅璁㈠崟璇︽儏 */
+ function handleDetail(row: MesProWorkOrderApi.WorkOrder) {
+ formModalApi.setData({ formType: "detail", id: row.id }).open();
+ }
-const [Grid, gridApi] = useVbenVxeGrid({
- formOptions: {
- schema: useGridFormSchema(),
- },
- gridOptions: {
- columns: useGridColumns(),
- height: 'auto',
- keepSource: true,
- proxyConfig: {
- ajax: {
- query: async ({ page }, formValues) => {
- return await getWorkOrderPage({
- pageNo: page.currentPage,
- pageSize: page.pageSize,
- ...formValues,
- });
+ /** 缂栬緫璁㈠崟 */
+ function handleEdit(row: MesProWorkOrderApi.WorkOrder) {
+ formModalApi.setData({ formType: "update", id: row.id }).open();
+ }
+
+ /** 瀹屾垚璁㈠崟 */
+ function handleFinish(row: MesProWorkOrderApi.WorkOrder) {
+ formModalApi.setData({ formType: "finish", id: row.id }).open();
+ }
+
+ /** 鍒犻櫎璁㈠崟 */
+ async function handleDelete(row: MesProWorkOrderApi.WorkOrder) {
+ const hideLoading = message.loading({
+ content: $t("ui.actionMessage.deleting", [row.code]),
+ duration: 0,
+ });
+ try {
+ await deleteWorkOrder(row.id!);
+ message.success($t("ui.actionMessage.deleteSuccess", [row.code]));
+ handleRefresh();
+ } finally {
+ hideLoading();
+ }
+ }
+
+ /** 鍙栨秷璁㈠崟 */
+ async function handleCancel(row: MesProWorkOrderApi.WorkOrder) {
+ await cancelWorkOrder(row.id!);
+ message.success("璁㈠崟宸插彇娑�");
+ handleRefresh();
+ }
+
+ /** 鏌ョ湅璁㈠崟鏉＄爜 */
+ function handleBarcode(row: MesProWorkOrderApi.WorkOrder) {
+ barcodeDetailRef.value?.openByBusiness(
+ row.id!,
+ BarcodeBizTypeEnum.WORKORDER,
+ row.code,
+ row.name
+ );
+ }
+
+ /** 瀵煎嚭琛ㄦ牸 */
+ async function handleExport() {
+ const data = await exportWorkOrder(await gridApi.formApi.getValues());
+ downloadFileFromBlobPart({ fileName: "鐢熶骇璁㈠崟.xls", source: data });
+ }
+
+ const [Grid, gridApi] = useVbenVxeGrid({
+ formOptions: {
+ schema: useGridFormSchema(),
+ },
+ gridOptions: {
+ columns: useGridColumns(),
+ height: "auto",
+ keepSource: true,
+ proxyConfig: {
+ ajax: {
+ query: async ({ page }, formValues) => {
+ return await getWorkOrderPage({
+ pageNo: page.currentPage,
+ pageSize: page.pageSize,
+ ...formValues,
+ });
+ },
},
},
- },
- rowConfig: {
- keyField: 'id',
- isHover: true,
- },
- toolbarConfig: {
- refresh: true,
- search: true,
- },
- treeConfig: {
- parentField: 'parentId',
- rowField: 'id',
- transform: true,
- expandAll: true,
- reserve: true,
- },
- } as VxeTableGridOptions<MesProWorkOrderApi.WorkOrder>,
-});
+ rowConfig: {
+ keyField: "id",
+ isHover: true,
+ },
+ toolbarConfig: {
+ refresh: true,
+ search: true,
+ },
+ treeConfig: {
+ parentField: "parentId",
+ rowField: "id",
+ transform: true,
+ expandAll: true,
+ reserve: true,
+ },
+ } as VxeTableGridOptions<MesProWorkOrderApi.WorkOrder>,
+ });
</script>
<template>
- <Page auto-content-height><FormModal @success="handleRefresh" />
-
- <Grid table-title="鐢熶骇宸ュ崟鍒楄〃">
+ <Page auto-content-height>
+ <FormModal @success="handleRefresh" />
+ <Grid table-title="鐢熶骇璁㈠崟鍒楄〃">
<template #toolbar-tools>
- <TableAction
- :actions="[
+ <TableAction :actions="[
{
- label: $t('ui.actionTitle.create', ['宸ュ崟']),
+ label: $t('ui.actionTitle.create', ['璁㈠崟']),
type: 'primary',
icon: ACTION_ICON.ADD,
auth: ['mes:pro-work-order:create'],
@@ -161,17 +160,16 @@
auth: ['mes:pro-work-order:export'],
onClick: handleExport,
},
- ]"
- />
+ ]" />
</template>
<template #code="{ row }">
- <Button type="link" @click="handleDetail(row)">
+ <Button type="link"
+ @click="handleDetail(row)">
{{ row.code }}
</Button>
</template>
<template #actions="{ row }">
- <TableAction
- :actions="[
+ <TableAction :actions="[
{
label: $t('common.edit'),
type: 'link',
@@ -205,7 +203,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),
},
{
@@ -215,7 +215,7 @@
auth: ['mes:pro-work-order:update'],
ifShow: row.status === MesProWorkOrderStatusEnum.CONFIRMED,
popConfirm: {
- title: '纭瑕佸彇娑堣宸ュ崟鍚楋紵鍙栨秷鍚庝笉鍙仮澶嶃��',
+ title: '纭瑕佸彇娑堣璁㈠崟鍚楋紵鍙栨秷鍚庝笉鍙仮澶嶃��',
confirm: handleCancel.bind(null, row),
},
},
@@ -225,8 +225,7 @@
auth: ['mes:pro-work-order:query'],
onClick: handleBarcode.bind(null, row),
},
- ]"
- />
+ ]" />
</template>
</Grid>
<BarcodeDetail ref="barcodeDetailRef" />
--
Gitblit v1.9.3