From 1f375577b9e5d6e89aa4d70c526db88eeb95c9a0 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 16 一月 2025 14:41:53 +0800
Subject: [PATCH] 原子指标输入验证
---
src/views/data/ind/item/DerIndDefineForm.vue | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/views/data/ind/item/DerIndDefineForm.vue b/src/views/data/ind/item/DerIndDefineForm.vue
index 60a72f1..cba741f 100644
--- a/src/views/data/ind/item/DerIndDefineForm.vue
+++ b/src/views/data/ind/item/DerIndDefineForm.vue
@@ -7,6 +7,18 @@
:rules="formRules" label-width="100px">
<el-row>
<el-col :span="12">
+ <el-form-item label="指标编码" prop="itemNo">
+ <el-input v-model="formData.itemNo" disabled/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="指标名称" prop="itemName">
+ <el-input v-model="formData.itemName"/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
<el-form-item label="原子指标" prop="atomItem.itemId">
<el-select v-model="formData.atomItem.itemId" clearable placeholder="请选择原子指标"
@change="handleChange($event)">
@@ -22,18 +34,6 @@
<el-col :span="12">
<el-form-item label="原子指标名称" prop="atomItem.itemName">
<el-input v-model="formData.atomItem.itemName" disabled/>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="指标编码" prop="itemNo">
- <el-input v-model="formData.itemNo" disabled/>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="指标名称" prop="itemName">
- <el-input v-model="formData.itemName"/>
</el-form-item>
</el-col>
</el-row>
@@ -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