From 2ee69f2c07b7cdc5b1f209d3b4d9606374b94c25 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 16:52:04 +0800
Subject: [PATCH] feat(erp): 采购/销售明细按含税单价口径联算,采购申请与申请采购单合并入口
---
src/views/erp/purchase/order/index.vue | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/views/erp/purchase/order/index.vue b/src/views/erp/purchase/order/index.vue
index 401405b..364d744 100644
--- a/src/views/erp/purchase/order/index.vue
+++ b/src/views/erp/purchase/order/index.vue
@@ -8,7 +8,7 @@
import { Page, useVbenModal } from '@vben/common-ui';
import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
-import { message, Tag } from 'ant-design-vue';
+import { message, Tabs, Tag } from 'ant-design-vue';
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import {
@@ -19,6 +19,7 @@
} from '#/api/erp/purchase/order';
import { $t } from '#/locales';
+import PlacePanel from '../place/modules/place-panel.vue';
import { useGridColumns, useGridFormSchema } from './data';
import Form from './modules/form.vue';
import ImportForm from './modules/import-form.vue';
@@ -28,6 +29,16 @@
defineOptions({ name: 'ErpPurchaseOrder' });
const route = useRoute();
+
+/**
+ * 椤电锛�4.2 閲囪喘涓嬪崟涓� 4.5 閲囪喘璁㈠崟鍏辩敤涓�寮犺鍗曪紝
+ * 鍚堝苟涓轰竴涓彍鍗曪紝閬垮厤涓や釜鍏ュ彛閲嶅銆�
+ */
+const activeTab = ref('order');
+const TAB_ITEMS = [
+ { key: 'order', label: '閲囪喘璁㈠崟' },
+ { key: 'place', label: '閲囪喘涓嬪崟' },
+];
const [FormModal, formModalApi] = useVbenModal({
connectedComponent: Form,
@@ -143,6 +154,7 @@
toolbarConfig: {
refresh: true,
search: true,
+ custom: true,
},
} as VxeTableGridOptions<ErpPurchaseOrderApi.PurchaseOrder>,
gridEvents: {
@@ -164,7 +176,11 @@
<FormModal @success="handleRefresh" />
<ImportModal @success="handleRefresh" />
<Print ref="printRef" />
- <Grid table-title="閲囪喘璁㈠崟鍒楄〃">
+ <div class="mx-4 mb-2">
+ <Tabs v-model:active-key="activeTab" :items="TAB_ITEMS" />
+ </div>
+ <PlacePanel v-if="activeTab === 'place'" />
+ <Grid v-show="activeTab === 'order'" table-title="閲囪喘璁㈠崟鍒楄〃">
<template #toolbar-tools>
<TableAction
:actions="[
--
Gitblit v1.9.3