From 3e84978d39cf6399e2335f9a5b10ca144ee9f606 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 07 十一月 2024 14:28:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/vehicle/category.vue | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/vehicle/category.vue b/admin/src/views/vehicle/category.vue
index 73b3540..ecf4b97 100644
--- a/admin/src/views/vehicle/category.vue
+++ b/admin/src/views/vehicle/category.vue
@@ -18,8 +18,11 @@
<ul class="toolbar" v-permissions="['business:category:create', 'business:category:delete']">
<li><el-button type="primary" @click="handleEdit()" icon="el-icon-plus"
v-permissions="['business:category:create']">鏂板缓</el-button></li>
+ <li v-permissions="['business:category:exportExcel']"><el-button type="primary" @click="exportExcel"
+ >瀵煎嚭</el-button></li>
</ul>
- <el-table row-key="id" :tree-props="{children: 'childCategoryList'}" v-loading="isWorking.search" :data="dataList" stripe @selection-change="handleSelectionChange">
+ <el-table row-key="id" :tree-props="{ children: 'childCategoryList' }" v-loading="isWorking.search"
+ :data="dataList" stripe @selection-change="handleSelectionChange">
<el-table-column prop="name" label="鍒嗙被鍚嶇О" min-width="100px"></el-table-column>
<el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
<!-- <el-table-column prop="status" label="鐘舵��" min-width="100px">
@@ -27,7 +30,7 @@
<span v-if="row.status === 0">鍚敤</span>
<span v-if="row.status === 1">绂佺敤</span>
</template>
- </el-table-column> -->
+</el-table-column> -->
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
<el-table-column v-if="containPermissions(['business:category:update', 'business:category:delete'])"
label="鎿嶄綔" min-width="120" fixed="right">
@@ -43,7 +46,8 @@
</pagination>
</template>
<!-- 鏂板缓/淇敼 -->
- <OperaCategoryWindow v-if="isShowEdit" @close="isShowEdit = false" ref="operaCategoryWindow" @success="getList" />
+ <OperaCategoryWindow v-if="isShowEdit" @close="isShowEdit = false" ref="operaCategoryWindow"
+ @success="getList" />
</TableLayout>
</template>
@@ -74,6 +78,12 @@
}
},
created() {
+ this.config({
+ module: '杞﹁締淇℃伅琛�',
+ api: '/business/category',
+ 'field.id': 'id',
+ 'field.main': 'id'
+ })
this.getList()
},
methods: {
@@ -83,7 +93,7 @@
this.$nextTick(() => {
this.$refs.operaCategoryWindow.open(str)
this.$refs.operaCategoryWindow.getList()
- if(row && row.id){
+ if (row && row.id) {
this.$refs.operaCategoryWindow.getDetail(row.id)
}
})
--
Gitblit v1.9.3