From c8b32b8bca79a116cfab70eb8c389907b664c9ca Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 23 四月 2025 10:43:14 +0800
Subject: [PATCH] 提交

---
 admin/src/views/business/categoryDcaLocaltion.vue |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/admin/src/views/business/categoryDcaLocaltion.vue b/admin/src/views/business/categoryDcaLocaltion.vue
index 16d83c9..33001b4 100644
--- a/admin/src/views/business/categoryDcaLocaltion.vue
+++ b/admin/src/views/business/categoryDcaLocaltion.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>
@@ -17,7 +17,7 @@
       <div
         style="width: 100%; height: 50px; background: rgba(242, 242, 242, 1); line-height: 50px; text-align: center; font-size: 14px;">
         DCA浜嬩欢浣嶇疆</div>
-      <div style="width: 100%; height: calc(100vh - 170px); overflow-y: scroll;">
+      <div style="width: 100%; height: calc(100vh - 130px); overflow-y: scroll;">
         <Tree :list="treeList" :alllist="treeList"  :defaultProps="{ name: 'name', status: 'fsStatus', children: 'childList', id: 'id' }"
           @callback="callback" />
       </div>
@@ -26,17 +26,18 @@
     <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 ,searchForm.type,searchForm.parentIdPath)" icon="el-icon-plus"
+                       @click="$refs.operaCategoryWindow.open('鏂板缓DCA浜嬩欢浣嶇疆淇℃伅', null,categoryList ,searchForm.type,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>
-      <el-table   v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+      <el-table  :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column prop="name" label="鍚嶇О" min-width="100px"></el-table-column>
         <el-table-column prop="parentName" label="鐖剁骇" min-width="150px"></el-table-column>
+        <el-table-column prop="namePath" label="瀹屾暣璺緞" min-width="150px"></el-table-column>
         <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 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,searchForm.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>
@@ -70,7 +71,7 @@
         keyword: '',
         type: 3,
         isRoot: 1,
-        parentId: '',
+        parentId: null,
         parentIdPath: null
       },
       loading: false,
@@ -91,6 +92,12 @@
     this.getfindTreePage()
   },
   methods: {
+    refresh () {
+      this.searchForm.parentId = null
+      this.searchForm.isRoot = null
+      this.getfindTreePage()
+      this.handlePageChange()
+    },
     handlePageChangeDo () {
       this.searchForm.isRoot = 1
       this.searchForm.parentId = null

--
Gitblit v1.9.3