BUG

assets/js/controllers/system/user/schedulingplan.js

@@ -171,9 +171,9 @@ app.controller("calendarCtrl", function($scope,$rootScope, $filter, $q, $timeout
             for (var i = 0; i < $scope.selectedDate.length; i++) {
                 console.log(moment(date).format('YYYY-MM-DD HH:mm:ss'), moment($scope.selectedDate[i]).format('YYYY-MM-DD HH:mm:ss'));
                 if (angular.equals(date, $scope.selectedDate[i]) == true) {
-                    ischeck = false
+                    ischeck = true
                     break
-                } else { ischeck = true }
+                } else { ischeck = false }
             }
             console.log(date);
             // var ymd = [date.getFullYear(), date.getMonth() + 1, date.getDate()].join("-");
@@ -194,7 +194,7 @@ app.controller("calendarCtrl", function($scope,$rootScope, $filter, $q, $timeout
             //         "isWork": ischeck
             //     }
             // }
-    
+
             // api_bpm_data.addData('workdayexception', monedata).then(function(response) {
             //     if (response.status == 200) {
             //         SweetAlert.swal({
@@ -211,7 +211,7 @@ app.controller("calendarCtrl", function($scope,$rootScope, $filter, $q, $timeout
             //             type: "error"
             //         });
             //     }
-    
+
             // })
         }else{
             SweetAlert.swal({

assets/views/system/user/matrialcalendar.html

@@ -2,22 +2,22 @@
     .dayparts {
         width: 750px;
     }
-    
+
     .dayparts table {
         width: 100%;
     }
-    
+
     .dayparts td {
         cursor: pointer;
         width: 26px;
         height: 26px;
         border: 1px solid #ccc;
     }
-    
+
     .dayparts th {
         font-weight: normal;
     }
-    
+
     .dayparts td,
     .dayparts th {
         -webkit-touch-callout: none;
@@ -28,42 +28,42 @@
         user-select: none;
         padding: 0;
     }
-    
+
     .dayparts tr:first-child th {
         text-align: left;
         text-indent: -4px;
     }
-    
+
     .dayparts tr:not(:first-child) th {
         text-align: right;
         padding-right: 5px;
     }
-    
+
     .dayparts .selected {
         background: #1e4163;
         color: white;
     }
-    
+
     .dayparts button {
         margin-top: 10px;
         float: right;
         cursor: pointer;
         margin-right: 25px;
     }
-    
+
     .dayparts a {
         cursor: pointer;
     }
-    
+
     .dayparts a:hover {
         color: #333333;
     }
-    
+
     .flex-size {
         -webkit-flex: 1;
         flex: 1;
     }
-    
+
     .calendar-md {
         display: -webkit-flex;
         display: flex;
@@ -73,7 +73,7 @@
         min-height: 100%;
         height: 100%;
     }
-    
+
     .calendar-md .subheader {
         background: rgba(0, 0, 0, 0.02);
         border: 1px solid rgba(0, 0, 0, 0.12);
@@ -82,21 +82,21 @@
         /* border-top-left-radius: 8px; */
         /* border-top-right-radius: 8px; */
     }
-    
+
     .layout-row {
         display: inherit;
         flex-direction: row;
     }
-    
+
     .layout-row.entity {
         border-radius: 8px;
     }
-    
+
     .layout-padding {
         padding: 8px;
         flex: 1;
     }
-    
+
     .layout-height {
         /* display: inherit; */
         display: inline-block;
@@ -104,32 +104,32 @@
         flex: 1;
         align-content: center;
     }
-    
+
     .subheader-day {
         min-width: 48px;
     }
-    
+
     .weekday {
         border: 1px solid rgba(0, 0, 0, 0.12);
         cursor: pointer;
     }
-    
+
     .flex {
         -webkit-flex: 1;
         flex: 1;
         box-sizing: border-box;
     }
-    
+
     angular-dayparts .calendar-md .layout-row.entity .weekday:hover {
         background: #f5f5f5;
     }
-    
+
     angular-dayparts .calendar-md .layout-row.entity *:disabled {
         color: rgba(0, 0, 0, 0.3);
         pointer-events: none;
         cursor: auto;
     }
-    
+
     angular-dayparts .calendar-md .layout-row.entity .weekday.active {
         box-shadow: 5px 5px 3px 0px rgba(0, 0, 0, 0.75);
         background: rgba(17, 110, 191, 0.75);
@@ -179,8 +179,9 @@ angular.module('app', ['angular-dayparts']).controller('main', function($scope){
     <div ng-if="calendarView=='week'" ng-model="options.selected" class="margin-top-20">
         <angular-dayparts options="options"></angular-dayparts>
         <p class="fontcolor-one">操作提示：此处为周排班设置，即在此处可以根据学校人员出勤情况勾选一个星期需出勤的星期数，点击即为出勤天，未做操作即为休息日，如有其它非常规休息日，你可到额外排班调整中将其点击取消出勤日。</p>
+        <p class="fontcolor-one" style="color: red;font-weight: bold;font-size: 16px;">注意：配置周工作日后，会重置额外排班，需要重新设置额外排班。</p>
     </div>
-    <div ng-if="calendarView=='month'">
+    <div ng-show="calendarView=='month'">
         <calendar-md flex layout layout-fill calendar-direction="direction" on-prev-month="prevMonth" on-next-month="nextMonth" on-day-click="dayClick" title-format="'MMMM y'" ng-model='selectedDate' day-format="'d'" day-label-format="'EEE'" day-label-tooltip-format="'EEEE'"
             day-tooltip-format="'fullDate'" week-starts-on="firstDayOfWeek" day-content="setDayContent"></calendar-md>
     </div>