工作时间接口调用

assets/js/controllers/system/organizationdesign/worktimeCtrl.js

@@ -38,7 +38,7 @@ app.controller('woketimeCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
     $scope.gridOptions.paginationPageSize = 10;
     $scope.gridOptions.multiSelect = false;
 
-    //$scope.gridOptions.rowTemplate= "<div ng-dblclick=\"grid.appScope.onDblClick(row)\" ng-repeat=\"(colRenderIndex, col) in colContainer.renderedColumns track by col.uid\" ui-grid-one-bind-id-grid=\"rowRenderIndex + '-' + col.uid + '-cell'\" class=\"ui-grid-cell\" ng-class=\"{ 'ui-grid-row-header-cell': col.isRowHeader }\" role=\"{{col.isRowHeader ? 'rowheader' : 'gridcell'}}\" ui-grid-cell></div>";
+    $scope.gridOptions.rowTemplate= "<div ng-dblclick=\"grid.appScope.onDblClick(row)\" ng-repeat=\"(colRenderIndex, col) in colContainer.renderedColumns track by col.uid\" ui-grid-one-bind-id-grid=\"rowRenderIndex + '-' + col.uid + '-cell'\" class=\"ui-grid-cell\" ng-class=\"{ 'ui-grid-row-header-cell': col.isRowHeader }\" role=\"{{col.isRowHeader ? 'rowheader' : 'gridcell'}}\" ui-grid-cell></div>";
 
     $scope.gridOptions.rowIdentity = function(row) {
         return row.id;
@@ -53,30 +53,32 @@ app.controller('woketimeCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
         if (deleteFlag == true) { return "停用" } else { return "使用" }
     }
     $scope.translate = function(item) {
-        return moment(item).format('HH:mm')
+        return item?moment(item).format('HH:mm'):''
     }
     $scope.gridOptions.columnDefs = [
         { name: 'item', displayName: '序号', width: 50, enableFiltering: false },
-        { name: 'name', displayName: '班次', width: '10%', enableFiltering: false },
+        { name: 'name', displayName: '班次', width: '8%', enableFiltering: false },
         {
             name: 'startTime',
             displayName: '开始时间',
-            width: '10%',
+            width: '8%',
             enableFiltering: false,
             cellTemplate: '<div class="ui-grid-cell-contents">{{grid.appScope.translate(row.entity.startTime)}}</div>'
         },
         {
             name: 'endTime',
             displayName: '结束时间',
-            width: '10%',
+            width: '8%',
             enableFiltering: false,
             cellTemplate: '<div class="ui-grid-cell-contents">{{grid.appScope.translate(row.entity.endTime)}}</div>'
         },
-        { name: 'person', displayName: '本班次人数', width: '10%', enableFiltering: false },
-        { name: 'dictionaryDTO.name', displayName: '季节', width: '10%', enableFiltering: false },
-        { name: 'description', displayName: '班次描述', width: '12%', enableFiltering: false },
-        { name: 'deleteFlag', displayName: '使用状态', width: '10%', enableFiltering: false, cellTemplate: '<div class="ui-grid-cell-contents">{{grid.appScope.transferstatus(row.entity.deleteFlag)}}</div>' },
-        { name: 'isTemplate', displayName: '是否为模版', width: '10%', enableFiltering: false, cellTemplate: '<div class="ui-grid-cell-contents">{{grid.appScope.transfer(row.entity.isTemplate)}}</div>' },
+        { name: 'person', displayName: '本班次人数', width: '8%', enableFiltering: false },
+        { name: 'dictionaryDTO.name', displayName: '季节', width: '8%', enableFiltering: false },
+        { name: 'description', displayName: '班次描述', width: '10%', enableFiltering: false },
+        { name: 'deleteFlag', displayName: '使用状态', width: '8%', enableFiltering: false, cellTemplate: '<div class="ui-grid-cell-contents">{{grid.appScope.transferstatus(row.entity.deleteFlag)}}</div>' },
+        { name: 'isTemplate', displayName: '是否为模版', width: '8%', enableFiltering: false, cellTemplate: '<div class="ui-grid-cell-contents">{{grid.appScope.transfer(row.entity.isTemplate)}}</div>' },
+        { name: 'sendMsg', displayName: '是否值班提醒', width: '8%', enableFiltering: false, cellTemplate: '<div class="ui-grid-cell-contents">{{grid.appScope.transfer(row.entity.sendMsg)}}</div>' },
+        { name: 'sendTime', displayName: '每日发送时间', width: '8%', enableFiltering: false, cellTemplate: '<div class="ui-grid-cell-contents">{{grid.appScope.translate(row.entity.sendTime)}}</div>' },
         {
             name: '编辑',
             cellTemplate: '<div><div class="links cl-effect-1 ui-grid-cell-contents" >' +
@@ -90,11 +92,18 @@ app.controller('woketimeCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
 
     $scope.saveData = function(selectdata) {
         var modalInstance = $modal.open({
+            resolve: {
+                scope: function () {
+                    return $scope;
+                }
+            },
             templateUrl: 'assets/views/system/tpl/systemworktime.html',
-            controller: function($scope, $modalInstance, api_bpm_data) {
+            controller: function($scope, scope, $modalInstance, api_bpm_data) {
                 $scope.title = "修改班次";
                 $scope.worktimedata = {};
-                $scope.worktimedata = selectdata;
+                selectdata.sendMsg = selectdata.sendMsg?selectdata.sendMsg:0;
+                selectdata.sendTime = selectdata.sendTime?moment(selectdata.sendTime).format('YYYY-MM-DD HH:mm:ss'):moment().format('YYYY-MM-DD HH:mm:ss');
+                $scope.worktimedata = angular.copy(selectdata);
                 $scope.dictionary = [];
                 api_wechatfile.getDictionary({ "type": "list", "key": "incident_scheduleclass" }).then(function(data) {
                     if (data) {
@@ -118,7 +127,9 @@ app.controller('woketimeCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
                                 "succeedTime": worktimedata.succeedTime,
                                 "dictionaryDTO": worktimedata.dictionaryDTO,
                                 "isTemplate": worktimedata.isTemplate,
-                                "deleteFlag": worktimedata.deleteFlag
+                                "deleteFlag": worktimedata.deleteFlag,
+                                "sendMsg": worktimedata.sendMsg,
+                                "sendTime": worktimedata.sendMsg == 1?(worktimedata.sendTime?moment(worktimedata.sendTime).format('YYYY-MM-DD HH:mm:ss'):moment().format('YYYY-MM-DD HH:mm:ss')):undefined
                             }
                         }
                         // api_wechatfile.getDictionary({ "type": "list", "key": "incident_scheduleclass" }).then(function(data) {
@@ -133,7 +144,7 @@ app.controller('woketimeCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
                                     title: "修改成功!",
                                     type: "success"
                                 }, function() {
-                                    // $scope.refreshData('expand-right', defaultFilterData);
+                                    scope.refreshData('expand-right');
                                 })
                             } else {
                                 SweetAlert.swal({
@@ -161,7 +172,7 @@ app.controller('woketimeCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
                         $scope.dictionary = data;
                     }
                 })
-                $scope.worktimedata = { "startTime": new Date(), "endTime": new Date(), "isTemplate": false, duty:0 }
+                $scope.worktimedata = { "startTime": new Date(), "endTime": new Date(), "isTemplate": false, sendMsg:0,sendTime:new Date() }
                 $scope.cancel = function() {
                     $modalInstance.dismiss('cancel');
                 };
@@ -184,7 +195,9 @@ app.controller('woketimeCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
                         "succeedTime": selectedItem.succeedTime,
                         "dictionaryDTO": selectedItem.dictionaryDTO,
                         "isTemplate": selectedItem.isTemplate,
-                        "deleteFlag": selectedItem.deleteFlag
+                        "deleteFlag": selectedItem.deleteFlag,
+                        "sendMsg": selectedItem.sendMsg,
+                        "sendTime": selectedItem.sendMsg == 1?moment(selectedItem.sendTime).format('YYYY-MM-DD HH:mm:ss'):undefined
                     }
                 }
                 if (!fildata.scheduleclass.name) {
@@ -374,7 +387,9 @@ app.controller('woketimeCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
                             description: item.description,
                             deleteFlag: item.deleteFlag,
                             isTemplate: item.isTemplate,
-                            draggable: true
+                            draggable: true,
+                            sendMsg: item.sendMsg,
+                            sendTime: item.sendTime
                         };
                         $scope.myData.push(templateEvent);
                     })

assets/views/system/tpl/systemworktime.html

@@ -74,13 +74,13 @@
                     <div class="setting-box clearfix">
                         <div class="setting-switch pull-left">
                             <div class="radio clip-radio radio-primary radio-inline">
-                                <input type="radio" id="yes" ng-value="1" name="duty" ng-model="worktimedata.duty">
+                                <input type="radio" id="yes" ng-value="1" name="sendMsg" ng-model="worktimedata.sendMsg">
                                 <label for="yes">
                                     是
                                 </label>
                             </div>
                             <div class="radio clip-radio radio-primary radio-inline">
-                                <input type="radio" id="no" ng-value="0" name="duty" ng-model="worktimedata.duty">
+                                <input type="radio" id="no" ng-value="0" name="sendMsg" ng-model="worktimedata.sendMsg">
                                 <label for="no">
                                     否
                                 </label>
@@ -90,10 +90,10 @@
                 </div>
             </div>
             <!-- 值班提醒选择是的时候，需要选择时间 -->
-            <div class="margin-bottom-15 anline" ng-if="worktimedata.duty == 1">
+            <div class="margin-bottom-15 anline" ng-if="worktimedata.sendMsg == 1">
                 <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14 margin-top-10" style="width: 100px;">每日发送时间*:</div>
                 <div class="pull-right openaddinput">
-                    <timepicker ng-model="worktimedata.dutyTime" ng-change="changed()" hour-step="hstep" minute-step="mstep" show-meridian="ismeridian"></timepicker>
+                    <timepicker ng-model="worktimedata.sendTime" ng-change="changed()" hour-step="hstep" minute-step="mstep" show-meridian="ismeridian"></timepicker>
                 </div>
             </div>
         </div>