From 2353af8edf94434cd571100bb16ed9fe9f12819d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 16 四月 2024 20:15:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/integration/integrationTransfer.vue | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue b/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue
index 7793e02..25df711 100644
--- a/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue
+++ b/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue
@@ -78,12 +78,6 @@
dialogVisible(n) {
this.$emit('update:visible', n)
},
- data(n) {
- console.log('n', n)
- },
- newdata(n) {
- console.log('newdata', n)
- }
},
computed: {
newdata() {
@@ -92,7 +86,7 @@
let name = this.props.label;
let key = this.props.key;
- if (this.data) {
+ if (Array.isArray(this.data)) {
let data = this.data.map(item => {
let objitem = {disabled: false, ...item};
if (this.disabledData.length !== 0) {
@@ -110,7 +104,8 @@
renPing: renPing,
[name]: item[this.props.label],
[key]: item[this.props.key],
- disabled: item.disabled
+ disabled: item.disabled,
+ id:item.id
};
return obj;
});
--
Gitblit v1.9.3