From 350787b52f00433101868fdc93564fe755e921a9 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 21 四月 2026 15:04:26 +0800
Subject: [PATCH] Merge branch 'dev_河南_鹤壁天沐玻璃厂' of http://114.132.189.42:9002/r/product-inventory-management into dev_河南_鹤壁天沐玻璃厂
---
src/views/collaborativeApproval/approvalProcess/index.vue | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index a9df154..9e5a1ce 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -18,6 +18,8 @@
name="6"></el-tab-pane>
<el-tab-pane label="鍙戣揣瀹℃壒"
name="7"></el-tab-pane>
+ <el-tab-pane label="鍏ュ簱瀹℃壒"
+ name="9"></el-tab-pane>
</el-tabs>
<div class="search_form">
<div>
@@ -52,12 +54,12 @@
<el-button @click="handleOut">瀹℃壒浜虹淮鎶�</el-button>
<el-button type="primary"
@click="openForm('add')"
- v-if="currentApproveType !== 5 && currentApproveType !== 6 && currentApproveType !== 7">鏂板</el-button>
+ v-if="currentApproveType !== 5 && currentApproveType !== 6 && currentApproveType !== 7 && currentApproveType !== 9">鏂板</el-button>
<el-button @click="handleExport">瀵煎嚭</el-button>
<el-button type="danger"
plain
@click="handleDelete"
- v-if="currentApproveType !== 5 && currentApproveType !== 6 && currentApproveType !== 7">鍒犻櫎</el-button>
+ v-if="currentApproveType !== 5 && currentApproveType !== 6 && currentApproveType !== 7 && currentApproveType !== 9">鍒犻櫎</el-button>
</div>
</div>
<div class="table_list">
@@ -187,6 +189,7 @@
const isReimburseType = currentApproveType.value === 4; // 鎶ラ攢绠＄悊
const isQuotationType = currentApproveType.value === 6; // 鎶ヤ环瀹℃壒
const isPurchaseType = currentApproveType.value === 5; // 閲囪喘瀹℃壒
+ const isInboundType = currentApproveType.value === 9; // 鍏ュ簱瀹℃壒
// 鍩虹鍒楅厤缃�
const baseColumns = [
@@ -237,6 +240,8 @@
? "鎶ヤ环鍗曞彿"
: isPurchaseType
? "閲囪喘鍚堝悓鍙�"
+ : isInboundType
+ ? "鍏ュ簱鍗曞彿"
: "瀹℃壒浜嬬敱",
prop: "approveReason",
},
@@ -289,6 +294,7 @@
currentApproveType.value === 5 ||
currentApproveType.value === 6 ||
currentApproveType.value === 7 ||
+ currentApproveType.value === 9 ||
row.approveStatus == 2 ||
row.approveStatus == 1 ||
row.approveStatus == 4,
@@ -402,6 +408,7 @@
5: "/approveProcess/exportFive",
6: "/approveProcess/exportSix",
7: "/approveProcess/exportSeven",
+ 9: "/approveProcess/exportNine",
};
const url = urlMap[type] || urlMap[0];
const nameMap = {
@@ -413,6 +420,7 @@
5: "閲囪喘鐢宠瀹℃壒琛�",
6: "鎶ヤ环瀹℃壒琛�",
7: "鍙戣揣瀹℃壒琛�",
+ 9: "鍏ュ簱瀹℃壒琛�",
};
const fileName = nameMap[type] || nameMap[0];
proxy.download(url, {}, `${fileName}.xlsx`);
--
Gitblit v1.9.3