From 6749fc51f07d9824640c4c2508ff242b8850a323 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 21 四月 2026 10:44:01 +0800
Subject: [PATCH] 湟水峡 1.bug修改
---
src/views/collaborativeApproval/approvalProcess/index.vue | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index 8c84b27..f30c960 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -6,9 +6,11 @@
<el-tab-pane label="璇峰亣绠＄悊" name="2"></el-tab-pane>
<el-tab-pane label="鍑哄樊绠＄悊" name="3"></el-tab-pane>
<el-tab-pane label="鎶ラ攢绠＄悊" name="4"></el-tab-pane>
- <el-tab-pane label="閲囪喘瀹℃壒" name="5"></el-tab-pane>
- <el-tab-pane label="鎶ヤ环瀹℃壒" name="6"></el-tab-pane>
+ <el-tab-pane label="閲囪喘璁″垝瀹℃壒" name="5"></el-tab-pane>
+<!-- <el-tab-pane label="鎶ヤ环瀹℃壒" name="6"></el-tab-pane>-->
<el-tab-pane label="鍑哄簱瀹℃壒" name="7"></el-tab-pane>
+ <el-tab-pane label="閿�鍞鎵�" name="9"></el-tab-pane>
+ <el-tab-pane label="鑷敱鍗忓悓瀹℃壒" name="10"></el-tab-pane>
</el-tabs>
<div class="search_form">
@@ -35,7 +37,7 @@
>
</div>
<div>
- <el-button type="primary" @click="openForm('add')">鏂板</el-button>
+ <el-button type="primary" @click="openForm('add')" v-if="currentApproveType !== 6 && currentApproveType !== 5 && currentApproveType !== 9">鏂板</el-button>
<el-button @click="handleOut">瀵煎嚭</el-button>
<el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
</div>
@@ -54,7 +56,7 @@
></PIMTable>
</div>
<info-form-dia ref="infoFormDia" @close="handleQuery" :approveType="currentApproveType"></info-form-dia>
- <approval-dia ref="approvalDia" @close="handleQuery"></approval-dia>
+ <approval-dia ref="approvalDia" @close="handleQuery" :approveType="currentApproveType"></approval-dia>
<FileList ref="fileListRef" />
</div>
</template>
@@ -103,6 +105,9 @@
const tableColumnCopy = computed(() => {
const isLeaveType = currentApproveType.value === 2; // 璇峰亣绠＄悊
const isReimburseType = currentApproveType.value === 4; // 鎶ラ攢绠＄悊
+ const isQuotationType = currentApproveType.value === 6; // 鎶ヤ环瀹℃壒
+ const isSalesType = currentApproveType.value === 9; // 閿�鍞鎵�
+ const isFreeType = currentApproveType.value === 10; // 鑷敱鍗忓悓瀹℃壒
// 鍩虹鍒楅厤缃�
const baseColumns = [
@@ -148,8 +153,14 @@
prop: "approveDeptName",
width: 220
},
+ // 瀹℃壒鏍囬锛堜粎鑷敱鍗忓悓瀹℃壒鏄剧ず锛�
+ ...(isFreeType ? [{
+ label: "瀹℃壒鏍囬",
+ prop: "approveTitle",
+ width: 200
+ }] : []),
{
- label: "瀹℃壒浜嬬敱",
+ label: isQuotationType ? "鎶ヤ环鍗曞彿" : (isSalesType ? "閿�鍞悎鍚屽彿" : "瀹℃壒浜嬬敱"),
prop: "approveReason",
width: 200
},
@@ -204,7 +215,7 @@
clickFun: (row) => {
openForm("edit", row);
},
- disabled: (row) => row.approveStatus == 2 || row.approveStatus == 1 || row.approveStatus == 4
+ disabled: (row) => currentApproveType.value === 6 || row.approveStatus == 2 || row.approveStatus == 1 || row.approveStatus == 4
},
{
name: "瀹℃牳",
@@ -283,6 +294,8 @@
5: "/approveProcess/exportFive",
6: "/approveProcess/exportSix",
7: "/approveProcess/exportSeven",
+ 9: "/approveProcess/exportEight",
+ 10: "/approveProcess/exportNine",
}
const url = urlMap[type] || urlMap[0]
const nameMap = {
@@ -294,6 +307,8 @@
5: "閲囪喘鐢宠瀹℃壒琛�",
6: "鎶ヤ环瀹℃壒琛�",
7: "鍑哄簱瀹℃壒琛�",
+ 9: "閿�鍞鎵硅〃",
+ 10: "鑷敱鍗忓悓瀹℃壒琛�",
}
const fileName = nameMap[type] || nameMap[0]
proxy.download(url, {}, `${fileName}.xlsx`)
--
Gitblit v1.9.3