From c52fa8533693c03362561067e4b65716c8bfcfee Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期日, 16 三月 2025 18:47:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/resourceDemand/device/component/management.vue | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/management.vue b/src/views/CNAS/resourceDemand/device/component/management.vue
index c608c6e..6fb77f5 100644
--- a/src/views/CNAS/resourceDemand/device/component/management.vue
+++ b/src/views/CNAS/resourceDemand/device/component/management.vue
@@ -491,10 +491,18 @@
{
label: "璁惧鍒嗙被", prop: "largeCategory", dataType: "tag",
formatData: (params) => {
- return this.equipmentList.find(m => m.value == params).label
+ if (this.equipmentList.find(m => m.value == params)) {
+ return this.equipmentList.find(m => m.value == params).label
+ } else {
+ return null
+ }
},
formatType: (params) => {
- return this.equipmentList.find(m => m.value == params).type
+ if (this.equipmentList.find(m => m.value == params)) {
+ return this.equipmentList.find(m => m.value == params).type
+ } else {
+ return null
+ }
}
},
{ label: "鍗曚环", prop: "unitPrice" },
@@ -803,10 +811,6 @@
}
this.upLoad = true;
upDeviceParameter(formData).then(res => {
- if (res.code === 201) {
- this.upLoad = false
- return
- }
this.$message.success('淇敼鎴愬姛')
this.upLoad = false
this.refreshTable('page')
@@ -856,10 +860,6 @@
}
this.upLoad2 = true;
addDeviceParameter(formData).then(res => {
- if (res.code === 201) {
- this.upLoad2 = false
- return
- }
this.$message.success('鎻愪氦鎴愬姛')
this.upLoad2 = false
this.refreshTable('page')
@@ -927,9 +927,6 @@
this.upLoad3 = true
numberCollect(this.configForm).then(res => {
this.upLoad3 = false
- if (res.code === 201) {
- return
- }
this.$message.success('鎿嶄綔鎴愬姛')
this.refreshTable('page')
this.dialogVisible3 = false
@@ -976,7 +973,6 @@
})
.then(() => {
delDeviceParameter({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
--
Gitblit v1.9.3