diff --git a/ruoyi-ui/src/views/pay/employeeInfo/index.vue b/ruoyi-ui/src/views/pay/employeeInfo/index.vue index accc5c6..1818875 100644 --- a/ruoyi-ui/src/views/pay/employeeInfo/index.vue +++ b/ruoyi-ui/src/views/pay/employeeInfo/index.vue @@ -718,13 +718,14 @@ export default { }, /** 修改每日应出勤小时数 */ handleEdit() { - this.reset(); + this.resetHour(); this.openHour = true; this.title = "修改每日应出勤小时数"; }, submitFormHour() { this.$refs["formHour"].validate(valid => { if (valid) { + this.formHour.tenantId = this.gsInfo.active_id; updateHour(this.formHour).then(response => { if (response.code === 200) { this.$modal.msgSuccess("修改成功"); diff --git a/ruoyi-ui/src/views/pay/workOrderBaohuo/index.vue b/ruoyi-ui/src/views/pay/workOrderBaohuo/index.vue index 47c1ae1..b6e9863 100644 --- a/ruoyi-ui/src/views/pay/workOrderBaohuo/index.vue +++ b/ruoyi-ui/src/views/pay/workOrderBaohuo/index.vue @@ -909,7 +909,7 @@ export default { }, /** 查询时员工 */ getlistEmployee() { - listEmployeeInfo({ pageSize: 1000000000 }).then(response => { + listEmployeeInfo({ pageSize: 1000000000, tenantId: this.gsInfo.active_id }).then(response => { this.employeeList = response.rows }); }, @@ -1189,7 +1189,8 @@ export default { } else { this.queryParams.exportDate = this.queform.date this.download('pay/workOrderBaohuo/export', { - ...this.queryParams + exportDate: this.queform.date, + tenantId: this.gsInfo.active_id }, `包活信息_${new Date().getTime()}.xlsx`) } },