开发订单查询
This commit is contained in:
		@@ -1,11 +1,10 @@
 | 
			
		||||
import Vue from 'vue'
 | 
			
		||||
import Router from 'vue-router'
 | 
			
		||||
 | 
			
		||||
Vue.use(Router)
 | 
			
		||||
 | 
			
		||||
/* Layout */
 | 
			
		||||
import Layout from '@/layout'
 | 
			
		||||
 | 
			
		||||
Vue.use(Router)
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Note: sub-menu only appear when route children.length >= 1
 | 
			
		||||
 * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
 | 
			
		||||
@@ -315,20 +314,20 @@ export const constantRoutes = [
 | 
			
		||||
    component: Layout,
 | 
			
		||||
    redirect: '/user/leader/list',
 | 
			
		||||
    name: 'Leader',
 | 
			
		||||
    meta: { title: '团长管理', icon: 'table' },
 | 
			
		||||
    meta: {title: '配送员管理', icon: 'table'},
 | 
			
		||||
    alwaysShow: true,
 | 
			
		||||
    children: [
 | 
			
		||||
      {
 | 
			
		||||
        path: 'leader/checkList',
 | 
			
		||||
        name: 'LeaderCheck',
 | 
			
		||||
        component: () => import('@/views/user/leader/checkList'),
 | 
			
		||||
        meta: { title: '团长待审核' }
 | 
			
		||||
        meta: {title: '配送员待审核'}
 | 
			
		||||
      },
 | 
			
		||||
      {
 | 
			
		||||
        path: 'leader/list',
 | 
			
		||||
        name: 'leader',
 | 
			
		||||
        component: () => import('@/views/user/leader/list'),
 | 
			
		||||
        meta: { title: '团长已审核' }
 | 
			
		||||
        meta: {title: '配送员已审核'}
 | 
			
		||||
      }
 | 
			
		||||
    ]
 | 
			
		||||
  },
 | 
			
		||||
 
 | 
			
		||||
@@ -3,41 +3,41 @@
 | 
			
		||||
 | 
			
		||||
    <!-- 工具条 -->
 | 
			
		||||
    <div class="tools-div">
 | 
			
		||||
      <el-button type="success" icon="el-icon-plus" size="mini" @click="add()">添 加</el-button>
 | 
			
		||||
      <el-button icon="el-icon-plus" size="mini" type="success" @click="add()">添 加</el-button>
 | 
			
		||||
    </div>
 | 
			
		||||
    <el-table
 | 
			
		||||
      :data="sysMenuList"
 | 
			
		||||
      style="width: 100%;margin-bottom: 20px;margin-top: 10px;"
 | 
			
		||||
      row-key="id"
 | 
			
		||||
      border
 | 
			
		||||
      :default-expand-all="false"
 | 
			
		||||
      :tree-props="{children: 'children'}"
 | 
			
		||||
      border
 | 
			
		||||
      row-key="id"
 | 
			
		||||
      style="width: 100%;margin-bottom: 20px;margin-top: 10px;"
 | 
			
		||||
    >
 | 
			
		||||
 | 
			
		||||
      <el-table-column prop="name" label="菜单名称" width="200" />
 | 
			
		||||
      <el-table-column label="菜单名称" prop="name" width="200"/>
 | 
			
		||||
 | 
			
		||||
      <el-table-column prop="code" label="权限标识" width="180" />
 | 
			
		||||
      <el-table-column label="权限标识" prop="code" width="180"/>
 | 
			
		||||
 | 
			
		||||
      <el-table-column prop="createTime" label="创建时间" width="200" />
 | 
			
		||||
      <el-table-column label="创建时间" prop="createTime" width="200"/>
 | 
			
		||||
 | 
			
		||||
      <el-table-column prop="updateTime" label="修改时间" width="200" />
 | 
			
		||||
      <el-table-column label="操作" align="center">
 | 
			
		||||
      <el-table-column label="修改时间" prop="updateTime" width="200"/>
 | 
			
		||||
      <el-table-column align="center" label="操作">
 | 
			
		||||
        <template slot-scope="scope">
 | 
			
		||||
          <el-button
 | 
			
		||||
            v-if="scope.row.type !== 2"
 | 
			
		||||
            type="success"
 | 
			
		||||
            icon="el-icon-plus"
 | 
			
		||||
            size="mini"
 | 
			
		||||
            title="添加下级节点"
 | 
			
		||||
            type="success"
 | 
			
		||||
            @click="add(scope.row)"
 | 
			
		||||
          />
 | 
			
		||||
          <el-button type="primary" icon="el-icon-edit" size="mini" title="修改" @click="edit(scope.row)" />
 | 
			
		||||
          <el-button icon="el-icon-edit" size="mini" title="修改" type="primary" @click="edit(scope.row)"/>
 | 
			
		||||
          <el-button
 | 
			
		||||
            type="danger"
 | 
			
		||||
            :disabled="scope.row.children.length > 0"
 | 
			
		||||
            icon="el-icon-delete"
 | 
			
		||||
            size="mini"
 | 
			
		||||
            title="删除"
 | 
			
		||||
            :disabled="scope.row.children.length > 0"
 | 
			
		||||
            type="danger"
 | 
			
		||||
            @click="removeDataById(scope.row.id)"
 | 
			
		||||
          />
 | 
			
		||||
        </template>
 | 
			
		||||
