直接处理的“关闭代码”，建议改成“处理结果”

assets/i18n/zh.json

@@ -293,7 +293,7 @@
                     "CHANGETYPE": "变更类型",
                     "CHANGECLASSIFY": "变更分类",
                     "CHANGESTATE": "变更状态",
-                    "CHANGECLOSECODE": "变更关闭代码"
+                    "CHANGECLOSECODE": "变更处理结果"
                 },
                 "servicelayer": {
                     "MAIN": "服务配置",

assets/i18n/zh.json.bak

@@ -250,7 +250,7 @@
           "CHANGETYPE": "变更类型",
           "CHANGECLASSIFY": "变更分类",
           "CHANGESTATE": "变更状态",
-          "CHANGECLOSECODE": "变更关闭代码"
+          "CHANGECLOSECODE": "变更处理结果"
         },
         "servicelayer": {
           "MAIN": "服务配置",

assets/js/controllers/businessConfiguration/faultSymptomsCtrl.js

@@ -1375,7 +1375,7 @@ app.controller('faultSymptoms', ["$rootScope", "$scope", "$state", "$timeout", "
         },2000)
     }
     // 事件来源结束
-    // 关闭代码开始
+    // 处理结果开始
     $scope.incident_closecodeData=[];
     $scope.getIncident_closecode=function(){
         var data={
@@ -1433,7 +1433,7 @@ app.controller('faultSymptoms', ["$rootScope", "$scope", "$state", "$timeout", "
             $scope.getIncident_closecode();
         },2000)
     }
-    // 关闭代码结束
+    // 处理结果结束
     // 优先级规则开始
     $scope.incident_prioritymatrixAdd=function(){
         var modalInstance = $modal.open({

assets/js/controllers/incident/incidentCtrl.js

@@ -1090,7 +1090,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                         }
                     })
                 }
