From 222a623191c8dbd934a45c5da32c6c6883c8587f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 06 九月 2024 00:18:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/report/index.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue
index be4c425..ed883e4 100644
--- a/src/views/system/report/index.vue
+++ b/src/views/system/report/index.vue
@@ -35,7 +35,8 @@
v-hasPermi="['system:report:add']">鍗曟鎶ュ</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport">鎵归噺鎶ュ</el-button>
+ <el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport"
+ v-hasPermi="['system:report:add']">鎵归噺鎶ュ</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
@@ -87,7 +88,7 @@
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:report:edit']" v-if="scope.row.status === 2 || scope.row.status === 0">淇敼</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleAuditing(scope.row)"
- v-hasPermi="['system:report:edit']" v-if="scope.row.status === 0 || scope.row.status === 2">瀹℃牳</el-button>
+ v-hasPermi="['system:report:auditing']" v-if="scope.row.status === 0 || scope.row.status === 2">瀹℃牳</el-button>
<el-button size="mini" type="text" icon="el-icon-s-check" @click="handleAuditingRecord(scope.row.id)"
v-hasPermi="['system:report:record']">瀹℃牳璁板綍</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -380,9 +381,9 @@
if (item.result === 0) {
return '瀹℃牳涓�'
} else if (item.status === 1) {
- return '瀹℃牳閫氳繃'
+ return '閫氳繃'
} else if (item.status === 2) {
- return '瀹℃牳鏈�氳繃'
+ return '鏈�氳繃'
}
},
auditingCancel() {
--
Gitblit v1.8.0