建单，暂存，指派，转派，接单

assets/js/config.constant.js

@@ -45,6 +45,7 @@ app.constant('JS_REQUIRES', {
         'largedashboardCtrl': 'assets/js/controllers/dashboard/largedashboard.js',
         'canvasjs': 'assets/js/controllers/canvasjs.js',
         'incidentCtrl': 'assets/js/controllers/incident/incidentCtrl.js',
+        'incidentDetailCtrl': 'assets/js/controllers/incident/incidentDetailCtrl.js',
         'realtimeBroadcastCtrl': 'assets/js/controllers/bigScreen/realtimeBroadcastCtrl.js',
         'problemCtrl': 'assets/js/controllers/problem/problemCtrl.js',
         'watchCtrl': 'assets/js/controllers/watch/watchCtrl.js',

assets/js/config.router.js

@@ -541,6 +541,16 @@ app.config(['$authProvider', '$httpProvider', '$stateProvider', '$urlRouterProvi
                 ncyBreadcrumb: {
                     label: 'detail'
                 }
+            }).state('app.incident.incidentDetail', {
+                // 事件详情
+                url: '/incidentDetail/:id',
+                templateUrl: "assets/views/incident/incidentDetail.html",
+                resolve: loadSequence('jquery-sparkline', 'api-check', 'formly', 'angularFormly', 'angularFileUpload', 'multi.select.tree', 'customformCtrl', 'sanitize', 'incidentDetailCtrl'),
+                title: 'form detail',
+                icon: 'ti-list',
+                ncyBreadcrumb: {
+                    label: 'detail'
+                }
             }).state('app.incident.follow', {
                 url: '/follow/{processInstanceId}',
                 templateUrl: "assets/views/customform/indexfollow.html",

assets/js/controllers/incident/incidentCtrl.js

@@ -294,7 +294,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                 displayName: '受理人|处理人/组',
                 width: 150,
                 cellTemplate: '<div style="width: 100%;">' +
-                    '<div class="ui-grid-cell-contents">{{row.entity.acceptUser ? row.entity.acceptUser.name : "无"}}<br>{{(row.entity.state.value == "resolved" || row.entity.state.value == "close") ? (row.entity.handlingPersonnelUser ? row.entity.handlingPersonnelUser.name : "无") : (row.entity.groupORHandlerUser || "无")}}</div>' +
+                    '<div class="ui-grid-cell-contents">{{row.entity.acceptUser ? row.entity.acceptUser.name : "无"}}<br>{{row.entity.groupORHandlerUser || "无"}}</div>' +
                     '</div>'
             },
             {
@@ -626,46 +626,16 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         if (response) {
             if (response.status = 200) {
                 $scope.state = response;
-                if (sessionStorage.searchincident && JSON.parse(sessionStorage.getItem("searchincident")).incident) {
-                    angular.forEach($scope.state, function (item) {
-                        if (item.id == JSON.parse(sessionStorage.getItem("searchincident")).incident.statusId) {
-                            $scope.othcode = {
-                                "state": item
-                            };
-                        }
-                    })
-                }
             }
         }
     })
-    if (sessionStorage.searchincident && JSON.parse(sessionStorage.getItem("searchincident")).incident) {
-        if (JSON.parse(sessionStorage.getItem("searchincident")).incident) {
-            $scope.searchkeys = JSON.parse(sessionStorage.getItem("searchincident")).incident;
-        }
-        if ($scope.searchkeys.acceptDate) {
-            $scope.searchkeys.acceptDate = new Date($scope.searchkeys.acceptDate);
-        }
-        if ($scope.searchkeys.acceptDateEnd) {
-            $scope.searchkeys.acceptDateEnd = new Date($scope.searchkeys.acceptDateEnd);
-        }
-    }
+
     $scope.clear = function () {
         $scope.searchkeys = {};
-        $scope.searchstate = JSON.parse(sessionStorage.getItem("searchincident")).searchType;
         $scope.othcode = {};
 
         $scope.try_async_load();
-        var fildata = {
-            "assignee": loginUser.id,
-            "candidateGroups": loginuserGroup,
-            "searchType": JSON.parse(sessionStorage.getItem("searchincident")).searchType,
-            "idx": JSON.parse(sessionStorage.getItem("searchincident")).idx,
-            "sum": JSON.parse(sessionStorage.getItem("searchincident")).sum
-        }
-        sessionStorage.removeItem("searchincident");
-        fildata.assignee = loginUser.id;
-        $scope.memoryfilterData = fildata;
-        $scope.refreshData('expand-right', fildata);
+        $scope.refreshData('expand-right');
         $interval.cancel($scope.timer);
         $scope.timer = $interval(function () {
             $scope.jry_refresh()
@@ -673,15 +643,9 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
     }
     // 刷新
     $scope.jry_refresh = function () {
-        var fildata = {};
-        if (sessionStorage.searchincident) {
-            fildata = JSON.parse(sessionStorage.getItem("searchincident"));
-        } else {
-            fildata = defaultFilterData;
-        }
+        var fildata = defaultFilterData;
         if (fildata.incident && fildata.incident.category) {
             delete fildata.incident.category
-
         }
         fildata.idx = $scope.jry_idx;
         fildata.sum = $scope.jry_sum;
@@ -698,14 +662,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         }
         console.log(item)
 
-        var fildata = {};
-        if (sessionStorage.searchincident) {
-            fildata = JSON.parse(sessionStorage.getItem("searchincident"));
-            $scope.gridOptions.paginationCurrentPage = 1;
-            fildata.idx = 0;
-        } else {
-            fildata = defaultFilterData;
-        }
+        var fildata = defaultFilterData;
         if (!fildata.incident) {
             fildata['incident'] = {};
         }
@@ -718,9 +675,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
 
         var transitiondata = angular.copy(item);
         angular.extend(fildata.incident, transitiondata)
-        sessionStorage['searchincident'] = JSON.stringify(fildata);
         $scope.memoryfilterData = fildata;
-        fildata.assignee = loginUser.id;
         // seimin
         if($scope.searchstate === 'all_del'){
             fildata.searchType = 'all';
@@ -967,7 +922,6 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                     }
                 }
             }
-            fildata.assignee = loginUser.id;
             $scope.refreshData('expand-right', fildata);
         }
         $scope.jry_idx = 0;
@@ -978,10 +932,6 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             $scope.jry_idx = newPage - 1;
             filtersData.sum = pageSize;
             $scope.jry_sum = pageSize;
-            if (JSON.parse(sessionStorage.getItem("searchincident")).idx != filtersData.idx || JSON.parse(sessionStorage.getItem("searchincident")).sum != filtersData.sum) {
-                filtersData.assignee = loginUser.id;
-                $scope.refreshData('expand-right', filtersData);
-            }
         });
 
         $scope.Change = function (upTypes) {
@@ -1043,14 +993,11 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             var grid = this.grid;
             if ($rootScope.user.group) {
                 var filtersData = {
-                    "assignee": loginUser.id,
-                    "candidateGroups": loginuserGroup,
                     idx: 0,
                     sum: mun
                 };
             } else {
                 var filtersData = {
-                    "assignee": loginUser.id,
                     idx: 0,
                     sum: mun
                 };
@@ -1081,7 +1028,6 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                 }
             });
             filtersData.idx = 0;
-            filtersData.assignee = loginUser.id;
             $scope.memoryfilterData = filtersData;
             $scope.refreshData('expand-right', filtersData);
         });
@@ -1149,50 +1095,26 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             console.log(data);
         });
     }
