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

renkang

2025-01-24 d492850f1cc64ddcfaf43798af9c76c2505414fd

 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 => {