seimin 2 anni fa
parent
commit
43b32a17bf
1 ha cambiato i file con 7 aggiunte e 3 eliminazioni
  1. 7 3
      assets/js/controllers/incident/incidentCtrl.js

+ 7 - 3
assets/js/controllers/incident/incidentCtrl.js

@@ -455,7 +455,11 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
455 455
         })
456 456
     };
457 457
     $scope.transferTime = function (time) {
458
-        return moment(time).format('YYYY-MM-DD HH:mm');
458
+        if(time){
459
+            return moment(time).format('YYYY-MM-DD HH:mm');
460
+        }else{
461
+            return '无';
462
+        }
459 463
     }
460 464
     $scope.parameters = null;
461 465
     $scope.open = function ($event) {
@@ -3378,8 +3382,8 @@ app.directive('incidentoperator', function () {
3378 3382
             '<a ng-click="toDetail(item)" class="bianjifont" >查看</a>' +
3379 3383
             '<a ng-click="changeCenter()"  ng-show="jry_modify(item)"  class="luyinfont">编辑</a>' +
3380 3384
             '<a ng-click="print()" ng-show="dayin" class="bianjifont" >打印</a>' +
3381
-            '<a ng-click="delSj()" ng-show="{{delFlag&&item.state.value!== \'deleted\'}}" class="assign" >删除</a>' +
3382
-            '<a ng-click="edit()"  ng-show="{{item.chaozuoPower&&chuli}}"  class="bianjifont">处理</a><br>' +
3385
+            '<a ng-click="delSj()" ng-show="{{delFlag&&item.state.value!== \'deleted\'}}" class="assign" >删除</a><br>' +
3386
+            '<a ng-click="edit()"  ng-show="{{item.chaozuoPower&&chuli}}"  class="bianjifont">处理</a>' +
3383 3387
             '<a ng-click="handler()" ng-show="{{item.state.id != 1546 &&!item.handlerUser&&item.tiquPower&&qiangdan}}" class="bianjifont" >抢单</a>' +
3384 3388
             '<a ng-click="visit()"  ng-show="{{item.huifang&&huifang}}"  class="bianjifont">回访</a>' +
3385 3389
             '<a ng-click="toAssign()" ng-show="{{(item.state.id==1543||item.state.id==1544)&&assignFlag&&item.assignee}}" class="assign" >指派</a>' +