BUG修复

assets/js/controllers/desk/chartCtrl.js

@@ -1,6 +1,6 @@
 'use strict';
 
-app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$timeout", "$interval", "$modal", "SweetAlert", "uiGridConstants", "uiGridGroupingConstants", "Restangular", "api_bpm_data", "api_text", "api_user_data", function($scope, i18nService, $rootScope, $state, $timeout, $interval, $modal, SweetAlert, uiGridConstants, uiGridGroupingConstants, Restangular, api_bpm_data, api_text, api_user_data) {
+app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$timeout", "$interval", "$modal", "SweetAlert", "uiGridConstants", "uiGridGroupingConstants", "Restangular", "api_bpm_data", "api_text", "api_user_data", function ($scope, i18nService, $rootScope, $state, $timeout, $interval, $modal, SweetAlert, uiGridConstants, uiGridGroupingConstants, Restangular, api_bpm_data, api_text, api_user_data) {
     $scope.langs = i18nService.getAllLangs();
     $scope.lang = 'zh-cn';
     i18nService.setCurrentLang($scope.lang);
@@ -31,126 +31,126 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
     $scope.gridOptions.rowTemplate = "<div ng-click=\"lookFunction(row)\" ng-repeat=\"(colRenderIndex, col) in colContainer.renderedColumns track by col.uid\" ui-grid-one-bind-id-grid=\"rowRenderIndex + '-' + col.uid + '-cell'\" class=\"ui-grid-cell\" ng-class=\"{ 'ui-grid-row-header-cell': col.isRowHeader }\" role=\"{{col.isRowHeader ? 'rowheader' : 'gridcell'}}\" ui-grid-cell></div>";
 
 
