seimin 2 роки тому
батько
коміт
9f9a8c098d

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

@@ -14866,7 +14866,7 @@ appFormly.config(function config(formlyConfigProvider) {
14866 14866
             api_bpm_data.fetchData("place", model.place.id)
14867 14867
                   .then(function (response) {
14868 14868
                     if (response.status == 200) {
14869
-                      text = `姓名:${model.requester?(model.requester.name||''):''}\r\n工号:${model.requester?(model.requester.account||''):''}\r\n来电电话:${model.requester?(model.requester.telephone||''):''}\r\n地点:${response.data.place||''}\r\n详细地址:${model.houseNumber||''}\r\n事件描述:${model.description||''}`;
14869
+                      text = `姓名:${model.requester?(model.requester.name||''):''}\r\n工号:${model.requester?(model.requester.account||''):''}\r\n来电电话:${model.incomingPhone || ''}\r\n地点:${response.data.place||''}\r\n详细地址:${model.houseNumber||''}\r\n事件描述:${model.description||''}`;
14870 14870
                       var textarea = document.createElement('textarea');
14871 14871
                       document.body.appendChild(textarea);
14872 14872
                       // 隐藏此输入框
@@ -14884,7 +14884,7 @@ appFormly.config(function config(formlyConfigProvider) {
14884 14884
                     }
14885 14885
                   });
14886 14886
           }else{
14887
-            text = `姓名:${model.requester?(model.requester.name||''):''}\r\n工号:${model.requester?(model.requester.account||''):''}\r\n来电电话:${model.requester?(model.requester.telephone||''):''}\r\n地点:${''}\r\n详细地址:${model.houseNumber||''}\r\n事件描述:${model.description||''}`;
14887
+            text = `姓名:${model.requester?(model.requester.name||''):''}\r\n工号:${model.requester?(model.requester.account||''):''}\r\n来电电话:${model.incomingPhone || ''}\r\n地点:${''}\r\n详细地址:${model.houseNumber||''}\r\n事件描述:${model.description||''}`;
14888 14888
             var textarea = document.createElement('textarea');
14889 14889
             document.body.appendChild(textarea);
14890 14890
             // 隐藏此输入框
@@ -14905,7 +14905,8 @@ appFormly.config(function config(formlyConfigProvider) {
14905 14905
           // alert('复制成功');
14906 14906
         }
14907 14907
         if (angular.isDefined($stateParams.model) && $stateParams.model != "") {
14908
-          var paramsModel = JSON.parse($stateParams.model)
14908
+          var paramsModel = JSON.parse($stateParams.model);
14909
+          $scope.model.incomingPhone = paramsModel.model.incident ? paramsModel.model.incident.incomingPhone : '';
14909 14910
           //来电-添加报修人
14910 14911
           if (paramsModel.model.incident.requester.hjzxPhone) {
14911 14912
             $scope.options.templateOptions['addRequeter']('lg', $scope.options, $scope.to.modal);

+ 3 - 0
assets/js/controllers/mainCtrl.js

@@ -1247,6 +1247,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
1247 1247
                                                                                     contacts:response.data.name,
1248 1248
                                                                                     callID: cdrid,
1249 1249
                                                                                     source: { id: 1547 },
1250
+                                                                                    incomingPhone: $rootScope.phone
1250 1251
                                                                                   },
1251 1252
                                                                                 },
1252 1253
                                                                               };
@@ -1323,6 +1324,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
1323 1324
                                                                   contacts:myData.list[0].name,
1324 1325
                                                                   callID: cdrid,
1325 1326
                                                                   source: { id: 1547 },
1327
+                                                                  incomingPhone: $rootScope.phone
1326 1328
                                                                 },
1327 1329
                                                               },
1328 1330
                                                             };
@@ -1350,6 +1352,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
1350 1352
                                                                               contacts:requester.name,
1351 1353
                                                                               callID: cdrid,
1352 1354
                                                                               source: { id: 1547 },
1355
+                                                                              incomingPhone: $rootScope.phone
1353 1356
                                                                             },
1354 1357
                                                                           },
1355 1358
                                                                         };

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

@@ -48,7 +48,7 @@
48 48
                 <div class="control-label col-xs-12  fontsizes-16 formheardpad">
49 49
                     <div class="row">
50 50
                         <div class="demo pull-left">来电号码</div>
51
-                        <span class="font-weight-600">: {{model[options.key].telephone}}</span>
51
+                        <div class="font-weight-600">: {{model.incomingPhone}}</div>
52 52
                     </div>
53 53
                 </div>
54 54
             </div>