Merge branch '黑龙江艺术高中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 黑龙江艺术高中职

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())

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/FormDay.js

@@ -34,8 +34,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(',')
                         }
                     },
@@ -50,7 +51,7 @@ var bootstrap = function ($, learun) {
                             } else {
                                 this.selectedData.push(data.day)
                             }
-                            $('#WorkDay').val(this.selectedData.toString())
+                            $('#WorkDay').val(this.selectedData.join(','))
                         }
                     }
                 })