瀏覽代碼

汇总单

seimin 11 月之前
父節點
當前提交
01e111714b

+ 69 - 0
assets/js/controllers/inspect/summaryCtrl.js

@@ -18,6 +18,7 @@ app.controller("summaryCtrl", [
18 18
   "api_bpm_data",
19 19
   "api_wechatfile",
20 20
   "api_configure_data",
21
+  "api_user_data",
21 22
   "moment",
22 23
   function (
23 24
     $rootScope,
@@ -35,6 +36,7 @@ app.controller("summaryCtrl", [
35 36
     api_bpm_data,
36 37
     api_wechatfile,
37 38
     api_configure_data,
39
+    api_user_data,
38 40
     moment
39 41
   ) {
40 42
     $scope.langs = i18nService.getAllLangs();
@@ -60,6 +62,7 @@ app.controller("summaryCtrl", [
60 62
     var defaultFilterData = {
61 63
       idx: 0,
62 64
       sum: 10,
65
+      repairSummary:{}
63 66
     };
64 67
 
65 68
     var repairSummaryParameter = {
@@ -114,6 +117,50 @@ app.controller("summaryCtrl", [
114 117
       }
115 118
     };
116 119
 
120
+    $scope.searchkeys = {};
121
+
122
+    $scope.endOpen = function ($event) {
123
+      $event.preventDefault();
124
+      $event.stopPropagation();
125
+      $scope.startOpened = false;
126
+      $scope.endOpened = !$scope.endOpened;
127
+    };
128
+    $scope.startOpen = function ($event) {
129
+        $event.preventDefault();
130
+        $event.stopPropagation();
131
+        $scope.endOpened = false;
132
+        $scope.startOpened = !$scope.startOpened;
133
+    };
134
+    //受理人,处理人
135
+    var getUser = function (fieldatas) {
136
+      api_user_data.fetchDataList('user', fieldatas).then(function (data) {
137
+        $scope.handlingPersonnelUser = data.list;
138
+      });
139
+    }
140
+    //处理人过滤
141
+    $scope.onChangehandling = function (key = "") {
142
+      var filuser = {
143
+          "idx": 0,
144
+          "sum": 10,
145
+          "user": {
146
+              "name": key,
147
+              'selectType': "pinyin_qs",
148
+              engineer: 1,
149
+          }
150
+      }
151
+      getUser(filuser);
152
+    }
153
+    //状态
154
+    $scope.state = [];
155
+    $scope.getStatus = function(){
156
+      $scope.state = [
157
+        {id: 1, name: '暂存'},
158
+        {id: 2, name: '未审核'},
159
+        {id: 3, name: '审核通过'},
160
+      ]
161
+    }
162
+    $scope.getStatus();
163
+
117 164
     $scope.gridOptions.columnDefs = [
118 165
       {
119 166
         name: "item",
@@ -427,6 +474,12 @@ app.controller("summaryCtrl", [
427 474
       });
428 475
     };
429 476
 
477
+    // 重置
478
+    $scope.clear = function () {
479
+      $scope.searchkeys = {};
480
+      $scope.refreshData('expand-right');
481
+  }
482
+
430 483
     //数据刷新
431 484
     $scope.refreshData = function (style, filterData) {
432 485
       $scope.ldloading[style.replace("-", "_")] = true;
@@ -441,6 +494,14 @@ app.controller("summaryCtrl", [
441 494
       }else if($rootScope.user.branch){
442 495
         filterData.repairSummary.branch = $rootScope.user.branch.id;
443 496
       }
497
+      console.log($scope.searchkeys)
498
+      Object.assign(filterData.repairSummary, {
499
+        incidentSign: $scope.searchkeys.incidentSign || undefined,
500
+        startTime: $scope.searchkeys.startTime ? moment($scope.searchkeys.startTime).startOf('day').format('YYYY-MM-DD HH:mm:ss') : undefined,
501
+        endTime: $scope.searchkeys.endTime ? moment($scope.searchkeys.endTime).startOf('day').format('YYYY-MM-DD HH:mm:ss') : undefined,
502
+        state: $scope.searchkeys.state ? $scope.searchkeys.state.id : undefined,
503
+        maintainer: $scope.searchkeys.maintainer || undefined,
504
+      })
444 505
       api_bpm_data.fetchDataList("repairSummary", filterData).then(
445 506
         function (data) {
446 507
           var myData = Restangular.stripRestangular(data);
@@ -499,6 +560,14 @@ app.controller("summaryCtrl", [
499 560
       }else if($rootScope.user.branch){
500 561
         filterData.repairSummary.branch = $rootScope.user.branch.id;
501 562
       }
563
+
564
+      Object.assign(filterData.repairSummary, {
565
+        incidentSign: $scope.searchkeys.incidentSign || undefined,
566
+        startTime: $scope.searchkeys.startTime ? moment($scope.searchkeys.startTime).startOf('day').format('YYYY-MM-DD HH:mm:ss') : undefined,
567
+        endTime: $scope.searchkeys.endTime ? moment($scope.searchkeys.endTime).startOf('day').format('YYYY-MM-DD HH:mm:ss') : undefined,
568
+        state: $scope.searchkeys.state ? $scope.searchkeys.state.id : undefined,
569
+        maintainer: $scope.searchkeys.maintainer || undefined,
570
+      })
502 571
       api_bpm_data.fetchDataList("repairSummary", filterData).then(
503 572
         function (data) {
504 573
           var myData = Restangular.stripRestangular(data);

+ 3 - 3
assets/js/controllers/system/organizationdesign/worktimeCtrl.js

@@ -86,7 +86,7 @@ app.controller('woketimeCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
86 86
         { name: 'isTemplate', displayName: '呼叫中心关联', width: '8%', enableFiltering: false, cellTemplate: '<div class="ui-grid-cell-contents">{{grid.appScope.transfer(row.entity.isTemplate)}}</div>' },
87 87
         { name: 'priority.name', displayName: '优先级关联', width: '8%', enableFiltering: false },
88 88
         { name: 'description', displayName: '班次描述', width: '10%', enableFiltering: false },
89
-        { name: 'deleteFlag', displayName: '使用状态', width: '8%', enableFiltering: false, cellTemplate: '<div class="ui-grid-cell-contents">{{grid.appScope.transferstatus(row.entity.deleteFlag)}}</div>' },
89
+        // { name: 'deleteFlag', displayName: '使用状态', width: '8%', enableFiltering: false, cellTemplate: '<div class="ui-grid-cell-contents">{{grid.appScope.transferstatus(row.entity.deleteFlag)}}</div>' },
90 90
         { name: 'workDay', displayName: '工作日/节假日', width: '8%', enableFiltering: false, cellTemplate: '<div class="ui-grid-cell-contents">{{grid.appScope.transferWorkDay(row.entity.workDay)}}</div>' },
91 91
         {
92 92
             name: '编辑',
@@ -313,7 +313,7 @@ app.controller('woketimeCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
313 313
                             "type": selectedItem.type,
314 314
                             "priority": selectedItem.priority,
315 315
                             "isTemplate": selectedItem.isTemplate,
316
-                            "deleteFlag": selectedItem.deleteFlag,
316
+                            // "deleteFlag": selectedItem.deleteFlag,
317 317
                             "workDay": selectedItem.workDay,
318 318
                         }
319 319
                     }
@@ -530,7 +530,7 @@ app.controller('woketimeCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
530 530
                             succeedTime: item.succeedTime,
531 531
                             shiftTime: item.shiftTime,
532 532
                             description: item.description,
533
-                            deleteFlag: item.deleteFlag,
533
+                            // deleteFlag: item.deleteFlag,
534 534
                             isTemplate: item.isTemplate,
535 535
                             draggable: true,
536 536
                             workDay: item.workDay,

+ 230 - 10
assets/views/inspect/summary.html

@@ -1,21 +1,186 @@
1
-<style type="text/css">
2
-    .incidentsearch {
3
-        width: 30% !important;
4
-        margin-right: 16px
1
+<style>
2
+    @media screen and (max-width: 1750px) {
3
+        .wt_width1 {
4
+            width: 60% !important;
5
+        }
6
+
7
+        .wt_width4 {
8
+            width: 27% !important;
9
+        }
10
+
11
+        .wt_width5 {
12
+            width: 60% !important;
13
+            border-color: #dedede;
14
+            float: right;
15
+        }
16
+
17
+    }
18
+
19
+    .selectzise {
20
+        width: 160px;
21
+    }
22
+
23
+    .wt_width {
24
+        width: 20%;
25
+        margin-right: 16px;
26
+    }
27
+
28
+    .wt_width1 {
29
+        width: 160px;
5 30
     }
6 31
 
7
-    .iptSize {
8
-        width: 60% !important;
32
+    .wt_margin-top {
33
+        margin-top: 35px !important;
34
+    }
35
+
36
+    .form-inline .form-control {
37
+        border-radius: 2px;
38
+    }
39
+
40
+    .wt_width3 {
41
+        width: 160px;
9 42
         height: 28px !important;
43
+        border-radius: 2px !important;
44
+    }
45
+
46
+    .wt_width4 {
47
+        width: 20%;
48
+    }
49
+
50
+    .wt_width5 {
51
+        width: 160px;
52
+        border-color: #dedede;
53
+        float: right;
54
+        height: 28px;
55
+        border-radius: 2px !important;
10 56
     }
11 57
 
12
-    .tree-control .tree-input {
13
-        min-height: 28px !important
58
+    .wt_width6 {
59
+        display: inline-block;
60
+        padding-top: 0px;
61
+        position: relative;
62
+        top: 4px;
63
+        width: 8.2%;
64
+        text-align: left;
14 65
     }
15 66
 
16
-    .searchBtnBox>.btn{
67
+    .ui-select-bootstrap .ui-select-toggle {
68
+        height: 28px;
69
+    }
70
+
71
+    .wt_width2 {
72
+        width: 50% !important;
73
+    }
74
+
75
+    .wt_pad {
76
+        padding: 0px;
77
+    }
78
+
79
+    .wt_btns {
80
+        display: inline-block;
81
+        margin-right: 8px;
82
+    }
83
+
84
+    .wt_btn1 {
85
+        width: 60px;
86
+        height: 28px !important;
87
+        border-radius: 2px;
88
+        line-height: 28px;
89
+        font-size: 14px;
90
+        padding: 0px !important;
91
+        font-size: 14px !important;
92
+    }
93
+
94
+    .btn.steelbutton.wt_btn1 {
95
+        padding: 0px !important;
96
+    }
97
+
98
+    .wt_btnColor {
99
+        background: #4A90E2 !important;
100
+    }
101
+
102
+    .wt_btnColor:hover {
103
+        background: #fff !important;
104
+        color: #2B5EB8 !important;
105
+        border: 1px solid #2B5EB8;
106
+    }
107
+
108
+    .wt_btnColor2:hover {
109
+        background: #fff !important;
110
+        color: #2B5EB8 !important;
111
+        border: 1px solid #2B5EB8;
112
+    }
113
+
114
+    .wt_btn2 {
115
+        min-width: 100px;
116
+        height: 34px !important;
117
+        border-radius: 2px !important;
118
+    }
119
+
120
+    .wt_list {
121
+        padding: 15px;
122
+        background: #F9F9F9;
123
+    }
124
+
125
+    .ui-grid-render-container:hover {
126
+        background: #fff !important;
127
+    }
128
+
129
+    .wt_btnColor1 {
130
+        background: #fff !important;
131
+        color: #2B5EB8 !important;
132
+        border: 1px solid #2B5EB8;
133
+    }
134
+
135
+    .wt_btnColor1:hover {
136
+        background: #4A90E2 !important;
137
+        color: #fff !important;
138
+        border: 1px solid #4A90E2 !important;
139
+    }
140
+
141
+    div.ui-grid-row.ng-scope:hover {
142
+        cursor: pointer;
143
+        background: #fff !important;
144
+    }
145
+
146
+    .wt_searchlistback {
147
+        margin-top: 1px;
148
+        margin-bottom: 8px;
149
+        border-top-left-radius: 0px !important;
150
+        border-top-right-radius: 8px !important;
151
+        border-bottom-left-radius: 8px !important;
152
+        border-bottom-right-radius: 8px !important;
153
+    }
154
+
155
+    .ui-grid-row:nth-child(even) .ui-grid-cell {
156
+        background: #fafafa !important;
157
+        display: flex;
158
+        justify-content: center;
159
+        align-items: center;
160
+    }
161
+
162
+    .ui-grid-row:nth-child(odd) .ui-grid-cell {
163
+        display: flex;
164
+        justify-content: center;
165
+        align-items: center;
166
+    }
167
+
168
+    .ui-grid-row .ui-grid-cell:last-of-type {
169
+        justify-content: flex-start;
170
+    }
171
+
172
+    .searchBtnBox>.wt_btns {
17 173
         margin: 0 8px 10px 0;
18 174
     }
175
+
176
+    /* 故障地点 */
177
+    .address-wrap {
178
+        position: relative;
179
+        height: 28px;
180
+    }
181
+    #filterSearch .incidentsearch:nth-child(n + 9){
182
+        display: none;
183
+    }
19 184
 </style>
20 185
 <div ng-controller="summaryCtrl">
21 186
     <section id="page-title">
@@ -29,11 +194,66 @@
29 194
     <div class="schuback" id="searchid">
30 195
         <div class="row " style="padding-right: 0px !important;">
31 196
             <div class="col-xs-12">
32
-                <div class="col-xs-10" style="padding-right: 0px !important;"></div>
197
+                <div class="col-xs-10" style="padding-right: 0px !important;">
198
+                    <form class="form-inline incidentsearchsize" id="filterSearch" style='padding-top: 8px;' ng-style="{height: isDeployment ? 'auto' : '108px'}">
199
+                        <div class="form-group incidentsearch wt_width">
200
+                            <div>
201
+                                <div class="control-label pull-left margin-top-5 margin-right-5">事件单号:</div>
202
+                                <input class="f inputcolor wt_width1 wt_width3 pull-right" type="text"
203
+                                    ng-model="searchkeys.incidentSign" placeholder="" />
204
+                            </div>
205
+                        </div>
206
+                        <div class="form-group incidentsearch wt_width">
207
+                            <div class="">
208
+                                <div class="control-label pull-left margin-top-5">生成时间:</div>
209
+                                <input type="text" class=" incidentsearchsize wt_width5"
210
+                                    datepicker-popuptime="yyyy-MM-dd" ng-model="searchkeys.startTime"
211
+                                    max-date="searchkeys.endTime" is-open="startOpened" hour-time="true"
212
+                                    ng-init="startOpened = false" close-text="关闭" ng-click="startOpen($event)"
213
+                                    placeholder="" />
214
+                            </div>
215
+                        </div>
216
+                        <div class="form-group incidentsearch wt_width">
217
+                            <div class="">
218
+                                <div class="control-label pull-left margin-top-5">至</div>
219
+                                <input type="text" class=" selectzise incidentsearchsize wt_width5"
220
+                                    datepicker-popuptime="yyyy-MM-dd" ng-model="searchkeys.endTime" hour-time="true"
221
+                                    min-date="searchkeys.startTime" is-open="endOpened" ng-init="endOpened = false"
222
+                                    close-text="关闭" ng-click="endOpen($event)" placeholder="" />
223
+                            </div>
224
+                        </div>
225
+                        <div class="form-group incidentsearch  wt_width">
226
+                            <div class="control-label pull-left margin-top-5">状态:</div>
227
+                            <ui-select ng-disabled="isDisabledState" class="pull-right selectzise wt_width1 wt_width3" ng-model="searchkeys.state"
228
+                                theme="bootstrap">
229
+                                <ui-select-match placeholder="请选择状态">
230
+                                    {{$select.selected.name}}
231
+                                </ui-select-match>
232
+                                <ui-select-choices repeat="item in state | filter: $select.search">
233
+                                    <div ng-bind-html="item.name | highlight: $select.search"></div>
234
+                                </ui-select-choices>
235
+                            </ui-select>
236
+                        </div>
237
+                        <div class="form-group incidentsearch wt_width">
238
+                            <div class="control-label pull-left margin-top-5">维修人:</div>
239
+                            <ui-select class="pull-right selectzise wt_width1 wt_width3"
240
+                                ng-model="searchkeys.maintainer" theme="bootstrap">
241
+                                <ui-select-match placeholder="请选择维修人">
242
+                                    {{$select.selected.name}}
243
+                                </ui-select-match>
244
+                                <ui-select-choices repeat="item in handlingPersonnelUser"
245
+                                    refresh="onChangehandling($select.search)">
246
+                                    <div ng-bind-html="item.name | highlight: $select.search"></div>
247
+                                </ui-select-choices>
248
+                            </ui-select>
249
+                        </div>
250
+                    </form>
251
+                </div>
33 252
                 <div class="col-xs-2">
34 253
                     <div>
35 254
                         <div class="pull-left margin-top-10 searchBtnBox">
36 255
                             <div class="btn btn_search" ng-click="searchinspe(inspectdata)"><span>搜索</span></div>
256
+                            <div class="btn btn_clean" ng-click="clear()" type="button">重置</div>
37 257
                             <div class="btn btn_remove" ng-click="removeData()"
38 258
                                 ng-class="isMousedown?'btn_removeMousedown':''" ng-mousedown="changeRemoveClass()"
39 259
                                 ng-show="shanchu" ng-disabled="selected.items.length==0"><span

+ 2 - 2
assets/views/system/tpl/systemworktime.html

@@ -176,7 +176,7 @@
176 176
                 </div>
177 177
             </div>
178 178
 
179
-            <div class="margin-bottom-15 anline">
179
+            <!-- <div class="margin-bottom-15 anline">
180 180
                 <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">是否停用:</div>
181 181
                 <div class="pull-right openaddinput">
182 182
                     <div class="setting-box clearfix">
@@ -185,7 +185,7 @@
185 185
                     </span>
186 186
                     </div>
187 187
                 </div>
188
-            </div>
188
+            </div> -->
189 189
             <div class="margin-bottom-15 anline">
190 190
                 <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14" style="width: 100px;"><span class="red">*</span>工作日/节假日:</div>
191 191
                 <div class="pull-right openaddinput">