Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-14 680c4f9e4e8b079593c8e57c100b92890e70960d

 src/views/febs/system/dept/Index.vue

@@ -5,43 +5,32 @@
        <div class="app-container">
          <div class="filter-container">
            <el-input v-model="deptName" :placeholder="$t('table.dept.deptName')" class="filter-item search-item" />
            <el-button class="filter-item" type="primary" @click="search">
            <el-button class="hr-but-all" type="primary" @click="search">
              {{ $t('table.search') }}
            </el-button>
            <el-button class="filter-item" type="success" @click="reset">
            <el-button class="hr-but-all" type="success" @click="reset">
              {{ $t('table.reset') }}
            </el-button>
            <el-dropdown
              v-has-any-permission="['dept:add','dept:delete','dept:export']"
              trigger="click"
              class="filter-item"
            >
              <el-button>
                {{ $t('table.more') }}<i class="el-icon-arrow-down el-icon--right" />
              </el-button>
              <el-dropdown-menu slot="dropdown">
                <el-dropdown-item v-has-permission="['dept:add']" @click.native="add">{{
                  $t('table.add')
                }}
                </el-dropdown-item>
                <el-dropdown-item v-has-permission="['dept:delete']" @click.native="deleteDept">{{
                  $t('table.delete')
                }}
                </el-dropdown-item>
                <el-dropdown-item v-has-permission="['dept:export']" @click.native="exportExcel">{{
                  $t('table.export')
                }}
                </el-dropdown-item>
              </el-dropdown-menu>
            </el-dropdown>

            <el-button v-has-permission="['dept:add']" class="hr-but-all" type="success" @click.native="add">
              {{ $t('table.add') }}
            </el-button>
            <el-button v-has-permission="['dept:delete']" type="primary" @click.native="deleteDept">
              {{ $t('table.delete') }}
            </el-button>
            <el-button v-has-permission="['dept:export']" class="hr-but-all" type="success" @click.native="exportExcel">
              {{ $t('table.export') }}
            </el-button>
          </div>
          <el-tree
            ref="deptTree"
            :data="deptTree"
            :check-strictly="true"
            :check-strictly="false"
            show-checkbox
            accordion
            node-key="id"
            default-expand-all
            :expand-on-click-node="false"
            highlight-current
            :filter-node-method="filterNode"
            @node-click="nodeClick"
@@ -59,6 +48,7 @@
                <treeselect
                  v-model="dept.parentId"
                  :multiple="false"

                  :options="deptTree"
                  :clear-value-text="$t('common.clear')"
                  placeholder=" "
@@ -78,6 +68,7 @@
                  <el-option label="分(子)公司、办事处" value="03" />
                  <el-option label="部门" value="04" />
                  <el-option label="子部门" value="05" />
                  <el-option label="护卫点" value="06" />
                </el-select>
              </el-form-item>
            </el-form>
@@ -141,7 +132,8 @@
        parentId: null,
        deptType: '',
        deptFunction: '',
        orderNum: 0
        orderNum: 0,
        allDeptName: ''
      }
    },
    initDeptTree() {
@@ -171,6 +163,7 @@
      this.dept.deptId = data.id
      this.dept.deptType = data.deptType
      this.dept.deptFunction = data.deptFunction
      this.dept.allDeptName = data.allDeptName
      this.$refs.form.clearValidate()
    },
    add() {