From d492850f1cc64ddcfaf43798af9c76c2505414fd Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 24 一月 2025 18:24:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/stock/assetCate.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/admin/src/views/stock/assetCate.vue b/admin/src/views/stock/assetCate.vue
index 375678f..cfa31b6 100644
--- a/admin/src/views/stock/assetCate.vue
+++ b/admin/src/views/stock/assetCate.vue
@@ -1,16 +1,13 @@
<template>
<TableLayout>
<template v-slot:table-wrap>
- <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 class="toolbar">
+ <li><el-button type="primary" @click="handleEdit()" icon="el-icon-plus">鏂板缓</el-button></li>
+ <li><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-column prop="name" label="璧勪骇鍒嗙被" min-width="100px"></el-table-column>
- <!-- <el-table-column prop="parentName" label="鎵�灞炲垎绫�" min-width="100px"></el-table-column> -->
<el-table-column prop="sortnum" 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">
@@ -46,6 +43,9 @@
filters: {
parentId: ''
},
+ form: {
+ type: 7
+ },
isShowEdit: false,
loading: false,
pagination: {
@@ -58,7 +58,7 @@
},
created() {
this.config({
- module: '杞﹁締淇℃伅琛�',
+ module: '鍒嗙被淇℃伅琛�',
api: '/business/category',
'field.id': 'id',
'field.main': 'id'
@@ -93,7 +93,7 @@
const { pagination, filters } = this
this.loading = true
fetchList({
- model: { ...filters, type: 5 },
+ model: { ...filters, type: 7 },
capacity: pagination.pageSize,
page: pagination.page,
}).then(res => {
--
Gitblit v1.9.3