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/request/index.vue | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/views/erp/purchase/request/index.vue b/src/views/erp/purchase/request/index.vue
index a0a8a00..0cea817 100644
--- a/src/views/erp/purchase/request/index.vue
+++ b/src/views/erp/purchase/request/index.vue
@@ -9,7 +9,7 @@
import { confirm, 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 {
@@ -22,6 +22,7 @@
} from '#/api/erp/purchase/request';
import { $t } from '#/locales';
+import DemandPanel from '../demand/modules/demand-panel.vue';
import { useGridColumns, useGridFormSchema } from './data';
import Form from './modules/form.vue';
import ImportForm from './modules/import-form.vue';
@@ -32,6 +33,16 @@
defineOptions({ name: 'ErpPurchaseRequest' });
const router = useRouter();
+
+/**
+ * 椤电锛�4.3 閲囪喘鐢宠鍗曚笌 4.4 鐢宠閲囪喘鍗曢兘鏄�屾彁閲囪喘闇�姹傘�嶏紝
+ * 鍚堝苟涓轰竴涓彍鍗曪紝閬垮厤涓や釜鍏ュ彛閲嶅銆�
+ */
+const activeTab = ref('request');
+const TAB_ITEMS = [
+ { key: 'request', label: '閲囪喘鐢宠鍗�' },
+ { key: 'demand', label: '鐢宠閲囪喘鍗�' },
+];
const [FormModal, formModalApi] = useVbenModal({
connectedComponent: Form,
@@ -188,6 +199,7 @@
toolbarConfig: {
refresh: true,
search: true,
+ custom: true,
},
} as VxeTableGridOptions<ErpPurchaseRequestApi.PurchaseRequest>,
gridEvents: {
@@ -203,7 +215,11 @@
<ImportModal @success="handleRefresh" />
<OrderFormModal @success="handleRefresh" />
<ProcessModal @success="handleRefresh" />
- <Grid table-title="閲囪喘鐢宠鍒楄〃">
+ <div class="mx-4 mb-2">
+ <Tabs v-model:active-key="activeTab" :items="TAB_ITEMS" />
+ </div>
+ <DemandPanel v-if="activeTab === 'demand'" />
+ <Grid v-show="activeTab === 'request'" table-title="閲囪喘鐢宠鍒楄〃">
<template #toolbar-tools>
<TableAction
:actions="[
--
Gitblit v1.9.3