From b32d139e8c6b6e9590bf14479710e6d107a21d26 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 10 六月 2025 15:27:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/basicInformation/index.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/basicInformation/index.vue b/src/views/basicInformation/index.vue
index 9f5927e..c8be716 100644
--- a/src/views/basicInformation/index.vue
+++ b/src/views/basicInformation/index.vue
@@ -23,16 +23,16 @@
<div>
<data-table :loading="loading" :table-data="tableData" :columns="columns"
@selection-change="handleSelectionChange" @edit="handleEdit" :show-selection="true" :border="true"> <!-- 瀛楁鍚嶇О鍒楃殑鑷畾涔夋彃妲� - 鏄剧ず涓烘爣绛� -->
- <template v-if="tabName === 'coalQualityMaintenance'" #coalFields="{ row }">
- <template v-if="typeof row.coalFields === 'string' && row.coalFields.includes(',')">
- <el-tag v-for="(field, index) in row.coalFields.split(',')" :key="index" type="primary" size="small"
+ <template v-if="tabName === 'coalQualityMaintenance'" #fieldIds="{ row }">
+ <template v-if="typeof row.fieldIds === 'string' && row.fieldIds.includes(',')">
+ <el-tag v-for="(field, index) in row.fieldIds.split(',')" :key="index" type="primary" size="small"
style="margin-right: 4px; margin-bottom: 2px;">
{{ getFieldDisplayName(field.trim()) }}
</el-tag>
</template>
<template v-else>
<el-tag type="primary" size="small">
- {{ getFieldDisplayName(row.coalFields) || '--' }}
+ {{ getFieldDisplayName(row.fieldIds) || '--' }}
</el-tag>
</template>
</template>
@@ -380,7 +380,7 @@
const coalQualityMaintenanceColumns = ref([
{ prop: "plan", label: "鏂规鍚嶇О", minWidth: 100 },
{
- prop: "coalFields",
+ prop: "fieldIds",
label: "瀛楁鍚嶇О",
minWidth: 200,
showOverflowTooltip: true,
--
Gitblit v1.9.3