Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

rk

2025-09-29 e067f714c0588407b1c20ddd6b7af3b2043e35f8

 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 {
      // 搜索