From beb95fb5fc166804056abafd70fc01ac27de7621 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 26 Jan 2026 09:11:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/index.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/index.vue b/applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/index.vue
index 9dcdfc8..f01cb6e 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/index.vue
@@ -52,7 +52,7 @@
<el-table-column prop="belongDomain" show-overflow-tooltip label="所属领域" />
<el-table-column prop="innovationStatus" show-overflow-tooltip label="应用创新状态">
<template v-slot="{ row }">
- {{ getDictLabel(row.innovationStatus) }}
+ {{ getDictLabel(row.innovationStatus, dictObj.appInnovationStatus) }}
</template>
</el-table-column>
<el-table-column prop="applicationScenarioDesc" show-overflow-tooltip label="应用场景描述" />
@@ -60,11 +60,11 @@
<el-table-column prop="resourceName" show-overflow-tooltip label="资源名称" />
<el-table-column prop="resourceCode" show-overflow-tooltip label="资源编码" />
<el-table-column prop="caseDesc" show-overflow-tooltip label="案例描述" />
- <el-table-column label="操作" class-name="operation-btns">
+ <el-table-column label="操作" class-name="operation-btns" width="180">
<template v-slot="{ row }">
<el-link @click="openForm('view', row)">查看</el-link>
- <!-- <el-link @click="openForm('edit', row)">编辑</el-link>-->
- <el-link @click="handleDelete(row)">删除</el-link>
+<!-- <el-link @click="openForm('edit', row)">编辑</el-link>-->
+ <el-link @click="handleDelete(row)" v-if="!['1', '2'].includes(row.innovationStatus)">删除</el-link>
</template>
</el-table-column>
</el-table>
@@ -113,7 +113,9 @@
const dialogRef = ref(null) // 弹框实例
const dialogVisible = ref(false)
const dictObj = ref({}) // 字典对象
+const innovationDetailsStatus = ref( '')
provide('dictObj', dictObj)
+provide('innovationDetailsStatus', innovationDetailsStatus)
// 获取字典
function getDictList() {
return getDictionaryByCode('appInnovationStatus').then(res => {
@@ -148,6 +150,7 @@
// 新增/编辑/查看 弹框
function openForm(mode, row) {
+ innovationDetailsStatus.value = row?.innovationStatus
dialogVisible.value = true
nextTick(() => {
dialogRef.value?.open({ mode, row })
--
Gitblit v1.9.3