@@ -47,36 +47,36 @@
 | 
			
		||||
    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="40%">
 | 
			
		||||
      <el-form ref="dataForm" :model="sysMenu" label-width="150px" size="small" style="padding-right: 40px;">
 | 
			
		||||
        <el-form-item v-if="sysMenu.id === ''" label="上级部门">
 | 
			
		||||
          <el-input v-model="sysMenu.parentName" disabled="true" />
 | 
			
		||||
          <el-input v-model="sysMenu.parentName" disabled="true"/>
 | 
			
		||||
        </el-form-item>
 | 
			
		||||
        <el-form-item label="菜单类型" prop="type">
 | 
			
		||||
          <el-radio-group v-model="sysMenu.type" :disabled="typeDisabled">
 | 
			
		||||
            <el-radio :label="0" :disabled="type0Disabled">目录</el-radio>
 | 
			
		||||
            <el-radio :label="1" :disabled="type1Disabled">菜单</el-radio>
 | 
			
		||||
            <el-radio :label="2" :disabled="type2Disabled">按钮</el-radio>
 | 
			
		||||
            <el-radio :disabled="type0Disabled" :label="0">目录</el-radio>
 | 
			
		||||
            <el-radio :disabled="type1Disabled" :label="1">菜单</el-radio>
 | 
			
		||||
            <el-radio :disabled="type2Disabled" :label="2">按钮</el-radio>
 | 
			
		||||
          </el-radio-group>
 | 
			
		||||
        </el-form-item>
 | 
			
		||||
        <el-form-item label="菜单名称" prop="name">
 | 
			
		||||
          <el-input v-model="sysMenu.name" />
 | 
			
		||||
          <el-input v-model="sysMenu.name"/>
 | 
			
		||||
        </el-form-item>
 | 
			
		||||
 | 
			
		||||
        <el-form-item v-if="sysMenu.type !== 0" prop="to_code">
 | 
			
		||||
          <span slot="label">
 | 
			
		||||
            <el-tooltip content="访问的组件路径,如:`system/user/index`,默认在`views`目录下" placement="top">
 | 
			
		||||
              <i class="el-icon-question" />
 | 
			
		||||
              <i class="el-icon-question"/>
 | 
			
		||||
            </el-tooltip>
 | 
			
		||||
            组件路径
 | 
			
		||||
          </span>
 | 
			
		||||
          <el-input v-model="sysMenu.to_code" placeholder="请输入组件路径" />
 | 
			
		||||
          <el-input v-model="sysMenu.to_code" placeholder="请输入组件路径"/>
 | 
			
		||||
        </el-form-item>
 | 
			
		||||
        <el-form-item v-if="sysMenu.type === 2">
 | 
			
		||||
          <el-input v-model="sysMenu.code" placeholder="请输入权限标识" maxlength="100" />
 | 
			
		||||
          <el-input v-model="sysMenu.code" maxlength="100" placeholder="请输入权限标识"/>
 | 
			
		||||
          <span slot="label">
 | 
			
		||||
            <el-tooltip
 | 
			
		||||
              content="控制器中定义的权限字符,如:@PreAuthorize(hasAuthority('bnt.sysRole.list'))"
 | 
			
		||||
              placement="top"
 | 
			
		||||
            >
 | 
			
		||||
              <i class="el-icon-question" />
 | 
			
		||||
              <i class="el-icon-question"/>
 | 
			
		||||
            </el-tooltip>
 | 
			
		||||
            权限字符
 | 
			
		||||
          </span>
 | 
			
		||||
