Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-11 7369fd5866a78cde7ecbb4721d9decdfa181fd39

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

@@ -132,7 +132,8 @@
        parentId: null,
        deptType: '',
        deptFunction: '',
        orderNum: 0
        orderNum: 0,
        allDeptName: ''
      }
    },
    initDeptTree() {
@@ -162,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() {