From eb291c55ed2860b38b40385be78a30f30552685f Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 06 十二月 2024 16:51:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/Inspection/plan.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/Inspection/plan.vue b/admin/src/views/Inspection/plan.vue
index 2dcd367..421f804 100644
--- a/admin/src/views/Inspection/plan.vue
+++ b/admin/src/views/Inspection/plan.vue
@@ -20,8 +20,8 @@
<ul class="toolbar" v-permissions="['business:ywpatrolscheme:create', 'business:ywpatrolscheme:delete']">
<li><el-button type="primary" @click="editClick()" icon="el-icon-plus"
v-permissions="['business:ywpatrolscheme:create']">鏂板缓</el-button></li>
- <el-button type="primary" plain :loading="isWorking.export" v-permissions="['business:ywpatrolscheme:exportExcel']"
- @click="exportExcel">瀵煎嚭</el-button>
+ <el-button type="primary" plain :loading="isWorking.export"
+ v-permissions="['business:ywpatrolscheme:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
<!-- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete"
v-permissions="['business:ywpatrolscheme:delete']">鍒犻櫎</el-button></li> -->
</ul>
@@ -29,7 +29,7 @@
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="title" label="璁″垝鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="lineId" label="璁″垝缂栧彿" min-width="100px"></el-table-column>
+ <el-table-column prop="code" label="璁″垝缂栧彿" min-width="100px"></el-table-column>
<el-table-column prop="userName" label="璐熻矗浜哄憳" min-width="100px"></el-table-column>
<el-table-column prop="startDate" label="璁″垝鏃ユ湡" min-width="150px">
--
Gitblit v1.9.3