@@ -84,8 +84,8 @@
 | 
			
		||||
 | 
			
		||||
      </el-form>
 | 
			
		||||
      <span slot="footer" class="dialog-footer">
 | 
			
		||||
        <el-button size="small" icon="el-icon-refresh-right" @click="dialogVisible = false">取 消</el-button>
 | 
			
		||||
        <el-button type="primary" icon="el-icon-check" size="small" @click="saveOrUpdate()">确 定</el-button>
 | 
			
		||||
        <el-button icon="el-icon-refresh-right" size="small" @click="dialogVisible = false">取 消</el-button>
 | 
			
		||||
        <el-button icon="el-icon-check" size="small" type="primary" @click="saveOrUpdate()">确 定</el-button>
 | 
			
		||||
      </span>
 | 
			
		||||
    </el-dialog>
 | 
			
		||||
  </div>
 | 
			
		||||
 
 | 
			
		||||
@@ -3,12 +3,12 @@
 | 
			
		||||
 | 
			
		||||
    <el-card class="operate-container" shadow="never">
 | 
			
		||||
      <div style="margin-top: 15px">
 | 
			
		||||
        <el-form :inline="true" size="small" label-width="140px">
 | 
			
		||||
        <el-form :inline="true" label-width="140px" size="small">
 | 
			
		||||
          <el-form-item label="输入搜索:">
 | 
			
		||||
            <el-input v-model="tempSearchObj.roleName" style="width: 203px" placeholder="角色名称" />
 | 
			
		||||
            <el-input v-model="tempSearchObj.roleName" placeholder="角色名称" style="width: 203px"/>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
 | 
			
		||||
          <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
 | 
			
		||||
          <el-button icon="el-icon-search" type="primary" @click="search()">查询</el-button>
 | 
			
		||||
          <el-button type="default" @click="resetSearch()">清空</el-button>
 | 
			
		||||
        </el-form>
 | 
			
		||||
      </div>
 | 
			
		||||
@@ -16,14 +16,14 @@
 | 
			
		||||
 | 
			
		||||
    <!-- 工具条 -->
 | 
			
		||||
    <el-card class="operate-container" shadow="never">
 | 
			
		||||
      <i class="el-icon-tickets" style="margin-top: 5px" />
 | 
			
		||||
      <i class="el-icon-tickets" style="margin-top: 5px"/>
 | 
			
		||||
      <span style="margin-top: 5px">数据列表</span>
 | 
			
		||||
 | 
			
		||||
      <el-button class="btn-add" size="mini" @click="addRole">添加</el-button>
 | 
			
		||||
      <el-button
 | 
			
		||||
        :disabled="selectedRoles.length === 0"
 | 
			
		||||
        class="btn-add"
 | 
			
		||||
        size="mini"
 | 
			
		||||
        :disabled="selectedRoles.length === 0"
 | 
			
		||||
        style="margin: 0 10px;"
 | 
			
		||||
        @click="removeRoles()"
 | 
			
		||||
      >批量删除
 | 
			
		||||
@@ -32,9 +32,9 @@
 | 
			
		||||
 | 
			
		||||
    <el-table
 | 
			
		||||
      v-loading="listLoading"
 | 
			
		||||
      :data="roles"
 | 
			
		||||
      border
 | 
			
		||||
      stripe
 | 
			
		||||
      :data="roles"
 | 
			
		||||
      @selection-change="handleSelectionChange"
 | 
			
		||||
    >
 | 
			
		||||
 | 
			
		||||
