From 6b77bf1b01c29954f21c2b287cccbe08aa1373fe Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 29 四月 2025 08:53:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/data/ind/item/DerIndDefineForm.vue | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/src/views/data/ind/item/DerIndDefineForm.vue b/src/views/data/ind/item/DerIndDefineForm.vue
index 8579fc6..f625a6d 100644
--- a/src/views/data/ind/item/DerIndDefineForm.vue
+++ b/src/views/data/ind/item/DerIndDefineForm.vue
@@ -26,15 +26,15 @@
<el-option
v-for="item in atomItemList"
:key="item.id"
- :label="item.itemNo"
+ :label="item.itemName"
:value="item.id + ''"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="原子指标名称" prop="atomItem.itemName">
- <el-input v-model="formData.atomItem.itemName" disabled/>
+ <el-form-item label="原子指标编码" prop="atomItem.itemNo">
+ <el-input v-model="formData.atomItem.itemNo" disabled/>
</el-form-item>
</el-col>
</el-row>
@@ -80,11 +80,27 @@
<el-input v-model="formData.unit"/>
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item label="固化标识" prop="solidifyFlag">
+ <el-select v-model="formData.solidifyFlag"
+ clearable
+ filterable
+ allow-create
+ placeholder="请选择">
+ <el-option
+ v-for="dict in getStrDictOptions(DICT_TYPE.SOLIDIFY_FLAG)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="时间标识" prop="timeLabel">
- <el-select v-model="formData.derItem.timeLabel" clearable placeholder="请选择时间标识">
+ <el-select v-model="formData.derItem.timeLabel" allow-create filterable clearable placeholder="请选择时间标识">
<el-option
v-for="item in dataSetFieldList"
:key="item.id"
@@ -105,6 +121,19 @@
:value="dict.value"
/>
</el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6" v-if="['LAST_MONTH_12','THIS_MONTH','LAST_MONTH'].includes(formData.derItem.timeLimit)">
+ <el-form-item label="月周期开始日" prop="monthStart">
+ <div style="display: flex;flex-direction: row;align-items: center">
+ <el-input-number v-model="formData.derItem.monthStart" :min="-28" :max="28" />
+ <el-tooltip content="正数代表当前月，负数代表上月。例：-26代表上月26号为本月开始日期" placement="top">
+ <div style="margin-left: 4px;display: flex;align-items: center">
+ <el-icon :size="20"><QuestionFilled /></el-icon>
+ </div>
+ </el-tooltip>
+ </div>
+
</el-form-item>
</el-col>
</el-row>
@@ -188,6 +217,7 @@
businessType: '',
timeRange: '',
timeGranularity: '',
+ solidifyFlag:'',
atomItem: {
id: '',
itemId: '',
@@ -334,9 +364,12 @@
let a = itemData.atomItem.id
formData.value.atomItem.id = a
formData.value.atomItem.itemName = itemData.itemName
+ formData.value.atomItem.itemNo = itemData.itemNo
formData.value.atomItem.itemId = itemData.atomItem.itemId
const queryParams = reactive({
dataSetId: itemData.atomItem.dataSet,
+ pageSize: 1000,
+ pageNo: 1
})
dataSetFieldList.value = (await DataSetFieldApi.getDataSetFieldPage(queryParams)).list
}
--
Gitblit v1.9.3