From cdd399de614778acee8880ec133242c5500c3e03 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期三, 12 八月 2026 09:56:22 +0800
Subject: [PATCH] 合并冲突
---
src/views/project/fund/performanceApply/index.vue | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/src/views/project/fund/performanceApply/index.vue b/src/views/project/fund/performanceApply/index.vue
index b3c2e31..1b20cc1 100644
--- a/src/views/project/fund/performanceApply/index.vue
+++ b/src/views/project/fund/performanceApply/index.vue
@@ -147,7 +147,7 @@
</template>
</el-table-column>
<el-table-column
- label="鐢宠鏉愭枡鐘舵��"
+ label="鏉愭枡棰勫鐘舵��"
width="140"
align="center"
prop="checkstatus"
@@ -195,7 +195,6 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['project:medicalfund:edit']"
>淇敼</el-button
>
@@ -211,7 +210,6 @@
size="mini"
type="text"
@click="handleDelete(scope.row)"
- v-hasPermi="['project:medicalfund:delete']"
><span class="button-delete"
><i class="el-icon-delete"></i>鍒犻櫎</span
></el-button
@@ -221,7 +219,6 @@
type="text"
icon="el-icon-download"
@click="mixExport(scope.row.id)"
- v-hasPermi="['project:medicalfund:download']"
>涓嬭浇</el-button
>
<el-button
--
Gitblit v1.9.3