Merge remote-tracking branch 'origin/master'

jiangping

2024-02-18 05cf6324ea8322164d99a3d3d4161fe374534b3b

 platform/src/views/system/menuCom.vue

@@ -3,7 +3,7 @@
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['system:menu:create', 'system:menu:delete', 'system:menu:sort']">
        <li><el-button type="primary" @click="$refs.operaMenuWindow.open('新建企业一级菜单')" icon="el-icon-plus" v-permissions="['system:menu:create']">新建</el-button></li>
                <li><el-button type="primary" @click="$refs.OperaMenuComWindow.open('新建一级菜单')" icon="el-icon-plus" v-permissions="['system:menu:create']">新建</el-button></li>
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['system:menu:delete']">删除</el-button></li>
        <li><el-button @click="sort('top')" :loading="isWorking.sort" icon="el-icon-sort-up" v-permissions="['system:menu:sort']">上移</el-button></li>
        <li><el-button @click="sort('bottom')" :loading="isWorking.sort" icon="el-icon-sort-down" v-permissions="['system:menu:sort']">下移</el-button></li>
@@ -15,7 +15,7 @@
        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
        row-key="id"
        stripe
        default-expand-all
                :default-expand-all="false"
        @selection-change="handleSelectionChange"
      >
        <el-table-column type="selection" width="55" fixed="left"></el-table-column>
@@ -48,27 +48,27 @@
          fixed="right"
        >
          <template slot-scope="{row}">
            <el-button type="text" icon="el-icon-edit" @click="$refs.operaMenuWindow.open('编辑企业菜单', row)" v-permissions="['system:menu:update']">编辑</el-button>
            <el-button type="text" icon="el-icon-plus" @click="$refs.operaMenuWindow.open('新建企业子菜单', null, row)" v-permissions="['system:menu:create']">新建子菜单</el-button>
                        <el-button type="text" icon="el-icon-edit" @click="$refs.OperaMenuComWindow.open('编辑菜单', {...row, type: 1})" v-permissions="['system:menu:update']">编辑</el-button>
                        <el-button type="text" icon="el-icon-plus" @click="$refs.OperaMenuComWindow.open('新建子菜单', null, {...row, type: 1})" v-permissions="['system:menu:create']">新建子菜单</el-button>
            <el-button v-if="!row.fixed" type="text" icon="el-icon-delete" @click="deleteById(row)" v-permissions="['system:menu:delete']">删除</el-button>
          </template>
        </el-table-column>
      </el-table>
    </template>
    <!-- 新建/修改 -->
    <OperaMenuWindow ref="operaMenuWindow" type="1" @success="handlePageChange(tableData.pagination.pageIndex)"/>
        <OperaMenuComWindow ref="OperaMenuComWindow" @success="handlePageChange(tableData.pagination.pageIndex)"/>
  </TableLayout>
</template>

<script>
import TableLayout from '@/layouts/TableLayout'
import BaseTable from '@/components/base/BaseTable'
import OperaMenuWindow from '@/components/system/menu/OperaMenuWindow'
import { fetchTree, updateStatus, sort } from '@/api/system/menu'
    import OperaMenuComWindow from '@/components/system/menu/OperaMenuComWindow'
    import { fetchTree1, updateStatus, sort } from '@/api/system/menu'
export default {
  name: 'SystemMenu',
  extends: BaseTable,
  components: { OperaMenuWindow, TableLayout },
        components: { OperaMenuComWindow, TableLayout },
  data () {
    return {
      // 是否正在处理中
@@ -81,7 +81,7 @@
    // 查询数据
    handlePageChange () {
      this.isWorking.search = true
      fetchTree({}, 1)
                fetchTree1()
        .then(records => {
          this.tableData.list = records
        })