新增短信，工作日管理修改

assets/js/controllers/incident/incidentCtrl.js

@@ -301,6 +301,15 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                     '</div>'
             },
             {
+                name: 'visited',
+                displayName: '回访状态',
+                width: '70',
+                enableSorting: false,
+                cellTemplate: '<div>' +
+                    '<div class="ui-grid-cell-contents" >{{row.entity.visited === 1 ? "已回访" : (row.entity.visited === 0 ? "未回访" : "")}}</div>' +
+                    '</div>'
+            },
+            {
                 name: '操作',
                 enableSorting: false,
                 width: 500,
@@ -952,14 +961,20 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             fildata.searchType = $scope.searchstate;
         }
         console.log(fildata,78777);
-        if(fildata.searchType === 'all'){
-            if(fildata.incident&&fildata.incident.selectType){
-                fildata.incident.selectType = fildata.incident.selectType.id;
-            }
-        }else{
-            if(fildata.incident&&fildata.incident.selectType){
-                delete fildata.incident.selectType;
-            }
+        // if(fildata.searchType === 'all'){
+        //     if(fildata.incident&&fildata.incident.selectType){
+        //         fildata.incident.selectType = fildata.incident.selectType.id;
+        //     }
+        // }else{
+        //     if(fildata.incident&&fildata.incident.selectType){
+        //         delete fildata.incident.selectType;
+        //     }
+        // }
+        if(fildata.incident&&fildata.incident.selectType){
+            fildata.incident.selectType = fildata.incident.selectType.id;
+        }
+        if(fildata.incident&&fildata.incident.visited){
+            fildata.incident.visited = fildata.incident.visited.id;
         }
         // /seimin
         $scope.refreshData('expand-right', fildata);
@@ -2250,7 +2265,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             }
         });
     }
-    // 指派弹窗baba
+    // 指派弹窗
     $scope.toAssign = function (model) {
         console.log(model)
         var modalInstance = $modal.open({
@@ -2395,6 +2410,117 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         });
     }
     
+    // 新增发送短信弹窗 liaomingming
+    $scope.toSms = function (model) {
+        console.log(model)
+        var modalInstance = $modal.open({
+            templateUrl: 'assets/views/incident/tpl/toSms.tpl.html',
+            controller: function ($scope, $modalInstance, api_bpm_domain, modelData, currentUserId, Alert, api_user_data) {
+                console.log(model,loginUser);
+                $scope.assignUser = null;
+                $scope.assignGroup = null;
+                //获取用户
+                $scope.getUsers = function(key = ''){
+                    $scope.user = [];
+                    var postData = postData = {
+                        "idx": 0,
+                        "sum": 10,
+                        user: {
+                            name: key,
+                            roledata: { rolecode: "first-line support" },
+                            selectType: "pinyin_qs"
+                        }
+                    };
+                    api_user_data.fetchDataList('user', postData).then(function (data) {
+                        $scope.user = data.list;
+                    })
+                }
+                //获取组
+                $scope.getGroups = function(){
+                    $scope.user = [];
+                    var postData = postData = {
+                        "idx": 0,
+                        "sum": 100,
+                        group: {
+                            'selectType':'nouser'
+                        }
+                    };
+                    api_user_data.fetchDataList('group', postData).then(function (data) {
+                        $scope.group = data.list;
+                    })
+                }
+                $scope.userOrGroup = 1;
+                $scope.user = [];
+                $scope.group = [];
+                $scope.getUsers();
+                $scope.getGroups();
+                
+                $scope.ok = function () {
+                    if ($scope.userOrGroup == 1 && !$scope.assignUser){
+                        Alert.swal({
+                            title: "操作失败",
+                            text: "请选择处理人!",
+                            type: "error"
+                        });
+                        return;
+                    }
+                    if ($scope.userOrGroup == 2 && !$scope.assignGroup){
+                        Alert.swal({
+                            title: "操作失败",
+                            text: "请选择处理组!",
+                            type: "error"
+                        });
+                        return;
+                    }
+                    return;
+                    api_bpm_domain.delegateTask(model.taskId, {assginee:$scope.assignUser}).then(function (response) {
+                        console.log(response)
+                        if (response.status == 200) {
+                            Alert.swal({
+                                title: "操作成功!",
+                                confirmButtonColor: "#007AFF",
+                                type: "success"
+                            });
+                            $modalInstance.close('success');
+                        } else {
+                            Alert.swal({
+                                title: "操作失败",
+                                text: "操作失败, 请稍后再试!",
+                                type: "error"
+                            });
+                        }
+                    });
+                }
+
+                $scope.cancel = function () {
+                    $modalInstance.dismiss('cancel');
+                }
+            },
+            size: 'sm',
+            resolve: {
+                api_bpm: function () {
+                    return api_bpm;
+                },
+                modelData: function () {
+                    return model;
+                },
+                currentUserId: function () {
+                    return loginUser.id;
+                },
+                Alert: function () {
+                    return SweetAlert;
+                },
+                api_user_data: function () {
+                    return api_user_data;
+                }
+            }
+        });
+        modalInstance.result.then(function (selectedItem) {
+            if (selectedItem == 'success') {
+                $scope.refreshData('expand-right', defaultFilterData);
+            }
+        });
+    }
     // 新增沟通记录弹窗
     $scope.toHandlerLog = function (model) {
         console.log(model)
@@ -2471,7 +2597,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                         });
                         return;
                     }
