From 3731565ad0c58f42ef1cf0596786c9e1469dd0cc Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Thu, 5 Jun 2025 08:44:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=AE=A1=E7=90=86=E3=80=81?=
 =?UTF-8?q?=E5=8C=85=E6=B4=BB=E6=B4=BE=E5=B7=A5=E5=8D=95=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/pay/employeeInfo/index.vue    | 3 ++-
 ruoyi-ui/src/views/pay/workOrderBaohuo/index.vue | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

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`)
       }
     },