增加处理日志

assets/js/controllers/incident/incidentCtrl.js

@@ -288,7 +288,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             {
                 name: '操作',
                 enableSorting: false,
-                width: 250,
+                width: 400,
                 cellTemplate: '<incidentoperator style="background-color:{{row.entity.colourInfo.rgb}}" item="row.entity" colobject="col">',
                 enableFiltering: false
             },
@@ -394,7 +394,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             {
                 name: '操作',
                 enableSorting: false,
-                width: 250,
+                width: 400,
                 cellTemplate: '<incidentoperator style="background-color:{{row.entity.colourInfo.rgb}}" item="row.entity" colobject="col">',
                 enableFiltering: false
             },
@@ -2240,6 +2240,73 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             }
         });
     }
+    // 新增处理日志弹窗baba
+    $scope.toHandlerLog = function (model) {
+        console.log(model)
+        var modalInstance = $modal.open({
+            templateUrl: 'assets/views/incident/tpl/toHandlerLog.tpl.html',
+            controller: function ($scope, $modalInstance, api_bpm_domain,api_bpm_data, modelData, currentUserId, Alert, api_user_data) {
+                console.log(model,loginUser);
+                $scope.handlerLog = '';
+                $scope.user = [];
+                $scope.ok = function () {
+                    if (!$scope.handlerLog.trim()){
+                        Alert.swal({
+                            title: "操作失败",
+                            text: "请填写处理日志!",
+                            type: "error"
+                        });
+                        return;
+                    }
+                    api_bpm_data.addData('operationLog',{operationLog:{opType:'handlerLog',opValue:$scope.handlerLog,extra1:model.id}}).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)
@@ -2778,6 +2845,11 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$http', '$scope', '$modal', '
         $scope.colobject.grid.appScope.toAssign($scope.item);
         // $scope.doEdit($scope.item.id);
     }
+    // 新增处理日志
+    $scope.toHandlerLog = function () { //print
+        $scope.colobject.grid.appScope.toHandlerLog($scope.item);
+        // $scope.doEdit($scope.item.id);
+    }
     // 协同
     $scope.cooperate = function () { //print
         $scope.colobject.grid.appScope.cooperate($scope.item);
@@ -2857,6 +2929,7 @@ app.directive('incidentoperator', function () {
             // '<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="toHandlerLog()" ng-show="{{item.state.id==1544}}" 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/views/incident/tpl/toHandlerLog.tpl.html

@@ -0,0 +1,21 @@
+<!-- 新增处理日志 -->
+<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: 250px;">
+        <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>
+                <textarea data-ng-model="handlerLog" rows="5"  maxlength="255" style="width: 100%;resize:none;" placeholder="请填写处理日志"></textarea>
+            </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>