From a01d637e9ff2bf26aa44c65a239413a38bd8b1fe Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 04 六月 2025 09:39:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/views/business/solutions.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/company/src/views/business/solutions.vue b/company/src/views/business/solutions.vue
index 6ab1414..17f8511 100644
--- a/company/src/views/business/solutions.vue
+++ b/company/src/views/business/solutions.vue
@@ -38,8 +38,8 @@
<el-table-column prop="solutionBaseName" label="涓绘柟妗�" min-width="100px" v-if="userInfo.type === 0"></el-table-column>
<el-table-column label="鎶曚繚绫诲瀷" min-width="120px" align="center">
<template slot-scope="{row}">
- <span v-if="row.type === 0">鐩翠繚</span>
- <span v-if="row.type === 1">濮旀墭<div style="color: blue;display: block" >{{row.shopName||'-'}}</div></span>
+ <span v-if="row.type === 0">鐩翠繚<div style="color: blue;display: block" >{{ row.shopName || '-' }}</div></span>
+ <span v-if="row.type === 1">濮旀墭<div style="color: blue;display: block" >{{ row.shopName || '-' }}</div></span>
</template>
</el-table-column>
<el-table-column label="鎶曚繚浠锋牸" min-width="100px">
@@ -100,6 +100,7 @@
<template v-if="userInfo.type === 1 && row.signStatus === 1">
<el-button type="text" icon="el-icon-tickets" @click="seeFleSignUrl(row.fileSignUrl)">鏌ョ湅鏂规纭涔�</el-button>
</template>
+ <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:solutions:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
--
Gitblit v1.9.3