工作时间设置修改

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

@@ -1,5 +1,5 @@
 'use strict';
-/** 
+/**
  * controller for User Profile Example
  */
 app.controller('woketimeCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$interval", "$modal", "SweetAlert", "i18nService", "uiGridConstants", "uiGridGroupingConstants", "Restangular", "api_bpm_schedule", "api_bpm_data", "api_wechatfile", function($rootScope, $scope, $state, $timeout, $interval, $modal, SweetAlert, i18nService, uiGridConstants, uiGridGroupingConstants, Restangular, api_bpm_schedule, api_bpm_data, api_wechatfile) {
@@ -46,6 +46,9 @@ app.controller('woketimeCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
     $scope.gridOptions.getRowIdentity = function(row) {
         return row.id;
     };
+    $scope.transferWorkDay = function(deleteFlag) {
+        if (deleteFlag == true) { return "工作日" } else { return "节假日" }
+    }
     $scope.transfer = function(deleteFlag) {
         if (deleteFlag == true) { return "是" } else { return "否" }
     }
@@ -60,25 +63,31 @@ app.controller('woketimeCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
         { name: 'name', displayName: '班次', width: '8%', enableFiltering: false },
         {
             name: 'startTime',
-            displayName: '开始时间',
+            displayName: '起始时间1',
+            width: '8%',
+            enableFiltering: false,
+            cellTemplate: '<div class="ui-grid-cell-contents">{{grid.appScope.translate(row.entity.startTime)}}~{{grid.appScope.translate(row.entity.endTime)}}</div>'
+        },
+        {
+            name: 'startTime2',
+            displayName: '起始时间2',
             width: '8%',
             enableFiltering: false,
-            cellTemplate: '<div class="ui-grid-cell-contents">{{grid.appScope.translate(row.entity.startTime)}}</div>'
+            cellTemplate: '<div class="ui-grid-cell-contents">{{grid.appScope.translate(row.entity.startTime2)}}~{{grid.appScope.translate(row.entity.endTime2)}}</div>'
         },
         {
-            name: 'endTime',
-            displayName: '结束时间',
+            name: 'startTime3',
+            displayName: '起始时间3',
             width: '8%',
             enableFiltering: false,
-            cellTemplate: '<div class="ui-grid-cell-contents">{{grid.appScope.translate(row.entity.endTime)}}</div>'
+            cellTemplate: '<div class="ui-grid-cell-contents">{{grid.appScope.translate(row.entity.startTime3)}}~{{grid.appScope.translate(row.entity.endTime3)}}</div>'
         },
-        { name: 'person', displayName: '本班次人数', width: '8%', enableFiltering: false },
-        { name: 'dictionaryDTO.name', displayName: '季节', width: '8%', enableFiltering: false },
+        { name: 'type.name', displayName: '班次类型', width: '8%', enableFiltering: false },
+        { name: 'isTemplate', displayName: '呼叫中心关联', width: '8%', enableFiltering: false, cellTemplate: '<div class="ui-grid-cell-contents">{{grid.appScope.transfer(row.entity.isTemplate)}}</div>' },
+        { name: 'priority.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: 'workDay', displayName: '工作日/节假日', width: '8%', enableFiltering: false, cellTemplate: '<div class="ui-grid-cell-contents">{{grid.appScope.transferWorkDay(row.entity.workDay)}}</div>' },
         {
             name: '编辑',
             cellTemplate: '<div><div class="links cl-effect-1 ui-grid-cell-contents" >' +
@@ -101,61 +110,125 @@ app.controller('woketimeCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
             templateUrl: 'assets/views/system/tpl/systemworktime.html',
             controller: function($scope, scope, $modalInstance, api_bpm_data) {
                 $scope.title = "修改班次";
-                $scope.worktimedata = {};
-                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.changeType = function(e){
+                    $scope.worktimedata.isTemplate = false;
+                    $scope.worktimedata.priority = undefined;
+                }
+
+                // 时间start
+                $scope.times = [];
+                $scope.timeId = 1;
+                $scope.isAdd = true;
+                // 新添加
+                $scope.add = function() {
+                    $scope.times.push({ id: ++$scope.timeId, startTime: new Date(), endTime: new Date() });
+                    $scope.timeChange();
+                }
+                // 删除
+                $scope.remove = function(index) {
+                    $scope.times.splice(index, 1);
+                    $scope.timeChange();
+                }
+                //监听输入事件
+                $scope.timeChange = function(e, time, i) {
+                    console.log(e, time)
+                    // -------------判断添加按钮是否禁用 start
+                    $scope.isAdd = $scope.times.length >= 3;
+                    // -------------判断添加按钮是否禁用 end
+                }
+                $scope.timeChange();
+                // 时间end
+
+                $scope.worktimedata = {"isTemplate": false, name: ''};
+                selectdata.workDay = selectdata.workDay?selectdata.workDay:0;
+                var times = [];
+                if(selectdata.startTime && selectdata.endTime){
+                    times.push({id: $scope.timeId++, startTime: selectdata.startTime, endTime: selectdata.endTime})
+                }
+                if(selectdata.startTime2 && selectdata.endTime2){
+                    times.push({id: $scope.timeId++, startTime: selectdata.startTime2, endTime: selectdata.endTime2})
+                }
+                if(selectdata.startTime3 && selectdata.endTime3){
+                    times.push({id: $scope.timeId++, startTime: selectdata.startTime3, endTime: selectdata.endTime3})
+                }
+                $scope.times = times;
                 $scope.worktimedata = angular.copy(selectdata);
                 $scope.dictionary = [];
-                api_wechatfile.getDictionary({ "type": "list", "key": "incident_scheduleclass" }).then(function(data) {
+                api_wechatfile.getDictionary({ "type": "list", "key": "schedule_class_type" }).then(function(data) {
                     if (data) {
                         $scope.dictionary = data;
                     }
                 })
+                $scope.priorityList = [];
+                api_wechatfile.getDictionary({ "type": "list", "key": "incident_priority" }).then(function(data) {
+                    if (data) {
+                        $scope.priorityList = data;
+                    }
+                })
                 $scope.cancel = function() {
                     $modalInstance.dismiss('cancel');
                 };
                 $scope.savercode = function(worktimedata) {
                     var fildata = {
-                            "scheduleclass": {
-                                "id": worktimedata.id,
-                                // "code": worktimedata.code,
-                                "name": worktimedata.name,
-                                "person": worktimedata.person,
-                                "description": worktimedata.description,
-                                "startTime": moment(worktimedata.startTime).format('YYYY-MM-DD HH:mm:ss'),
-                                "endTime": moment(worktimedata.endTime).format('YYYY-MM-DD HH:mm:ss'),
-                                "shiftTime": worktimedata.shiftTime,
-                                "succeedTime": worktimedata.succeedTime,
-                                "dictionaryDTO": worktimedata.dictionaryDTO,
-                                "isTemplate": worktimedata.isTemplate,
-                                "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) {
-                        //     if (data.status == 200) {
-                        //         $scope.dictionary = data;
-                        //     }
-                        // })
-                    api_bpm_data.updData('scheduleclass', fildata).then(function(response) {
-                        if (response) {
-                            if (response.status == 200) {
-                                SweetAlert.swal({
-                                    title: "修改成功!",
-                                    type: "success"
-                                }, function() {
-                                    scope.refreshData('expand-right');
-                                })
-                            } else {
-                                SweetAlert.swal({
-                                    title: "修改失败!",
-                                    type: "error"
-                                })
-                            }
-                        }
+                        "scheduleclass": worktimedata
+                    }
+                    $scope.times.forEach( (v, i) => {
+                        fildata.scheduleclass['startTime' + (i === 0 ? '' : (i + 1))] = v.startTime ? moment(v.startTime).format('YYYY-MM-DD HH:mm:ss') : undefined;
+                        fildata.scheduleclass['endTime' + (i === 0 ? '' : (i + 1))] = v.endTime ? moment(v.endTime).format('YYYY-MM-DD HH:mm:ss') : undefined;
                     })
-                    $modalInstance.close();
+
+                    if (!fildata.scheduleclass.name.trim()) {
+                        SweetAlert.swal({
+                            title: "新增失败!",
+                            text: "班次未填",
+                            type: "error"
+                        })
+                    } else if (!fildata.scheduleclass.startTime) {
+                        SweetAlert.swal({
+                            title: "新增失败!",
+                            text: "班次开始时间未填",
+                            type: "error"
+                        })
+                    } else if (!fildata.scheduleclass.endTime) {
+                        SweetAlert.swal({
+                            title: "新增失败!",
+                            text: "班次结束时间未填",
+                            type: "error"
+                        })
+                    } else if (!fildata.scheduleclass.type) {
+                        SweetAlert.swal({
+                            title: "新增失败!",
+                            text: "班次类型未填",
+                            type: "error"
+                        })
+                    } else if (fildata.scheduleclass.workDay === undefined) {
+                        SweetAlert.swal({
+                            title: "新增失败!",
+                            text: "工作日/节假日未填",
+                            type: "error"
+                        })
+                    }else{
+                        api_bpm_data.updData('scheduleclass', fildata).then(function(response) {
+                            if (response) {
+                                if (response.status == 200) {
+                                    SweetAlert.swal({
+                                        title: "修改成功!",
+                                        type: "success"
+                                    }, function() {
+                                        scope.refreshData('expand-right');
+                                        $modalInstance.close();
+                                    })
+                                } else {
+                                    SweetAlert.swal({
+                                        title: "修改失败!",
+                                        type: "error"
+                                    })
+                                }
+                            }
+                        })
+
+                    }
                 }
             }
         });
@@ -167,81 +240,126 @@ app.controller('woketimeCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
             templateUrl: 'assets/views/system/tpl/systemworktime.html',
             controller: function($scope, $modalInstance, api_bpm_data) {
                 $scope.title = "新增班次";
+
+                $scope.changeType = function(e){
+                    $scope.worktimedata.isTemplate = false;
+                    $scope.worktimedata.priority = undefined;
+                }
+
+                // 时间start
+                $scope.times = [{id: 1, startTime: new Date(), endTime: new Date()}];
+                $scope.timeId = 1;
+                $scope.isAdd = true;
+                // 新添加
+                $scope.add = function() {
+                    $scope.times.push({ id: ++$scope.timeId, startTime: new Date(), endTime: new Date() });
+                    $scope.timeChange();
+                }
+                // 删除
+                $scope.remove = function(index) {
+                    $scope.times.splice(index, 1);
+                    $scope.timeChange();
+                }
+                //监听输入事件
+                $scope.timeChange = function(e, time, i) {
+                    console.log(e, time)
+                    // -------------判断添加按钮是否禁用 start
+                    $scope.isAdd = $scope.times.length >= 3;
+                    // -------------判断添加按钮是否禁用 end
+                }
+                $scope.timeChange();
+                // 时间end
+
                 $scope.dictionary = [];
-                api_wechatfile.getDictionary({ "type": "list", "key": "incident_scheduleclass" }).then(function(data) {
+                api_wechatfile.getDictionary({ "type": "list", "key": "schedule_class_type" }).then(function(data) {
                     if (data) {
                         $scope.dictionary = data;
                     }
                 })
-                $scope.worktimedata = { "startTime": new Date(), "endTime": new Date(), "isTemplate": false, sendMsg:0,sendTime:new Date() }
+                $scope.priorityList = [];
+                api_wechatfile.getDictionary({ "type": "list", "key": "incident_priority" }).then(function(data) {
+                    if (data) {
+                        $scope.priorityList = data;
+                    }
+                })
+                $scope.worktimedata = { "isTemplate": false, name: '' }
                 $scope.cancel = function() {
                     $modalInstance.dismiss('cancel');
                 };
                 $scope.savercode = function(worktimedata) {
-                    $modalInstance.close(worktimedata);
+                    var selectedItem = worktimedata;
+                    var fildata = {
+                        "scheduleclass": {
+                            // "code": selectedItem.code,
+                            "name": selectedItem.name,
+                            "description": selectedItem.description,
+                            "shiftTime": selectedItem.shiftTime,
+                            "succeedTime": selectedItem.succeedTime,
+                            "type": selectedItem.type,
+                            "priority": selectedItem.priority,
+                            "isTemplate": selectedItem.isTemplate,
+                            "deleteFlag": selectedItem.deleteFlag,
+                            "workDay": selectedItem.workDay,
+                        }
+                    }
+                    $scope.times.forEach( (v, i) => {
+                        fildata.scheduleclass['startTime' + (i === 0 ? '' : (i + 1))] = v.startTime ? moment(v.startTime).format('YYYY-MM-DD HH:mm:ss') : undefined;
+                        fildata.scheduleclass['endTime' + (i === 0 ? '' : (i + 1))] = v.endTime ? moment(v.endTime).format('YYYY-MM-DD HH:mm:ss') : undefined;
+                    })
+                    if (!fildata.scheduleclass.name.trim()) {
+                        SweetAlert.swal({
+                            title: "新增失败!",
+                            text: "班次未填",
+                            type: "error"
+                        })
+                    } else if (!fildata.scheduleclass.startTime) {
+                        SweetAlert.swal({
+                            title: "新增失败!",
+                            text: "班次开始时间未填",
+                            type: "error"
+                        })
+                    } else if (!fildata.scheduleclass.endTime) {
+                        SweetAlert.swal({
+                            title: "新增失败!",
+                            text: "班次结束时间未填",
+                            type: "error"
+                        })
+                    } else if (!fildata.scheduleclass.type) {
+                        SweetAlert.swal({
+                            title: "新增失败!",
+                            text: "班次类型未填",
+                            type: "error"
+                        })
+                    } else if (fildata.scheduleclass.workDay === undefined) {
+                        SweetAlert.swal({
+                            title: "新增失败!",
+                            text: "工作日/节假日未填",
+                            type: "error"
+                        })
+                    }else{
+                        $modalInstance.close(fildata);
+                    }
                 };
             }
         });
         modalInstance.result.then(function(selectedItem) {
             if (selectedItem) {
-                var fildata = {
-                    "scheduleclass": {
-                        // "code": selectedItem.code,
-                        "name": selectedItem.name,
-                        "person": selectedItem.person,
-                        "description": selectedItem.description,
-                        "startTime": moment(selectedItem.startTime).format('YYYY-MM-DD HH:mm:ss'),
-                        "endTime": moment(selectedItem.endTime).format('YYYY-MM-DD HH:mm:ss'),
-                        "shiftTime": selectedItem.shiftTime,
-                        "succeedTime": selectedItem.succeedTime,
-                        "dictionaryDTO": selectedItem.dictionaryDTO,
-                        "isTemplate": selectedItem.isTemplate,
-                        "deleteFlag": selectedItem.deleteFlag,
-                        "sendMsg": selectedItem.sendMsg,
-                        "sendTime": selectedItem.sendMsg == 1?moment(selectedItem.sendTime).format('YYYY-MM-DD HH:mm:ss'):undefined
+                var fildata = selectedItem
+                api_bpm_data.addData('scheduleclass', fildata).then(function(response) {
+                    if (response.status == 200) {
+                        SweetAlert.swal({
+                            title: "新增成功!",
+                            type: "success"
+                        }, function() {
+                            $scope.refreshData('expand-right', defaultFilterData);
+                        })
+                    } else {
+                        SweetAlert.swal({
+                            title: "新增失败!",
+                            type: "error"
+                        })
                     }
-                }
-                if (!fildata.scheduleclass.name) {
-                    SweetAlert.swal({
-                        title: "新增失败!",
-                        text: "班次未填",
-                        type: "error"
-                    })
-                } else if (!fildata.scheduleclass.startTime) {
-                    SweetAlert.swal({
-                        title: "新增失败!",
-                        text: "班次开始时间未填",
-                        type: "error"
-                    })
-                } else if (!fildata.scheduleclass.endTime) {
-                    SweetAlert.swal({
-                        title: "新增失败!",
-                        text: "班次结束时间未填",
-                        type: "error"
-                    })
-                } else if (!fildata.scheduleclass.person) {
-                    SweetAlert.swal({
-                        title: "新增失败!",
-                        text: "本班次人数未填",
-                        type: "error"
-                    })
-                } else {
-                    api_bpm_data.addData('scheduleclass', fildata).then(function(response) {
-                        if (response.status == 200) {
-                            SweetAlert.swal({
-                                title: "新增成功!",
-                                type: "success"
-                            }, function() {
-                                $scope.refreshData('expand-right', defaultFilterData);
-                            })
-                        } else {
-                            SweetAlert.swal({
-                                title: "新增失败!",
-                                type: "error"
-                            })
-                        }
-                    })
-                }
+                })
             }
         });
     }
@@ -379,18 +497,21 @@ app.controller('woketimeCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
                             name: item['name'],
                             // code: item['code'],
                             startTime: item.startTime,
-                            person: item.person,
+                            startTime2: item.startTime2,
+                            startTime3: item.startTime3,
                             //starts_at:
                             endTime: item.endTime,
-                            dictionaryDTO: item.dictionaryDTO,
+                            endTime2: item.endTime2,
+                            endTime3: item.endTime3,
+                            type: item.type,
+                            priority: item.priority,
                             succeedTime: item.succeedTime,
                             shiftTime: item.shiftTime,
                             description: item.description,
                             deleteFlag: item.deleteFlag,
                             isTemplate: item.isTemplate,
                             draggable: true,
-                            sendMsg: item.sendMsg,
-                            sendTime: item.sendTime
+                            workDay: item.workDay,
                         };
                         $scope.myData.push(templateEvent);
                     })

assets/views/system/tpl/systemworktime.html

@@ -1,3 +1,95 @@
+<style>
+    .btn-plus-div{
+        text-align: left;
+        margin-top: 15px;
+    }
+    .btn-plus-div .btn-plus{
+        line-height: 1.5;
+        position: relative;
+        display: inline-block;
+        font-weight: 400;
+        white-space: nowrap;
+        text-align: center;
+        background-image: none;
+        border: 1px dashed #d9d9d9;
+        -webkit-box-shadow: 0 2px 0 rgba(0,0,0,.015);
+        box-shadow: 0 2px 0 rgba(0,0,0,.015);
+        -webkit-transition: .3s cubic-bezier(.645,.045,.355,1);
+        transition: all .3s cubic-bezier(.645,.045,.355,1);
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        -ms-user-select: none;
+        user-select: none;
+        -ms-touch-action: manipulation;
+        touch-action: manipulation;
+        height: 32px;
+        padding: 0 15px;
+        font-size: 14px;
+        border-radius: 4px;
+        cursor: pointer;
+        color: rgba(0,0,0,.65);
+        background-color: #fff;
+    }
+    .btn-plus-div .btn-plus .icon-tianjia{
+        font-size: 12px;
+        margin-right: 8px;
+    }
+    .btn-plus-div .btn-plus{
+        line-height: 1.5;
+        position: relative;
+        display: inline-block;
+        font-weight: 400;
+        white-space: nowrap;
+        text-align: center;
+        background-image: none;
+        border: 1px dashed #d9d9d9;
+        -webkit-box-shadow: 0 2px 0 rgba(0,0,0,.015);
+        box-shadow: 0 2px 0 rgba(0,0,0,.015);
+        -webkit-transition: .3s cubic-bezier(.645,.045,.355,1);
+        transition: all .3s cubic-bezier(.645,.045,.355,1);
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        -ms-user-select: none;
+        user-select: none;
+        -ms-touch-action: manipulation;
+        touch-action: manipulation;
+        height: 32px;
+        padding: 0 15px;
+        font-size: 14px;
+        border-radius: 4px;
+        cursor: pointer;
+        color: rgba(0,0,0,.65);
+        background-color: #fff;
+    }
+    .btn-plus-div .btn-plus[disabled]{
+        color: rgba(0,0,0,.25);
+        background-color: #f5f5f5;
+        border-color: #d9d9d9;
+        text-shadow: none;
+        -webkit-box-shadow: none;
+        box-shadow: none;
+        background: #f5f5f5;
+        cursor: not-allowed;
+        border: 1px solid rgba(0,0,0,.25);
+    }
+    .btn-plus-div .btn-plus[disabled] .icon-tianjia{
+        color: inherit;
+    }
+    .btn-plus-input{
+        text-align: left;
+        display: flex;
+        align-items: center;
+        margin-bottom: 16px;
+    }
+    .btn-plus-input .form-control{
+        width: 90%;
+    }
+    .btn-plus-input .icon-shanchu3{
+        cursor: pointer;
+        margin-left: 8px;
+        font-size: 18px;
+    }
+</style>
 <div class="modal-header">
     <div class="modal-title fontcolor-two fontsizes-14">{{title}}<button type="button" class="close pull-right" ng-click="cancel()">×</button></div>
 </div>
@@ -5,12 +97,12 @@
     <form role="form" class="row">
         <div class="margin-left-30 margin-right-30 margin-top-20">
             <div class="margin-bottom-15 anline">
-                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">班次*:</div>
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14"><span class="red">*</span>班次:</div>
                 <div class="pull-right openaddinput">
                     <input class="form-control" ng-model="worktimedata.name" placeholder="输入班次..." />
                 </div>
             </div>
-            <div class="margin-bottom-15 anline">
+            <!-- <div class="margin-bottom-15 anline">
                 <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14 margin-top-10">开始时间*:</div>
                 <div class="pull-right openaddinput">
                     <timepicker ng-model="worktimedata.startTime" ng-change="changed()" hour-step="hstep" minute-step="mstep" show-meridian="ismeridian"></timepicker>
@@ -21,18 +113,31 @@
                 <div class="pull-right openaddinput">
                     <timepicker ng-model="worktimedata.endTime" ng-change="changed()" hour-step="hstep" minute-step="mstep" show-meridian="ismeridian"></timepicker>
                 </div>
-            </div>
+            </div> -->
             <div class="margin-bottom-15 anline">
-                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">班次人数*:</div>
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14"><span class="red">*</span>起始时间:</div>
                 <div class="pull-right openaddinput">
-                    <input class="form-control" ng-model="worktimedata.person" placeholder="输入班次人数..." />
+                    <div class="btn-plus-input" ng-repeat="time in times">
+                        <timepicker class="pull-left" style="margin-right: 8px;" ng-model="time.startTime" hour-step="hstep" minute-step="mstep" show-meridian="ismeridian" ng-change="timeChange(e,time)"></timepicker>
+                        <timepicker class="pull-right" ng-model="time.endTime" hour-step="hstep" minute-step="mstep" show-meridian="ismeridian" ng-change="timeChange(e,time)"></timepicker>
+                        <span class="icon iconfont icon-shanchu3" ng-click="remove($index)" ng-if="!$first"></span>
+                    </div>
+                    <div class="btn-plus-div">
+                        <button class="btn-plus" ng-click="add()" ng-disabled="isAdd" ng-if="!isAdd"><span class="icon iconfont icon-tianjia"></span>添加起始时间</button>
+                    </div>
                 </div>
             </div>
+            <!-- <div class="margin-bottom-15 anline">
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14"><span class="red">*</span>班次人数:</div>
+                <div class="pull-right openaddinput">
+                    <input class="form-control" ng-model="worktimedata.person" placeholder="输入班次人数..." />
+                </div>
+            </div> -->
             <div class="margin-bottom-15 anline">
-                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">季节:</div>
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14"><span class="red">*</span>班次类型:</div>
                 <div class="pull-right openaddinput">
-                    <ui-select ng-model="worktimedata.dictionaryDTO" theme="bootstrap">
-                        <ui-select-match placeholder="选择所属季节...">
+                    <ui-select ng-model="worktimedata.type" theme="bootstrap" ng-change="changeType(e)">
+                        <ui-select-match placeholder="选择所属班次类型...">
                             {{$select.selected.name}}
                         </ui-select-match>
                         <ui-select-choices repeat="item in dictionary | filter: $select.search">
@@ -41,34 +146,69 @@
                     </ui-select>
                 </div>
             </div>
+            <div class="margin-bottom-15 anline" ng-if="worktimedata.type && worktimedata.type.value == 'service'">
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14" style="width: 100px;">呼叫中心关联:</div>
+                <div class="pull-right openaddinput">
+                    <div class="setting-box clearfix">
+                        <span class="setting-switch pull-left">
+                        <switch ng-model="worktimedata.isTemplate"  class="green"></switch>
+                    </span>
+                    </div>
+                </div>
+            </div>
+            <div class="margin-bottom-15 anline" ng-if="worktimedata.type && worktimedata.type.value == 'handle'">
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14"><span class="red">*</span>优先级关联:</div>
+                <div class="pull-right openaddinput">
+                    <ui-select ng-model="worktimedata.priority" theme="bootstrap">
+                        <ui-select-match placeholder="选择所属优先级关联...">
+                            {{$select.selected.name}}
+                        </ui-select-match>
+                        <ui-select-choices repeat="item in priorityList | filter: $select.search">
+                            {{item.name}}
+                        </ui-select-choices>
+                    </ui-select>
+                </div>
+            </div>
             <div class="margin-bottom-15 anline">
                 <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">班次描述:</div>
                 <div class="pull-right openaddinput">
                     <input class="form-control" ng-model="worktimedata.description" placeholder="输入班次描述..." />
                 </div>
             </div>
+
             <div class="margin-bottom-15 anline">
-                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">是否为模版:</div>
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">是否停用:</div>
                 <div class="pull-right openaddinput">
                     <div class="setting-box clearfix">
                         <span class="setting-switch pull-left">
-                        <switch ng-model="worktimedata.isTemplate"  class="green"></switch>
+                        <switch ng-model="worktimedata.deleteFlag"  class="green"></switch>
                     </span>
                     </div>
                 </div>
             </div>
             <div class="margin-bottom-15 anline">
-                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">是否停用:</div>
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14" style="width: 100px;"><span class="red">*</span>工作日/节假日:</div>
                 <div class="pull-right openaddinput">
                     <div class="setting-box clearfix">
-                        <span class="setting-switch pull-left">
-                        <switch ng-model="worktimedata.deleteFlag"  class="green"></switch>
-                    </span>
+                        <div class="setting-switch pull-left">
+                            <div class="radio clip-radio radio-primary radio-inline">
+                                <input type="radio" id="yes" ng-value="1" name="workDay" ng-model="worktimedata.workDay">
+                                <label for="yes">
+                                    工作日
+                                </label>
+                            </div>
+                            <div class="radio clip-radio radio-primary radio-inline">
+                                <input type="radio" id="no" ng-value="0" name="workDay" ng-model="worktimedata.workDay">
+                                <label for="no">
+                                    节假日
+                                </label>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
             <!-- 是否值班提醒 -->
-            <div class="margin-bottom-15 anline">
+            <!-- <div class="margin-bottom-15 anline">
                 <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14" style="width: 100px;">是否值班提醒:</div>
                 <div class="pull-right openaddinput">
                     <div class="setting-box clearfix">
@@ -88,18 +228,18 @@
                         </div>
                     </div>
                 </div>
-            </div>
+            </div> -->
             <!-- 值班提醒选择是的时候，需要选择时间 -->
-            <div class="margin-bottom-15 anline" ng-if="worktimedata.sendMsg == 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.sendTime" ng-change="changed()" hour-step="hstep" minute-step="mstep" show-meridian="ismeridian"></timepicker>
                 </div>
-            </div>
+            </div> -->
         </div>
     </form>
 </div>
 <div class="modal-footer">
     <button class="btn btn-primary" ng-click="savercode(worktimedata)" data-dismiss="modal" translate="modal.button.OK">OK</button>
     <button class="btn btn-primary btn-o" ng-click="cancel()" translate="modal.button.CANCEL">Cancel</button>
-</div>
+</div>