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 | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/views/data/ind/item/DerIndDefineForm.vue b/src/views/data/ind/item/DerIndDefineForm.vue
index 60a72f1..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,7 +243,8 @@
}else {
formData.value.derItem.dimension = ""
}
- await handleChange(formData.value.atomItem.itemId)
+ showTimeChange.value = formData.value.derItem.timeLimit === 'CUSTOM'
+ await handleChange(formData.value.derItem.atomItemId)
} finally {
formLoading.value = false
}
@@ -262,7 +263,7 @@
formLoading.value = true
try {
formData.value.itemType = 'DER'
- formData.value.derItem.atomItemId = formData.value.atomItem.id
+ formData.value.derItem.atomItemId = formData.value.atomItem.itemId
if(formData.value.derItem.dimension.length > 0){
let dimension = ''
for (let index in formData.value.derItem.dimension){
@@ -320,9 +321,10 @@
async function handleChange(event) {
if (event !== null && event !== undefined) {
const itemData = await ItemApi.getItem(event)
+ let a = itemData.atomItem.id
+ formData.value.atomItem.id = a
formData.value.atomItem.itemName = itemData.itemName
- formData.value.atomItem.id = itemData.atomItem.id
- formData.value.atomItem.itemId = itemData.id
+ formData.value.atomItem.itemId = itemData.atomItem.itemId
const queryParams = reactive({
dataSetId: itemData.atomItem.dataSet,
})
--
Gitblit v1.9.3