From e067f714c0588407b1c20ddd6b7af3b2043e35f8 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 29 九月 2025 11:29:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 admin/src/views/business/categoryJkLine.vue |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/admin/src/views/business/categoryJkLine.vue b/admin/src/views/business/categoryJkLine.vue
index f1a7a9d..46db5ee 100644
--- a/admin/src/views/business/categoryJkLine.vue
+++ b/admin/src/views/business/categoryJkLine.vue
@@ -13,7 +13,7 @@
     <!-- 琛ㄦ牸鍜屽垎椤� -->
     <template v-slot:table-wrap>
       <ul class="toolbar" v-permissions="['business:category:create','business:category:delete']">
-        <li><el-button type="primary" @click="$refs.OperaCategoryFileWindow.open('鏂板缓涓荤嚎璺�')" icon="el-icon-plus" v-permissions="['business:category:create']">鏂板缓</el-button></li>
+        <li><el-button type="primary" @click="$refs.OperaCategoryJkLineWindow.open('鏂板缓涓荤嚎璺�')" icon="el-icon-plus" v-permissions="['business:category:create']">鏂板缓</el-button></li>
         <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:category:delete']">鎵归噺鍒犻櫎</el-button></li>
       </ul>
       <el-table
@@ -34,7 +34,7 @@
             fixed="right"
         >
           <template slot-scope="{row}">
-            <el-button type="text" icon="el-icon-edit" @click="$refs.OperaCategoryFileWindow.open('缂栬緫涓荤嚎璺�',row)" v-permissions="['business:category:update']">缂栬緫</el-button>
+            <el-button type="text" icon="el-icon-edit" @click="$refs.OperaCategoryJkLineWindow.open('缂栬緫涓荤嚎璺�',row)" v-permissions="['business:category:update']">缂栬緫</el-button>
             <el-button  type="text"  icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:category:delete']">鍒犻櫎</el-button>
           </template>
         </el-table-column>
@@ -47,7 +47,7 @@
       </pagination>
     </template>
     <!-- 鏂板缓/淇敼 -->
-    <OperaCategoryFileWindow ref="OperaCategoryFileWindow" @success="handlePageChange"/>
+    <OperaCategoryJkLineWindow ref="OperaCategoryJkLineWindow" @success="handlePageChange"/>
   </TableLayout>
 </template>
 
@@ -55,11 +55,11 @@
 import BaseTable from '@/components/base/BaseTable'
 import TableLayout from '@/layouts/TableLayout'
 import Pagination from '@/components/common/Pagination'
-import OperaCategoryFileWindow from '@/components/business/OperaCategoryFileWindow'
+import OperaCategoryJkLineWindow from '@/components/business/OperaCategoryJkLineWindow'
 export default {
   name: 'areaSet',
   extends: BaseTable,
-  components: { TableLayout, Pagination, OperaCategoryFileWindow },
+  components: { TableLayout, Pagination, OperaCategoryJkLineWindow },
   data () {
     return {
       // 鎼滅储

--
Gitblit v1.9.3