增加事件列表已删除tab__事件修改

assets/js/controllers/customform/customformDetailCtrl.js

@@ -1,8 +1,8 @@
 var appFormly = angular.module('formlyDetail', ['formlyExample']);
 app.requires.push('formlyDetail');
 
-appFormly.controller('CustomformDetailCtrl', ['$scope', 'i18nService', '$rootScope', '$parse', '$injector', '$http', '$q', '$state', '$stateParams', '$modal', '$timeout', '$interval', 'SweetAlert', 'FileUploader', 'Restangular', 'BpmRestangular', 'UserRestangular', 'api_configure_form', 'api_bpm_domain', 'api_bpm_data', 'api_user_data', 'up_down_file',
-    function($scope, i18nService, $rootScope, $parse, $injector, $http, $q, $state, $stateParams, $modal, $timeout, $interval, SweetAlert, FileUploader, Restangular, BpmRestangular, UserRestangular, api_configure_form, api_bpm_domain, api_bpm_data, api_user_data, up_down_file) {
+appFormly.controller('CustomformDetailCtrl', ['$scope', 'i18nService', '$rootScope', '$parse', '$injector', '$http', '$q', '$state', '$stateParams', '$modal', '$timeout', '$interval', 'SweetAlert', 'FileUploader', 'Restangular', 'BpmRestangular', 'UserRestangular', 'api_configure_form', 'api_bpm_domain', 'api_bpm_data', 'api_user_data', 'up_down_file','WechatRestangular',
+    function($scope, i18nService, $rootScope, $parse, $injector, $http, $q, $state, $stateParams, $modal, $timeout, $interval, SweetAlert, FileUploader, Restangular, BpmRestangular, UserRestangular, api_configure_form, api_bpm_domain, api_bpm_data, api_user_data, up_down_file,WechatRestangular) {
         //console.log($parse('Restangular')($scope));
         //console.log($injector.get('Restangular'));
         //保存报修主体
@@ -456,7 +456,7 @@ appFormly.controller('CustomformDetailCtrl', ['$scope', 'i18nService', '$rootSco
                 if (pdKey != "") {
                     if (pdKey == "incident") { //修改
                         vm.model.incident.category = { id: vm.model.incident.category.id };
-                        api_bpm_data.updData("incident", { "incident": vm.model.incident }).then(function(response) {
+                        api_bpm_data.addData("incident", { "incident": vm.model.incident }).then(function(response) {
                             if (response) {
                                 var resData = Restangular.stripRestangular(response);
                                 SweetAlert.swal({

assets/js/controllers/incident/incidentCtrl.js

@@ -939,7 +939,11 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         $scope.memoryfilterData = fildata;
         fildata.assignee = loginUser.id;
         // seimin
-        fildata.searchType = $scope.searchstate;
+        if($scope.searchstate === 'all_del'){
+            fildata.searchType = 'all'; 
+        }else{
+            fildata.searchType = $scope.searchstate;
+        }
         console.log(fildata,78777);
         if(fildata.searchType === 'all'){
             if(fildata.incident&&fildata.incident.selectType){
@@ -2552,6 +2556,13 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         $scope.searchstate = 'todo';//baba
     }
     $scope.onChange = function (searchType) {
+        if(searchType === 'all_del'){
+            var obj = $scope.state.find(function(v){return v.id == 1708});
+            $scope.othcode = {state:obj};
+            $scope.isDisabledState = true;
+        }else{
+            $scope.isDisabledState = false;
+        }
         $scope.searchstate = searchType;
         $scope.chiceIncident($scope.searchkeys,$scope.othcode.state);
         // console.log(defaultFilterData,'fanbu')
@@ -2932,18 +2943,17 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$http', '$scope', '$modal', '
     // }
 
     //修改页面显示判断
-    $scope.jry_modify = function () {
+    $scope.jry_modify = function (item) {
+        console.log(item)
         var jry_role = false;
         for (var i = 0; i < $rootScope.user.role.length; i++) {
-            if ($rootScope.user.role[i].role == "服务台" && $rootScope.user.role[i].rolecode == "call center") {
+            if ($rootScope.user.role[i].rolecode == "call center") {
                 jry_role = true
             }
         }
-        if (jry_role) {
-            return true
-        } else {
-            return false
-        }
+        var arrFlag = ['reassign','assigned','pending','handler','storage'];
+        var stateFlag = arrFlag.includes(item.state.value)
+        return jry_role && stateFlag;
     }
     // 回访操作权限
     for (var obj in $rootScope.user.role) {
@@ -3100,7 +3110,7 @@ app.directive('incidentoperator', function () {
         template: '<div><div class="cl-effect-1 ui-grid-cell-contents pull-left" >' +
             // '<a ng-click="look()"   tooltip="查看" tooltip-placement="left"><i class="ti-eye"></i></a>'+
             '<a ng-click="handler()" ng-show="{{item.state.id != 1546 &&!item.handlerUser&&item.tiquPower&&qiangdan}}" class="bianjifont" >抢单</a>' +
-            // '<a ng-click="changeCenter()"  ng-show="jry_modify()"  class="luyinfont">修改</a>' +
+            '<a ng-click="changeCenter()"  ng-show="jry_modify(item)"  class="luyinfont">修改</a>' +
             '<a ng-click="edit()"  ng-show="{{item.chaozuoPower&&chuli}}"  class="bianjifont">处理</a>' +
             '<a ng-click="visit()"  ng-show="{{item.huifang&&huifang}}"  class="bianjifont">回访</a>' +
             '<a ng-click="print()" ng-show="dayin" class="bianjifont" >打印</a>' +

assets/views/customform/tpl/ui-textAreaKnowledge.html

@@ -1,7 +1,7 @@
 <!-- <div>
 	<textarea class="form-control autosize msd-elastic: \n;" data-ng-model="model[options.key]" ng-change="to['onChange'](model[options.key], options, this, $event ,model);"></textarea>
 </div> -->
-<div class="jry_tit">事件描述<span class="important_red">*</span>:<span class="knowledge" tooltip="点击查看可以引用的知识库" tooltip-placement="right" ng-click="openSolution(model[options.key], options, this, $event ,model)">引用知识库</span></div>
+<div class="jry_tit">事件描述<span class="important_red">*</span>:<span ng-if="!options.templateOptions.isHidden" class="knowledge" tooltip="点击查看可以引用的知识库" tooltip-placement="right" ng-click="openSolution(model[options.key], options, this, $event ,model)">引用知识库</span></div>
 <div>
 	<textarea class="form-control autosize msd-elastic: \n;" maxlength="{{to.maxlength}}" data-ng-model="model[options.key]" ng-change="to['onChange'](model[options.key], options, this, $event ,model);" ng-disabled="{{to.readOnly}}" rows="{{options.templateOptions.rows||0}}"></textarea>
 </div>

assets/views/incident/list.html

@@ -21,6 +21,8 @@
                     ng-click="onChange('done')">处理过</button>
                 <button class="btn btn-statebutton statebutton keeprightbottom wt_btn2"
                     ng-class="{'statecolor':searchstate=='create'}" ng-click="onChange('create')">我创建</button>
+                <button class="btn btn-statebutton statebutton keeprightbottom wt_btn2"
+                    ng-class="{'statecolor':searchstate=='all_del'}" ng-click="onChange('all_del')">已删除</button>
                 <!-- <button class="btn btn-statebutton statebutton keeprightbottom wt_btn2" ng-class="{'statecolor':searchstate=='overDate'}"
                     ng-click="onChange('overDate')">已逾期</button> -->
                 <!-- <button class="btn btn-statebutton statebutton keeprightbottom wt_btn2" ng-class="{'statecolor':searchstate=='wt_all'}" ng-click="onChange1('wt_all')">我的通知</button> -->
@@ -83,7 +85,7 @@
                                 <div class="control-label pull-left margin-top-5">报修人:</div>
                                 <ui-select class="pull-right selectzise wt_width1 wt_width3"
                                     ng-model="searchkeys.requester" theme="bootstrap">
-                                    <ui-select-match placeholder="">
+                                    <ui-select-match placeholder="请选择报修人">
                                         {{$select.selected.name}}
                                     </ui-select-match>
                                     <ui-select-choices repeat="item in requester"
@@ -129,7 +131,7 @@
                             <div class="control-label pull-left margin-top-5 ">区域:</div>
                             <ui-select class="pull-right selectzise wt_width1 wt_width3" ng-model="searchkeys.area" theme="bootstrap"
                                 ng-change="onChangearea(searchkeys)">
-                                <ui-select-match placeholder="">
+                                <ui-select-match placeholder="请选择区域">
                                     {{$select.selected.area}}
                                 </ui-select-match>
                                 <ui-select-choices repeat="item in outarea | filter: $select.search">
@@ -143,7 +145,7 @@
                             <div class="control-label pull-left margin-top-5">地点:</div>
                             <ui-select class="pull-right selectzise wt_width1 wt_width3" ng-model="searchkeys.place" theme="bootstrap"
                                 ng-change="onChangeplace(key)">
-                                <ui-select-match placeholder="">
+                                <ui-select-match placeholder="请选择地点">
                                     {{$select.selected.place}}
                                 </ui-select-match>
                                 <ui-select-choices repeat="item in outplace | filter: $select.search">
@@ -154,9 +156,9 @@
                         </div>
                         <div class="form-group incidentsearch  wt_width">
                             <div class="control-label pull-left margin-top-5">状态:</div>
-                            <ui-select class="pull-right selectzise wt_width1 wt_width3" ng-model="othcode.state"
+                            <ui-select ng-disabled="isDisabledState" class="pull-right selectzise wt_width1 wt_width3" ng-model="othcode.state"
                                 theme="bootstrap">
-                                <ui-select-match placeholder="">
+                                <ui-select-match placeholder="请选择状态">
                                     {{$select.selected.name}}
                                 </ui-select-match>
                                 <ui-select-choices repeat="item in state | filter: $select.search">
@@ -166,7 +168,7 @@
                         </div>
                         <div class="form-group incidentsearch  wt_width">
                             <div class="control-label pull-left margin-top-5">事件分类:</div>
-                            <multi-select-tree class="pull-right selectzise wt_width1 wt_width3"
+                            <multi-select-tree data-default-label="请选择事件分类" class="pull-right selectzise wt_width1 wt_width3"
                                 ng-model="cifilter_classic" data-input-model="select_treedata"
                                 data-output-model="cifilter_classics" theme="bootstrap" multi-select="false"
                                 data-callback="onFilterCallback(item)" data-select-only-leafs="false"
@@ -177,7 +179,7 @@
                             <div class="control-label pull-left margin-top-5 ">受理人:</div>
                             <ui-select class="pull-right selectzise wt_width1 wt_width3"
                                 ng-model="searchkeys.acceptUser" theme="bootstrap">
-                                <ui-select-match placeholder="">
+                                <ui-select-match placeholder="请选择受理人">
                                     {{$select.selected.name}}
                                 </ui-select-match>
                                 <ui-select-choices repeat="item in acceptUser | filter: $select.search"
@@ -190,7 +192,7 @@
                             <div class="control-label pull-left margin-top-5">处理人:</div>
                             <ui-select class="pull-right selectzise wt_width1 wt_width3"
                                 ng-model="searchkeys.handlingPersonnelUser" theme="bootstrap">
-                                <ui-select-match placeholder="">
+                                <ui-select-match placeholder="请选择处理人">
                                     {{$select.selected.name}}
                                 </ui-select-match>
                                 <ui-select-choices repeat="item in handlingPersonnelUser"
@@ -228,7 +230,7 @@
                         <div class="form-group incidentsearch wt_width">
                             <div class="control-label pull-left margin-top-5">是否逾期:</div>
                             <ui-select ng-change="selectTypeChange()" ng-model="searchkeys.selectType" class="pull-right selectzise wt_width1 wt_width3" theme="bootstrap">
-                                <ui-select-match>
+                                <ui-select-match placeholder="请选择">
                                     <span ng-bind="$select.selected.name"></span>
                                 </ui-select-match>
                                 <ui-select-choices repeat="item in selectType">