UPDATE: 修改计划数据源选择逻辑。
This commit is contained in:
@@ -141,7 +141,7 @@
|
||||
link
|
||||
icon="Postcard"
|
||||
@click="openDrawer('报告生成', scope.row)"
|
||||
v-if="form.activeTabs === 3"
|
||||
v-if="form.activeTabs === 3 && modeStore.currentMode == '比对式'"
|
||||
>
|
||||
报告生成
|
||||
</el-button>
|
||||
@@ -204,7 +204,8 @@ import { onBeforeMount, onMounted, type PropType, reactive, ref, watch } from 'v
|
||||
import { type Action, ElMessage, ElMessageBox } from 'element-plus'
|
||||
import TestPopup from './testPopup.vue'
|
||||
import dataCheckPopup from './dataCheckSingleChannelSingleTestPopup.vue'
|
||||
import CompareDataCheckSingleChannelSingleTestPopup from '@/views/home/components/compareDataCheckSingleChannelSingleTestPopup.vue'
|
||||
import CompareDataCheckSingleChannelSingleTestPopup
|
||||
from '@/views/home/components/compareDataCheckSingleChannelSingleTestPopup.vue'
|
||||
import ProTable from '@/components/ProTable/index.vue'
|
||||
import SelectTestItemPopup from '@/views/home/components/selectTestItemPopup.vue'
|
||||
import WriteTHPopup from '@/views/home/components/writeTHPopup.vue'
|
||||
|
||||
@@ -87,9 +87,9 @@
|
||||
collapse-tags-tooltip
|
||||
:multiple="selectByMode"
|
||||
autocomplete="off"
|
||||
:clearable="planType != 0"
|
||||
clearable
|
||||
collapse-tags
|
||||
:filterable="planType != 0"
|
||||
filterable
|
||||
placeholder="请选择数据源"
|
||||
@change="handleDataSourceChange"
|
||||
>
|
||||
@@ -98,7 +98,7 @@
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.code || ''"
|
||||
:disabled="(selectByMode && planType == 0) || allDisabled"
|
||||
:disabled="allDisabled"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
@@ -817,13 +817,7 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
|
||||
formContent.errorSysId = pqErrSysList.value[0]?.id ?? ''
|
||||
formContent.sourceIds = pqSourceList.value[0]?.id ?? ''
|
||||
const datasourceDicts = dictStore.getDictData('Datasource')
|
||||
if (plan == 0 && mode.value === '比对式') {
|
||||
formContent.datasourceIds = datasourceDicts.map(item => item.code)
|
||||
} else {
|
||||
formContent.datasourceIds = dictStore.getDictData('Datasource')[0]?.code ?? ''
|
||||
}
|
||||
|
||||
formContent.dataRule = dictStore.getDictData('Data_Rule')[0]?.id ?? ''
|
||||
formContent.datasourceIds = datasourceDicts[0]?.code ?? ''
|
||||
} else {
|
||||
//编辑时先给表单赋值(这会没接收被检设备),需要手动再给被检设备复制后整体表单赋值
|
||||
|
||||
@@ -990,7 +984,9 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
|
||||
if (plan == 1) {
|
||||
//新增子计划名称清空
|
||||
formContent.name = ''
|
||||
formContent.datasourceIds = []
|
||||
// 新建子计划允许选择数据源
|
||||
const datasourceDicts = dictStore.getDictData('Datasource')
|
||||
formContent.datasourceIds = datasourceDicts[0]?.code ?? ''
|
||||
formContent.memberIds = []
|
||||
}
|
||||
generateData()
|
||||
@@ -1126,7 +1122,6 @@ const dataSourceType = computed(() => {
|
||||
|
||||
const handleDataSourceChange = () => {
|
||||
if (mode.value != '比对式') return
|
||||
if (planType.value == 1 || planType.value == 2) {
|
||||
// 获取当前选中的 datasourceIds,并确保为数组
|
||||
const values = Array.isArray(formContent.datasourceIds)
|
||||
? formContent.datasourceIds
|
||||
@@ -1151,13 +1146,12 @@ const handleDataSourceChange = () => {
|
||||
ElMessage.warning('分钟统计数据不能多选')
|
||||
formContent.datasourceIds = ''
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//导入设备
|
||||
const deviceImportExcel = ref<InstanceType<typeof ImportExcel> | null>(null)
|
||||
|
||||
const importFile = async (pattern: string) => {
|
||||
const importFile = async () => {
|
||||
const params = {
|
||||
title: '被检设备',
|
||||
showCover: false,
|
||||
|
||||
Reference in New Issue
Block a user