@@ -44,20 +44,20 @@
 | 
			
		||||
      />
 | 
			
		||||
 | 
			
		||||
      <el-table-column
 | 
			
		||||
        type="index"
 | 
			
		||||
        label="序号"
 | 
			
		||||
        width="100"
 | 
			
		||||
        align="center"
 | 
			
		||||
        label="序号"
 | 
			
		||||
        type="index"
 | 
			
		||||
        width="100"
 | 
			
		||||
      />
 | 
			
		||||
 | 
			
		||||
      <el-table-column label="角色名称" width="500" align="center">
 | 
			
		||||
      <el-table-column align="center" label="角色名称" width="500">
 | 
			
		||||
        <template slot-scope="{row}">
 | 
			
		||||
          <template v-if="row.edit">
 | 
			
		||||
            <el-input v-model="row.roleName" class="edit-input" size="small" />
 | 
			
		||||
            <el-input v-model="row.roleName" class="edit-input" size="small"/>
 | 
			
		||||
            <el-button
 | 
			
		||||
              class="cancel-btn"
 | 
			
		||||
              size="small"
 | 
			
		||||
              icon="el-icon-refresh"
 | 
			
		||||
              size="small"
 | 
			
		||||
              type="warning"
 | 
			
		||||
              @click="cancelEdit(row)"
 | 
			
		||||
            >
 | 
			
		||||
@@ -68,37 +68,37 @@
 | 
			
		||||
        </template>
 | 
			
		||||
      </el-table-column>
 | 
			
		||||
 | 
			
		||||
      <el-table-column label="操作" align="center">
 | 
			
		||||
      <el-table-column align="center" label="操作">
 | 
			
		||||
        <template slot-scope="{row}">
 | 
			
		||||
          <HintButton
 | 
			
		||||
            size="mini"
 | 
			
		||||
            type="info"
 | 
			
		||||
            icon="el-icon-info"
 | 
			
		||||
            size="mini"
 | 
			
		||||
            title="分配权限"
 | 
			
		||||
            type="info"
 | 
			
		||||
            @click="$router.push(`/acl/role/auth/${row.id}?roleName=${row.roleName}`)"
 | 
			
		||||
          />
 | 
			
		||||
 | 
			
		||||
          <HintButton
 | 
			
		||||
            v-if="row.edit"
 | 
			
		||||
            size="mini"
 | 
			
		||||
            type="primary"
 | 
			
		||||
            icon="el-icon-check"
 | 
			
		||||
            size="mini"
 | 
			
		||||
            title="确定"
 | 
			
		||||
            type="primary"
 | 
			
		||||
            @click="updateRole(row)"
 | 
			
		||||
          />
 | 
			
		||||
          <HintButton
 | 
			
		||||
            v-if="!row.edit"
 | 
			
		||||
            size="mini"
 | 
			
		||||
            type="primary"
 | 
			
		||||
            icon="el-icon-edit"
 | 
			
		||||
            size="mini"
 | 
			
		||||
            title="修改角色"
 | 
			
		||||
            type="primary"
 | 
			
		||||
            @click="row.edit= true"
 | 
			
		||||
          />
 | 
			
		||||
          <HintButton
 | 
			
		||||
            size="mini"
 | 
			
		||||
            type="danger"
 | 
			
		||||
            icon="el-icon-delete"
 | 
			
		||||
            size="mini"
 | 
			
		||||
            title="删除角色"
 | 
			
		||||
            type="danger"
 | 
			
		||||
            @click="removeRole(row)"
 | 
			
		||||
          />
 | 
			
		||||
        </template>
 | 
			
		||||
@@ -108,11 +108,11 @@
 | 
			
		||||
    <!-- 分页组件 -->
 | 
			
		||||
    <el-pagination
 | 
			
		||||
      :current-page="page"
 | 
			
		||||
      :total="total"
 | 
			
		||||
      :page-size="limit"
 | 
			
		||||
      :page-sizes="[5, 10, 20]"
 | 
			
		||||
      style="padding: 10px;"
 | 
			
		||||
      :total="total"
 | 
			
		||||
      layout="prev, pager, next, jumper, ->, sizes, total"
 | 
			
		||||
      style="padding: 10px;"
 | 
			
		||||
      @current-change="getRoles"
 | 
			
		||||
      @size-change="handleSizeChange"
 | 
			
		||||
    />
 | 
			
		||||
