Browse Source

未转换改成未受理

seimin 3 years ago
parent
commit
6b8f701630

+ 3 - 3
assets/js/controllers/desk/chartCtrl.js

@@ -758,7 +758,7 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
758
             $scope.fileData.wxincident.serviceState.id = $scope.searchstate;
758
             $scope.fileData.wxincident.serviceState.id = $scope.searchstate;
759
         }
759
         }
760
     }else{
760
     }else{
761
-        //默认未转换
761
+        //默认未受理
762
         $scope.searchstate = 1650;
762
         $scope.searchstate = 1650;
763
         if (sessionStorage.getItem('jry_data')) {
763
         if (sessionStorage.getItem('jry_data')) {
764
             $scope.searchstate = sessionStorage.getItem('jry_data');
764
             $scope.searchstate = sessionStorage.getItem('jry_data');
@@ -787,12 +787,12 @@ app.controller('Wechatoperator', ['$rootScope', '$http', '$scope', '$modal', fun
787
     } else {
787
     } else {
788
         $scope.toHandle = false;
788
         $scope.toHandle = false;
789
     }
789
     }
790
-    if ($scope.item.serviceState.name == "未转换") {
790
+    if ($scope.item.serviceState.name == "未受理") {
791
         $scope.handle = true;
791
         $scope.handle = true;
792
     } else {
792
     } else {
793
         $scope.handle = false;
793
         $scope.handle = false;
794
     }
794
     }
795
-    if ($scope.item.serviceState.name == "已转换" || $scope.item.serviceState.name == "不受理" || $scope.item.serviceState.name == "未转换") {
795
+    if ($scope.item.serviceState.name == "已转换" || $scope.item.serviceState.name == "不受理" || $scope.item.serviceState.name == "未受理") {
796
         $scope.see = true;
796
         $scope.see = true;
797
     } else {
797
     } else {
798
         $scope.see = false;
798
         $scope.see = false;

+ 2 - 2
assets/js/controllers/desk/jry_emergencyCtrl.js

@@ -478,7 +478,7 @@ app.controller('jry_emergencyCtrl', ["$scope", "i18nService", "$rootScope", "$st
478
 
478
 
479
             // $state.go('app.incident.detail', { formKey: 'incident_back', pdKey: 'incident', dataId: data.id, taskId: data.taskId, processInstanceId: data.processInstanceId });
479
             // $state.go('app.incident.detail', { formKey: 'incident_back', pdKey: 'incident', dataId: data.id, taskId: data.taskId, processInstanceId: data.processInstanceId });
480
 
480
 
481
-            if (data.state == "未转换") {
481
+            if (data.state == "未受理") {
482
 
482
 
483
                 angular.extend(modelfile.model.incident, { status: 1 })
483
                 angular.extend(modelfile.model.incident, { status: 1 })
484
 
484
 
@@ -520,7 +520,7 @@ app.controller('jry_emergencyCtrl', ["$scope", "i18nService", "$rootScope", "$st
520
 
520
 
521
             var modelfile = { model: row.entity };
521
             var modelfile = { model: row.entity };
522
 
522
 
523
-            // if (row.entity.state == "未转换") {
523
+            // if (row.entity.state == "未受理") {
524
 
524
 
525
             //     angular.extend(modelfile.model.incident, { status: 1 })
525
             //     angular.extend(modelfile.model.incident, { status: 1 })
526
 
526
 

+ 1 - 1
assets/js/controllers/desk/recordCtrl.js

@@ -430,7 +430,7 @@ app.controller('recordCtrl', ["$scope", "i18nService", "$rootScope", "$state", "
430
     /*--------- double click --------- */
430
     /*--------- double click --------- */
431
     // $scope.onDblClick = function(row) {
431
     // $scope.onDblClick = function(row) {
432
     //     var modelfile = { model: { incident: row.entity } };
432
     //     var modelfile = { model: { incident: row.entity } };
433
-    //     if (row.entity.state == "未转换") {
433
+    //     if (row.entity.state == "未受理") {
434
     //         angular.extend(modelfile.model.incident, { status: 1 })
434
     //         angular.extend(modelfile.model.incident, { status: 1 })
435
     //     } else {
435
     //     } else {
436
     //         angular.extend(modelfile.model.incident, { status: 0 })
436
     //         angular.extend(modelfile.model.incident, { status: 0 })

+ 2 - 2
assets/js/controllers/report/service_formCtrl.js

@@ -169,7 +169,7 @@ app.controller('service_formCtrl', ["$scope", "$rootScope", "$state", "$timeout"
169
     $scope.web_list = null;//表格列表
169
     $scope.web_list = null;//表格列表
170
     $scope.web_req_total = 0;//微信/WEB报修总数
170
     $scope.web_req_total = 0;//微信/WEB报修总数
171
     $scope.web_req_trans = 0;//转换数量
171
     $scope.web_req_trans = 0;//转换数量
172
-    $scope.web_req_reject = 0;//未转换数量
172
+    $scope.web_req_reject = 0;//未受理数量
173
     $scope.web_trans_total = 0;//微信/WEB转换总数
173
     $scope.web_trans_total = 0;//微信/WEB转换总数
174
     $scope.web_p_total = 0;//直接解决
174
     $scope.web_p_total = 0;//直接解决
175
     $scope.web_unp_total = 0;//派单
175
     $scope.web_unp_total = 0;//派单
@@ -249,7 +249,7 @@ app.controller('service_formCtrl', ["$scope", "$rootScope", "$state", "$timeout"
249
                         $scope.web_list = res.dataList || [];//表格列表
249
                         $scope.web_list = res.dataList || [];//表格列表
250
                         $scope.web_req_total = res.title.req_total;//微信/WEB报修总数
250
                         $scope.web_req_total = res.title.req_total;//微信/WEB报修总数
251
                         $scope.web_req_trans = res.title.req_trans;//转换数量
251
                         $scope.web_req_trans = res.title.req_trans;//转换数量
252
-                        $scope.web_req_reject = res.title.req_reject;//未转换数量
252
+                        $scope.web_req_reject = res.title.req_reject;//未受理数量
253
                         $scope.web_trans_total = res.title.trans_total;//微信/WEB转换总数
253
                         $scope.web_trans_total = res.title.trans_total;//微信/WEB转换总数
254
                         $scope.web_p_total = res.title.p_total;//直接解决
254
                         $scope.web_p_total = res.title.p_total;//直接解决
255
                         $scope.web_unp_total = res.title.unp_total;//派单
255
                         $scope.web_unp_total = res.title.unp_total;//派单

+ 2 - 2
assets/js/controllers/system/notificationCtrl.js

@@ -36,8 +36,8 @@ app.controller('notificationCtr', ["$rootScope", "$scope", "$state", "$timeout",
36
     //请求获取报修流程列表
36
     //请求获取报修流程列表
37
     //process: '通知流程',processNode:'流程节点',processStatus:'状态',notifiedPerson:'被通知人'
37
     //process: '通知流程',processNode:'流程节点',processStatus:'状态',notifiedPerson:'被通知人'
38
     $scope.bxList = [
38
     $scope.bxList = [
39
-        { processName: '报修流程', processNode: '申请', processStatus: '未转换', notifiedPerson: '报修人' },
40
-        { processName: '报修流程', processNode: '申请', processStatus: '未转换', notifiedPerson: '服务台人员' },
39
+        { processName: '报修流程', processNode: '申请', processStatus: '未受理', notifiedPerson: '报修人' },
40
+        { processName: '报修流程', processNode: '申请', processStatus: '未受理', notifiedPerson: '服务台人员' },
41
         { processName: '报修流程', processNode: '申请', processStatus: '不受理', notifiedPerson: '报修人' },
41
         { processName: '报修流程', processNode: '申请', processStatus: '不受理', notifiedPerson: '报修人' },
42
         { processName: '报修流程', processNode: '受理', processStatus: '已转换', notifiedPerson: '报修人' }
42
         { processName: '报修流程', processNode: '受理', processStatus: '已转换', notifiedPerson: '报修人' }
43
     ];
43
     ];

+ 7 - 7
assets/views/dashboard/tpl/largedashboard/dash.html

@@ -123,7 +123,7 @@
123
                             <td align="center" bgcolor="#FFFFFF">测试地址</td>
123
                             <td align="center" bgcolor="#FFFFFF">测试地址</td>
124
                             <td align="center" bgcolor="#FFFFFF">突发事件</td>
124
                             <td align="center" bgcolor="#FFFFFF">突发事件</td>
125
                             <td align="center" bgcolor="#FFFFFF">&nbsp;</td>
125
                             <td align="center" bgcolor="#FFFFFF">&nbsp;</td>
126
-                            <td align="center" bgcolor="#FFFFFF">未转换</td>
126
+                            <td align="center" bgcolor="#FFFFFF">未受理</td>
127
                             <td align="center" bgcolor="#FFFFFF">2017-07-25 15:55:53</td>
127
                             <td align="center" bgcolor="#FFFFFF">2017-07-25 15:55:53</td>
128
                             </tr>
128
                             </tr>
129
                           <tr>
129
                           <tr>
@@ -131,7 +131,7 @@
131
                             <td align="center" bgcolor="#F9FAFF">测试地址</td>
131
                             <td align="center" bgcolor="#F9FAFF">测试地址</td>
132
                             <td align="center" bgcolor="#F9FAFF">突发事件</td>
132
                             <td align="center" bgcolor="#F9FAFF">突发事件</td>
133
                             <td align="center" bgcolor="#F9FAFF">&nbsp;</td>
133
                             <td align="center" bgcolor="#F9FAFF">&nbsp;</td>
134
-                            <td align="center" bgcolor="#F9FAFF">未转换</td>
134
+                            <td align="center" bgcolor="#F9FAFF">未受理</td>
135
                             <td align="center" bgcolor="#F9FAFF">2017-07-24 10:00:16</td>
135
                             <td align="center" bgcolor="#F9FAFF">2017-07-24 10:00:16</td>
136
                             </tr>
136
                             </tr>
137
                           <tr>
137
                           <tr>
@@ -139,7 +139,7 @@
139
                             <td align="center" bgcolor="#FFFFFF">测试地址</td>
139
                             <td align="center" bgcolor="#FFFFFF">测试地址</td>
140
                             <td align="center" bgcolor="#FFFFFF">突发事件</td>
140
                             <td align="center" bgcolor="#FFFFFF">突发事件</td>
141
                             <td align="center" bgcolor="#FFFFFF">&nbsp;</td>
141
                             <td align="center" bgcolor="#FFFFFF">&nbsp;</td>
142
-                            <td align="center" bgcolor="#FFFFFF">未转换</td>
142
+                            <td align="center" bgcolor="#FFFFFF">未受理</td>
143
                             <td align="center" bgcolor="#FFFFFF">2017-07-25 15:55:53</td>
143
                             <td align="center" bgcolor="#FFFFFF">2017-07-25 15:55:53</td>
144
                             </tr>
144
                             </tr>
145
                           <tr>
145
                           <tr>
@@ -147,7 +147,7 @@
147
                             <td align="center" bgcolor="#F9FAFF">测试地址</td>
147
                             <td align="center" bgcolor="#F9FAFF">测试地址</td>
148
                             <td align="center" bgcolor="#F9FAFF">突发事件</td>
148
                             <td align="center" bgcolor="#F9FAFF">突发事件</td>
149
                             <td align="center" bgcolor="#F9FAFF">&nbsp;</td>
149
                             <td align="center" bgcolor="#F9FAFF">&nbsp;</td>
150
-                            <td align="center" bgcolor="#F9FAFF">未转换</td>
150
+                            <td align="center" bgcolor="#F9FAFF">未受理</td>
151
                             <td align="center" bgcolor="#F9FAFF">2017-07-24 10:00:16</td>
151
                             <td align="center" bgcolor="#F9FAFF">2017-07-24 10:00:16</td>
152
                             </tr>
152
                             </tr>
153
                           <tr>
153
                           <tr>
@@ -155,7 +155,7 @@
155
                             <td align="center" bgcolor="#FFFFFF">测试地址</td>
155
                             <td align="center" bgcolor="#FFFFFF">测试地址</td>
156
                             <td align="center" bgcolor="#FFFFFF">突发事件</td>
156
                             <td align="center" bgcolor="#FFFFFF">突发事件</td>
157
                             <td align="center" bgcolor="#FFFFFF">&nbsp;</td>
157
                             <td align="center" bgcolor="#FFFFFF">&nbsp;</td>
158
-                            <td align="center" bgcolor="#FFFFFF">未转换</td>
158
+                            <td align="center" bgcolor="#FFFFFF">未受理</td>
159
                             <td align="center" bgcolor="#FFFFFF">2017-07-25 15:55:53</td>
159
                             <td align="center" bgcolor="#FFFFFF">2017-07-25 15:55:53</td>
160
                             </tr>
160
                             </tr>
161
                           <tr>
161
                           <tr>
@@ -163,7 +163,7 @@
163
                             <td align="center" bgcolor="#F9FAFF">测试地址</td>
163
                             <td align="center" bgcolor="#F9FAFF">测试地址</td>
164
                             <td align="center" bgcolor="#F9FAFF">突发事件</td>
164
                             <td align="center" bgcolor="#F9FAFF">突发事件</td>
165
                             <td align="center" bgcolor="#F9FAFF">&nbsp;</td>
165
                             <td align="center" bgcolor="#F9FAFF">&nbsp;</td>
166
-                            <td align="center" bgcolor="#F9FAFF">未转换</td>
166
+                            <td align="center" bgcolor="#F9FAFF">未受理</td>
167
                             <td align="center" bgcolor="#F9FAFF">2017-07-24 10:00:16</td>
167
                             <td align="center" bgcolor="#F9FAFF">2017-07-24 10:00:16</td>
168
                           </tr>
168
                           </tr>
169
                           <tr>
169
                           <tr>
@@ -171,7 +171,7 @@
171
                             <td align="center" bgcolor="#FFFFFF">测试地址</td>
171
                             <td align="center" bgcolor="#FFFFFF">测试地址</td>
172
                             <td align="center" bgcolor="#FFFFFF">突发事件</td>
172
                             <td align="center" bgcolor="#FFFFFF">突发事件</td>
173
                             <td align="center" bgcolor="#FFFFFF">&nbsp;</td>
173
                             <td align="center" bgcolor="#FFFFFF">&nbsp;</td>
174
-                            <td align="center" bgcolor="#FFFFFF">未转换</td>
174
+                            <td align="center" bgcolor="#FFFFFF">未受理</td>
175
                             <td align="center" bgcolor="#FFFFFF">2017-07-25 15:55:53</td>
175
                             <td align="center" bgcolor="#FFFFFF">2017-07-25 15:55:53</td>
176
                           </tr>
176
                           </tr>
177
                         </table>
177
                         </table>

+ 1 - 1
assets/views/desk/chart.html

@@ -89,7 +89,7 @@
89
         </button>
89
         </button>
90
         <button class="btn btn-statebutton statebutton" ng-class="{'statecolor':searchstate==1650}"
90
         <button class="btn btn-statebutton statebutton" ng-class="{'statecolor':searchstate==1650}"
91
           ng-click="onChange(1650)">
91
           ng-click="onChange(1650)">
92
-          未转换
92
+          未受理
93
         </button>
93
         </button>
94
         <button class="btn btn-statebutton statebutton" ng-class="{'statecolor':searchstate==1651}"
94
         <button class="btn btn-statebutton statebutton" ng-class="{'statecolor':searchstate==1651}"
95
           ng-click="onChange(1651)">
95
           ng-click="onChange(1651)">