From 027222214c48a4752515fcf2e129487feb7c233b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 12 五月 2026 10:08:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro
---
src/views/inventoryManagement/receiptManagement/Record.vue | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index c9cb6ee..78ba5bb 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -50,6 +50,7 @@
height="calc(100vh - 18.5em)">
<el-table-column align="center"
type="selection"
+ :selectable="isRowSelectableForApprove"
width="55"/>
<el-table-column align="center"
label="搴忓彿"
@@ -181,6 +182,7 @@
APPROVED: "閫氳繃",
REJECTED: "椹冲洖",
};
+approvalStatusLabelMap[3] = "寰呯‘璁�";
const getApprovalStatusLabel = (status) => {
if (status === null || status === undefined || status === "") {
@@ -194,6 +196,14 @@
if (status === 1 || status === "1" || status === "approved" || status === "APPROVED") return "success";
if (status === 2 || status === "2" || status === "rejected" || status === "REJECTED") return "danger";
return "warning";
+};
+
+const isPendingApproval = status => {
+ return status === 0 || status === "0" || status === "pending" || status === "PENDING" || status === null || status === undefined || status === "";
+};
+
+const isRowSelectableForApprove = row => {
+ return isPendingApproval(row?.approvalStatus);
};
const pageProductChange = obj => {
@@ -234,7 +244,7 @@
// 琛ㄦ牸閫夋嫨鏁版嵁
const handleSelectionChange = selection => {
- selectedRows.value = selection.filter(item => item.id);
+ selectedRows.value = selection.filter(item => item.id && isPendingApproval(item.approvalStatus));
};
const expandedRowKeys = ref([]);
--
Gitblit v1.9.3