From d916dfba2efa2d9359f5b432350a15e5ed1a0af4 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 18 十月 2024 13:58:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/data/ind/item/DerIndDefineForm.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/data/ind/item/DerIndDefineForm.vue b/src/views/data/ind/item/DerIndDefineForm.vue
index f5b4235..3822e86 100644
--- a/src/views/data/ind/item/DerIndDefineForm.vue
+++ b/src/views/data/ind/item/DerIndDefineForm.vue
@@ -88,7 +88,7 @@
v-for="item in dataSetFieldList"
:key="item.id"
:label="item.fieldCode"
- :value="item.id + ''"
+ :value="item.fieldCode"
/>
</el-select>
</el-form-item>
@@ -135,7 +135,7 @@
v-for="item in dataSetFieldList"
:key="item.id"
:label="item.fieldCode"
- :value="item.id + ''"
+ :value="item.fieldCode"
/>
</el-select>
</el-form-item>
@@ -243,6 +243,7 @@
}else {
formData.value.derItem.dimension = ""
}
+ showTimeChange.value = formData.value.derItem.timeLimit === 'CUSTOM'
await handleChange(formData.value.derItem.atomItemId)
} finally {
formLoading.value = false
--
Gitblit v1.9.3