From 470bd526f3e62ad331409a542638d836fea20665 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 23 十一月 2024 17:37:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/finance/bull.vue | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/finance/bull.vue b/admin/src/views/finance/bull.vue
index fef662a..c0aea32 100644
--- a/admin/src/views/finance/bull.vue
+++ b/admin/src/views/finance/bull.vue
@@ -13,16 +13,18 @@
</div>
</div>
<el-table v-loading="loading" :data="list" stripe>
- <el-table-column prop="" label="杩愮淮浜�" min-width="100" show-overflow-tooltip />
- <el-table-column prop="code" label="璁惧缂栧彿" min-width="100" show-overflow-tooltip />
- <el-table-column prop="name" label="璁惧鍚嶇О" min-width="100" show-overflow-tooltip />
- <el-table-column prop="stautsName" label="璁惧鐘舵��" min-width="100" show-overflow-tooltip />
- <el-table-column prop="remark" label="杩愮淮澶囨敞" min-width="100" show-overflow-tooltip />
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="" label="瀹㈡埛鍚嶇О" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="code" label="妤煎畤鍚嶇О" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="name" label="鎴块棿鍙�" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="stautsName" label="鍚堝悓缂栧彿" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="remark" label="缁撴竻鐘舵��" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="createTime" label="璐﹀崟閲戦" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="createTime" label="搴旀敹閲戦" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="createTime" label="鍚堝悓鐘舵��" min-width="100" show-overflow-tooltip />
<el-table-column label="鎿嶄綔" min-width="120" fixed="right">
<template slot-scope="{row}">
<el-button type="text" @click="handleDetail(row)" icon="el-icon-edit"
- v-permissions="['business:category:update']">鏌ョ湅</el-button>
+ v-permissions="['business:category:update']">鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
@@ -30,19 +32,22 @@
<Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
</div>
<Edit v-if="showEdit" ref="EditRef" @success="getList" @close="showEdit = false" />
+ <Detail ref="DetailRef" @success="getList" @close="showEdit = false" />
</div>
</template>
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
-import Edit from './components/deviceEdit.vue'
+import Edit from './components/bullEdit.vue'
+import Detail from './components/bullDetail.vue'
import { fetchList, deleteById } from '@/api/Inspection/device'
export default {
components: {
Pagination,
QueryForm,
- Edit
+ Edit,
+ Detail
},
data() {
return {
--
Gitblit v1.9.3