Merge remote-tracking branch 'origin/master'

jiangping

2024-12-16 214e6fe7a754ddf4900e07033a2fda6200f4d7a1

 admin/src/components/common/DepartmentSelect.vue

@@ -45,7 +45,7 @@
    }
  },
  watch: {
    excludeId () {
    value () {
      this.fetchData()
    }
  },
@@ -54,11 +54,12 @@
    fetchData () {
      fetchTree()
        .then(records => {
          // debugger
          this.data = []
          this.__fillData(this.data, records)
        })
        .catch(e => {
          this.$tip.apiFailed(e)
         //  this.$tip.apiFailed(e)
        })
    },
    // 填充部门树