浏览代码

文字未沟通记录修改为沟通记录

seimin 2 年之前
父节点
当前提交
27cc975e03

+ 5 - 3
assets/js/controllers/customform/customformCtrl.js

@@ -10972,6 +10972,8 @@ appFormly.config(function config(formlyConfigProvider) {
10972 10972
                       } else if (key == "placeDTO") {
10973 10973
                         item.templateOptions.options = list;
10974 10974
                       } else if (key == "requester") {
10975
+                      } else if (key == "area") {
10976
+                        item.templateOptions.options = list;
10975 10977
                       } else {
10976 10978
                         item.value(list[0][key][item.key]);
10977 10979
                       }
@@ -13487,7 +13489,7 @@ appFormly.config(function config(formlyConfigProvider) {
13487 13489
       },
13488 13490
     ],
13489 13491
   });
13490
-  //沟通记录
13492
+  //沟通记录
13491 13493
   formlyConfigProvider.setType({
13492 13494
     name: "ui-handlerLog",
13493 13495
     templateUrl: "assets/views/customform/tpl/ui-handlerLog.html",
@@ -22308,8 +22310,8 @@ appFormly.controller("CustomformCtrl", [
22308 22310
                   }
22309 22311
                   
22310 22312
                   function handlerLogFn(){
22311
-                    //沟通记录
22312
-                    // 沟通记录不为空并且事件是处理中状态
22313
+                    //沟通记录
22314
+                    // 沟通记录不为空并且事件是处理中状态
22313 22315
                     if (vm.model.handlerLog && vm.model.handlerLog.trim() && vm.model.incident.state.value == 'handler') {
22314 22316
                       api_bpm_data.addData('operationLog', { operationLog: { opType: 'handlerLog', opValue: vm.model.handlerLog, extra1: vm.model.incident.id } }).then(function (result1) {
22315 22317
                         baseHandler();

+ 3 - 3
assets/js/controllers/incident/incidentCtrl.js

@@ -2336,7 +2336,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
2336 2336
             }
2337 2337
         });
2338 2338
     }
2339
-    // 新增沟通记录弹窗
2339
+    // 新增沟通记录弹窗
2340 2340
     $scope.toHandlerLog = function (model) {
2341 2341
         console.log(model)
2342 2342
         var modalInstance = $modal.open({
@@ -3092,7 +3092,7 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$http', '$scope', '$modal', '
3092 3092
     $scope.delSj = function () {
3093 3093
         $scope.colobject.grid.appScope.delSj($scope.item);
3094 3094
     }
3095
-    // 新增沟通记录
3095
+    // 新增沟通记录
3096 3096
     $scope.toHandlerLog = function () { //print
3097 3097
         $scope.colobject.grid.appScope.toHandlerLog($scope.item);
3098 3098
         // $scope.doEdit($scope.item.id);
@@ -3175,7 +3175,7 @@ app.directive('incidentoperator', function () {
3175 3175
             '<a ng-click="visit()"  ng-show="{{item.huifang&&huifang}}"  class="bianjifont">回访</a>' +
3176 3176
             '<a ng-click="changeCenter()"  ng-show="jry_modify(item)"  class="luyinfont">编辑</a>' +
3177 3177
             '<a ng-click="toAssign()" ng-show="{{(item.state.id==1543||item.state.id==1544)&&assignFlag&&item.assignee}}" class="assign" >指派</a>' +
3178
-            '<a ng-click="toHandlerLog()" ng-show="{{item.state.id==1544}}" class="assign" >新增沟通记录</a>' +
3178
+            '<a ng-click="toHandlerLog()" ng-show="{{item.state.id==1544}}" class="assign" >新增沟通记录</a>' +
3179 3179
             '<a ng-click="delSj()" ng-show="{{delFlag&&item.state.value!== \'deleted\'}}" class="assign" >删除</a>' +
3180 3180
             '<a ng-click="print()" ng-show="dayin" class="bianjifont" >打印</a>' +
3181 3181
             // '<a ng-click="jry_evaluate()"  ng-show="jry_evaluateShow()" class="luyinfont" >评价</a>' +

+ 1 - 1
assets/views/customform/tpl/ui-handlerLog.html

@@ -1,6 +1,6 @@
1 1
 <div class="row padding-sm no-padding-vr bordered no-border-hr ">
2 2
     <div class="col-md-12">
3
-        <div style="color: #333;">沟通记录:</div>
3
+        <div style="color: #333;">沟通记录:</div>
4 4
         <div class="panel panel-white">
5 5
             <div class="panel-body">
6 6
                 <table class="table table-striped table-hover" style="table-layout:fixed">

+ 2 - 2
assets/views/incident/tpl/toHandlerLog.tpl.html

@@ -1,6 +1,6 @@
1
-<!-- 新增沟通记录 -->
1
+<!-- 新增沟通记录 -->
2 2
 <div class="modal-header">
3
-    <div class="modal-title fontcolor-two fontsizes-14">新增沟通记录
3
+    <div class="modal-title fontcolor-two fontsizes-14">新增沟通记录
4 4
         <button type="button" class="close pull-right" ng-click="cancel()">×</button>
5 5
     </div>
6 6
 </div>