From 11e1de7bb345bc937cce53a2ac7672476b5b4db3 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期一, 02 二月 2026 16:17:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/views/safeProduction/hazardousMaterialsControl/index.vue | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/views/safeProduction/hazardousMaterialsControl/index.vue b/src/views/safeProduction/hazardousMaterialsControl/index.vue
index da995c2..b2048fe 100644
--- a/src/views/safeProduction/hazardousMaterialsControl/index.vue
+++ b/src/views/safeProduction/hazardousMaterialsControl/index.vue
@@ -264,7 +264,8 @@
@selection-change="handleSafeHazardSelectionChange"
style="width: 100%">
<el-table-column type="selection"
- width="55" />
+ width="55"
+ :selectable="isSelectable" />
<el-table-column prop="code"
label="鍗遍櫓婧愮紪鐮�"
width="180"
@@ -547,6 +548,11 @@
}
};
const handleApplyQtyChange = () => {
+ if (Number(form.value.applyQty) < 0) {
+ ElMessage.error("棰嗙敤鏁伴噺涓嶈兘灏忎簬0");
+ form.value.applyQty = 0;
+ return;
+ }
if (form.value.applyQty > valueItem.value.stockQty) {
ElMessage.error("棰嗙敤鏁伴噺涓嶈兘澶т簬搴撳瓨鏁伴噺");
form.value.applyQty = "";
@@ -587,7 +593,7 @@
const fetchSafeHazardList = () => {
safeHazardLoading.value = true;
return safeHazardListPage({
- page: safeHazardPage.value.current,
+ current: safeHazardPage.value.current,
size: safeHazardPage.value.size,
})
.then(res => {
@@ -597,6 +603,11 @@
.finally(() => {
safeHazardLoading.value = false;
});
+ };
+
+ const isSelectable = row => {
+ // 鍙湁搴撳瓨鏁伴噺澶т簬0鐨勮鎵嶈兘琚�夋嫨
+ return Number(row.stockQty) > 0;
};
const handleSafeHazardSelectionChange = selection => {
@@ -775,7 +786,7 @@
.catch(err => {
ElMessage.error(err.msg);
});
- } else {
+ } else if (dialogType.value === "edit") {
await formRef1.value.validate();
safeHazardRecordUpdate({ ...form.value })
.then(res => {
@@ -788,6 +799,9 @@
.catch(err => {
ElMessage.error(err.msg);
});
+ } else if (dialogType.value === "view") {
+ // 鏌ョ湅妯″紡涓嬩笉鎻愪氦琛ㄥ崟
+ dialogVisible.value = false;
}
} catch (error) {
console.error("琛ㄥ崟楠岃瘉澶辫触:", error);
--
Gitblit v1.9.3