From 226ba0f4e64ba0eacb780909a3bc120a36b3b720 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 17 七月 2024 22:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/do/b3-work-time-management/work-time-management.vue |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/components/do/b3-work-time-management/work-time-management.vue b/src/components/do/b3-work-time-management/work-time-management.vue
index d061a24..f70ad63 100644
--- a/src/components/do/b3-work-time-management/work-time-management.vue
+++ b/src/components/do/b3-work-time-management/work-time-management.vue
@@ -823,8 +823,21 @@
       return String(d)
     },
     collectWorkingHours(){
+      let entity = {}
+      if(this.entity.week1&&this.entity.week2){
+        entity.week = JSON.stringify([this.entity.week1,this.entity.week2])
+      }else{
+        entity.week = ''
+      }
+      if(this.entity.dateTime){
+        entity.dateTime = JSON.stringify(this.entity.dateTime)
+      }else{
+        entity.dateTime = ''
+      }
+      entity.weekDay = this.entity.weekDay
+      entity.name = this.entity.name
       this.$axios.post(this.$api.auxiliaryOutputWorkingHours.collectWorkingHours,{
-    entity:this.componentData.entity
+    entity:entity
    }, {
   headers: {
  'Content-Type': 'application/json'

--
Gitblit v1.9.3