-                    api_bpm_data.getCallRecordId({ano: localStorage.getItem('hk_phone'), bno: $scope.telephone, agentId: $rootScope.user.id}).then(function(response){
+                    api_bpm_data.getCallRecordId({ano: localStorage.getItem('hk_phone') || undefined, bno: $scope.telephone || undefined, agentId: $rootScope.user.id}).then(function(response){
                         console.log(response)
                         if (response.status == 200) {
                             $scope.callId = response.data || undefined;//获取callId
@@ -2741,24 +2867,43 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         //     $scope.jry_refresh()
         // }, $rootScope.refreshTime);
     }
-    // 是否逾期下拉框选择seimin
+    // 是否逾期下拉框选择
     $scope.selectTypeChange = function(){
         console.log($scope.searchkeys.selectType,66666);
         if(window.sessionStorage.getItem('isGoyuqi') == 'yes'){
             $scope.searchkeys.selectType = {id:'2',name:'是'};
-            // window.sessionStorage.removeItem('isGoyuqi');//seimin
+            // window.sessionStorage.removeItem('isGoyuqi');
         }
         var ids = $scope.searchkeys.selectType.id
         if(defaultFilterData.incident){
-            defaultFilterData.incident.selectType = ids;//seimin
+            defaultFilterData.incident.selectType = ids;
         }else{
             defaultFilterData.incident = {
                 selectType:ids
             };
         }
-        defaultFilterData.searchType = 'all';
+        defaultFilterData.searchType = $scope.searchstate;
         console.log(defaultFilterData,2222)
-        $scope.onChange('all');
+        $scope.onChange($scope.searchstate);
+    }
+    // 是否回访下拉框选择
+    $scope.visited = [
+        {id: 1, name: '已回访'},
+        {id: 0, name: '未回访'}
+    ]
+    $scope.visitedChange = function(){
+        console.log($scope.searchkeys.visited,66666);
+        var ids = $scope.searchkeys.visited.id;
+        if(defaultFilterData.incident){
+            defaultFilterData.incident.visited = ids;
+        }else{
+            defaultFilterData.incident = {
+                visited:ids
+            };
+        }
+        defaultFilterData.searchType = $scope.searchstate;
+        console.log(defaultFilterData,3333)
+        $scope.onChange($scope.searchstate);
     }
     //获取列表数据
     $scope.refreshData = function (style, filterData) {
@@ -3182,6 +3327,10 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$http', '$scope', '$modal', '
     $scope.delSj = function () {
         $scope.colobject.grid.appScope.delSj($scope.item);
     }
+    // 发送短信
+    $scope.toSms = function () {
+        $scope.colobject.grid.appScope.toSms($scope.item);
+    }
     // 新增沟通记录
     $scope.toHandlerLog = function () { //print
         $scope.colobject.grid.appScope.toHandlerLog($scope.item);
@@ -3270,6 +3419,7 @@ app.directive('incidentoperator', function () {
             // '<a ng-click="print()" ng-show="dayin" class="bianjifont" >打印</a>' +
             // '<a ng-click="jry_evaluate()"  ng-show="jry_evaluateShow()" class="luyinfont" >评价</a>' +
             '<a ng-click="record()"  ng-show="{{item.callID}}" class="luyinfont" >录音</a>' +
+            '<a ng-click="toSms()" ng-show="{{item.huifang&&huifang}}" class="assign" >发送短信</a>' +
             '<a ng-click="toHandlerLog()" ng-show="{{item.huifang&&huifang}}" class="assign" >新增沟通记录</a>' +
             // '<a ng-click="rotate()" ng-show="{{item.state.id==4}}" class="rotate" >转派</a>' +
             // '<a ng-click="upgrade()" ng-show="{{up&&item.state.id==4&&item.currentRole!=' + "'incident manager'" + '}}" class="upgrade" >升级</a>' +

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

@@ -42,7 +42,7 @@ app.controller("calendarCtrl", function($scope,$rootScope, $filter, $q, $timeout
         myData.friday == 1 ? $scope.options.selected[4] = workdays.year + '-5' : $scope.options.selected[4] = '';
         myData.saturday == 1 ? $scope.options.selected[5] = workdays.year + '-6' : $scope.options.selected[5] = '';
         myData.sunday == 1 ? $scope.options.selected[6] = workdays.year + '-7' : $scope.options.selected[6] = '';
-        // console.log($scope.options.selected)
+        console.log($scope.options.selected)
     })
     $scope.options = {
         reset: true,
@@ -53,6 +53,27 @@ app.controller("calendarCtrl", function($scope,$rootScope, $filter, $q, $timeout
         selected: []
     };
 
+    $scope.saveMonth = function(){
+        api_bpm_data.addData('workdayexception', {workdayexception: {list: $scope.arrList}}).then(function(response) {
+            if (response.status == 200) {
+                SweetAlert.swal({
+                    title: "修改成功!",
+                    text: "修改排班成功!",
+                    type: "success"
+                }, function() {
+                    $scope.refreshData(workdays);
+                });
+            } else {
+                SweetAlert.swal({
+                    title: "修改失败!",
+                    text: "修改排班失败!",
+                    type: "error"
+                });
+            }
+
+        })
+    }
+
     $scope.saveweek = function(selected) {
         var numget = ['2', '2', '2', '2', '2', '2', '2'];
         var longtime = '';
@@ -117,6 +138,7 @@ app.controller("calendarCtrl", function($scope,$rootScope, $filter, $q, $timeout
             }
         }
         api_bpm_data.fetchDataList('workday', monedata).then(function(response) {
+            $scope.arrList = [];
             var myData = response.list;
             $scope.selectedDate = [];
             angular.forEach(myData, function(item) {
@@ -132,6 +154,7 @@ app.controller("calendarCtrl", function($scope,$rootScope, $filter, $q, $timeout
         $scope.dayFormat = direction === "vertical" ? "EEEE, MMMM d" : "d";
     };
     var ischeck = '';
+    $scope.arrList = [];
     $scope.dayClick = function(date) {
         if($scope.bianji){
             if ($scope.selectedDate.length == 0) {
@@ -151,31 +174,41 @@ app.controller("calendarCtrl", function($scope,$rootScope, $filter, $q, $timeout
             console.log(date);
             // var ymd = [date.getFullYear(), date.getMonth() + 1, date.getDate()].join("-");
             var ymd =  moment(date.getTime() + 86399999).format('YYYY-MM-DD HH:mm:ss');
-            var monedata = {
-                "workdayexception": {
+            var flagIndex = $scope.arrList.findIndex(v => angular.equals(ymd, v.date));
+            if(flagIndex > -1){
+                $scope.arrList[flagIndex].isWork = !$scope.arrList[flagIndex].isWork;
+            }else{
+                $scope.arrList.push({
                     "date": ymd,
                     "isWork": ischeck
-                }
+                });
             }
+            console.log($scope.arrList)
+            // var monedata = {
+            //     "workdayexception": {
+            //         "date": ymd,
+            //         "isWork": ischeck
+            //     }
+            // }
     
-            api_bpm_data.addData('workdayexception', monedata).then(function(response) {
-                if (response.status == 200) {
-                    SweetAlert.swal({
-                        title: "修改成功!",
-                        text: "修改排班成功!",
-                        type: "success"
-                    }, function() {
-                        $scope.refreshData(workdays);
-                    });
-                } else {
-                    SweetAlert.swal({
-                        title: "修改失败!",
-                        text: "修改排班失败!",
-                        type: "error"
-                    });
-                }
+            // api_bpm_data.addData('workdayexception', monedata).then(function(response) {
+            //     if (response.status == 200) {
+            //         SweetAlert.swal({
+            //             title: "修改成功!",
+            //             text: "修改排班成功!",
+            //             type: "success"
+            //         }, function() {
+            //             $scope.refreshData(workdays);
+            //         });
+            //     } else {
+            //         SweetAlert.swal({
+            //             title: "修改失败!",
+            //             text: "修改排班失败!",
+            //             type: "error"
+            //         });
+            //     }
     
-            })
+            // })
         }else{
             SweetAlert.swal({
                 title: "修改失败",

assets/views/incident/list.html

@@ -272,6 +272,20 @@
                                 <span class="glyphicon glyphicon-trash"></span>
                             </button>
                         </div>
+                        <div class="form-group incidentsearch">
+                            <div class="control-label pull-left margin-top-5">是否回访:</div>
+                            <ui-select style="margin-right:24px;width: 60%;" ng-change="visitedChange()" ng-model="searchkeys.visited" class="pull-right selectzise wt_width1 wt_width3" theme="bootstrap">
+                                <ui-select-match placeholder="请选择">
+                                    <span ng-bind="$select.selected.name"></span>
+                                </ui-select-match>
+                                <ui-select-choices repeat="item in visited">
+                                    <span ng-bind="item.name"></span>
+                                </ui-select-choices>
+                             </ui-select>
+                             <button style="position:absolute;right:0;padding:2px 4px;" ng-click="searchkeys.visited = undefined" class="btn btn-default">
+                                <span class="glyphicon glyphicon-trash"></span>
+                            </button>
+                        </div>
                         <!-- <div class='wt_width6' style="">
                             <span class="panel-title text-dark">至</span>
                         </div>

assets/views/incident/tpl/toSms.tpl.html

@@ -0,0 +1,61 @@
+<!-- 转派 -->
+<div class="modal-header">
+    <div class="modal-title fontcolor-two fontsizes-14">发送短信
+        <button type="button" class="close pull-right" ng-click="cancel()">×</button>
+    </div>
+</div>
+<div class="modal-body center">
+    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;">
+        <div class=" input-group" style="margin:8px 0 0;">
+            <div class="control-label pull-left margin-top-5 margin-right-5">
+                <label class="demoincident">选择处理人/组</label>:</div>
+            <div class="pull-left">
+                <label>
+                    <input type="radio" value="1" ng-model="userOrGroup" name="userOrGroup" style="position:relative;top:2px;">
+                    <span>处理人</span>
+                </label>
+                <label>
+                    <input type="radio" value="2" ng-model="userOrGroup" name="userOrGroup" style="position:relative;top:2px;">
+                    <span>处理组</span>
+                </label>
+            </div>
+        </div>
+    </div>
+    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;" ng-if="userOrGroup == 1">
+        <div class=" input-group" style="margin:8px 0 0;">
+            <div class="control-label pull-left margin-top-5 margin-right-5">
+                <label class="demoincident">处理人</label>:</div>
+            <div class="pull-right">
+                <ui-select class="pull-left" style="width:230px" ng-model="assignUser" theme="bootstrap">
+                    <ui-select-match placeholder="">
+                        {{$select.selected.name}}
+                    </ui-select-match>
+                    <ui-select-choices repeat="item in user | filter:{$:$select.search}" refresh="getUsers($select.search)">
+                        <div ng-bind-html="(item.name + '(' + item.account + ')') | highlight: $select.search"></div>
+                    </ui-select-choices>
+                </ui-select>
+            </div>
+        </div>
+    </div>
+    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;" ng-if="userOrGroup == 2">
+        <div class=" input-group" style="margin:8px 0 0;">
+            <div class="control-label pull-left margin-top-5 margin-right-5">
+                <label class="demoincident">处理组</label>:</div>
+            <div class="pull-right">
+                <ui-select class="pull-left" style="width:230px" ng-model="assignGroup" theme="bootstrap">
+                    <ui-select-match placeholder="">
+                        {{$select.selected.groupName}}
+                    </ui-select-match>
+                    <ui-select-choices repeat="item in group | filter:{$:$select.search}">
+                        <div ng-bind-html="item.groupName | highlight: $select.search"></div>
+                    </ui-select-choices>
+                </ui-select>
+            </div>
+        </div>
+    </div>
+    
+</div>
+<div class="modal-footer modelfooter-hint pointfont">
+    <div class="hintfooterleft pull-left" ng-click="ok()" style="cursor: pointer;">确定</div>
+    <div class="hintfooterright pull-right" ng-click="cancel()" style="cursor: pointer;">取消</div>
+</div>

assets/views/system/user/matrialcalendar.html

@@ -187,4 +187,7 @@ angular.module('app', ['angular-dayparts']).controller('main', function($scope){
     <div ng-if="calendarView=='week'&&bianji" class="text-center margin-top-30px">
         <a ng-click="saveweek(options.selected);" class="btn btn-addbutton  addbutton">保存</a>
     </div>
+    <div ng-if="calendarView=='month'&&bianji" class="text-center margin-top-30px">
+        <a ng-click="saveMonth();" class="btn btn-addbutton  addbutton">保存</a>
+    </div>
     </div>