BUG修复-修改密码-指派功能

assets/js/controllers/customform/customformCtrl.js

@@ -11176,6 +11176,8 @@ appFormly.config(function config(formlyConfigProvider) {
                 if (
                   $scope.$parent.$parent.$parent.model.incident.handlerUser.id
                 ) {
+                  $scope.$parent.$parent.$parent.model.assignee =
+                    $scope.$parent.$parent.$parent.model.incident.handlerUser.id;
                   $scope.options.model.id =
                     $scope.$parent.$parent.$parent.model.incident.handlerUser.id;
                 }

assets/js/controllers/incident/incidentCtrl.js

@@ -2159,6 +2159,87 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             }
         });
     }
+    // 指派弹窗baba
+    $scope.toAssign = function (model) {
+        console.log(model)
+        var modalInstance = $modal.open({
+            templateUrl: 'assets/views/incident/tpl/toAssign.tpl.html',
+            controller: function ($scope, $modalInstance, api_bpm_domain, modelData, currentUserId, Alert, api_user_data) {
+                console.log(model,loginUser);
+                $scope.assignUser = null;
+                $scope.user = [];
+                api_user_data.fetchDataList('user', {
+                    "idx": 0,
+                    "sum": 100,
+                    user: {
+                        roledata: { rolecode: "first-line support" },
+                        roledata2: { rolecode: "second-line support" },
+                        selectType: "1"
+                    }
+                }).then(function (data) {
+                    $scope.user = data.list;
+                })
+                $scope.onChangeRotateUser = function(item){
+                    $scope.assignUser = item.id;
+                }
+                $scope.ok = function () {
+                    if (!$scope.assignUser){
+                        Alert.swal({
+                            title: "操作失败",
+                            text: "请选择转派对象信息!",
+                            type: "error"
+                        });
+                        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') {
+                defaultFilterData.assignee = loginUser.id;
+                $scope.refreshData('expand-right', defaultFilterData);
+            }
+        });
+    }
     // 协同弹窗
     $scope.cooperate = function (model) {
         console.log(model)
@@ -2544,10 +2625,17 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$http', '$scope', '$modal', '
     // console.log('$rootScope.user3='+JSON.stringify($scope.item));
     // console.log($scope.item)
     var loginUser = $rootScope.user;
+    console.log(loginUser.role)
     $scope.chuli = false;
     $scope.qiangdan = false;
     $scope.dayin = false;
     $scope.huifang = false;
+    $scope.assign = false;
+    if(loginUser.role.length){
+        $scope.assign = loginUser.role.some(function(v){
+            return v.rolecode === "incident-category-manager"||v.rolecode === 'incident manager';
+        })
+    }
     for (var i = 0; i < loginUser.menu.length; i++) {
         if (loginUser.menu[i].link == "shijianliebiao_chuli") {
             $scope.chuli = true
@@ -2685,6 +2773,11 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$http', '$scope', '$modal', '
         $scope.colobject.grid.appScope.rotate($scope.item);
         // $scope.doEdit($scope.item.id);
     }
+    // 指派
+    $scope.toAssign = function () { //print
+        $scope.colobject.grid.appScope.toAssign($scope.item);
+        // $scope.doEdit($scope.item.id);
+    }
     // 协同
     $scope.cooperate = function () { //print
         $scope.colobject.grid.appScope.cooperate($scope.item);
@@ -2763,6 +2856,7 @@ app.directive('incidentoperator', function () {
             // '<a ng-click="jry_evaluate()"  ng-show="jry_evaluateShow()" class="luyinfont" >评价</a>' +
             // '<a ng-click="record()"  ng-show="{{item.listen}}" class="luyinfont" >录音</a>' +
             // '<a ng-click="rotate()" ng-show="{{item.state.id==4}}" class="rotate" >转派</a>' +
+            '<a ng-click="toAssign()" ng-show="{{(item.state.id==1543||item.state.id==1544)&&assign&&item.assignee}}" class="assign" >指派</a>' +
             // '<a ng-click="upgrade()" ng-show="{{up&&item.state.id==4&&item.currentRole!=' + "'incident manager'" + '}}" class="upgrade" >升级</a>' +
             // '<a ng-click="problem()" ng-show="{{item.state.id==5&&item.currentRole!=' + "'incident manager'" + '}}" class="upgrade" >问题升级</a>' +
             // '<a ng-click="configuration()"  ng-show="{{item.state.id==5}}"  class="bianjifont">变更升级</a>' +

assets/js/main.js

@@ -697,6 +697,10 @@ app.factory('api_bpm_domain', ['BpmRestangular', 'CommonRestangular', function (
     var bpmService = BpmRestangular.all("bpm");
     var commonService = CommonRestangular.all("common");
     return {
+        //指派
+        delegateTask: function (pdKey, data) {
+            return bpmService.customPOST(data, 'delegateTask/' + pdKey, {});
+        },
         fetchtask: function (pdKey, data) {
             return bpmService.customPOST(data, 'fetchTask/' + pdKey, {});
         },

assets/views/incident/tpl/toAssign.tpl.html

@@ -0,0 +1,28 @@
+<!-- 转派 -->
+<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;">
+        <div class=" input-group" style="margin:30px 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:130px" ng-model="assignUser" theme="bootstrap" ng-change="onChangeRotateUser($select.selected)">
+                    <ui-select-match placeholder="">
+                        {{$select.selected.name}}
+                    </ui-select-match>
+                    <ui-select-choices repeat="item in user | filter:{$:$select.search}">
+                        <div ng-bind-html="item.name | 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()" translate="modal.button.OK ">OK</div>
+    <div class="hintfooterright pull-right" ng-click="cancel() " translate="modal.button.CANCEL ">Cancel</div>
+</div>

assets/views/partials/top-navbar.html

@@ -116,9 +116,9 @@
                 <li>
                     <a ng-click="wt_messages()" class="fontchangepas ng-scope" translate="topbar.user.MESSAGES">我的消息</a>
                 </li>
-                <!-- <li>
+                <li>
                     <a ng-click="changepassword()" class="fontchangepas ng-scope" translate="topbar.user.CHANGEPASSWORD">修改密码</a>
-                </li> -->
+                </li>
                 <li>
                     <a ng-click="logout()" class="fontchangepas" translate="topbar.user.LOGOUT">
                         Log Outs