Merge remote-tracking branch 'origin/master'

xiangpei

2024-07-12 b62c6c9ab29e933fd0333ac183ef837d00aba5d2

 src/views/education/department/edit.vue

@@ -65,6 +65,7 @@
    if (id && parseInt(id) !== 0) {
      _this.formLoading = true
      departmentApi.select(id).then(re => {
        re.response.parentId = re.response.parentIds
        _this.form = re.response
        _this.formLoading = false
      })
@@ -98,9 +99,11 @@
      // let obj = {
      //   name: this.form.name
      // }
      _this.form.parentId = _this.form.parentId[0]
      if (_this.form.parentId) {
        _this.form.parentId = _this.form.parentId[_this.form.parentId.length - 1];
      }
      if (_this.fig === 1) {
        departmentApi.addData(this.form.name).then(res => {
        departmentApi.addData(this.form).then(res => {
          console.log(res)
          if (res.code === 1) {
            _this.$message.success(res.message)
@@ -145,6 +148,7 @@
        id: null,
        name: '',
        level: 1,
        parentId: null,
        levelName: ''
      }
      this.form.id = lastId