@@ -161,7 +161,7 @@ export default {
 | 
			
		||||
    更新角色
 | 
			
		||||
    */
 | 
			
		||||
    updateRole(role) {
 | 
			
		||||
      this.$API.role.updateById({ id: role.id, roleName: role.roleName })
 | 
			
		||||
      this.$API.role.updateById({id: role.id, roleName: role.roleName})
 | 
			
		||||
        .then(result => {
 | 
			
		||||
          this.$message.success(result.message || '更新角色成功!')
 | 
			
		||||
          this.getRoles(this.page)
 | 
			
		||||
@@ -184,8 +184,8 @@ export default {
 | 
			
		||||
      this.$prompt('请输入新名称', '添加角色', {
 | 
			
		||||
        confirmButtonText: '确定',
 | 
			
		||||
        cancelButtonText: '取消'
 | 
			
		||||
      }).then(({ value }) => {
 | 
			
		||||
        this.$API.role.save({ roleName: value }).then(result => {
 | 
			
		||||
      }).then(({value}) => {
 | 
			
		||||
        this.$API.role.save({roleName: value}).then(result => {
 | 
			
		||||
          this.$message.success(result.message || '添加角色成功')
 | 
			
		||||
          this.getRoles()
 | 
			
		||||
        })
 | 
			
		||||
@@ -200,10 +200,10 @@ export default {
 | 
			
		||||
    getRoles(page = 1) {
 | 
			
		||||
      this.page = page
 | 
			
		||||
      this.listLoading = true
 | 
			
		||||
      const { limit, searchObj } = this
 | 
			
		||||
      const {limit, searchObj} = this
 | 
			
		||||
      this.$API.role.getPageList(page, limit, searchObj).then(
 | 
			
		||||
        result => {
 | 
			
		||||
          const { records, total } = result.data
 | 
			
		||||
          const {records, total} = result.data
 | 
			
		||||
          this.roles = records.map(item => {
 | 
			
		||||
            item.edit = false // 用于标识是否显示编辑输入框的属性
 | 
			
		||||
            item.originRoleName = item.roleName // 缓存角色名称, 用于取消
 | 
			
		||||
@@ -220,7 +220,7 @@ export default {
 | 
			
		||||
    根据搜索条件进行搜索
 | 
			
		||||
    */
 | 
			
		||||
    search() {
 | 
			
		||||
      this.searchObj = { ...this.tempSearchObj }
 | 
			
		||||
      this.searchObj = {...this.tempSearchObj}
 | 
			
		||||
      this.getRoles()
 | 
			
		||||
    },
 | 
			
		||||
 | 
			
		||||
@@ -240,10 +240,10 @@ export default {
 | 
			
		||||
    /*
 | 
			
		||||
    删除指定的角色
 | 
			
		||||
    */
 | 
			
		||||
    removeRole({ id, roleName }) {
 | 
			
		||||
    removeRole({id, roleName}) {
 | 
			
		||||
      this.$confirm(`确定删除 '${roleName}' 吗?`, '提示', {
 | 
			
		||||
        type: 'warning'
 | 
			
		||||
      }).then(async() => {
 | 
			
		||||
      }).then(async () => {
 | 
			
		||||
        const result = await this.$API.role.removeById(id)
 | 
			
		||||
        this.getRoles(this.roles.length === 1 ? this.page - 1 : this.page)
 | 
			
		||||
        this.$message.success(result.message || '删除成功!')
 | 
			
		||||
@@ -265,7 +265,7 @@ export default {
 | 
			
		||||
    removeRoles() {
 | 
			
		||||
      this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
 | 
			
		||||
        type: 'warning'
 | 
			
		||||
      }).then(async() => {
 | 
			
		||||
      }).then(async () => {
 | 
			
		||||
        const ids = this.selectedRoles.map(role => role.id)
 | 
			
		||||
        const result = await this.$API.role.removeRoles(ids)
 | 
			
		||||
        this.getRoles()
 | 
			
		||||
 
 | 
			
		||||
@@ -10,7 +10,7 @@
 | 
			
		||||
    >
 | 
			
		||||
 | 
			
		||||
      <div class="title-container">
 | 
			
		||||
        <h3 class="title">购物商城管理端</h3>
 | 
			
		||||
        <h3 class="title">小鹿超市管理端</h3>
 | 
			
		||||
      </div>
 | 
			
		||||
 | 
			
		||||
      <el-form-item prop="username">
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user