-                // 获取关闭代码
+                // 获取处理结果
                 $scope.getIncidentClosecode = function(){
                     api_wechatfile.getDictionary({"key":"incident_closecode","type":"list"}).then(function (data) {
                         $scope.incidentClosecodeList = data || [];
@@ -1141,7 +1141,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                     if ($scope.model.category.hasSimple != 1 &&!$scope.postData.closecode){
                         Alert.swal({
                             title: "操作失败",
-                            text: "请选择关闭代码!",
+                            text: "请选择处理结果!",
                             type: "error"
                         });
                         return;

assets/js/controllers/mainCtrl.js

@@ -4388,9 +4388,9 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                 console.log($scope.categorySelect)
                 $scope.incidentModel = {
                   handlerMsg:'',//处理方案
-                  closecode:'',//关闭代码
+                  closecode:'',//处理结果
                 };
-                // 关闭代码
+                // 处理结果
                 $scope.closecodeArray = [];
                 $scope.jry_closecodeSearch = function () {
                   api_wechatfile
@@ -4414,7 +4414,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                   if(!$scope.incidentModel.closecode.id){
                     SweetAlert.swal({
                         title: "提示",
-                        text: "请选择关闭代码!",
+                        text: "请选择处理结果!",
                         type: "error",
                         confirmButtonColor: "#DD6B55"
                     });

assets/js/controllers/system/processdesign/incidentplan/incidentSetUpCtrl.js

@@ -24,7 +24,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         {"name":"工时"},
         {"name":"服务级别协议"},
         {"name":"事件来源"},
-        {"name":"关闭代码"},
+        {"name":"处理结果"},
         {"name":"事件状态"},
         {"name":"满意度评价"},
         {"name":"结果类型"},
@@ -1318,7 +1318,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         },2000)
     }
     // 事件来源结束
-    // 关闭代码开始
+    // 处理结果开始
     $scope.incident_closecodeData=[];
     $scope.getIncident_closecode=function(){
         var data={
@@ -1376,7 +1376,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
             $scope.getIncident_closecode();
         },2000)
     }
-    // 关闭代码结束
+    // 处理结果结束
     // 优先级规则开始
     $scope.incident_prioritymatrixAdd=function(){
         var modalInstance = $modal.open({

assets/views/businessConfiguration/faultSymptoms.html

@@ -82,28 +82,28 @@
     }
    /* 故障现象开始 */
    /* 公共css,需要复用 */
-    
+
    .iconfont {
         font-size: 14px;
     }
-    
+
     .nav-pills>li>a {
         border-radius: 0px;
     }
-    
+
     .nav-pills>li.active>a,
     .nav-pills>li.active>a:hover,
     .nav-pills>li.active>a:focus {
         background-color: #006bbf;
         color: white !important;
     }
-    
+
     .panel-tabs,
     .tabbable {
         /* padding: 14px; */
         background-color: white;
     }
-    
+
     .tab-content>.tab-pane,
     .pill-content>.pill-pane {
         padding: 14px;
@@ -112,14 +112,14 @@
         border-right: 1px solid #eeeeee;
         border-radius: 0px 0px 8px 8px;
     }
-    
+
     .nav-tabs>li.active a,
     .nav-tabs>li.active a:hover,
     .nav-tabs>li.active a:focus {
         background-color: #006bc0;
         color: white;
     }
-    
+
     .nav-tabs {
         border-top: 1px solid #eeeeee;
         border-bottom: 1px solid #eeeeee;
@@ -128,16 +128,16 @@
         border-radius: 8px 8px 0 0;
         height: 47px;
     }
-    
+
     .nav-tabs>li {
         border-right: 1px solid #eeeeee;
     }
-    
+
     .nav-tabs>li:last-child {
         border-right: none;
     }
     /* 独立css */
-    
+
     .mainDiv {
         /* background: red; */
         /* padding: 14px; */
@@ -145,20 +145,20 @@
         overflow: hidden;
         /* zoom: 1; */
     }
-    
+
     .mainDivLeft {
         border-radius: 8px;
         border: 1px solid #eeeeee;
         width: 288px;
         float: left;
     }
-    
+
     .mainDivRight {
         margin-left: 302px;
         border-radius: 8px;
         border: 1px solid #eeeeee;
     }
-    
+
     .mainDiv-head {
         height: 47px;
         line-height: 47px;
@@ -169,7 +169,7 @@
         padding-left: 10px;
         padding-right: 4px;
     }
-    
+
     .mainDivLeft-span {
         border: 1px solid;
         /* padding: 15px 0px 15px 0px; */
@@ -183,35 +183,35 @@
         margin-right: 10px;
         font-size: 14px;
     }
-    
+
     .mainDiv-head-right {
         display: inline-block;
         float: right;
     }
-    
+
     .edit-left {
         display: inline-block;
         /* float: left; */
         margin-left: 10px;
     }
-    
+
     .span-1 {
         border-color: #006bc0;
         color: #006bc0;
     }
-    
+
     .span-2 {
         border: none;
         color: white;
         background-color: #006bc0;
     }
-    
+
     .span-3 {
         border: none;
         color: white;
         background-color: #fc4c58;
     }
-    
+
     .mainDiv-body {
         border-radius: 8px;
         border: 1px solid #eeeeee;
@@ -221,7 +221,7 @@
         /* height: 402px; */
         overflow: auto;
     }
-    
+
     .mainDiv-body-1 {
         height: 50px;
         line-height: 50px;
@@ -230,7 +230,7 @@
         padding: 0px 14px;
         border-bottom: 1px solid #eeeeee;
     }
-    
+
     .mainDiv-body-2 {
         height: 70px;
         line-height: 70px;
@@ -239,16 +239,16 @@
         padding: 0px 30px;
         border-bottom: 1px solid #eeeeee;
     }
-    
+
     .mainDiv-body-2:last-child {
         border-bottom: none;
     }
-    
+
     .fixHeight {
         /* height: 450px; */
         overflow: auto;
     }
-    
+
     .mainDiv-body-3 {
         height: 50px;
         line-height: 50px;
@@ -257,7 +257,7 @@
         padding: 0px 30px;
         border-bottom: 1px solid #eeeeee;
     }
-    
+
     .mainDiv-body-3:last-child {
         border-bottom: none;
     }
@@ -271,17 +271,17 @@
         margin-bottom: 0px;
         overflow: hidden;
     }
-    
+
     .mainDiv-body-noList {
         height: 110px;
         margin: 50px 0;
         text-align: center;
     }
-    
+
     .form-control {
         display: inline-block;
     }
-    
+
     .mainDivLeft-span-1 {
         border: 1px solid;
         padding-left: 15px;
@@ -295,7 +295,7 @@
         font-size: 14px;
         display: inline-block;
     }
-    
+
     .mainDivLeft-span-2 {
         border: 1px solid;
         padding-left: 15px;
@@ -309,7 +309,7 @@
         font-size: 14px;
         display: inline-block;
     }
-    
+
     .mainDivLeft-span-edit-1 {
         border: 1px solid;
         padding-left: 8px;
@@ -323,7 +323,7 @@
         font-size: 12px;
         display: inline-block;
     }
-    
+
     .mainDivLeft-span-edit-2 {
         border: 1px solid;
         padding-left: 8px;
@@ -338,13 +338,13 @@
         display: inline-block;
     }
     /* tab内容css */
-    
+
     .tab-mainDiv {
         border: 1px solid #eeeeee;
         border-radius: 8px;
         /* min-height: 360px; */
     }
-    
+
     .tab-mainDiv-head {
         text-align: center;
         border-bottom: 1px solid #eeeeee;
@@ -353,7 +353,7 @@
         font-size: 14px;
         color: #93989e;
     }
-    
+
     .tab-mainDiv-body {
         padding: 14px;
         min-height: 280px;
@@ -362,7 +362,7 @@
         /* padding-top: 14px; */
         /* padding-bottom: 14px; */
     }
-    
+
     .tab-mainDiv-body-lineDiv-50 {
         /* display: inline-block; */
         font-size: 14px;
@@ -371,7 +371,7 @@
         width: 47%;
         padding-left: 14px;
     }
-    
+
     .tab-mainDiv-body-lineDiv-100 {
         /* display: inline-block; */
         font-size: 14px;
@@ -380,29 +380,29 @@
         width: 96%;
         padding-left: 14px;
     }
-    
+
     .tab-mainDiv-body-lable {
         padding-bottom: 10px;
         /* width: 370px; */
     }
-    
+
     .tab-mainDiv-body-content {
         padding-bottom: 10px;
         /* width: 370px; */
     }
-    
+
     .tab-mainDiv-body-content>textarea {
         min-height: 68px;
         width: 100%;
     }
-    
+
     .tab-mainDiv-foot {
         /* margin: 14px auto; */
         border-top: 1px solid #eeeeee;
         text-align: center;
         padding: 7px;
     }
-    
+
     .tab-mainDiv-body-button-1 {
         display: inline-block;
         width: 80px;
@@ -415,7 +415,7 @@
         border-radius: 4px;
         margin-right: 14px;
     }
-    
+
     .tab-mainDiv-body-button-2 {
         display: inline-block;
         width: 80px;
@@ -429,9 +429,9 @@
         box-sizing: border-box;
         border: 1px solid #eeeeee;
     }
-    
+
     .abn-tree {}
-    
+
     .tree-control .tree-view {
         width: inherit;
         z-index: 9999;
@@ -469,13 +469,13 @@
         <div class="col-xs-12">
             <div class="fonsize">故障现象管理>{{leftListName}}</div>
             <div class="rightBox">
-                
+
                 <!-- 故障现象开始 -->
                 <div ng-if="leftListName=='故障现象'">
                     <div class="mainDiv">
-                        
+
                         <!-- 谁固定谁在前 -->
-                
+
                         <div class="mainDivLeft">
                             <div class="mainDiv-head">
                                 <span>服务目录</span>
@@ -490,10 +490,10 @@
                                     <!-- <abn-tree tree-data="my_data" tree-control="my_tree" on-select="my_tree_handler(branch)" expand-level="2" icon-leaf="iconfont icon-zuzhijiaose" icon-expand="ti-plus" icon-collapse="ti-minus "></abn-tree> -->
                                     <abn-tree tree-data="my_data" tree-control="my_tree" on-select="my_tree_handler(branch)" expand-level="2" icon-leaf="iconfont icon-fenlei" icon-expand="ti-plus" icon-collapse="ti-minus"></abn-tree>
                                 </div>
-                
+
                             </div>
                         </div>
-                
+
                         <div class="mainDivRight" ng-if="changecate">
                             <!-- <div class="mainDivRight"> -->
                             <div class="mainDiv-head" style="display: flex;justify-content: space-between;align-items:center;">
@@ -571,7 +571,7 @@
                                         <switch ng-model="subdata.hasSimple" class="green"></switch>
                                     </div>
                                 </div>
-                                
+
                                 <div class="tab-mainDiv-body-lineDiv-50">
                                     <div class="tab-mainDiv-body-lable">
                                         别名:
@@ -711,8 +711,8 @@
                                         </div>
                                     </div>
                                 </div>
-                                
-                                
+
+
                                 <!-- <div class="tab-mainDiv-body-lineDiv-50">
                                     <div class="tab-mainDiv-body-lable">关联组:</div>
                                     <ui-select class="tab-mainDiv-body-content" ng-model="subdata.group" theme="bootstrap">
@@ -743,7 +743,7 @@
                                         <switch ng-model="subdata.hasArea" class="green"></switch>
                                     </div>
                                 </div> -->
-                                
+
                                 <!-- <div class="tab-mainDiv-body-lineDiv-50">
                                     <div class="tab-mainDiv-body-lable">
                                         是否关联地点:
@@ -762,7 +762,7 @@
                                 </div> -->
                             </div>
                         </div>
-                
+
                         <div class="mainDivRight" ng-if="addcate">
                             <!-- <div class="mainDivRight"> -->
                             <div class="mainDiv-head">
@@ -839,7 +839,7 @@
                                             <switch ng-model="adddata.hasSimple" class="green"></switch>
                                         </div>
                                     </div>
-                                    
+
                                     <div class="tab-mainDiv-body-lineDiv-50">
                                         <div class="tab-mainDiv-body-lable">
                                             是否分院区处理:
@@ -959,7 +959,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    
+
                                 <!-- <div class="tab-mainDiv-body-lineDiv-50">
                                     <div class="tab-mainDiv-body-lable">关联组:</div>
                                     <ui-select class="tab-mainDiv-body-content" ng-model="adddata.group" theme="bootstrap">
@@ -990,7 +990,7 @@
                                         <switch ng-model="adddata.hasArea" class="green"></switch>
                                     </div>
                                 </div> -->
-                                
+
                                 <!-- <div class="tab-mainDiv-body-lineDiv-50">
                                     <div class="tab-mainDiv-body-lable">
                                         是否关联地点:
@@ -1009,7 +1009,7 @@
                                 </div>
                             </div>
                         </div>
-                
+
                         <div class="mainDivRight" ng-if="addcate==''&&changecate==''">
                             <!-- <div class="mainDivRight"> -->
                             <div class="mainDiv-head">
@@ -1022,15 +1022,15 @@
                                 </div>
                             </div>
                         </div>
-                    </div>   
+                    </div>
                 </div>
                 <!-- 故障现象结束 -->
                 <!-- 巡检范围开始 -->
                 <div ng-if="leftListName=='巡检范围'">
                     <div class="mainDiv">
-                        
+
                         <!-- 谁固定谁在前 -->
-                
+
                         <div class="mainDivLeft">
                             <div class="mainDiv-head">
                                 <span>服务目录</span>
@@ -1046,7 +1046,7 @@
                                 </div>
                             </div>
                         </div>
-                
+
                         <div class="mainDivRight" ng-if="changecate">
                             <div class="mainDiv-head">
                                 <span>服务目录修改</span>
@@ -1100,7 +1100,7 @@
                                 </div>
                             </div>
                         </div>
-                
+
                         <div class="mainDivRight" ng-if="add1cate">
                             <div class="mainDiv-head">
                                 <span>服务目录新增</span>
@@ -1165,7 +1165,7 @@
                                 </div>
                             </div>
                         </div>
-                
+
                         <div class="mainDivRight" ng-if="add1cate==''&&changecate==''">
                             <!-- <div class="mainDivRight"> -->
                             <div class="mainDiv-head">
@@ -1178,7 +1178,7 @@
                                 </div>
                             </div>
                         </div>
-                    </div>   
+                    </div>
                 </div>
                 <!-- 巡检范围结束 -->
                 <!-- 事件紧急度开始 -->
@@ -1187,8 +1187,8 @@
                         <div class="contentName col-xs-12">紧急度</div>
                         <div class="col-xs-12" ng-repeat="v in incident_emergencyData">
                             <input class="form-control inputcolor emergencyIptSize" style="border-color: #dedede;color: #93989e;" type="text" ng-model="v.name" placeholder="" />
-                        </div> 
-                    </div>                                  
+                        </div>
+                    </div>
                 </div>
                 <!-- 事件紧急度结束 -->
                 <!-- 事件影响度开始 -->
@@ -1197,7 +1197,7 @@
                         <div class="contentName col-xs-12">影响度</div>
                         <div class="col-xs-12" ng-repeat="v in incident_influenceData">
                             <input class="form-control inputcolor emergencyIptSize" style="border-color: #dedede;color: #93989e;" type="text" ng-model="v.name" placeholder="" />
-                        </div>        
+                        </div>
                     </div>
                 </div>
                 <!-- 事件影响度结束 -->
@@ -1207,8 +1207,8 @@
                         <div class="contentName col-xs-12">优先级</div>
                         <div class="col-xs-12" ng-repeat="v in incident_priorityData">
                             <input class="form-control inputcolor emergencyIptSize" style="border-color: #dedede;color: #93989e;" type="text" ng-model="v.name" placeholder="" />
-                        </div> 
-                    </div>              
+                        </div>
+                    </div>
                 </div>
                 <!-- 事件优先级结束 -->
                 <!-- 服务级别协议开始 -->
@@ -1217,20 +1217,20 @@
                         <div class="contentName col-xs-12">名称</div>
                         <div class="col-xs-12" ng-repeat="v in incident_SLA_Data">
                             <input class="form-control inputcolor emergencyIptSize" style="border-color: #dedede;color: #93989e;" type="text" ng-model="v.name" placeholder="" disabled="true">
-                        </div>  
-                    </div>  
+                        </div>
+                    </div>
                     <div class="col-xs-4">
                         <div class="contentName col-xs-12">解决时间(分钟)</div>
                         <div class="col-xs-12" ng-repeat="v in incident_SLA_Data">
                             <input class="form-control inputcolor emergencyIptSize" style="border-color: #dedede;color: #93989e;" type="text" ng-model="v.resolveTime" placeholder="" />
-                        </div>  
-                    </div> 
+                        </div>
+                    </div>
                     <div class="col-xs-4">
                         <div class="contentName col-xs-12">响应时间(分钟)</div>
                         <div class="col-xs-12" ng-repeat="v in incident_SLA_Data">
                             <input class="form-control inputcolor emergencyIptSize" style="border-color: #dedede;color: #93989e;" type="text" ng-model="v.responseTime" placeholder="" />
-                        </div>  
-                    </div>            
+                        </div>
+                    </div>
                 </div>
                 <!-- 服务级别协议结束 -->
                 <!-- 工时开始 -->
@@ -1239,8 +1239,8 @@
                         <div class="contentName col-xs-12">工时</div>
                         <div class="col-xs-12" ng-repeat="v in incident_complexityData">
                             <input class="form-control inputcolor emergencyIptSize" style="border-color: #dedede;color: #93989e;" type="text" ng-model="v.name" placeholder="" />
-                        </div> 
-                    </div>              
+                        </div>
+                    </div>
                 </div>
                 <!-- 工时结束 -->
                 <!-- 事件来源开始 -->
@@ -1249,45 +1249,45 @@
                         <div class="contentName col-xs-12">来源</div>
                         <div class="col-xs-12" ng-repeat="v in incident_sourceData">
                             <input class="form-control inputcolor emergencyIptSize" style="border-color: #dedede;color: #93989e;" type="text" ng-model="v.name" placeholder="" />
-                        </div> 
-                    </div> 
+                        </div>
+                    </div>
                     <div class="col-xs-4">
                         <div class="contentName col-xs-12">来源关联</div>
                         <div class="col-xs-12" ng-repeat="v in incident_sourceData">
                             <input class="form-control inputcolor emergencyIptSize" style="border-color: #dedede;color: #93989e;" type="text" ng-model="v.value" placeholder="" />
-                        </div> 
-                    </div>             
+                        </div>
+                    </div>
                 </div>
                 <!-- 事件来源结束 -->
-                <!-- 关闭代码开始 -->
-                <div ng-if="leftListName=='关闭代码'">
+                <!-- 处理结果开始 -->
+                <div ng-if="leftListName=='处理结果'">
                     <div class="col-xs-4">
-                        <div class="contentName col-xs-12">关闭代码</div>
+                        <div class="contentName col-xs-12">处理结果</div>
                         <div class="col-xs-12" ng-repeat="v in incident_closecodeData">
                             <input class="form-control inputcolor emergencyIptSize" style="border-color: #dedede;color: #93989e;" type="text" ng-model="v.value" placeholder="" />
-                        </div>  
-                    </div>  
+                        </div>
+                    </div>
                     <div class="col-xs-4">
                         <div class="contentName col-xs-12">关闭原因</div>
                         <div class="col-xs-12" ng-repeat="v in incident_closecodeData">
                             <input class="form-control inputcolor emergencyIptSize" style="border-color: #dedede;color: #93989e;" type="text" ng-model="v.desc" placeholder="" />
-                        </div>  
-                    </div> 
+                        </div>
+                    </div>
                     <div class="col-xs-4">
                         <div class="contentName col-xs-12">关闭原因缩写</div>
                         <div class="col-xs-12" ng-repeat="v in incident_closecodeData">
                             <input class="form-control inputcolor emergencyIptSize" style="border-color: #dedede;color: #93989e;" type="text" ng-model="v.name" placeholder="" />
-                        </div>  
-                    </div>            
+                        </div>
+                    </div>
                 </div>
-                <!-- 关闭代码结束 -->
+                <!-- 处理结果结束 -->
                 <!-- 事件状态开始 -->
                 <div ng-if="leftListName=='事件状态'">
                     <div class="col-xs-4">
                         <div class="contentName col-xs-12">事件状态</div>
                         <div class="col-xs-12" ng-repeat="v in incident_classificationData">
                             <input class="form-control inputcolor emergencyIptSize" style="border-color: #dedede;color: #93989e;" type="text" ng-model="v.name" placeholder="" />
-                        </div>        
+                        </div>
                     </div>
                 </div>
                 <!-- 事件状态结束 -->
@@ -1297,7 +1297,7 @@
                         <div class="contentName col-xs-12">满意度评价</div>
                         <div class="col-xs-12" ng-repeat="v in incident_evaluateData">
                             <input class="form-control inputcolor emergencyIptSize" style="border-color: #dedede;color: #93989e;" type="text" ng-model="v.name" placeholder="" />
-                        </div>        
+                        </div>
                     </div>
                 </div>
                 <!-- 满意度评价结束 -->
@@ -1307,7 +1307,7 @@
                         <div class="contentName col-xs-12">结果类型</div>
                         <div class="col-xs-12" ng-repeat="v in incident_resultData">
                             <input class="form-control inputcolor emergencyIptSize" style="border-color: #dedede;color: #93989e;" type="text" ng-model="v.name" placeholder="" />
-                        </div>        
+                        </div>
                     </div>
                 </div>
                 <!-- 结果类型结束 -->
@@ -1324,7 +1324,7 @@
                                     <div ng-bind-html="item.name | highlight: $select.search"></div>
                                 </ui-select-choices>
                             </ui-select>
-                        </div>  
+                        </div>
                     </div>
                     <div class="col-xs-4">
                         <div class="contentName col-xs-12">紧急度</div>
@@ -1337,7 +1337,7 @@
                                     <div ng-bind-html="item.name | highlight: $select.search"></div>
                                 </ui-select-choices>
                             </ui-select>
-                        </div>  
+                        </div>
                     </div>
                     <div class="col-xs-4">
                         <div class="contentName col-xs-12">优先级</div>
@@ -1352,9 +1352,9 @@
                                     </ui-select-choices>
                                 </ui-select>
                                 <i class="iconfont icon-shanchu2 guanbiIco" ng-click="removePrioritymatrix(v)" ng-show="shanchu"></i>
-                            </div>  
+                            </div>
                         </div>
-                        
+
                     </div>
                     <div class="col-xs-12" ng-show="xinzeng">
                         <button class="btn btnAdd" ng-click="incident_prioritymatrixAdd()">新增</button>
@@ -1408,8 +1408,8 @@
             <div class="btn btn_search" ng-click="incident_sourceSave()">保存</div>
             <div class="btn btn_other" ng-click="incident_sourceReturn()">恢复默认</div>
         </div>
-        <!-- 关闭代码 -->
-        <div class="col-xs-12 btn_box" ng-if="leftListName=='关闭代码'&&bianji">
+        <!-- 处理结果 -->
+        <div class="col-xs-12 btn_box" ng-if="leftListName=='处理结果'&&bianji">
             <div class="btn btn_search" ng-click="incident_closecodeSave()">保存</div>
             <div class="btn btn_other" ng-click="incident_closecodeReturn()">恢复默认</div>
         </div>

assets/views/incident/incidentDetail.html

@@ -424,7 +424,7 @@
                 <div class="col-xs-4 ui-label">
                     <div class="form-group">
                         <div class="padding-top-5">
-                            <label>关闭代码:</label>
+                            <label>处理结果:</label>
                             <div>
                                 <input class="form-control" ng-value="model.closecode.desc" type="text" disabled="disabled" />
                             </div>

assets/views/incident/tpl/detailincident.html

@@ -103,9 +103,9 @@
             </div>
         </div>
         <div class=" form-group col-md-4">
-            <label class=" control-label">关闭代码:</label>
+            <label class=" control-label">处理结果:</label>
             <div>
-                <input id="title" name="title" ng-model="entity.closecode.reason" class="form-control" placeholder="关闭代码" disabled="true" />
+                <input id="title" name="title" ng-model="entity.closecode.reason" class="form-control" placeholder="处理结果" disabled="true" />
             </div>
         </div>
         <div class=" form-group col-md-12">

assets/views/incident/tpl/doing.tpl.html

@@ -24,7 +24,7 @@
     <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;" ng-if="model.category.hasSimple != 1">
         <div class=" input-group" style="margin:8px 0 0;">
             <div class="control-label pull-left margin-top-5 margin-right-5">
-                <label class="demoincident"><span class="red">*</span>关闭代码</label>:</div>
+                <label class="demoincident"><span class="red">*</span>处理结果</label>:</div>
             <div class="pull-right">
                 <ui-select class="pull-left" style="width:220px" ng-model="postData.closecode" theme="bootstrap">
                     <ui-select-match placeholder="">

assets/views/newOrderDirectly.html

@@ -22,13 +22,13 @@
             ></textarea>
           </div>
           <div class="c_item clearfix">
-            <label><span class="colorRed">*</span>关闭代码：</label>
+            <label><span class="colorRed">*</span>处理结果：</label>
             <ui-select
               class="c_item_value"
               ng-model="incidentModel.closecode"
               theme="bootstrap"
             >
-              <ui-select-match placeholder="请选择关闭代码">
+              <ui-select-match placeholder="请选择处理结果">
                 <span ng-bind="$select.selected.name"> </span>
               </ui-select-match>
               <ui-select-choices
@@ -72,7 +72,7 @@
       color: #c2c2c5;
       opacity: 1;
     }
-  
+
     .newOrder_content textarea::-webkit-input-placeholder {
       /* Chrome/Opera/Safari */
       color: #c2c2c5;
@@ -91,7 +91,7 @@
       color: #c2c2c5;
       opacity: 1;
     }
-  
+
     .newOrder_content .colorRed {
       color: red;
     }
@@ -110,7 +110,7 @@
       border-radius: 5px;
       color: #d8d8d8;
     }
-  
+
     .newOrder_content .fileupload-icon {
       font-size: 32px;
       position: absolute;
@@ -135,7 +135,7 @@
       opacity: 1;
       overflow: hidden;
     }
-  
+
     .newOrder_content .close:hover {
       opacity: 0.8;
     }
@@ -175,11 +175,11 @@
       flex: 1;
       text-align: right;
     }
-  
+
     .jry_positionFather .describe {
       width: 430px;
     }
-  
+
     .jry_positionChild {
       position: absolute;
       height: 20px;
@@ -187,17 +187,17 @@
       right: 14px;
       top: 50%;
     }
-  
+
     .jry_positionFather {
       position: relative;
       width: 100%;
     }
-  
+
     .jry_item {
       display: inline-block;
       margin-left: 5px;
     }
-  
+
     .jry_icon {
       position: absolute;
       right: 0;
@@ -211,7 +211,7 @@
       background-color: white;
       border-radius: 0 4px 4px 0;
     }
-  
+
     .DingW {
       position: relative;
       display: flex;
@@ -236,27 +236,27 @@
       color: #fff;
       background-color: #006bc0;
     }
-  
+
     .SJFL_ipt {
       width: 100%;
       height: 30px;
       border-radius: 4px 0 0 4px !important;
     }
-  
+
     .radio_left {
       width: 40px;
       display: flex;
       align-items: center;
       justify-content: center;
     }
-  
+
     .list {
       padding: 10px 0;
       border-bottom: 1px rgb(211, 211, 211) solid;
       border-top: 1px rgb(211, 211, 211) solid;
       display: flex;
     }
-  
+
     .noData {
       display: flex;
       width: 100%;
@@ -266,15 +266,15 @@
       border-bottom: none !important;
       padding-top: 30px !important;
     }
-  
+
     .noData img {
       width: 120px;
     }
-  
+
     .newOrder_content {
       display: flex;
     }
-  
+
     .leftList {
       width: 280px;
       background-color: rgb(245, 245, 245);
@@ -284,7 +284,7 @@
       border-radius: 4px;
       padding: 5px;
     }
-  
+
     .centerList {
       /* width: 778px; */
       flex: 1;
@@ -324,7 +324,7 @@
       line-height: 30px;
       margin: 0;
     }
-  
+
     .rightList {
       width: 280px;
       background-color: rgb(245, 245, 245);
@@ -334,7 +334,7 @@
       border-radius: 4px;
       padding: 5px;
     }
-  
+
     .head {
       color: #005395;
       font-size: 12px;
@@ -343,4 +343,3 @@
       border-bottom: 1px rgb(211, 211, 211) solid;
     }
   </style>
-  

assets/views/report/catergry.html

@@ -404,7 +404,7 @@
                             优先级
                         </th>
                         <th rowspan="1" colspan='5'>
-                            关闭代码
+                            处理结果
                         </th>
                     </tr>
                     <tr>
@@ -442,19 +442,19 @@
                             低
                         </th>
                         <th rowspan="1">
-                            关闭代码1
+                            处理结果1
                         </th>
                         <th rowspan="1">
-                            关闭代码2
+                            处理结果2
                         </th>
                         <th rowspan="1">
-                            关闭代码3
+                            处理结果3
                         </th>
                         <th rowspan="1">
-                            关闭代码4
+                            处理结果4
                         </th>
                         <th rowspan="1">
-                            关闭代码5
+                            处理结果5
                         </th>
                     </tr>
                 </thread>

assets/views/system/processdesign/incidentplan/closecode.html

@@ -1,7 +1,7 @@
 <section id="page-title">
     <div class="row">
         <div class="col-sm-8">
-            <h1 class="mainTitle">事件关闭代码设置</h1><span class="mainDescription">事件关闭代码设置，可对事件关闭代码进行修改，新增，删除</span></div>
+            <h1 class="mainTitle">事件处理结果设置</h1><span class="mainDescription">事件处理结果设置，可对事件处理结果进行修改，新增，删除</span></div>
     </div>
 </section>
 <div ng-controller="incidentcloseCtrl">

assets/views/system/processdesign/incidentplan/incidentSetUp.html

@@ -1173,10 +1173,10 @@
                     </div>
                 </div>
                 <!-- 事件来源结束 -->
-                <!-- 关闭代码开始 -->
-                <div ng-if="leftListName=='关闭代码'">
+                <!-- 处理结果开始 -->
+                <div ng-if="leftListName=='处理结果'">
                     <div class="col-xs-4">
-                        <div class="contentName col-xs-12">关闭代码</div>
+                        <div class="contentName col-xs-12">处理结果</div>
                         <div class="col-xs-12" ng-repeat="v in incident_closecodeData">
                             <input class="form-control inputcolor emergencyIptSize" style="border-color: #dedede;color: #93989e;" type="text" ng-model="v.value" placeholder="" />
                         </div>
@@ -1194,7 +1194,7 @@
                         </div>
                     </div>
                 </div>
-                <!-- 关闭代码结束 -->
+                <!-- 处理结果结束 -->
                 <!-- 事件状态开始 -->
                 <div ng-if="leftListName=='事件状态'">
                     <div class="col-xs-4">
@@ -1350,8 +1350,8 @@
             <div class="btn btn_search" ng-click="incident_sourceSave()">保存</div>
             <div class="btn btn_other" ng-click="incident_sourceReturn()">恢复默认</div>
         </div>
-        <!-- 关闭代码 -->
-        <div class="col-xs-12 btn_box" ng-if="leftListName=='关闭代码'&&bianji">
+        <!-- 处理结果 -->
+        <div class="col-xs-12 btn_box" ng-if="leftListName=='处理结果'&&bianji">
             <div class="btn btn_search" ng-click="incident_closecodeSave()">保存</div>
             <div class="btn btn_other" ng-click="incident_closecodeReturn()">恢复默认</div>
         </div>

assets/views/system/processdesign/knowledgedesign/system_1/processdesign/incidentplan/closecode.html

@@ -1,5 +1,5 @@
 
-<section id="page-title"><div class="row"><div class="col-sm-8"><h1 class="mainTitle">事件关闭代码设置</h1><span class="mainDescription">事件关闭代码设置，可对事件关闭代码进行修改，新增，删除</span></div></div></section>
+<section id="page-title"><div class="row"><div class="col-sm-8"><h1 class="mainTitle">事件处理结果设置</h1><span class="mainDescription">事件处理结果设置，可对事件处理结果进行修改，新增，删除</span></div></div></section>
 <div ng-controller="incidentcloseCtrl">
   <div class="row margin-top-10 margin-bottom-10">
     <div class="col-xs-12">
@@ -10,7 +10,7 @@
     </div>
   </div>
   </div>
- 
+
   <div ui-i18n="{{lang}}">
         <div id="grid1" ui-grid="gridOptions" ui-grid-pagination ui-grid-edit external-scopes="$scope" ui-grid-cellNav ui-grid-resize-columns ui-grid-selection class="grid"></div>
    </div>

assets/views/system/processdesign/knowledgedesign/system_1/tpl/systemclose.html

@@ -1,28 +1,28 @@
 <div class="modal-header bg-primary" >
     <button type="button" class="close" ng-click="cancel()">×</button>
-    <i class="fa fa-inbox"></i><span class="label label-tag">关闭代码设置</span>
+    <i class="fa fa-inbox"></i><span class="label label-tag">处理结果设置</span>
 </div>
 <div class="modal-body">
     <div class="well well-lg"><br/>
       <div class="row form-group">
-        <label class="col-md-3 col-md-offset-1 control-label" for="code">关闭代码:</label>
+        <label class="col-md-3 col-md-offset-1 control-label" for="code">处理结果:</label>
         <div class="col-md-7">
-          <input  id="title" name="code" class="form-control"  ng-model="closedata.code" placeholder="关闭代码" />
+          <input  id="title" name="code" class="form-control"  ng-model="closedata.code" placeholder="处理结果" />
         </div>
-      </div>  
+      </div>
       <div class="row form-group">
         <label class="col-md-3 col-md-offset-1 control-label" for="reason">关闭原因:</label>
         <div class="col-md-7">
           <input  class="form-control" id="reason" name="reason" ng-model="closedata.reason"   placeholder="关闭原因" />
-        </div> 
+        </div>
       </div>
       <div class="row form-group">
         <label class="col-md-3 col-md-offset-1 control-label" for="type">关闭原因简写:</label>
         <div class="col-md-7">
           <input  class="form-control" id="type" name="type" class="form-control" ng-model="closedata.type" placeholder="关闭原因简写" />
-        </div> 
+        </div>
       </div>
-    </div> 
+    </div>
     <div class="panel-footer text-center">
         <a ng-click="savercode(closedata)"   data-dismiss="modal" class="btn btn-primary">保存</a>
         <button class="btn btn-primary btn-o" ng-click="cancel()" translate="modal.button.CANCEL">取消</button>

assets/views/system/tpl/systemclose.html

@@ -1,28 +1,28 @@
 <div class="modal-header bg-primary" >
     <button type="button" class="close" ng-click="cancel()">×</button>
-    <i class="fa fa-inbox"></i><span class="label label-tag">关闭代码设置</span>
+    <i class="fa fa-inbox"></i><span class="label label-tag">处理结果设置</span>
 </div>
 <div class="modal-body">
     <div class="well well-lg"><br/>
       <div class="row form-group">
-        <label class="col-md-3 col-md-offset-1 control-label" for="code">关闭代码:</label>
+        <label class="col-md-3 col-md-offset-1 control-label" for="code">处理结果:</label>
         <div class="col-md-7">
-          <input  id="title" name="code" class="form-control"  ng-model="closedata.code" placeholder="关闭代码" />
+          <input  id="title" name="code" class="form-control"  ng-model="closedata.code" placeholder="处理结果" />
         </div>
-      </div>  
+      </div>
       <div class="row form-group">
         <label class="col-md-3 col-md-offset-1 control-label" for="reason">关闭原因:</label>
         <div class="col-md-7">
           <input  class="form-control" id="reason" name="reason" ng-model="closedata.reason"   placeholder="关闭原因" />
-        </div> 
+        </div>
       </div>
       <div class="row form-group">
         <label class="col-md-3 col-md-offset-1 control-label" for="type">关闭原因简写:</label>
         <div class="col-md-7">
           <input  class="form-control" id="type" name="type" class="form-control" ng-model="closedata.type" placeholder="关闭原因简写" />
-        </div> 
+        </div>
       </div>
-    </div> 
+    </div>
     <div class="panel-footer text-center">
         <a ng-click="savercode(closedata)"   data-dismiss="modal" class="btn btn-primary">保存</a>
         <button class="btn btn-primary btn-o" ng-click="cancel()" translate="modal.button.CANCEL">取消</button>