Przeglądaj źródła

巡检计划列表展示去掉执行人组的字段

seimin 2 lat temu
rodzic
commit
7d367a3ed9

+ 7 - 7
assets/js/controllers/inspect/inspectPlanCtrl.js

@@ -127,13 +127,13 @@ app.controller('inspectPlanCtrl', ["$rootScope", "$scope", "$state", "$timeout",
127
         //     width: '109',
127
         //     width: '109',
128
         //     enableFiltering: false
128
         //     enableFiltering: false
129
         // },
129
         // },
130
-        {
131
-            name: 'executeUser.name',
132
-            displayName: '执行人/组',
133
-            width: '11%',
134
-            enableFiltering: false,
135
-            cellTemplate: '<div class="ui-grid-cell-contents"><span ng-if="row.entity.dictionary.value == 1&&row.entity.executeUser">{{row.entity.executeUser.name }}</span><span ng-if="row.entity.dictionary.value == 3&&row.entity.group">{{row.entity.group.groupName }}</span><span ng-if="row.entity.dictionary.value == 4">无</span></div>'
136
-        },
130
+        // {
131
+        //     name: 'executeUser.name',
132
+        //     displayName: '执行人/组',
133
+        //     width: '11%',
134
+        //     enableFiltering: false,
135
+        //     cellTemplate: '<div class="ui-grid-cell-contents"><span ng-if="row.entity.dictionary.value == 1&&row.entity.executeUser">{{row.entity.executeUser.name }}</span><span ng-if="row.entity.dictionary.value == 3&&row.entity.group">{{row.entity.group.groupName }}</span><span ng-if="row.entity.dictionary.value == 4">无</span></div>'
136
+        // },
137
         {
137
         {
138
             name: 'status.name',
138
             name: 'status.name',
139
             displayName: '状态',
139
             displayName: '状态',

+ 1 - 0
assets/js/controllers/inspect/inspectionScopeCtrl.js

@@ -557,6 +557,7 @@ app.controller("inspectionScope", [
557
         user: v.user,
557
         user: v.user,
558
         group: v.group,
558
         group: v.group,
559
       }));
559
       }));
560
+      // 一条都没选择
560
       if (arr.length === 0) {
561
       if (arr.length === 0) {
561
         arr.push({ inspection: $scope.stateModel });
562
         arr.push({ inspection: $scope.stateModel });
562
       }
563
       }