Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-23 94304b8061ceb025860d379c592255093e7db349

 src/views/dashboard/qjUser.vue

@@ -111,9 +111,11 @@
    }
  },
  mounted() {
    this.getDicts('LEAVETYPE').then(response => {
      this.leaveTypeOptions = response.data
    })
    setTimeout(() => {
      this.getDicts('LEAVETYPE').then(response => {
        this.leaveTypeOptions = response.data
      })
    }, 1000)
  },
  methods: {
    leaveTypeFormat(row, column) {