From e320cece8a6e4321453e6b9c4736860997731646 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 02 四月 2025 10:03:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/data/ind/item/DerIndDefineForm.vue | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/views/data/ind/item/DerIndDefineForm.vue b/src/views/data/ind/item/DerIndDefineForm.vue
index a4f2b12..44ef103 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>
@@ -123,6 +123,19 @@
</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>
<el-row v-if="showTimeChange">
<el-col :span="6">
@@ -204,6 +217,7 @@
businessType: '',
timeRange: '',
timeGranularity: '',
+ solidifyFlag:'',
atomItem: {
id: '',
itemId: '',
@@ -350,6 +364,7 @@
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,
--
Gitblit v1.9.3