From c44c76ea3e1f6b70bb84bdde85ffd1b389e5b8f4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 23 四月 2025 10:58:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/categoryDcaProblem.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/business/categoryDcaProblem.vue b/admin/src/views/business/categoryDcaProblem.vue
index 55f6eae..d35b9d3 100644
--- a/admin/src/views/business/categoryDcaProblem.vue
+++ b/admin/src/views/business/categoryDcaProblem.vue
@@ -8,7 +8,7 @@
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button type="primary" @click="refresh">鏄剧ず椤跺眰</el-button>
+ <el-button type="primary" @click="refresh">涓�绾т富棰�</el-button>
<el-button @click="reset">閲嶇疆</el-button>
</section>
</el-form>
@@ -26,7 +26,7 @@
<template v-slot:table-wrap>
<ul class="toolbar" v-if="containPermissions(['business:category:create', 'business:category:delete' ])" >
<li><el-button type="primary"
- @click="$refs.operaCategoryWindow.open('鏂板缓DCA涓婚鍜岃瀵熼」', null,categoryList ,4,searchForm.parentIdPath)" icon="el-icon-plus"
+ @click="$refs.operaCategoryWindow.open('鏂板缓DCA涓婚鍜岃瀵熼」', null,categoryList ,4,searchForm.parentId)" icon="el-icon-plus"
v-permissions="['business:category:create']">鏂板缓</el-button></li>
<li><el-button type="danger" @click="deleteByIdInBatch(true,getfindTreePage)" icon="el-icon-delete" v-permissions="['business:category:delete']">鎵归噺鍒犻櫎</el-button></li>
</ul>
@@ -44,7 +44,7 @@
<el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
<el-table-column prop="editDate" label="鏈�鍚庢搷浣滄椂闂�" min-width="150px"></el-table-column>
<el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
- <el-table-column v-if="containPermissions(['business:category:update', 'business:category:delete' ])" label="鎿嶄綔" min-width="280">
+ <el-table-column fixed="right" v-if="containPermissions(['business:category:update', 'business:category:delete' ])" label="鎿嶄綔" min-width="120">
<template slot-scope="{row}">
<el-button type="text" icon="el-icon-edit" @click="$refs.operaCategoryWindow.open('缂栬緫DCA涓婚鍜岃瀵熼」', row, categoryList,row.type)" v-permissions="['business:category:update']">缂栬緫</el-button>
<el-button type="text" icon="el-icon-delete" @click="deleteById(row,true, getfindTreePage)" style="color: red" v-permissions="['business:category:delete']">鍒犻櫎</el-button>
@@ -66,19 +66,19 @@
import Tree from '@/components/common/Tree'
import { treeList } from '@/api/business/category'
export default {
- name: 'categorySheType',
+ name: 'categoryDcaProblem',
extends: BaseTable,
components: { TableLayout1, Pagination, Tree, OperaCategoryDcaProblemWindow },
data () {
return {
TreeList: [],
- level: 1,
+ level: 0,
// 鎼滅储
searchForm: {
name: '',
keyword: '',
type: 4,
- parentId: '',
+ parentId: null,
isRoot: 1,
parentIdPath: null
},
--
Gitblit v1.9.3