From c1bf5ebfe65ee67c64da6e9e4e6f7c7dbb3e992e Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 17 三月 2026 14:28:26 +0800
Subject: [PATCH] fix: 新增不合格原料库存时，没有皮重、毛重、净重、过磅日期、车牌号、过磅员输入框（不会存在不合格入库，把按钮屏蔽掉）
---
src/views/collaborativeApproval/approvalProcess/index.vue | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index 00e59c9..2d6c37d 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -6,9 +6,7 @@
<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="7"></el-tab-pane>
+ <el-tab-pane label="鍘熸枡绠＄悊" name="9"></el-tab-pane>
</el-tabs>
<div class="search_form">
@@ -38,14 +36,14 @@
<el-button
type="primary"
@click="openForm('add')"
- v-if="currentApproveType !== 6 && currentApproveType !== 7"
+ v-if="currentApproveType !== 5 && currentApproveType !== 6 && currentApproveType !== 7 && currentApproveType !== 9"
>鏂板</el-button>
<el-button @click="handleOut">瀵煎嚭</el-button>
<el-button
type="danger"
plain
@click="handleDelete"
- v-if="currentApproveType !== 7"
+ v-if="currentApproveType !== 5 && currentApproveType !== 6 && currentApproveType !== 7"
>鍒犻櫎</el-button>
</div>
</div>
@@ -113,6 +111,7 @@
const isLeaveType = currentApproveType.value === 2; // 璇峰亣绠＄悊
const isReimburseType = currentApproveType.value === 4; // 鎶ラ攢绠＄悊
const isQuotationType = currentApproveType.value === 6; // 鎶ヤ环瀹℃壒
+ const isPurchaseType = currentApproveType.value === 5; // 閲囪喘瀹℃壒
// 鍩虹鍒楅厤缃�
const baseColumns = [
@@ -159,7 +158,7 @@
width: 220
},
{
- label: isQuotationType ? "鎶ヤ环鍗曞彿" : "瀹℃壒浜嬬敱",
+ label: isQuotationType ? "鎶ヤ环鍗曞彿" : isPurchaseType ? "閲囪喘鍚堝悓鍙�" : "瀹℃壒浜嬬敱",
prop: "approveReason",
width: 200
},
@@ -215,8 +214,10 @@
openForm("edit", row);
},
disabled: (row) =>
+ currentApproveType.value === 5 ||
currentApproveType.value === 6 ||
currentApproveType.value === 7 ||
+ currentApproveType.value === 9 ||
row.approveStatus == 2 ||
row.approveStatus == 1 ||
row.approveStatus == 4
@@ -298,6 +299,7 @@
5: "/approveProcess/exportFive",
6: "/approveProcess/exportSix",
7: "/approveProcess/exportSeven",
+ 9: "/approveProcess/exportNine",
}
const url = urlMap[type] || urlMap[0]
const nameMap = {
@@ -309,6 +311,7 @@
5: "閲囪喘鐢宠瀹℃壒琛�",
6: "鎶ヤ环瀹℃壒琛�",
7: "鍙戣揣瀹℃壒琛�",
+ 9: "鍘熸枡瀹℃壒琛�",
}
const fileName = nameMap[type] || nameMap[0]
proxy.download(url, {}, `${fileName}.xlsx`)
--
Gitblit v1.9.3