-    //事件提取
+    //接单
     $scope.acceptTaskAction = function (model) {
         var modalInstance = $modal.open({
             templateUrl: 'assets/views/incident/tpl/acceptTask.tpl.html',
-            controller: function ($scope, $modalInstance, APIService, modelData, currentUserId, Alert) {
-                var receiveTask = function (receive_code, modelData) {
-                    var data = {
-                        'receive_code': receive_code
-                    };
-
-                    if (modelData) {
-                        return {
-                            taskId: modelData.taskId,
-                            data: data
-                        };
-                    } else {
-                        return 'error';
-                    }
-                };
+            controller: function ($scope, $modalInstance, modelData, currentUserId, Alert) {
+
                 $scope.title = "提示";
                 $scope.connect = "确认接单？";
                 $scope.ok = function () {
+                    console.log(model);
                     $rootScope.isMask = true;
-                    //接收任务//请求重新指派
-                    var data = receiveTask($scope.receive_code, modelData);
-                    APIService.claimAndCompletedTask(data.taskId, {
-                        userId: currentUserId,
-                        receive_code: "handler"
-                    }).then(function (response) {
+                    api_flow.accept("receive", {incident: model}).then(function (response) {
                         $rootScope.isMask = false;
-                        if (response.status == 200) {
+                        if (response.state == 200) {
                             Alert.swal({
                                 title: "操作成功!",
                                 confirmButtonColor: "#007AFF",
                                 type: "success"
                             });
                             $modalInstance.close('success');
-                        } else if (response.status == 500) {
-                            Alert.swal({
-                                title: "操作失败",
-                                text: "该事件已被提取，请刷新页面!",
-                                type: "error"
-                            });
-                            $modalInstance.close('success');
                         } else {
                             Alert.swal({
                                 title: "操作失败",
@@ -1209,9 +1131,6 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             },
             size: 'sm',
             resolve: {
-                APIService: function () {
-                    return api_bpm_domain;
-                },
                 modelData: function () {
                     return model;
                 },
@@ -1225,7 +1144,6 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         });
         modalInstance.result.then(function (selectedItem) {
             if (selectedItem == 'success') {
-                defaultFilterData.assignee = loginUser.id;
                 $scope.refreshData('expand-right', defaultFilterData);
             }
         });
@@ -1285,13 +1203,6 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                 $scope.user = [];
                 $scope.group = [];
                 $scope.isShowRadioUser = false;
-                // if(model.state.id == 1544){
-                //     $scope.assign.isRadioUser = 1;
-                //     $scope.isShowRadioUser = false;
-                // }else{
-                //     $scope.assign.isRadioUser = 0;
-                //     $scope.isShowRadioUser = true;
-                // }
 
                 // 修改是否指派到人
                 $scope.changeRadioUser = function(){
@@ -1415,76 +1326,21 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                         });
                         return;
                     }
-                    var postData = {};
+                    let postData = {};
 
                     if($scope.assign.user && $scope.assign.user.id){
                         // 派人
-                        // 接单
-                        if(model.state.value == 'pending'){
-                            postData = {
-                                type: 'receiveAssginee',
-                                userId: $scope.assign.user.id,
-                                taskId: model.taskId,
-                                incidentId: model.id,
-                                logType: 'assign',
-                            }
-                        }
-                        // 处理中
-                        if(model.state.value == 'handler'){
-                            postData = {
-                                type: 'handlerAssginee',
-                                userId: $scope.assign.user.id,
-                                taskId: model.taskId,
-                                incidentId: model.id,
-                                logType: 'assign',
-                            }
-                        }
+                        postData ={ incident: {...model, ...{assignee: $scope.assign.user.id}} };
                     } else if($scope.assign.group && $scope.assign.group.id){
                         // 派组
-                        // 接单，派组
-                        if(model.state.value == 'pending'){
-                            postData = {
-                                type: 'receiveGroup',
-                                groupId: $scope.assign.group.id,
-                                taskId: model.taskId,
-                                activityId: 'usertask5',
-                                executionId: model.processInstanceId,
-                                incidentId: model.id,
-                                logType: 'assign',
-                            }
-                        }
-                        // 处理中
-                        if(model.state.value == 'handler'){
-                            postData = {
-                                type: 'handlerGroup',
-                                groupId: $scope.assign.group.id,
-                                taskId: model.taskId,
-                                activityId: 'usertask5',
-                                executionId: model.processInstanceId,
-                                incidentId: model.id,
-                                logType: 'assign',
-                            }
-                        }
+                        postData ={ incident: {...model, ...{candidateGroups: $scope.assign.group.id}} };
                     }
-                    // if($scope.assign.isRadioUser == 1){
-                    //     postData = {
-                    //         assginee:$scope.assign.user.id,
-                    //         handlerIncidentId: model.state.value === 'handler' ? model.id : undefined,
-                    //         incId: model.assignee ? model.id : undefined,
-                    //         incidentId: model.assignee ? undefined : model.id,
-                    //         taskType: model.state.value == 'handler' ? 'handlerform' : (model.state.value == 'pending' ? 'receiveform' : undefined)
-                    //     };
-                    // }else{
-                    //     postData = {
-                    //         group:$scope.assign.group.id,
-                    //         taskType: model.state.value == 'handler' ? 'handlerform' : (model.state.value == 'pending' ? 'receiveform' : undefined)
-                    //     };
-                    // }
+
                     $rootScope.isMask = true;
-                    api_bpm_domain.delegateTask2(postData).then(function (response) {
+                    api_flow.accept("assign", postData).then(function (response) {
                         console.log(response)
                         $rootScope.isMask = false;
-                        if (response.status == 200) {
+                        if (response.state == 200) {
                             Alert.swal({
                                 title: "操作成功!",
                                 confirmButtonColor: "#007AFF",
@@ -1526,7 +1382,6 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         });
         modalInstance.result.then(function (selectedItem) {
             if (selectedItem == 'success') {
-                defaultFilterData.assignee = loginUser.id;
                 $scope.refreshData('expand-right', defaultFilterData);
             }
         });
@@ -1609,63 +1464,21 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                         });
                         return;
                     }
-                    var postData = {};
+                    let postData = {};
 
                     if($scope.assign.user && $scope.assign.user.id){
                         // 派人
-                        // 接单
-                        if(model.state.value == 'pending'){
-                            postData = {
-                                type: 'receiveAssginee',
-                                userId: $scope.assign.user.id,
-                                taskId: model.taskId,
-                                incidentId: model.id,
-                                logType: 'redeploy',
-                            }
-                        }
-                        // 处理中
-                        if(model.state.value == 'handler'){
-                            postData = {
-                                type: 'handlerAssginee',
-                                userId: $scope.assign.user.id,
-                                taskId: model.taskId,
-                                incidentId: model.id,
-                                logType: 'redeploy',
-                            }
-                        }
+                        postData ={ incident: {...model, ...{assignee: $scope.assign.user.id}} };
                     } else if($scope.assign.group && $scope.assign.group.id){
                         // 派组
-                        // 接单，派组
-                        if(model.state.value == 'pending'){
-                            postData = {
-                                type: 'receiveGroup',
-                                groupId: $scope.assign.group.id,
-                                taskId: model.taskId,
-                                activityId: 'usertask5',
-                                executionId: model.processInstanceId,
-                                incidentId: model.id,
-                                logType: 'redeploy',
-                            }
-                        }
-                        // 处理中
-                        if(model.state.value == 'handler'){
-                            postData = {
-                                type: 'handlerGroup',
-                                groupId: $scope.assign.group.id,
-                                taskId: model.taskId,
-                                activityId: 'usertask5',
-                                executionId: model.processInstanceId,
-                                incidentId: model.id,
-                                logType: 'redeploy',
-                            }
-                        }
+                        postData ={ incident: {...model, ...{candidateGroups: $scope.assign.group.id}} };
                     }
 
                     $rootScope.isMask = true;
-                    api_bpm_domain.delegateTask2(postData).then(function (response) {
+                    api_flow.accept("redeploy", postData).then(function (response) {
                         console.log(response)
                         $rootScope.isMask = false;
-                        if (response.status == 200) {
+                        if (response.state == 200) {
                             Alert.swal({
                                 title: "操作成功!",
                                 confirmButtonColor: "#007AFF",
@@ -1707,7 +1520,6 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         });
         modalInstance.result.then(function (selectedItem) {
             if (selectedItem == 'success') {
-                defaultFilterData.assignee = loginUser.id;
                 $scope.refreshData('expand-right', defaultFilterData);
             }
         });
@@ -1730,7 +1542,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                 api_bpm_schedule.del(model.id).then(function (response) {
                     if (response.status == 200) {
                         SweetAlert.swal("操作成功!", "数据已经被删除.", "success");
-                        $scope.refreshData('expand-right', JSON.parse(sessionStorage.getItem("searchincident")));
+                        $scope.refreshData('expand-right');
                     } else {
                         SweetAlert.swal("操作失败!", "数据暂时无法被删除,请稍候重试", "error");
                     }
@@ -1740,6 +1552,11 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             }
         });
     }
+    // 继续创建
+    $scope.storageSj = function(model){
+        console.log(model);
+        $rootScope.newOrder({incident: model});
+    }
     // 新增维修记录弹窗
     $scope.toHandlerLog = function (model) {
         console.log(model)
@@ -1862,7 +1679,6 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         });
         modalInstance.result.then(function (selectedItem) {
             if (selectedItem == 'success') {
-                defaultFilterData.assignee = loginUser.id;
                 $scope.refreshData('expand-right', defaultFilterData);
             }
         });
@@ -1998,7 +1814,6 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         });
         modalInstance.result.then(function (selectedItem) {
             if (selectedItem == 'success') {
-                defaultFilterData.assignee = loginUser.id;
                 $scope.refreshData('expand-right', defaultFilterData);
             }
         });
@@ -2016,15 +1831,12 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
 
     if ($rootScope.user.group) {
         var defaultFilterData = {
-            "assignee": loginUser.id,
-            "candidateGroups": loginuserGroup,
             "searchType": "todo",
             "idx": 0,
             "sum": mun
         };
     } else {
         var defaultFilterData = {
-            "assignee": $rootScope.user.id,
             "searchType": "todo",
             "idx": 0,
             "sum": mun
@@ -2087,42 +1899,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         }
         $scope.ldloading[style.replace('-', '_')] = true;
         if (angular.isUndefined(filterData)) {
-            if (sessionStorage.searchincident) {
-                filterData = JSON.parse(sessionStorage.getItem("searchincident"));
-                if ($scope.searchType) {
-                    filterData.searchType = $scope.searchType;
-                }
-                $scope.gridOptions.paginationCurrentPage = 1 + filterData.idx;
-                if($state.params.tab){
-                    $scope.searchstate = $state.params.tab;
-                    filterData.searchType = $state.params.tab;
-                    filterData.idx = 0;
-                    $scope.gridOptions.paginationCurrentPage = 1 + filterData.idx;
-                    sessionStorage.setItem('searchincident',JSON.stringify(filterData));
-                }else{
-                    $scope.searchstate = filterData.searchType;
-                }
-                if($state.params.date == 'today'){
-                    $scope.othcode = {};
-                    $scope.searchkeys.acceptDate = new Date();
-                    $scope.searchkeys.acceptDateEnd = new Date();
-                    filterData.incident = {acceptDate:moment().format('YYYY-MM-DD 00:00:00'),acceptDateEnd:moment().format('YYYY-MM-DD 23:59:59')};
-                    sessionStorage.setItem("searchincident",JSON.stringify(filterData));
-                }else{
-                    $scope.searchkeys.acceptDate = null;
-                    $scope.searchkeys.acceptDateEnd = null;
-                }
-                if($state.params.state){
-                    var obj = $scope.state.find(function(v){return $state.params.state == v.id});
-                    $scope.othcode = {state:obj};
-                    filterData.incident = {statusId: $state.params.state};
-                    sessionStorage.setItem("searchincident",JSON.stringify(filterData));
-                }
-                if (filterData.incident && filterData.incident.category) {
-                    delete filterData.incident.category
-                }
-            } else {
-                filterData = defaultFilterData;
+            filterData = defaultFilterData;
                 if ($scope.searchType) {
                     filterData.searchType = $scope.searchType;
                     if (filterData.searchType == 'overDate') {
@@ -2134,7 +1911,6 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                     filterData.searchType = $state.params.tab;
                     filterData.idx = 0;
                     $scope.gridOptions.paginationCurrentPage = 1 + filterData.idx;
-                    sessionStorage.setItem('searchincident',JSON.stringify(filterData));
                 }else{
                     $scope.searchstate = filterData.searchType;
                 }
@@ -2143,7 +1919,6 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                     $scope.searchkeys.acceptDate = new Date();
                     $scope.searchkeys.acceptDateEnd = new Date();
                     filterData.incident = {acceptDate:moment().format('YYYY-MM-DD 00:00:00'),acceptDateEnd:moment().format('YYYY-MM-DD 23:59:59')};
-                    sessionStorage.setItem("searchincident",JSON.stringify(filterData));
                 }else{
                     $scope.searchkeys.acceptDate = null;
                     $scope.searchkeys.acceptDateEnd = null;
@@ -2152,9 +1927,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                     var obj = $scope.state.find(function(v){return $state.params.state == v.id});
                     $scope.othcode = {state:obj};
                     filterData.incident = {statusId: $state.params.state};
-                    sessionStorage.setItem("searchincident",JSON.stringify(filterData));
                 }
-            }
         } else {
             filterData.searchType = $scope.searchstate;
         }
@@ -2171,7 +1944,6 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             window.sessionStorage.removeItem('isGoyuqi');
         }
         $scope.myData = [];
-        sessionStorage['searchincident'] = angular.copy(JSON.stringify(filterData));
         $scope.memoryfilterData = filterData;
         $scope.gridOptions['sum'] = filterData.sum;
         // 如果是全部，则根据权限查询
@@ -2258,54 +2030,17 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
 
         $scope.ldloading[style.replace('-', '_')] = true;
         if (angular.isUndefined(filterData)) {
-            if (sessionStorage.searchincident) {
-                filterData = JSON.parse(sessionStorage.getItem("searchincident"));
-                if ($scope.searchType) {
-                    filterData.searchType = $scope.searchType;
-                }
-                $scope.gridOptions.paginationCurrentPage = 1 + filterData.idx;
-                if($state.params.tab){
-                    $scope.searchstate = $state.params.tab;
-                    filterData.searchType = $state.params.tab;
-                    filterData.idx = 0;
-                    $scope.gridOptions.paginationCurrentPage = 1 + filterData.idx;
-                    sessionStorage.setItem('searchincident',JSON.stringify(filterData));
-                }else{
-                    $scope.searchstate = filterData.searchType;
-                }
-                if($state.params.date == 'today'){
-                    $scope.othcode = {};
-                    $scope.searchkeys.acceptDate = new Date();
-                    $scope.searchkeys.acceptDateEnd = new Date();
-                    filterData.incident = {acceptDate:moment().format('YYYY-MM-DD 00:00:00'),acceptDateEnd:moment().format('YYYY-MM-DD 23:59:59')};
-                    sessionStorage.setItem("searchincident",JSON.stringify(filterData));
-                }else{
-                    $scope.searchkeys.acceptDate = null;
-                    $scope.searchkeys.acceptDateEnd = null;
-                }
-                if($state.params.state){
-                    var obj = $scope.state.find(function(v){return $state.params.state == v.id});
-                    $scope.othcode = {state:obj};
-                    filterData.incident = {statusId: $state.params.state};
-                    sessionStorage.setItem("searchincident",JSON.stringify(filterData));
-                }
-                if (filterData.incident && filterData.incident.category) {
-                    delete filterData.incident.category
-                }
-            } else {
-                filterData = defaultFilterData;
-                if ($scope.searchType) {
-                    filterData.searchType = $scope.searchType;
-                    if (filterData.searchType == 'overDate') {
-                        $scope.searchstate = 'overDate';
-                    }
+            filterData = defaultFilterData;
+            if ($scope.searchType) {
+                filterData.searchType = $scope.searchType;
+                if (filterData.searchType == 'overDate') {
+                    $scope.searchstate = 'overDate';
                 }
             }
         }else{
             filterData.searchType = $scope.searchstate;
         }
         $scope.myData = [];
-        sessionStorage['searchincident'] = angular.copy(JSON.stringify(filterData));
         $scope.memoryfilterData = filterData;
         $scope.gridOptions['sum'] = filterData.sum;
         // 如果是全部，则根据权限查询
@@ -2387,26 +2122,9 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
 
     };
     // 进入页面时111
-    if(window.sessionStorage.getItem('searchincident')){
-        var varLin = JSON.parse(window.sessionStorage.getItem('searchincident'));
-        if(varLin.incident&&varLin.incident.selectType){
-            if(varLin.incident.selectType == '2'){
-                console.log(defaultFilterData)
-                $scope.searchkeys.selectType = {id:'2',name:'是'};
-            }else if(varLin.incident.selectType == '0'){
-                console.log(defaultFilterData)
-                $scope.searchkeys.selectType = {id:'0',name:'否'};
-            }
-        }
-    }
     if(window.sessionStorage.getItem('isGoyuqi') === 'yes'){
         $scope.selectTypeChange();
     }else{
-        if(sessionStorage.getItem("searchincident")){
-            var ss = JSON.parse(sessionStorage.getItem("searchincident"));
-            delete ss.incident;
-            sessionStorage.setItem("searchincident",JSON.stringify(ss));
-        }
         $scope.refreshData('expand-right');
     }
 
@@ -2425,6 +2143,7 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$scope', '$state', function (
     $scope.qiangdan = false;
     $scope.huifang = false;
     $scope.delFlag = false;
+    $scope.storageFlag = false;
     $scope.editFlag = false;//编辑
     $scope.assignFlag = false;//指派
     $scope.transferFlag = false;//转派
@@ -2443,6 +2162,9 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$scope', '$state', function (
         if (loginUser.menu[i].link == "shijianliebiao_del") {
             $scope.delFlag = true
         }
+        if (loginUser.menu[i].link == "shijianliebiao_build") {
+            $scope.storageFlag = true
+        }
         if (loginUser.menu[i].link == "shijianliebiao_edit") {
             $scope.editFlag = true
         }
@@ -2480,8 +2202,10 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$scope', '$state', function (
     }
 
     $rootScope.user.group.forEach(function (item, v) {
-        if (item.id == $scope.item.candidateGroups) {
-            $scope.item.tiquPower = true;
+        if($scope.item.currentLog){
+            if (item.id == $scope.item.currentLog.groupId) {
+                $scope.item.tiquPower = true;
+            }
         }
     })
 
@@ -2523,6 +2247,10 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$scope', '$state', function (
     $scope.delSj = function () {
         $scope.colobject.grid.appScope.delSj($scope.item);
     }
+    // 继续创建
+    $scope.storageSj = function () {
+        $scope.colobject.grid.appScope.storageSj($scope.item);
+    }
     // 新增维修记录
     $scope.toHandlerLog = function () {
         $scope.colobject.grid.appScope.toHandlerLog($scope.item);
@@ -2537,22 +2265,17 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$scope', '$state', function (
     }
     $scope.handler = function () {
         $scope.colobject.grid.appScope.acceptTaskAction($scope.item);
-        $scope.doComment($scope.item.id);
     }
     //查看
     $scope.toDetail = function (data) {
         console.log(data,$rootScope.isFuwutai);
         if($rootScope.isFuwutai){
             //角色是服务台人员
-            $state.go('app.incident.detail', {
-                formKey: 'incident_back',
-                pdKey: 'incident',
-                dataId: data.id,
-                taskId: data.taskId,
-                processInstanceId: data.processInstanceId
+            $state.go('app.incident.incidentDetail', {
+                id: data.id,
             });
         }else{
-            window.open(location.origin+'/#/app/incident/detail/incident_back/incident/'+data.id+'/'+data.taskId+'/'+data.processInstanceId+'//');
+            window.open(location.origin+'/#/app/incident/incidentDetail/'+data.id);
         }
     };
 }]);
@@ -2568,14 +2291,15 @@ app.directive('incidentoperator', function () {
         template: '<div><div class="cl-effect-1 ui-grid-cell-contents pull-left" style="text-align:left;">' +
             '<a ng-click="toDetail(item)" class="bianjifont" >查看</a>' +
             '<a ng-click="changeCenter()"  ng-show="jry_modify(item)"  class="luyinfont">编辑</a>' +
-            '<a ng-click="delSj()" ng-show="{{delFlag&&item.state.value!== \'deleted\'}}" class="assign" >删除</a><br>' +
-            '<a ng-click="edit()"  ng-show="{{item.chaozuoPower&&chuli}}"  class="bianjifont">处理</a>' +
-            '<a ng-click="handler()" ng-show="{{item.state.id != 1546 &&!item.handlerUser&&item.tiquPower&&qiangdan}}" class="bianjifont" >接单</a>' +
-            '<a ng-click="visit()"  ng-show="{{item.huifang&&huifang}}"  class="bianjifont">回访</a>' +
-            '<a ng-click="toAssign()" ng-show="{{(item.state.id==1543||item.state.id==1544)&&assignFlag}}" class="assign" >指派</a>' +
-            '<a ng-click="toTransfer()" ng-show="{{(item.state.id==1544)&&item.handlerUser&&item.handlerUser.id == user.id&&!assignFlag&&transferFlag}}" class="assign" >转派</a>' +
-            '<a ng-click="toHandlerLog()" ng-show="{{item.state.id==1544}}" class="assign" >维修进度</a>' +
-            '<a ng-click="setDuty()" ng-show="{{shijianliebiao_duty && (item.state.id==1545 || item.state.id==1546)}}" class="assign" >设置责任科室</a>' +
+            '<a ng-click="delSj()" ng-show="{{delFlag && item.state.value !== \'deleted\'}}" class="assign" >删除</a>' +
+            '<a ng-click="storageSj()" ng-show="{{storageFlag && item.state.value === \'storage\'}}" class="assign" >继续创建</a><br>' +
+            '<a ng-click="edit()"  ng-show="{{item.chaozuoPower && chuli}}"  class="bianjifont">处理</a>' +
+            '<a ng-click="handler()" ng-show="{{item.state.value == \'pending\' && ((item.currentLog && item.currentLog.workerId == user.id) || item.tiquPower) && qiangdan}}" class="bianjifont" >接单</a>' +
+            '<a ng-click="visit()"  ng-show="{{item.huifang && huifang}}"  class="bianjifont">回访</a>' +
+            '<a ng-click="toAssign()" ng-show="{{(item.state.value == \'pending\' || item.state.value == \'handler\') && assignFlag}}" class="assign" >指派</a>' +
+            '<a ng-click="toTransfer()" ng-show="{{item.state.value == \'handler\' && item.handlingPersonnelUser && item.handlingPersonnelUser.id == user.id && !assignFlag && transferFlag}}" class="assign" >转派</a>' +
+            '<a ng-click="toHandlerLog()" ng-show="{{item.state.value == \'handler\'}}" class="assign" >维修进度</a>' +
+            '<a ng-click="setDuty()" ng-show="{{shijianliebiao_duty && (item.state.value == \'resolved\' || item.state.value == \'close\')}}" class="assign" >设置责任科室</a>' +
             '</div></div>'
     };
 });

assets/js/controllers/mainCtrl.js

@@ -2,8 +2,8 @@
 /**
  * Clip-Two Main Controller
  */
-app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$localStorage', '$cookieStore', '$window', '$modal', '$document', '$timeout', '$filter', '$auth', 'cfpLoadingBar', 'DDP', 'deskNotification', 'Restangular', 'api_login', 'api_text', 'api_user_data', 'api_wechatfile', 'api_bpm_data', 'api_msg', 'Myservice', '$interval', 'jry_api_bpm','fileReader','api_custom','api_category','api_simple','WebsocketPhoneService','api_newreport',
-function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $window, $modal, $document, $timeout, $filter, $auth, cfpLoadingBar, DDP, deskNotification, Restangular, api_login, api_text, api_user_data, api_wechatfile, api_bpm_data, api_msg, Myservice, $interval, jry_api_bpm,fileReader,api_custom,api_category,api_simple,WebsocketPhoneService,api_newreport) {
+app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$localStorage', '$cookieStore', '$window', '$modal', '$document', '$timeout', '$filter', '$auth', 'cfpLoadingBar', 'DDP', 'deskNotification', 'Restangular', 'api_login', 'api_text', 'api_user_data', 'api_wechatfile', 'api_bpm_data', 'api_msg', 'Myservice', '$interval', 'jry_api_bpm','fileReader','api_custom','api_category','api_simple','WebsocketPhoneService','api_newreport', 'api_flow',
+function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $window, $modal, $document, $timeout, $filter, $auth, cfpLoadingBar, DDP, deskNotification, Restangular, api_login, api_text, api_user_data, api_wechatfile, api_bpm_data, api_msg, Myservice, $interval, jry_api_bpm,fileReader,api_custom,api_category,api_simple,WebsocketPhoneService,api_newreport,api_flow) {
 
     // 未读消息数量seimin
     $rootScope.getMsgNum = function (id) {
@@ -3896,97 +3896,148 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
             }
             $rootScope.isMask = true;
             var repair_main = JSON.parse(sessionStorage.getItem('repair_main'));
+            // var postData = {
+            //   "loginUser": $rootScope.user,
+            //   "incident": {
+            //       "deleteFlag": 0,
+            //       "duty":$scope.selectedDuty?$scope.selectedDuty:undefined,
+            //       "department": $scope.incidentModel.department||undefined,
+            //       "contactsInformation": $scope.incidentModel.contactsInformation,
+            //       "contacts": $scope.incidentModel.contacts,
+            //       "branch": $scope.incidentModel.branch?$scope.incidentModel.branch.id:undefined,
+            //       "area": $scope.incidentModel.area||undefined,
+            //       "place": $scope.incidentModel.place||undefined,
+            //       "houseNumber": $scope.incidentModel.address,
+            //       "category": $scope.categorySelect||undefined,
+            //       "priority": $scope.incidentModel.priority||undefined,
+            //       "source": $scope.incidentModel.source||undefined,
+            //       "title": $scope.categorySelect.category,
+            //       "description": $scope.incidentModel.description,
+            //       "yyTime": $scope.incidentModel.yyTime ? moment($scope.incidentModel.yyTime).format('YYYY-MM-DD HH:mm:ss') : undefined,
+            //       "repairType": repair_main?repair_main.valueconfig:undefined,
+            //       "requester":$scope.incidentModel.requester||undefined,
+            //       "acceptUser": $rootScope.user||undefined,
+            //       "callID": $scope.incidentModel.callID||undefined,
+            //       "incomingPhone": $scope.incidentModel.incomingPhone||undefined,
+            //   },
+            //   "start_code": "assignment",
+            //   "initUser": $rootScope.user.id
+            // };
             var postData = {
-              "loginUser": $rootScope.user,
-              // "isRoom": false,
-              // "state": "已登记",
-              // "submit": "创建事件",
-              // "close": "取消",
-              // "startSave": "true",
-              // "label": "事件工单",
-              // "addstr": "",
-              // "placeholder": "请填写事件单基本信息，“*”为必填项。",
               "incident": {
-                  "deleteFlag": 0,
-                  "duty":$scope.selectedDuty?$scope.selectedDuty:undefined,
-                  // "isRepeat": false,
-                  // "reason": {
-                  //     "id": 40
-                  // },
-                  // "complexity": {
-                  //     "id": ""
-                  // },
-                  // "emergency": {
-                  //     "id": ""
-                  // },
-                  // "influence": {
-                  //     "id": ""
-                  // },
-                  // "relationType": "",
-                  // "relationIncidentId": "",
-                  // "expectResponseTime": 60,
-                  // "expectIntroTime": 480,
-                  // "incidentsign": "SJ2207280059",
-                  "department": $scope.incidentModel.department||undefined,
-                  "contactsInformation": $scope.incidentModel.contactsInformation,
-                  "contacts": $scope.incidentModel.contacts,
-                  "branch": $scope.incidentModel.branch?$scope.incidentModel.branch.id:undefined,
-                  "area": $scope.incidentModel.area||undefined,
-                  "place": $scope.incidentModel.place||undefined,
-                  // "room": {
-                  //     "id": ""
-                  // },
-                  "houseNumber": $scope.incidentModel.address,
-                  "category": $scope.categorySelect||undefined,
-                  "priority": $scope.incidentModel.priority||undefined,
-                  "source": $scope.incidentModel.source||undefined,
-                  "title": $scope.categorySelect.category,
-                  "description": $scope.incidentModel.description,
-                  // "handlerUser": $scope.incidentModel.user,
-                  "yyTime": $scope.incidentModel.yyTime ? moment($scope.incidentModel.yyTime).format('YYYY-MM-DD HH:mm:ss') : undefined,
-                  // "closecode": {},
-                  // "degree": {},
-                  "repairType": repair_main?repair_main.valueconfig:undefined,
-                  "requester":$scope.incidentModel.requester||undefined,
-                  // "selecthouseNumber": {
-                  //     "id": 1
-                  // },
-                  "acceptUser": $rootScope.user||undefined,
-                  "callID": $scope.incidentModel.callID||undefined,
-                  "incomingPhone": $scope.incidentModel.incomingPhone||undefined,
-                  // "branchId": 1,
-                  // "branchType": 0,
-                  // "overdueTime": "2022-07-29 17:52:00"
-              },
-              // "alarmType": false,
-              // "isRepeat": false,
-              // "isHandlerUser": true,
-              // "directClose": true,
-              "start_code": "assignment",
-              // "save": "暂存",
-              // "_flowList_": [
-              //     "alarmType"
-              // ],
-              // "bpm_activiti": {},
-              // "repeatIncidentShow": true,
-              // "isHasSimple": false,
-              // "isPriority": true,
-              // "assignee": $scope.incidentModel.user.id,
-              // "handler_code": "resolve",
-              "initUser": $rootScope.user.id
+                "deleteFlag": 0,
+                "duty":$scope.selectedDuty?$scope.selectedDuty:undefined,
+                "department": $scope.incidentModel.department||undefined,
+                "contactsInformation": $scope.incidentModel.contactsInformation,
+                "contacts": $scope.incidentModel.contacts,
+                "branch": $scope.incidentModel.branch?$scope.incidentModel.branch.id:undefined,
+                "area": $scope.incidentModel.area||undefined,
+                "place": $scope.incidentModel.place||undefined,
+                "houseNumber": $scope.incidentModel.address,
+                "category": $scope.categorySelect||undefined,
+                "priority": $scope.incidentModel.priority||undefined,
+                "source": $scope.incidentModel.source||undefined,
+                "title": $scope.categorySelect.category,
+                "description": $scope.incidentModel.description,
+                "yyTime": $scope.incidentModel.yyTime ? moment($scope.incidentModel.yyTime).format('YYYY-MM-DD HH:mm:ss') : undefined,
+                "repairType": repair_main?repair_main.valueconfig:undefined,
+                "requester":$scope.incidentModel.requester||undefined,
+                "acceptUser": $rootScope.user||undefined,
+                "callID": $scope.incidentModel.callID||undefined,
+                "incomingPhone": $scope.incidentModel.incomingPhone||undefined,
+              }
             };
-            if(modelData){
-              // 微信报修转事件
-              postData.flow = modelData.flow;
+            // if(modelData){
+            //   // 微信报修转事件
+            //   postData.flow = modelData.flow;
+            // }
+            if($scope.incidentModel.assign == 1){
+              postData.incident.assignee = $scope.incidentModel.user.id;
+            }else if($scope.incidentModel.assign == 2){
+              postData.incident.candidateGroups = $scope.incidentModel.group.id;
             }
+            api_bpm_domain.workernumber('sj').then(res1=>{
+              postData.incident.incidentsign = res1.data;
+              api_flow.accept("accept", postData).then(function (response) {
+                if ($scope.uploader != null) {
+                  // 有图片
+                    $scope.uploader.onBeforeUploadItem = function(item) {
+                        angular.extend(item.headers, $rootScope.getSession());
+                        item.url = api_bpm_domain.uploadAttachment(response.id).getRequestedUrl();
+                        item.formData.push({ 'fileName': item.file.name });
+                    };
+                    $scope.uploader.uploadAll();
+                }
+                $rootScope.isMask = false;
+                SweetAlert.swal(
+                  {
+                    title: "保存成功!",
+                    type: "success",
+                    confirmButtonColor: "#007AFF",
+                  },
+                  function (isConfirm) {
+                    if(isConfirm){
+                      // 是否连续建单
+                      if($scope.isBuildOrderAgagin){
+                        $scope.categorySelect = "";
+                        $scope.categorySelectId = 0;
+                        $scope.incidentModel.assign = 1;
+                        $scope.incidentModel.user = "";
+                        $scope.incidentModel.group = "";
+                      }else{
+                        if (localStorage.getItem('fenjiNumber')) {
+                          $rootScope.jry_shixian();
+                        }
+                        $modalInstance.dismiss("cancel");
+                      }
+                      $rootScope.newOrderShowOpen = false;
+                      $state.go("app.incident.list");
+                    }
+                  }
+                );
+              });
+            })
+          }
+          // 暂存
+          $scope.temporaryStorage = function(){
+            $rootScope.isMask = true;
+            var repair_main = JSON.parse(sessionStorage.getItem('repair_main'));
+            var postData = {
+              "incident": {
+                "deleteFlag": 0,
+                "duty":$scope.selectedDuty?$scope.selectedDuty:undefined,
+                "department": $scope.incidentModel.department||undefined,
+                "contactsInformation": $scope.incidentModel.contactsInformation,
+                "contacts": $scope.incidentModel.contacts,
+                "branch": $scope.incidentModel.branch?$scope.incidentModel.branch.id:undefined,
+                "area": $scope.incidentModel.area||undefined,
+                "place": $scope.incidentModel.place||undefined,
+                "houseNumber": $scope.incidentModel.address,
+                "category": $scope.categorySelect||undefined,
+                "priority": $scope.incidentModel.priority||undefined,
+                "source": $scope.incidentModel.source||undefined,
+                "title": $scope.categorySelect.category,
+                "description": $scope.incidentModel.description,
+                "yyTime": $scope.incidentModel.yyTime ? moment($scope.incidentModel.yyTime).format('YYYY-MM-DD HH:mm:ss') : undefined,
+                "repairType": repair_main?repair_main.valueconfig:undefined,
+                "requester":$scope.incidentModel.requester||undefined,
+                "acceptUser": $rootScope.user||undefined,
+                "callID": $scope.incidentModel.callID||undefined,
+                "incomingPhone": $scope.incidentModel.incomingPhone||undefined,
+              }
+            };
+            // if(modelData){
+            //   // 微信报修转事件
+            //   postData.flow = modelData.flow;
+            // }
             if($scope.incidentModel.assign == 1){
-              postData.assignee = $scope.incidentModel.user.id;
+              postData.incident.assignee = $scope.incidentModel ? $scope.incidentModel.user.id : undefined;
             }else if($scope.incidentModel.assign == 2){
-              postData.candidateGroups = $scope.incidentModel.group.id;
+              postData.incident.candidateGroups = $scope.incidentModel ? $scope.incidentModel.group.id : undefined;
             }
             api_bpm_domain.workernumber('sj').then(res1=>{
               postData.incident.incidentsign = res1.data;
-              api_bpm_domain.start("bpm_incident", postData).then(function (response) {
+              api_flow.accept("storage", postData).then(function (response) {
                 if ($scope.uploader != null) {
                   // 有图片
                     $scope.uploader.onBeforeUploadItem = function(item) {
@@ -4323,48 +4374,52 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                   $rootScope.isMask = true;
                   console.log(scope.incidentModel,$scope.incidentModel);
                   var repair_main = JSON.parse(sessionStorage.getItem('repair_main'));
+                  // var postData = {
+                  //   "loginUser": $rootScope.user||undefined,
+                  //   "incident": {
+                  //     "deleteFlag": 0,
+                  //     "duty":scope.selectedDuty?scope.selectedDuty:undefined,
+                  //     "requester":$scope.incidentModel.requester||undefined,
+                  //     "alarmType": false,
+                  //     "department": scope.incidentModel.department||undefined,
+                  //     "contactsInformation": scope.incidentModel.contactsInformation,
+                  //     "contacts": scope.incidentModel.contacts,
+                  //     "branch": scope.incidentModel.branch?scope.incidentModel.branch.id:undefined,
+                  //     "area": scope.incidentModel.area||undefined,
+                  //     "place": scope.incidentModel.place||undefined,
+                  //     "houseNumber": scope.incidentModel.address,
+                  //     "category": scope.categorySelect||undefined,
+                  //     "priority": scope.incidentModel.priority||undefined,
+                  //     "source": scope.incidentModel.source||undefined,
+                  //     "title": scope.categorySelect.category,
+                  //     "description": scope.incidentModel.description,
+                  //     "directProcess": 1,
+                  //     "handleDescription": $scope.incidentModel.handlerMsg,
+                  //     "handlingPersonnelUser":{id:$rootScope.user.id},
+                  //     "yyTime": scope.incidentModel.yyTime ? moment(scope.incidentModel.yyTime).format('YYYY-MM-DD HH:mm:ss') : undefined,
+                  //     "closecode": $scope.incidentModel.closecode||undefined,
+                  //     "repairType": repair_main?repair_main.valueconfig:undefined,
+                  //     "acceptUser": $rootScope.user||undefined,
+                  //     "callID": scope.incidentModel.callID||undefined,
+                  //     "incomingPhone": scope.incidentModel.incomingPhone||undefined,
+                  //   },
+                  //   "start_code": "close",
+                  //   "handler_code": "resolve",
+                  //   "initUser": $rootScope.user.id,
+                  //   "isSolution": false
+                  // };
                   var postData = {
-                    "loginUser": $rootScope.user||undefined,
-                    // "isRoom": false,
-                    // "state": "已登记",
-                    // "submit": "创建事件",
-                    // "close": "取消",
-                    // "startSave": "true",
-                    // "label": "事件工单",
-                    // "addstr": "",
-                    // "placeholder": "请填写事件单基本信息，“*”为必填项。",
                     "incident": {
                       "deleteFlag": 0,
                       "duty":scope.selectedDuty?scope.selectedDuty:undefined,
                       "requester":$scope.incidentModel.requester||undefined,
                       "alarmType": false,
-                      // "isRepeat": false,
-                      // "reason": {
-                      //     "id": 40
-                      // },
-                      // "complexity": {
-                      //     "id": ""
-                      // },
-                      // "emergency": {
-                      //     "id": ""
-                      // },
-                      // "influence": {
-                      //     "id": ""
-                      // },
-                      // "relationType": "",
-                      // "relationIncidentId": "",
-                      // "expectResponseTime": 60,
-                      // "expectIntroTime": 480,
-                      // "incidentsign": "SJ2207280059",
                       "department": scope.incidentModel.department||undefined,
                       "contactsInformation": scope.incidentModel.contactsInformation,
                       "contacts": scope.incidentModel.contacts,
                       "branch": scope.incidentModel.branch?scope.incidentModel.branch.id:undefined,
                       "area": scope.incidentModel.area||undefined,
                       "place": scope.incidentModel.place||undefined,
-                      // "room": {
-                      //     "id": ""
-                      // },
                       "houseNumber": scope.incidentModel.address,
                       "category": scope.categorySelect||undefined,
                       "priority": scope.incidentModel.priority||undefined,
@@ -4374,46 +4429,21 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                       "directProcess": 1,
                       "handleDescription": $scope.incidentModel.handlerMsg,
                       "handlingPersonnelUser":{id:$rootScope.user.id},
-                      // "handlerUser": scope.incidentModel.user,
                       "yyTime": scope.incidentModel.yyTime ? moment(scope.incidentModel.yyTime).format('YYYY-MM-DD HH:mm:ss') : undefined,
                       "closecode": $scope.incidentModel.closecode||undefined,
-                      // "degree": {},
                       "repairType": repair_main?repair_main.valueconfig:undefined,
-                      // "selecthouseNumber": {
-                      //     "id": 1
-                      // },
                       "acceptUser": $rootScope.user||undefined,
                       "callID": scope.incidentModel.callID||undefined,
                       "incomingPhone": scope.incidentModel.incomingPhone||undefined,
-                      // "branchId": 1,
-                      // "branchType": 0,
-                      // "overdueTime": "2022-07-29 17:52:00"
                     },
-                    // "alarmType": false,
-                    // "isRepeat": false,
-                    // "isHandlerUser": true,
-                    // "directClose": true,
-                    "start_code": "close",
-                    // "save": "暂存",
-                    // "_flowList_": [
-                    //     "alarmType"
-                    // ],
-                    // "bpm_activiti": {},
-                    // "repeatIncidentShow": true,
-                    // "isHasSimple": false,
-                    // "isPriority": true,
-                    // "assignee": $scope.incidentModel.user.id,
-                    "handler_code": "resolve",
-                    "initUser": $rootScope.user.id,
-                    "isSolution": false
                   };
-                  if(scope.modelData){
-                    // 微信报修转事件
-                    postData.flow = scope.modelData.flow;
-                  }
+                  // if(scope.modelData){
+                  //   // 微信报修转事件
+                  //   postData.flow = scope.modelData.flow;
+                  // }
                   api_bpm_domain.workernumber('sj').then(res1=>{
                     postData.incident.incidentsign = res1.data;
-                    api_bpm_domain.start("bpm_incident", postData).then(function (resData) {
+                    api_flow.accept("accept", postData).then(function (resData) {
                       if (scope.uploader != null) {
                         // 有图片
                           scope.uploader.onBeforeUploadItem = function(item) {

assets/js/main.js

@@ -713,26 +713,13 @@ app.factory('api_flow', ['FlowRestangular', function (FlowRestangular) {
     var r_data = FlowRestangular.all("");
 
     return {
+        // 与我关联
         owns: function (data) {
             return r_data.customPOST(data, 'owns', {});
         },
-        addListData: function (model, data) {
-            return r_data.customPOST(data, 'addListData/' + model, {});
-        },
-        fetchDataList: function (model, data) {
-            return r_data.customPOST(data, 'fetchDataList/' + model, {});
-        },
-        fetchData: function (model, data) {
-            return r_data.customPOST(data, 'fetchData/' + model, {});
-        },
-        addData: function (model, data) {
-            return r_data.customPOST(data, 'addData/' + model, {});
-        },
-        updData: function (model, data) {
-            return r_data.customPOST(data, 'updData/' + model, {});
-        },
-        rmvData: function (model, data) {
-            return r_data.customPOST(data, 'rmvData/' + model, {});
+        // 建单
+        accept: function (model, data) {
+            return r_data.customPOST(data, 'incident/task/' + model, {});
         },
     }
 }]);
@@ -752,8 +739,8 @@ app.factory('api_simple', ['SimpleRestangular', function (SimpleRestangular) {
         fetchDataList: function (model, data) {
             return r_data.customPOST(data, 'fetchDataList/' + model, {});
         },
-        fetchData: function (model, data) {
-            return r_data.customPOST(data, 'fetchData/' + model, {});
+        fetchData: function (model, dataId) {
+            return r_data.customGET('fetchData/' + model + '/' + dataId);
         },
         addData: function (model, data) {
             return r_data.customPOST(data, 'addData/' + model, {});

assets/views/incident/incidentDetail.html

@@ -0,0 +1,559 @@
+<style>
+    .tree-control .tree-view .item-container:hover,
+    .tree-control .tree-view .selected,
+    .tree-control .tree-view .active {
+        background-color: #428bca;
+        background-image: linear-gradient(#428bca, #428bca) !important;
+        background: #428bca;
+        color: #fff;
+    }
+
+    .tree-control .tree-view .item-container:hover .expand,
+    .tree-control .tree-view .selected .expand,
+    .tree-control .tree-view .active .expand {
+        border-left: 10px solid #fff;
+    }
+
+    .tree-control .tree-view .item-container:hover .expand-opened,
+    .tree-control .tree-view .selected .expand-opened,
+    .tree-control .tree-view .active .expand-opened {
+        border-bottom: 0px solid transparent;
+        border-left: 6px solid transparent;
+        border-right: 6px solid transparent;
+        border-top: 10px solid #fff;
+    }
+
+    textarea.autosize {
+        height: 100px;
+    }
+
+    /* 事件工单信息 */
+    .ui-workernumbersign .inp{
+        width: 50px;
+    }
+    .ui-workernumbersign img{
+        width: 100%;
+    }
+
+    /* 报修/处理图片 */
+    .ui-repair-photos .fileupload{
+        width: 100px;
+        height: 100px;
+        border: 1px dotted #ccc;
+        display: inline-block;
+        background: #fff;
+        margin: 1%;
+    }
+    .ui-repair-photos .imgsBox {
+        border: 1px solid #ddd;
+        display: flex;
+        flex-wrap: wrap;
+        padding: 10px 10px;
+    }
+    /* 处理节点 */
+    .ui-followStatus2 .center{
+        text-align: center!important;
+    }
+    /* 联系电话 */
+    .ui-inputcall .input-group-btn{
+        height: 28px!important;
+    }
+    .ui-inputcall .input-group-btn:last-child>.btn{
+        height: 28px;
+    }
+    /* 处理方案 */
+    .ui-divTextarea #textarea {
+        height: auto;
+        min-height: 28px;
+        width: 100%;
+        padding: 4px;
+        color: #666;
+        background-color: #eee;
+        border: 1px solid #dedede;
+        border-radius: 2px;
+        resize: vertical;
+        overflow: auto;
+        transition-duration: 0.1s;
+        transition: 300ms ease-in-out;
+        font-size: 14px;
+    }
+    .ui-divTextarea #textarea img{
+        width: 400px;
+    }
+
+    .ui-divTextarea #textarea:focus,
+    .ui-divTextarea #textarea:hover {
+        outline: none;
+        background: #f7f7f8 !important;
+        border-color: #F8F8F8;
+    }
+</style>
+<div ng-controller="incidentDetailCtrl">
+    <form ng-submit="vm.submit(vm.model,'expand-right')" class="fontcolor-two">
+        <div class="panel">
+            <div class="col-xs-12 ui-title">
+                <section id="page-title-form">
+                    <div class="row">
+                        <div class="col-sm-8">
+                            <h1 class="mainTitle">
+                                事件详情<i tooltip="请查看事件" tooltip-placement="right" class="fa ti-help-alt margin-left-10 fontcolor-five pointfont"></i>
+                            </h1>
+                        </div>
+                    </div>
+                </section>
+            </div>
+        </div>
+        <div class="panel col-xs-3 col-left-0 ">
+            <div class="row">
+                <div class="col-xs-12 ui-deptinformation">
+                    <div class="row searchrequster" id="searchid">
+                        <div class="col-md-12 formheard_pad">
+                            <div class="pull-left fontcolor-two fontsizes-16 font-weight-500">
+                            报修科室基本信息
+                            </div>
+                        </div>
+                        <div class="col-md-12 col-10 requestconnect padding-top-5">
+                            <div class="requestback pull-left">
+                                <div class="col-md-12">
+                                <div class="control-label col-xs-12 fontsizes-16 formheardpad">
+                                    <div class="row">
+                                    <div class="demo pull-left">科室名称</div>
+                                    <span class="font-weight-600">: {{model.department.dept}}</span>
+                                    </div>
+                                </div>
+                                </div>
+                                <div class="col-md-12">
+                                <div class="control-label col-xs-12 fontsizes-16 formheardpad">
+                                    <div class="row">
+                                    <div class="demo pull-left">区域地点</div>
+                                    <span class="font-weight-600">
+                                        :
+                                        {{model.department.place.area.area+''+model.department.place.place}}</span
+                                    >
+                                    </div>
+                                </div>
+                                </div>
+                                <div class="col-md-12">
+                                <div class="control-label col-xs-12 fontsizes-16 formheardpad">
+                                    <div class="row">
+                                    <div class="demo pull-left">科室电话</div>
+                                    <span class="font-weight-600">: {{model.department.phone}}</span>
+                                    </div>
+                                </div>
+                                </div>
+                                <div class="col-md-12">
+                                <div class="control-label col-xs-12  fontsizes-16 formheardpad">
+                                    <div class="row">
+                                        <div class="demo pull-left">来电号码</div>
+                                        <div class="font-weight-600">: {{model.incomingPhone}}</div>
+                                    </div>
+                                </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div>
+                <div class="row">
+                    <div class="col-xs-12 ui-workernumbersign">
+                        <div class="row worknumber fontcolor-two margin-top-10" id="searchid">
+                            <div class="col-md-12 formheard_pad">
+                                <div class="pull-left  fontsizes-16 font-weight-500">
+                                    事件工单信息
+                                </div>
+                            </div>
+                            <div class="col-md-12 col-10 workconnect padding-top-10 fontsizes-14">
+                                <div class="workback pull-left">
+                                    <div class="col-md-12 ">
+                                        <div class="control-label col-xs-6  fontsizes-14 formheardpad">
+                                            <div class="row pull-left ">事件工单:</div>
+                                        </div>
+                                        <div class="control-label col-xs-6 col-0  fontsizes-14 formheardpad">
+                                            <div>{{model.incidentsign}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="col-md-12 ">
+                                        <div class="control-label col-xs-6  fontsizes-14 formheardpad">
+                                            <div class="row pull-left ">登记时间:</div>
+                                        </div>
+                                        <div class="control-label col-xs-6 col-0   fontsizes-14 formheardpad">
+                                            <div>{{model.acceptDate}}
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="col-md-12 ">
+                                        <div class="control-label col-xs-6  fontsizes-14 formheardpad">
+                                            <div class="row pull-left ">受理人:</div>
+                                        </div>
+                                        <div class="control-label col-xs-6 col-0   fontsizes-14 formheardpad">
+                                            <div>{{model.acceptUser.name}}
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="col-md-12 ">
+                                        <div class="control-label col-xs-6  fontsizes-14 formheardpad">
+                                            <div class="row pull-left ">预计响应时间:</div>
+                                        </div>
+                                        <div class="control-label col-xs-6 col-0   fontsizes-14 formheardpad">
+                                            <div>{{model.expectResponseTime||'--'}} 分钟</div>
+                                        </div>
+                                    </div>
+                                    <div class="col-md-12 ">
+                                        <div class="control-label col-xs-6  fontsizes-14 formheardpad">
+                                            <div class="row pull-left ">预计解决时间:</div>
+                                        </div>
+                                        <div class="control-label col-xs-6 col-0   fontsizes-14 formheardpad">
+
+                                            <div>{{model.expectIntroTime?(model.expectIntroTime|minutesToHours):'--分钟'}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="col-md-12 ">
+                                        <div class="control-label col-xs-6  fontsizes-14 formheardpad">
+                                            <div class="row pull-left ">逾期解决时间:</div>
+                                        </div>
+                                        <div class="control-label col-xs-6 col-0   fontsizes-14 formheardpad">
+
+                                            <div>{{model.overdueTime||'--'}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="col-md-12 ">
+                                        <div class="control-label col-xs-6  fontsizes-14 formheardpad">
+                                            <div class="row pull-left ">报修地址:</div>
+                                        </div>
+                                        <div class="control-label col-xs-6 col-0   fontsizes-14 formheardpad">
+                                            <div>{{model.place ? (model.place.area.area + model.place.place) : ''}}{{model.houseNumber || ''}}</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row ">
+                    <div class="col-xs-12 ui-repair-photos">
+                        <div class="row  fontcolor-two margin-top-15">
+                            <div class="col-md-12 formheard_pad worknumber">
+                                <div class="pull-left  fontsizes-16 font-weight-500">
+                                    报修图片
+                                </div>
+                            </div>
+                            <div class="col-md-12" style="padding:0;">
+                                <div class="imgsBox">
+                                    <div class="fileupload pos-rlt" ng-repeat="(idx,img) in requestImgs" style="position: relative;">
+                                        <img ng-src="{{attachmentAddressSplicing(img.relativeFilePath)}}"  style="max-height:300px;object-fit: contain;"
+                                            class="pos-rlt" width=100%; height=100%; ng-click="preview('requestImgs', img.relativeFilePath, idx)" />
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-xs-12 ui-repair-photos">
+                        <div class="row  fontcolor-two margin-top-15">
+                            <div class="col-md-12 formheard_pad worknumber">
+                                <div class="pull-left  fontsizes-16 font-weight-500">
+                                    处理图片
+                                </div>
+                            </div>
+                            <div class="col-md-12" style="padding:0;">
+                                <div class="imgsBox">
+                                    <div class="fileupload pos-rlt" ng-repeat="(idx,img) in userImgs" style="position: relative;">
+                                        <img ng-src="{{attachmentAddressSplicing(img.relativeFilePath)}}"  style="max-height:300px;object-fit: contain;"
+                                            class="pos-rlt" width=100%; height=100%; ng-click="preview('userImgs', img.relativeFilePath, idx)" />
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-xs-9 col-0 ">
+            <div class="panel col-xs-12 col-0 bg-lightgrey margin-top-10 ">
+                <div class="col-xs-12 ui-header">
+                    <div class="row"><div class="col-xs-12 col-15 form_heard border-top-left-2 border-top-right-2"> <div class = "pull-left fontcolor-two fontsizes-16  font-weight-500" > 报修科室信息 </div> </div></div>
+                </div>
+                <div class="col-xs-4 ui-label">
+                    <div class="form-group">
+                        <div class="padding-top-5">
+                            <label>报修科室:</label>
+                            <div>
+                                <input class="form-control" ng-value="model.department.dept" type="text" disabled="disabled" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-4 ui-inputcall">
+                    <div class="form-group">
+                        <div class="padding-top-5">
+                            <label>联系电话:</label>
+                            <div class="input-group  col-xs-12">
+                                <input class="form-control" ng-model="model.contactsInformation" disabled="disabled" />
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" tooltip="拨打" tooltip-placement="top"
+                                        ng-click="dialout(model.contactsInformation)"
+                                        type="button"><i class="fa fa-phone greenfont"></i>
+                                    </button>
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-4 ui-label">
+                    <div class="form-group">
+                        <div class="padding-top-5">
+                            <label>联系人:</label>
+                            <div>
+                                <input class="form-control" ng-value="model.contacts" type="text" disabled="disabled" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-4 ui-label">
+                    <div class="form-group">
+                        <div class="padding-top-5">
+                            <label>预约维修时间:</label>
+                            <div>
+                                <input class="form-control" ng-value="model.yyTime" type="text" disabled="disabled" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="panel col-xs-12 col-0 bg-lightgrey margin-top-10 "
+                style="border-bottom-left-radius:0px !important;border-bottom-right-radius:0px !important ">
+                <div class="col-xs-12 ui-header">
+                    <div class="row"><div class="col-xs-12 col-15 form_heard border-top-left-2 border-top-right-2"> <div class = "pull-left fontcolor-two fontsizes-16  font-weight-500" > 事件信息 </div> </div></div>
+                </div>
+                <div class="col-xs-4 ui-label">
+                    <div class="form-group">
+                        <div class="padding-top-5">
+                            <label>故障现象:</label>
+                            <div>
+                                <input class="form-control" ng-value="model.category.category" type="text" disabled="disabled" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-4 ui-label">
+                    <div class="form-group">
+                        <div class="padding-top-5">
+                            <label>事件来源:</label>
+                            <div>
+                                <input class="form-control" ng-value="model.source.name" type="text" disabled="disabled" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-4 ui-label">
+                    <div class="form-group">
+                        <div class="padding-top-5">
+                            <label>优先级:</label>
+                            <div>
+                                <input class="form-control" ng-value="model.priority.name" type="text" disabled="disabled" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-4 ui-label">
+                    <div class="form-group">
+                        <div class="padding-top-5">
+                            <label>故障描述:</label>
+                            <div>
+                                <input class="form-control" ng-value="model.description" type="text" disabled="disabled" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="panel col-xs-12 col-0 bg-lightgrey margin-top-10 "
+                style="border-bottom-left-radius:0px !important;border-bottom-right-radius:0px !important ">
+                <div class="col-xs-12 ui-header">
+                    <div class="row"><div class="col-xs-12 col-15 form_heard border-top-left-2 border-top-right-2"> <div class = "pull-left fontcolor-two fontsizes-16  font-weight-500" > 处理信息 </div> </div></div>
+                </div>
+                <div class="col-xs-12 ui-followStatus2">
+                    <div class="row padding-sm no-padding-vr bordered no-border-hr ">
+                        <div class="col-md-12">
+                            <div class="panel panel-white">
+                                <div class="panel-body">
+                                    <table class="table table-striped table-hover">
+                                        <thead>
+                                            <tr>
+                                                <th class="center" style="width: 10px;">#</th>
+                                                <th class="center" style="width: 25%;">处理过程</th>
+                                                <th class="center" style="width: 25%;">操作人</th>
+                                                <th class="center" style="width: 25%;">执行时间</th>
+                                                <th class="center" style="width: 25%;">备注</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            <tr ng-repeat="item in followData">
+                                                <td class="center">{{$index + 1}}</td>
+                                                <td class="center">{{item.logType ? item.logType.name : ''}}</td>
+                                                <td class="center">{{item.appointorName}}</td>
+                                                <td class="center">{{item.startTime|date:'yyyy-MM-dd HH:mm:ss'}}</td>
+                                                <td class="center">{{item.workerName}}{{item.groupName}}</td>
+                                            </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-4 ui-label">
+                    <div class="form-group">
+                        <div class="padding-top-5">
+                            <label>处理方式:</label>
+                            <div>
+                                <input class="form-control" ng-value="model.handleCategory.name" type="text" disabled="disabled" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-4 ui-label">
+                    <div class="form-group">
+                        <div class="padding-top-5">
+                            <label>确认故障现象:</label>
+                            <div>
+                                <input class="form-control" ng-value="model.category.category" type="text" disabled="disabled" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-4 ui-label">
+                    <div class="form-group">
+                        <div class="padding-top-5">
+                            <label>关闭代码:</label>
+                            <div>
+                                <input class="form-control" ng-value="model.closecode.desc" type="text" disabled="disabled" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 ui-divTextarea">
+                    <div class="form-group">
+                        <div class="padding-top-5">
+                            <label>处理方案:</label>
+                            <div>
+                                <div id="textarea" ng-bind-html="model.handleDescription"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 ui-followStatus2">
+                    <div class="row padding-sm no-padding-vr bordered no-border-hr ">
+                        <div class="col-md-12">
+                            <div style="color: #333;">维修记录：</div>
+                            <div class="panel panel-white">
+                                <div class="panel-body">
+                                    <table class="table table-striped table-hover" style="table-layout:fixed">
+                                        <thead>
+                                            <tr>
+                                                <th class="center" style="width:10px">#</th>
+                                                <th class="center" style="width:100px">处理人</th>
+                                                <th class="center" style="width:200px">时间</th>
+                                                <th class="center" style="width:100px">维修方式</th>
+                                                <th class="center" style="width:100px">预估天数</th>
+                                                <th class="center">备注</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            <tr ng-repeat="item in model.handlerLogs">
+                                                <td class="center">{{$index + 1}}</td>
+                                                <td class="center">{{item.userName}}</td>
+                                                <td class="center">{{item.opTime|date:'yyyy-MM-dd HH:mm:ss'}}</td>
+                                                <td class="center">{{item.repairType ? item.repairType.name : ''}}</td>
+                                                <td class="center">{{item.expectedDay}}</td>
+                                                <td class="center" style="white-space: normal;word-break:break-all">{{item.opValue}}</td>
+                                            </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="panel col-xs-12 col-0 bg-lightgrey margin-top-10 "
+                style="border-bottom-left-radius:0px !important;border-bottom-right-radius:0px !important ">
+                <div class="col-xs-12 ui-header">
+                    <div class="row"><div class="col-xs-12 col-15 form_heard border-top-left-2 border-top-right-2"> <div class = "pull-left fontcolor-two fontsizes-16  font-weight-500" > 评价信息 </div> </div></div>
+                </div>
+                <div class="col-xs-4 ui-label">
+                    <div class="form-group">
+                        <div class="padding-top-5">
+                            <label>满意度评价:</label>
+                            <div>
+                                <input class="form-control" ng-value="model.wxdegree.name" type="text" disabled="disabled" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 ui-label">
+                    <div class="form-group">
+                        <div class="padding-top-5">
+                            <label>评价内容:</label>
+                            <div>
+                                <textarea class="form-control autosize msd-elastic: \n;" data-ng-model="model.wxdegreeremark" ng-disabled="{{true}}"></textarea>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="panel col-xs-12 col-0 bg-lightgrey margin-top-10 "
+                style="border-bottom-left-radius:0px !important;border-bottom-right-radius:0px !important ">
+                <div class="col-xs-12 ui-header">
+                    <div class="row"><div class="col-xs-12 col-15 form_heard border-top-left-2 border-top-right-2"> <div class = "pull-left fontcolor-two fontsizes-16  font-weight-500" > 关单信息 </div> </div></div>
+                </div>
+                <div class="col-xs-4 ui-label">
+                    <div class="form-group">
+                        <div class="padding-top-5">
+                            <label>结果类型:</label>
+                            <div>
+                                <input class="form-control" ng-value="model.handleResult.name" type="text" disabled="disabled" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-4 ui-label">
+                    <div class="form-group">
+                        <div class="padding-top-5">
+                            <label>满意度评价:</label>
+                            <div>
+                                <input class="form-control" ng-value="model.degree.name" type="text" disabled="disabled" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-4 ui-label">
+                    <div class="form-group">
+                        <div class="padding-top-5">
+                            <label>是否已解决:</label>
+                            <div>
+                                <input class="form-control" ng-value="model.isclose" type="text" disabled="disabled" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 ui-label">
+                    <div class="form-group">
+                        <div class="padding-top-5">
+                            <label>回访备注:</label>
+                            <div>
+                                <input class="form-control" ng-value="model.visitRemarks" type="text" disabled="disabled" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="col-xs-12 margin-top-30 margin-bottom-30 text-center ">
+                <button type="submit" ng-if="vm.model.submit" ladda="ldloading.expand_right " style="height: 34px;"
+                    data-style="expand-right " class="btn btn-addbutton addbutton "
+                    ng-disabled="ldloading.expand_right ">{{vm.model.submit}}</button>
+                <button type="close" class="btn btn-default default" ng-click="closeModel()"
+                    translate="form.button.CLOSE">CLOSE</button>
+            </div>
+        </div>
+    </form>
+</div>

assets/views/newOrderSeimin.html

@@ -487,9 +487,8 @@
   <div class="modal-footer">
     <label style="display: inline-flex;align-items:center;cursor: pointer;position: relative;top: 3px;right: 16px;"><input style="margin:0;" type="checkbox" ng-model="isBuildOrderAgagin">是否连续建单</label>
     <button class="btn btn-primary" ng-click="build()">直接解决</button>
-    <button class="btn btn-primary" ng-click="buildAndAssign()">
-      建单并派单
-    </button>
+    <button class="btn btn-primary" ng-click="buildAndAssign()">建单并派单</button>
+    <button class="btn btn-primary" ng-click="temporaryStorage()">暂存</button>
     <button class="btn btn-primary btn-o" ng-click="cancel()">取消</button>
   </div>
 </div>