From 6f1bd54c8ea5327f09e077af3d16272987c48e40 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 17 九月 2025 16:22:17 +0800
Subject: [PATCH] Merge branch 'dev_meet' into dev
---
src/views/collaborativeApproval/approvalProcess/index.vue | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index 9630af3..c3b713e 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -42,7 +42,7 @@
:total="page.total"
></PIMTable>
</div>
- <info-form-dia ref="infoFormDia" @close="handleQuery"></info-form-dia>
+ <info-form-dia ref="infoFormDia" @close="handleQuery" :approveType="approveType"></info-form-dia>
<approval-dia ref="approvalDia" @close="handleQuery"></approval-dia>
<FileList ref="fileListRef" />
</div>
@@ -57,6 +57,15 @@
import ApprovalDia from "@/views/collaborativeApproval/approvalProcess/components/approvalDia.vue";
import {approveProcessDelete, approveProcessListPage} from "@/api/collaborativeApproval/approvalProcess.js";
import useUserStore from "@/store/modules/user";
+
+// 瀹氫箟缁勪欢鎺ユ敹鐨刾rops
+const props = defineProps({
+ approveType: {
+ type: [Number, String],
+ default: 0
+ }
+});
+
const userStore = useUserStore();
@@ -205,7 +214,7 @@
};
const getList = () => {
tableLoading.value = true;
- approveProcessListPage({...page, ...searchForm.value,}).then(res => {
+ approveProcessListPage({...page, ...searchForm.value,approveType:props.approveType}).then(res => {
tableLoading.value = false;
tableData.value = res.data.records
page.total = res.data.total;
--
Gitblit v1.9.3