关闭代码文字修改

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/system/processdesign/incidentplan/incidentSetUpCtrl.js

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

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/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

@@ -1172,10 +1172,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>  
@@ -1193,7 +1193,7 @@
                         </div>  
                     </div>            
                 </div>
-                <!-- 关闭代码结束 -->
+                <!-- 处理结果结束 -->
                 <!-- 事件状态开始 -->
                 <div ng-if="leftListName=='事件状态'">
                     <div class="col-xs-4">
@@ -1321,8 +1321,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">

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

@@ -1,13 +1,13 @@
 <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 class="row form-group">

assets/views/system/tpl/systemclose.html

@@ -1,13 +1,13 @@
 <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 class="row form-group">