-    $scope.gridOptions.rowIdentity = function(row) {
+    $scope.gridOptions.rowIdentity = function (row) {
         return row.id;
     };
-    $scope.gridOptions.getRowIdentity = function(row) {
+    $scope.gridOptions.getRowIdentity = function (row) {
         return row.id;
     };
 
     $scope.gridOptions.columnDefs = [{
-            name: 'item',
-            displayName: '序号',
-            width: 50,
-            cellTemplate: '<div>' +
-                '<div class="ui-grid-cell-contents">{{row.entity.item}}</div>' +
-                '</div>'
-        }, {
-            name: 'incidentDescription',
-            displayName: '事件描述',
-            width: '20%',
-            cellTemplate: '<div>' +
-                '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.incidentDescription}}</div>' +
-                '</div>'
-        },
-        {
-            name: 'address',
-            displayName: '地点',
-            width: '10%',
-            cellTemplate: '<div>' +
-                '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.place.place||""}} {{row.entity.address}}</div>' +
-                '</div>'
-        }, {
-            name: 'contacts',
-            displayName: '联系人',
-            width: '10%',
-            cellTemplate: '<div>' +
-                '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.contacts}}</div>' +
-                '</div>'
-        }, , {
-            name: 'contactsInformation',
-            displayName: '联系电话',
-            width: '10%',
-            cellTemplate: '<div>' +
-                '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.contactsInformation}}</div>' +
-                '</div>'
-        }, {
-            name: 'requester.name',
-            displayName: '报修人',
-            width: '10%',
-            cellTemplate: '<div>' +
-                '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.requester.name}}</div>' +
-                '</div>'
-        }, {
-            name: 'state',
-            displayName: '状态',
-            width: '10%',
-            cellTemplate: '<div>' +
-                '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.state}}</div>' +
-                '</div>'
-        }, {
-            name: 'createTime',
-            displayName: '创建时间',
-            width: '15%',
-            cellTemplate: '<div>' +
-                '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.createTime}}</div>' +
-                '</div>'
-                // },
-                // {
-                //     name: '生成事件',
-                //     width: 80,
-                //     cellTemplate: '<div class="links cl-effect-1">' +
-                //         '<a ng-click="grid.appScope.selectRowFunction(row.entity)" tooltip="新建事件" tooltip-placement="left"><i class="fa fa-pencil-square-o"></i></a>' +
-                //         '</div>'
-        },
-        { name: '操作', cellTemplate: '<wechatoperator item="row.entity" colobject="col">', enableFiltering: false }
+        name: 'item',
+        displayName: '序号',
+        width: 50,
+        cellTemplate: '<div>' +
+            '<div class="ui-grid-cell-contents">{{row.entity.item}}</div>' +
+            '</div>'
+    }, {
+        name: 'incidentDescription',
+        displayName: '事件描述',
+        width: '20%',
+        cellTemplate: '<div>' +
+            '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.incidentDescription}}</div>' +
+            '</div>'
+    },
+    {
+        name: 'address',
+        displayName: '地点',
+        width: '10%',
+        cellTemplate: '<div>' +
+            '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.place.place||""}} {{row.entity.address}}</div>' +
+            '</div>'
+    }, {
+        name: 'contacts',
+        displayName: '联系人',
+        width: '10%',
+        cellTemplate: '<div>' +
+            '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.contacts}}</div>' +
+            '</div>'
+    }, , {
+        name: 'contactsInformation',
+        displayName: '联系电话',
+        width: '10%',
+        cellTemplate: '<div>' +
+            '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.contactsInformation}}</div>' +
+            '</div>'
+    }, {
+        name: 'requester.name',
+        displayName: '报修人',
+        width: '10%',
+        cellTemplate: '<div>' +
+            '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.requester.name}}</div>' +
+            '</div>'
+    }, {
+        name: 'state',
+        displayName: '状态',
+        width: '10%',
+        cellTemplate: '<div>' +
+            '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.state}}</div>' +
+            '</div>'
+    }, {
+        name: 'createTime',
+        displayName: '创建时间',
+        width: '15%',
+        cellTemplate: '<div>' +
+            '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.createTime}}</div>' +
+            '</div>'
+        // },
+        // {
+        //     name: '生成事件',
+        //     width: 80,
+        //     cellTemplate: '<div class="links cl-effect-1">' +
+        //         '<a ng-click="grid.appScope.selectRowFunction(row.entity)" tooltip="新建事件" tooltip-placement="left"><i class="fa fa-pencil-square-o"></i></a>' +
+        //         '</div>'
+    },
+    { name: '操作', cellTemplate: '<wechatoperator item="row.entity" colobject="col">', enableFiltering: false }
     ];
     $scope.value = 10;
-    $scope.decrement = function() {
+    $scope.decrement = function () {
         $scope.value = $scope.value - 1;
     };
-    $scope.searchstate = '未转换';
+    // $scope.searchstate = '未转换';
     $scope.searchkeys = {};
-    $scope.onChange = function(searchType) {
+    $scope.onChange = function (searchType) {
         $scope.searchstate = searchType;
         defaultFilterData = $scope.memoryfilterData;
         defaultFilterData.wxincident['state'] = searchType;
         // sessionStorage.searchchart.state = searchType;
         $scope.refreshData('expand-right', defaultFilterData);
     }
-    $scope.record = function() {
-        api_text.record($rootScope.takes).then(function(data) {
+    $scope.record = function () {
+        api_text.record($rootScope.takes).then(function (data) {
             if (data.errno == 0) {
                 $scope.busy = false;
             }
         })
     };
     $scope.parameters = null;
-    $scope.open = function($event) {
+    $scope.open = function ($event) {
         $event.preventDefault();
         $event.stopPropagation();
 
         $scope.opened = !$scope.opened;
     };
-    $scope.endOpen = function($event) {
+    $scope.endOpen = function ($event) {
         $event.preventDefault();
         $event.stopPropagation();
         $scope.startOpened = false;
         $scope.endOpened = !$scope.endOpened;
     };
-    $scope.startOpen = function($event) {
+    $scope.startOpen = function ($event) {
         $event.preventDefault();
         $event.stopPropagation();
         $scope.endOpened = false;
         $scope.startOpened = !$scope.startOpened;
     };
 
-    var getUser = function(fieldatas) {
-        api_user_data.fetchDataList('requester', fieldatas).then(function(data) {
+    var getUser = function (fieldatas) {
+        api_user_data.fetchDataList('requester', fieldatas).then(function (data) {
             $scope.requester = data.list;
         });
     }
-    $scope.onChangehandling = function(key) {
+    $scope.onChangehandling = function (key) {
         var filuser = {
             "idx": 0,
             "sum": 10,
@@ -159,7 +159,7 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
         getUser(filuser);
     }
     getUser({ "idx": 0, "sum": 10 });
-    $scope.chiceIncident = function(item) {
+    $scope.chiceIncident = function (item) {
         var fildata = {};
         if (sessionStorage.searchincident) {
             fildata = JSON.parse(sessionStorage.getItem("searchchart"));
@@ -168,23 +168,24 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
         } else {
             fildata = defaultFilterData;
         }
-        if (!fildata.incident) {
-            fildata['wxincident'] = {};
-        }
+        // if (!fildata.incident) {
+        //     fildata['wxincident'] = {};
+        // }
         if (item.createTime) {
             item.createTime = moment(item.createTime).format('YYYY-MM-DD HH:mm:ss');
         }
         if (item.createTimeEnd) {
             item.createTimeEnd = moment(new Date(item.createTimeEnd).getTime() + 86399999).format('YYYY-MM-DD HH:mm:ss');
         }
-        angular.extend(fildata.wxincident, item)
+        // angular.extend(fildata.wxincident, item)
         sessionStorage['searchchart'] = angular.copy(JSON.stringify(fildata));
+        console.log(sessionStorage['searchchart'])
         $scope.memoryfilterData = fildata;
         $scope.refreshData('expand-right', fildata);
     }
-    $scope.gridOptions.onRegisterApi = function(gridApi) {
+    $scope.gridOptions.onRegisterApi = function (gridApi) {
         $scope.gridApi = gridApi;
-        gridApi.pagination.on.paginationChanged($scope, function(newPage, pageSize) {
+        gridApi.pagination.on.paginationChanged($scope, function (newPage, pageSize) {
             var filtersData = $scope.memoryfilterData;
             filtersData.idx = newPage - 1;
             filtersData.sum = pageSize;
@@ -199,40 +200,48 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
         }
 
     };
-    $scope.memoryfilterData = defaultFilterData = {
-        // "assignee":$rootScope.user.id,
-        // "candidateGroups":$rootScope.user.group[0].id,
-        "idx": 0,
-        "wxincident": { "state": "未转换" },
-        "sum": mun
-    };
+    var searchchartObj = JSON.parse(sessionStorage.getItem("searchchart"));
+    if (searchchartObj) {
+        $scope.memoryfilterData = defaultFilterData = searchchartObj;
+        $scope.searchstate = searchchartObj.wxincident.state;
+    } else {
+        $scope.memoryfilterData = defaultFilterData = {
+            // "assignee":$rootScope.user.id,
+            // "candidateGroups":$rootScope.user.group[0].id,
+            "idx": 0,
+            "wxincident": { "state": "未转换" },
+            "sum": mun
+        };
+        $scope.searchstate = $scope.memoryfilterData.wxincident.state;
+    }
 
-    $scope.selectRowFunction = function(data) {
+
+    $scope.selectRowFunction = function (data) {
         var formdata = {
-                'model': {
-                    'incident': {
-                        'requester': data.requester,
-                        'area': data.area,
-                        'place': data.place,
-                        'houseNumber': data.address,
-                        'contacts': data.contacts,
-                        'contactsInformation': data.contactsInformation,
-                        // 'category': data.wxIncidentClassifyDTO.category,
-                        'description': data.incidentDescription,
-                        'source': { 'id': 4 },
-                        'sourceType': data.sourceType,
-                        'fileUrl': data.fileUrl
-                    },
-                    'requestershow': data.requester,
-                    'flow': data.id
-                }
+            'model': {
+                'incident': {
+                    'requester': data.requester,
+                    'area': data.area,
+                    'place': data.place,
+                    'houseNumber': data.address,
+                    'contacts': data.contacts,
+                    'contactsInformation': data.contactsInformation,
+                    // 'category': data.wxIncidentClassifyDTO.category,
+                    'description': data.incidentDescription,
+                    'source': { 'id': 4 },
+                    'sourceType': data.sourceType,
+                    'fileUrl': data.fileUrl
+                },
+                'requestershow': data.requester,
+                'flow': data.id
             }
-            // if (data.requester.requesterTypeDTO && data.requester.requesterTypeDTO.id == 2) {
-            //     angular.extend(formdata.model.incident, { 'priority': { 'id': 2 } });
-            // }
+        }
+        // if (data.requester.requesterTypeDTO && data.requester.requesterTypeDTO.id == 2) {
+        //     angular.extend(formdata.model.incident, { 'priority': { 'id': 2 } });
+        // }
         $state.go('app.incident.chart', { 'model': JSON.stringify(formdata) });
     };
-    $scope.lookFunction = function(data) {
+    $scope.lookFunction = function (data) {
         // var data = row.entity;
         var formdata = {
             'model': {
@@ -267,7 +276,7 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
     //   $state.go('app.detail', { formKey:'statusform', pdKey:'incident', dataId: data.id,processInstanceId: data.processInstanceId});
 
     // };
-    $scope.onDblClick = function(row) {
+    $scope.onDblClick = function (row) {
         var data = row.entity;
         var formdata = {
             'model': {
@@ -310,7 +319,7 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
         "sum": mun
     };
     $scope.ldloading = {};
-    $scope.refreshData = function(style, filterData) {
+    $scope.refreshData = function (style, filterData) {
         $scope.ldloading[style.replace('-', '_')] = true;
         // if (angular.isUndefined(filterData)) {
         //     filterData = defaultFilterData;
@@ -321,7 +330,7 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
                 $scope.searchkeys = filterData.wxincident;
                 // $scope.searchstate = filterData.state;
                 $scope.gridOptions.paginationCurrentPage = 1 + filterData.idx;
-                $scope.searchstate = filterData.wxincident.searchType;
+                $scope.searchstate = filterData.wxincident.state;
             } else {
                 filterData = defaultFilterData;
             }
@@ -329,7 +338,8 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
         $scope.myData = [];
         $scope.gridOptions['sum'] = filterData.sum;
         sessionStorage['searchchart'] = angular.copy(JSON.stringify(filterData));
-        api_bpm_data.fetchDataList("wxincident", filterData).then(function(data) {
+        console.log(sessionStorage['searchchart'])
+        api_bpm_data.fetchDataList("wxincident", filterData).then(function (data) {
             var myData = Restangular.stripRestangular(data);
             $scope.gridOptions['totalItems'] = myData.totalNum;
             $scope.myData = myData.list;
@@ -338,28 +348,28 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
             }
             // console.log($scope.myData)
             $scope.ldloading[style.replace('-', '_')] = false;
-        }, function() {
+        }, function () {
             $scope.ldloading[style.replace('-', '_')] = false;
         });
     };
 
     $scope.refreshData('expand-right');
 }]);
-app.controller('Wechatoperator', ['$rootScope', '$http', '$scope', '$modal', function($rootScope, $http, $scope, $modal) {
+app.controller('Wechatoperator', ['$rootScope', '$http', '$scope', '$modal', function ($rootScope, $http, $scope, $modal) {
     $scope.handle = false;
     if ($scope.item.state == "未转换") {
         $scope.handle = true;
     } else { $scope.handle = false; }
-    $scope.edit = function() {
+    $scope.edit = function () {
         $scope.colobject.grid.appScope.selectRowFunction($scope.item);
         $scope.doEdit($scope.item.id);
     }
-    $scope.look = function() {
+    $scope.look = function () {
         $scope.colobject.grid.appScope.lookFunction($scope.item);
         $scope.doEdit($scope.item.id);
     }
 }]);
-app.directive('wechatoperator', function() {
+app.directive('wechatoperator', function () {
     return {
         restrict: 'E',
         scope: {

wechat/app/assets/views/customform/tpl/ui-dropfilenotup.html

@@ -181,7 +181,7 @@
         <!-- <div class="upLoadItem" ng-if="!uploader.queue.length">
         </div> -->
 
-        <div>
+        <div style="display: flex;">
             <div class="upLoadItem" ng-repeat="item in uploader.queue">
                 <div class="" ng-thumb="{ file: item._file,width:96,height:96}"></div>
                 <i class="icon  iconfont dsit-false-circle font-color-red uploadedFileDelete" ng-click="item.remove()"></i>