From bbc6799ad8d1de265d2efb67b04b84198d7b3750 Mon Sep 17 00:00:00 2001
From: yxq <y1530857136@qq.com>
Date: Sat, 5 Aug 2023 16:13:30 +0800
Subject: [PATCH] =?UTF-8?q?app=20=E8=80=83=E5=8B=A4=E6=89=93=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PersonnelManagement/Views/ADR_Restriction/Form.js      | 2 ++
 .../PersonnelManagement/Views/ADR_Restriction/FormDay.js   | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Form.js
index e0b53b67c..db7b7b36d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Form.js	
@@ -69,6 +69,8 @@ var bootstrap = function ($, learun) {
                     }
                     initMap()
                 });
+            } else {
+                initMap()
             }
             function initMap() {
                 console.log($('#GPSRange').val())
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/FormDay.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/FormDay.js
index a36dfab5b..81999d854 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/FormDay.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/FormDay.js	
@@ -41,8 +41,9 @@ var bootstrap = function ($, learun) {
                             selectedData: [],
                         }
                     },
-                    mouted() {
-                        if ($('#WorkDay')) {
+                    mounted() {
+                        $('.el-button-group .el-button:nth-child(2) span').html('当月')
+                        if ($('#WorkDay').val()) {
                             this.selectedData = $('#WorkDay').val().split(',')
                         }
                     },
@@ -57,7 +58,7 @@ var bootstrap = function ($, learun) {
                             } else {
                                 this.selectedData.push(data.day)
                             }
-                            $('#WorkDay').val(this.selectedData.toString())
+                            $('#WorkDay').val(this.selectedData.join(','))
                         }
                     }
                 })