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

+ 351 - 176
assets/js/controllers/customform/customformCtrl.js

@@ -14181,10 +14181,185 @@ appFormly.config(function config(formlyConfigProvider) {
14181 14181
                       }
14182 14182
                     );
14183 14183
                     console.log($scope.requester);
14184
-                    $modalInstance.close($scope.requester);
14184
+                    // $modalInstance.close($scope.requester);
14185
+                    $scope.selectedItemTodo(sco, $scope.requester)
14185 14186
                   }
14186 14187
                 };
14187 14188
 
14189
+                $scope.selectedItemTodo = function($scope, selectedItem){
14190
+                  if (selectedItem) {
14191
+                    var data = {
14192
+                      requester: selectedItem,
14193
+                    };
14194
+                    $scope.searchKey = selectedItem.account;
14195
+                    // $scope.$parent.$parent.$parent.model['requestershow'] = selectedItem;
14196
+                    // if (selectedItem.place && selectedItem.place.place) {
14197
+                    //     $scope.$parent.$parent.$parent.model.incident.houseNumber = selectedItem.place.area.area + selectedItem.place.place
14198
+                    // }
14199
+                    options.templateOptions.UserService.addData(
14200
+                      "requester",
14201
+                      data
14202
+                    ).then(function (response) {
14203
+                      if (response.status == 200) {
14204
+                        $modalInstance.dismiss("ok");
14205
+                        if (options.model) {
14206
+                          options.model.requester = response.data;
14207
+                          $scope.$parent.$parent.$parent.model.incident.requester =
14208
+                            response.data;
14209
+                          $scope.$parent.$parent.$parent.model.requestershow =
14210
+                            response.data;
14211
+                          if (options.model.place) {
14212
+                            options.model.place.id = "";
14213
+                          }
14214
+                          if (options.model.area) {
14215
+                            options.model.area.id = "";
14216
+                          }
14217
+  
14218
+                          options.model.contacts = selectedItem.name;
14219
+                          if (
14220
+                            selectedItem.mphone &&
14221
+                            selectedItem.mphone != null &&
14222
+                            selectedItem.mphone != ""
14223
+                          ) {
14224
+                            options.model.contactsInformation =
14225
+                              selectedItem.mphone;
14226
+                          } else {
14227
+                            options.model.contactsInformation =
14228
+                              selectedItem.telephone;
14229
+                          }
14230
+                          if (
14231
+                            selectedItem.requesterTypeDTO &&
14232
+                            selectedItem.requesterTypeDTO.id == 2
14233
+                          ) {
14234
+                            $scope.$parent.$parent.$parent.model.incident.priority.id = 2;
14235
+                            // $scope.$parent.$parent.$parent.model.incident.emergency.id = 2;
14236
+                            // $scope.$parent.$parent.$parent.model.incident.influence.id = 1
14237
+                          }
14238
+                        }
14239
+                        if (!response.data.id) {
14240
+                          response.data.id = selectedItem.id;
14241
+                        }
14242
+                        options.value(response.data);
14243
+                        options.value(response.data);
14244
+                        console.log($scope, "0000000");
14245
+                        //新增报修人带入区域地点2020年4月23日19:48:15
14246
+                        $scope.model.selecthouseNumber = selectedItem.place
14247
+                          ? selectedItem.place
14248
+                          : {};
14249
+                        $scope.$root.selecthouseNumber = selectedItem.place
14250
+                          ? selectedItem.place
14251
+                          : {};
14252
+                        if ($scope.$parent.$parent.$parent.model.saveAgain) {
14253
+                          if (selectedItem.place && selectedItem.place.id) {
14254
+                            options.model.place.id = selectedItem.place.id;
14255
+                            options.model.place.area.id = selectedItem.place.area.id;
14256
+                            if(selectedItem.branch && selectedItem.branch.id){
14257
+                              options.model.branch.id = selectedItem.branch.id;
14258
+                              console.log($scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields);
14259
+                              let fields = $scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields;
14260
+                              for (let i = 0; i < fields.length; i++) {
14261
+                                if(fields[i].templateOptions.onlyKey == 'area_start'){
14262
+                                  // 如果是区域
14263
+                                  options.templateOptions.UserService.fetchDataList('area', { idx: 0, sum: 1000, area:{branch:options.model.branch.id} }).then(function(response) {
14264
+                                      if (response.status == 200) {
14265
+                                        fields[i].templateOptions.options = response.list;
14266
+                                      }
14267
+                                  })
14268
+                                }else if(fields[i].templateOptions.onlyKey == 'place_start'){
14269
+                                  // 如果是地点
14270
+                                  options.templateOptions.UserService.fetchDataList('place', { idx: 0, sum: 1000, place:{area:{id:options.model.area.id}} }).then(function(response) {
14271
+                                    if (response.status == 200) {
14272
+                                      fields[i].templateOptions.options = response.list;
14273
+                                    }
14274
+                                })
14275
+                                }
14276
+                              }
14277
+                            }
14278
+                          }
14279
+                        } else {
14280
+                          if (selectedItem.place && selectedItem.place.id) {
14281
+                            options.model.place.id = selectedItem.place.id;
14282
+                            options.model.area.id = selectedItem.place.area.id;
14283
+                            if(selectedItem.branch && selectedItem.branch.id){
14284
+                              options.model.branch.id = selectedItem.branch.id;
14285
+                              console.log($scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields);
14286
+                              let fields = $scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields;
14287
+                              for (let i = 0; i < fields.length; i++) {
14288
+                                if(fields[i].templateOptions.onlyKey == 'area_start'){
14289
+                                  // 如果是区域
14290
+                                  options.templateOptions.UserService.fetchDataList('area', { idx: 0, sum: 1000, area:{branch:options.model.branch.id} }).then(function(response) {
14291
+                                      if (response.status == 200) {
14292
+                                        fields[i].templateOptions.options = response.list;
14293
+                                      }
14294
+                                  })
14295
+                                }else if(fields[i].templateOptions.onlyKey == 'place_start'){
14296
+                                  // 如果是地点
14297
+                                  options.templateOptions.UserService.fetchDataList('place', { idx: 0, sum: 1000, place:{area:{id:options.model.area.id}} }).then(function(response) {
14298
+                                    if (response.status == 200) {
14299
+                                      fields[i].templateOptions.options = response.list;
14300
+                                    }
14301
+                                })
14302
+                                }
14303
+                              }
14304
+                            }
14305
+                          }
14306
+                        }
14307
+                        // if (selectedItem.areaDTO && selectedItem.place.area.id) {
14308
+                        //     options.model.area.id = selectedItem.place.area.id
14309
+                        // }
14310
+                        if (selectedItem.houseNumber) {
14311
+                          options.model.houseNumber = selectedItem.houseNumber;
14312
+                        }
14313
+                        if (selectedItem.room) {
14314
+                          options.model.room.id = selectedItem.room.id;
14315
+                        }
14316
+                        // if (selectedItem.id) {
14317
+                        options.model.account = selectedItem.account;
14318
+                        // 找到表单报修人组件,并使用组件内部方法重新获取增加报修人后的报修人下拉选项
14319
+                        var baoxiuFields =
14320
+                          $scope.$parent.$parent.$parent.$parent.$parent.vm
14321
+                            .fields[1].fields;
14322
+                        var baoxiurenTo;
14323
+                        baoxiuFields.forEach((e, i) => {
14324
+                          if (e.key == "account") {
14325
+                            baoxiurenTo = e.templateOptions;
14326
+                            baoxiurenTo.APIService.fetchDataList("requester", {
14327
+                              idx: 0,
14328
+                              sum: 20,
14329
+                              requester: {
14330
+                                searchKey: selectedItem.account,
14331
+                              },
14332
+                            }).then((res) => {
14333
+                              baoxiurenTo.options = res.list;
14334
+                              options.model.account = selectedItem.account;
14335
+                            });
14336
+                          }
14337
+                        });
14338
+  
14339
+                        // }
14340
+                        // $scope.$parent.$parent.$parent.model.incident.requester = selectedItem
14341
+                        // 选择重复事件侧滑框
14342
+                        // if ($scope.$parent.$parent.$parent.model.incident.category && $scope.$parent.$parent.$parent.model.incident.category.id) {
14343
+                        $scope.$parent.$parent.$parent.model[
14344
+                          "repeatIncidentShow"
14345
+                        ] = false;
14346
+                        setTimeout(() => {
14347
+                          $scope.$parent.$parent.$parent.model[
14348
+                            "repeatIncidentShow"
14349
+                          ] = true;
14350
+                        }, 500);
14351
+                        // }
14352
+                      } else {
14353
+                        modalInstance.SweetAlert.swal({
14354
+                          title: "系统错误",
14355
+                          text: "账号重复!",
14356
+                          type: "error",
14357
+                        });
14358
+                      }
14359
+                    });
14360
+                  }
14361
+                }
14362
+
14188 14363
                 $scope.cancel = function () {
14189 14364
                   $modalInstance.dismiss("cancel");
14190 14365
                 };
@@ -14224,182 +14399,182 @@ appFormly.config(function config(formlyConfigProvider) {
14224 14399
                 },
14225 14400
               },
14226 14401
             });
14227
-            modalInstance.result.then(
14228
-              function (selectedItem) {
14229
-                console.log(selectedItem);
14230
-                if (selectedItem) {
14231
-                  var data = {
14232
-                    requester: selectedItem,
14233
-                  };
14234
-                  $scope.searchKey = selectedItem.account;
14235
-                  // $scope.$parent.$parent.$parent.model['requestershow'] = selectedItem;
14236
-                  // if (selectedItem.place && selectedItem.place.place) {
14237
-                  //     $scope.$parent.$parent.$parent.model.incident.houseNumber = selectedItem.place.area.area + selectedItem.place.place
14238
-                  // }
14239
-                  options.templateOptions.UserService.addData(
14240
-                    "requester",
14241
-                    data
14242
-                  ).then(function (response) {
14243
-                    if (response.status == 200) {
14244
-                      if (options.model) {
14245
-                        options.model.requester = response.data;
14246
-                        $scope.$parent.$parent.$parent.model.incident.requester =
14247
-                          response.data;
14248
-                        $scope.$parent.$parent.$parent.model.requestershow =
14249
-                          response.data;
14250
-                        if (options.model.place) {
14251
-                          options.model.place.id = "";
14252
-                        }
14253
-                        if (options.model.area) {
14254
-                          options.model.area.id = "";
14255
-                        }
14256
-
14257
-                        options.model.contacts = selectedItem.name;
14258
-                        if (
14259
-                          selectedItem.mphone &&
14260
-                          selectedItem.mphone != null &&
14261
-                          selectedItem.mphone != ""
14262
-                        ) {
14263
-                          options.model.contactsInformation =
14264
-                            selectedItem.mphone;
14265
-                        } else {
14266
-                          options.model.contactsInformation =
14267
-                            selectedItem.telephone;
14268
-                        }
14269
-                        if (
14270
-                          selectedItem.requesterTypeDTO &&
14271
-                          selectedItem.requesterTypeDTO.id == 2
14272
-                        ) {
14273
-                          $scope.$parent.$parent.$parent.model.incident.priority.id = 2;
14274
-                          // $scope.$parent.$parent.$parent.model.incident.emergency.id = 2;
14275
-                          // $scope.$parent.$parent.$parent.model.incident.influence.id = 1
14276
-                        }
14277
-                      }
14278
-                      if (!response.data.id) {
14279
-                        response.data.id = selectedItem.id;
14280
-                      }
14281
-                      options.value(response.data);
14282
-                      options.value(response.data);
14283
-                      console.log($scope, "0000000");
14284
-                      //新增报修人带入区域地点2020年4月23日19:48:15
14285
-                      $scope.model.selecthouseNumber = selectedItem.place
14286
-                        ? selectedItem.place
14287
-                        : {};
14288
-                      $scope.$root.selecthouseNumber = selectedItem.place
14289
-                        ? selectedItem.place
14290
-                        : {};
14291
-                      if ($scope.$parent.$parent.$parent.model.saveAgain) {
14292
-                        if (selectedItem.place && selectedItem.place.id) {
14293
-                          options.model.place.id = selectedItem.place.id;
14294
-                          options.model.place.area.id = selectedItem.place.area.id;
14295
-                          if(selectedItem.branch && selectedItem.branch.id){
14296
-                            options.model.branch.id = selectedItem.branch.id;
14297
-                            console.log($scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields);
14298
-                            let fields = $scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields;
14299
-                            for (let i = 0; i < fields.length; i++) {
14300
-                              if(fields[i].templateOptions.onlyKey == 'area_start'){
14301
-                                // 如果是区域
14302
-                                options.templateOptions.UserService.fetchDataList('area', { idx: 0, sum: 1000, area:{branch:options.model.branch.id} }).then(function(response) {
14303
-                                    if (response.status == 200) {
14304
-                                      fields[i].templateOptions.options = response.list;
14305
-                                    }
14306
-                                })
14307
-                              }else if(fields[i].templateOptions.onlyKey == 'place_start'){
14308
-                                // 如果是地点
14309
-                                options.templateOptions.UserService.fetchDataList('place', { idx: 0, sum: 1000, place:{area:{id:options.model.area.id}} }).then(function(response) {
14310
-                                  if (response.status == 200) {
14311
-                                    fields[i].templateOptions.options = response.list;
14312
-                                  }
14313
-                              })
14314
-                              }
14315
-                            }
14316
-                          }
14317
-                        }
14318
-                      } else {
14319
-                        if (selectedItem.place && selectedItem.place.id) {
14320
-                          options.model.place.id = selectedItem.place.id;
14321
-                          options.model.area.id = selectedItem.place.area.id;
14322
-                          if(selectedItem.branch && selectedItem.branch.id){
14323
-                            options.model.branch.id = selectedItem.branch.id;
14324
-                            console.log($scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields);
14325
-                            let fields = $scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields;
14326
-                            for (let i = 0; i < fields.length; i++) {
14327
-                              if(fields[i].templateOptions.onlyKey == 'area_start'){
14328
-                                // 如果是区域
14329
-                                options.templateOptions.UserService.fetchDataList('area', { idx: 0, sum: 1000, area:{branch:options.model.branch.id} }).then(function(response) {
14330
-                                    if (response.status == 200) {
14331
-                                      fields[i].templateOptions.options = response.list;
14332
-                                    }
14333
-                                })
14334
-                              }else if(fields[i].templateOptions.onlyKey == 'place_start'){
14335
-                                // 如果是地点
14336
-                                options.templateOptions.UserService.fetchDataList('place', { idx: 0, sum: 1000, place:{area:{id:options.model.area.id}} }).then(function(response) {
14337
-                                  if (response.status == 200) {
14338
-                                    fields[i].templateOptions.options = response.list;
14339
-                                  }
14340
-                              })
14341
-                              }
14342
-                            }
14343
-                          }
14344
-                        }
14345
-                      }
14346
-                      // if (selectedItem.areaDTO && selectedItem.place.area.id) {
14347
-                      //     options.model.area.id = selectedItem.place.area.id
14348
-                      // }
14349
-                      if (selectedItem.houseNumber) {
14350
-                        options.model.houseNumber = selectedItem.houseNumber;
14351
-                      }
14352
-                      if (selectedItem.room) {
14353
-                        options.model.room.id = selectedItem.room.id;
14354
-                      }
14355
-                      // if (selectedItem.id) {
14356
-                      options.model.account = selectedItem.account;
14357
-                      // 找到表单报修人组件,并使用组件内部方法重新获取增加报修人后的报修人下拉选项
14358
-                      var baoxiuFields =
14359
-                        $scope.$parent.$parent.$parent.$parent.$parent.vm
14360
-                          .fields[1].fields;
14361
-                      var baoxiurenTo;
14362
-                      baoxiuFields.forEach((e, i) => {
14363
-                        if (e.key == "account") {
14364
-                          baoxiurenTo = e.templateOptions;
14365
-                          baoxiurenTo.APIService.fetchDataList("requester", {
14366
-                            idx: 0,
14367
-                            sum: 20,
14368
-                            requester: {
14369
-                              searchKey: selectedItem.account,
14370
-                            },
14371
-                          }).then((res) => {
14372
-                            baoxiurenTo.options = res.list;
14373
-                            options.model.account = selectedItem.account;
14374
-                          });
14375
-                        }
14376
-                      });
14402
+            // modalInstance.result.then(
14403
+            //   function (selectedItem) {
14404
+            //     console.log(selectedItem);
14405
+            //     if (selectedItem) {
14406
+            //       var data = {
14407
+            //         requester: selectedItem,
14408
+            //       };
14409
+            //       $scope.searchKey = selectedItem.account;
14410
+            //       // $scope.$parent.$parent.$parent.model['requestershow'] = selectedItem;
14411
+            //       // if (selectedItem.place && selectedItem.place.place) {
14412
+            //       //     $scope.$parent.$parent.$parent.model.incident.houseNumber = selectedItem.place.area.area + selectedItem.place.place
14413
+            //       // }
14414
+            //       options.templateOptions.UserService.addData(
14415
+            //         "requester",
14416
+            //         data
14417
+            //       ).then(function (response) {
14418
+            //         if (response.status == 200) {
14419
+            //           if (options.model) {
14420
+            //             options.model.requester = response.data;
14421
+            //             $scope.$parent.$parent.$parent.model.incident.requester =
14422
+            //               response.data;
14423
+            //             $scope.$parent.$parent.$parent.model.requestershow =
14424
+            //               response.data;
14425
+            //             if (options.model.place) {
14426
+            //               options.model.place.id = "";
14427
+            //             }
14428
+            //             if (options.model.area) {
14429
+            //               options.model.area.id = "";
14430
+            //             }
14377 14431
 
14378
-                      // }
14379
-                      // $scope.$parent.$parent.$parent.model.incident.requester = selectedItem
14380
-                      // 选择重复事件侧滑框
14381
-                      // if ($scope.$parent.$parent.$parent.model.incident.category && $scope.$parent.$parent.$parent.model.incident.category.id) {
14382
-                      $scope.$parent.$parent.$parent.model[
14383
-                        "repeatIncidentShow"
14384
-                      ] = false;
14385
-                      setTimeout(() => {
14386
-                        $scope.$parent.$parent.$parent.model[
14387
-                          "repeatIncidentShow"
14388
-                        ] = true;
14389
-                      }, 500);
14390
-                      // }
14391
-                    } else {
14392
-                      modalInstance.SweetAlert.swal({
14393
-                        title: "系统错误",
14394
-                        text: "账号重复!",
14395
-                        type: "error",
14396
-                      });
14397
-                    }
14398
-                  });
14399
-                }
14400
-              },
14401
-              function () { }
14402
-            );
14432
+            //             options.model.contacts = selectedItem.name;
14433
+            //             if (
14434
+            //               selectedItem.mphone &&
14435
+            //               selectedItem.mphone != null &&
14436
+            //               selectedItem.mphone != ""
14437
+            //             ) {
14438
+            //               options.model.contactsInformation =
14439
+            //                 selectedItem.mphone;
14440
+            //             } else {
14441
+            //               options.model.contactsInformation =
14442
+            //                 selectedItem.telephone;
14443
+            //             }
14444
+            //             if (
14445
+            //               selectedItem.requesterTypeDTO &&
14446
+            //               selectedItem.requesterTypeDTO.id == 2
14447
+            //             ) {
14448
+            //               $scope.$parent.$parent.$parent.model.incident.priority.id = 2;
14449
+            //               // $scope.$parent.$parent.$parent.model.incident.emergency.id = 2;
14450
+            //               // $scope.$parent.$parent.$parent.model.incident.influence.id = 1
14451
+            //             }
14452
+            //           }
14453
+            //           if (!response.data.id) {
14454
+            //             response.data.id = selectedItem.id;
14455
+            //           }
14456
+            //           options.value(response.data);
14457
+            //           options.value(response.data);
14458
+            //           console.log($scope, "0000000");
14459
+            //           //新增报修人带入区域地点2020年4月23日19:48:15
14460
+            //           $scope.model.selecthouseNumber = selectedItem.place
14461
+            //             ? selectedItem.place
14462
+            //             : {};
14463
+            //           $scope.$root.selecthouseNumber = selectedItem.place
14464
+            //             ? selectedItem.place
14465
+            //             : {};
14466
+            //           if ($scope.$parent.$parent.$parent.model.saveAgain) {
14467
+            //             if (selectedItem.place && selectedItem.place.id) {
14468
+            //               options.model.place.id = selectedItem.place.id;
14469
+            //               options.model.place.area.id = selectedItem.place.area.id;
14470
+            //               if(selectedItem.branch && selectedItem.branch.id){
14471
+            //                 options.model.branch.id = selectedItem.branch.id;
14472
+            //                 console.log($scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields);
14473
+            //                 let fields = $scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields;
14474
+            //                 for (let i = 0; i < fields.length; i++) {
14475
+            //                   if(fields[i].templateOptions.onlyKey == 'area_start'){
14476
+            //                     // 如果是区域
14477
+            //                     options.templateOptions.UserService.fetchDataList('area', { idx: 0, sum: 1000, area:{branch:options.model.branch.id} }).then(function(response) {
14478
+            //                         if (response.status == 200) {
14479
+            //                           fields[i].templateOptions.options = response.list;
14480
+            //                         }
14481
+            //                     })
14482
+            //                   }else if(fields[i].templateOptions.onlyKey == 'place_start'){
14483
+            //                     // 如果是地点
14484
+            //                     options.templateOptions.UserService.fetchDataList('place', { idx: 0, sum: 1000, place:{area:{id:options.model.area.id}} }).then(function(response) {
14485
+            //                       if (response.status == 200) {
14486
+            //                         fields[i].templateOptions.options = response.list;
14487
+            //                       }
14488
+            //                   })
14489
+            //                   }
14490
+            //                 }
14491
+            //               }
14492
+            //             }
14493
+            //           } else {
14494
+            //             if (selectedItem.place && selectedItem.place.id) {
14495
+            //               options.model.place.id = selectedItem.place.id;
14496
+            //               options.model.area.id = selectedItem.place.area.id;
14497
+            //               if(selectedItem.branch && selectedItem.branch.id){
14498
+            //                 options.model.branch.id = selectedItem.branch.id;
14499
+            //                 console.log($scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields);
14500
+            //                 let fields = $scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields;
14501
+            //                 for (let i = 0; i < fields.length; i++) {
14502
+            //                   if(fields[i].templateOptions.onlyKey == 'area_start'){
14503
+            //                     // 如果是区域
14504
+            //                     options.templateOptions.UserService.fetchDataList('area', { idx: 0, sum: 1000, area:{branch:options.model.branch.id} }).then(function(response) {
14505
+            //                         if (response.status == 200) {
14506
+            //                           fields[i].templateOptions.options = response.list;
14507
+            //                         }
14508
+            //                     })
14509
+            //                   }else if(fields[i].templateOptions.onlyKey == 'place_start'){
14510
+            //                     // 如果是地点
14511
+            //                     options.templateOptions.UserService.fetchDataList('place', { idx: 0, sum: 1000, place:{area:{id:options.model.area.id}} }).then(function(response) {
14512
+            //                       if (response.status == 200) {
14513
+            //                         fields[i].templateOptions.options = response.list;
14514
+            //                       }
14515
+            //                   })
14516
+            //                   }
14517
+            //                 }
14518
+            //               }
14519
+            //             }
14520
+            //           }
14521
+            //           // if (selectedItem.areaDTO && selectedItem.place.area.id) {
14522
+            //           //     options.model.area.id = selectedItem.place.area.id
14523
+            //           // }
14524
+            //           if (selectedItem.houseNumber) {
14525
+            //             options.model.houseNumber = selectedItem.houseNumber;
14526
+            //           }
14527
+            //           if (selectedItem.room) {
14528
+            //             options.model.room.id = selectedItem.room.id;
14529
+            //           }
14530
+            //           // if (selectedItem.id) {
14531
+            //           options.model.account = selectedItem.account;
14532
+            //           // 找到表单报修人组件,并使用组件内部方法重新获取增加报修人后的报修人下拉选项
14533
+            //           var baoxiuFields =
14534
+            //             $scope.$parent.$parent.$parent.$parent.$parent.vm
14535
+            //               .fields[1].fields;
14536
+            //           var baoxiurenTo;
14537
+            //           baoxiuFields.forEach((e, i) => {
14538
+            //             if (e.key == "account") {
14539
+            //               baoxiurenTo = e.templateOptions;
14540
+            //               baoxiurenTo.APIService.fetchDataList("requester", {
14541
+            //                 idx: 0,
14542
+            //                 sum: 20,
14543
+            //                 requester: {
14544
+            //                   searchKey: selectedItem.account,
14545
+            //                 },
14546
+            //               }).then((res) => {
14547
+            //                 baoxiurenTo.options = res.list;
14548
+            //                 options.model.account = selectedItem.account;
14549
+            //               });
14550
+            //             }
14551
+            //           });
14552
+
14553
+            //           // }
14554
+            //           // $scope.$parent.$parent.$parent.model.incident.requester = selectedItem
14555
+            //           // 选择重复事件侧滑框
14556
+            //           // if ($scope.$parent.$parent.$parent.model.incident.category && $scope.$parent.$parent.$parent.model.incident.category.id) {
14557
+            //           $scope.$parent.$parent.$parent.model[
14558
+            //             "repeatIncidentShow"
14559
+            //           ] = false;
14560
+            //           setTimeout(() => {
14561
+            //             $scope.$parent.$parent.$parent.model[
14562
+            //               "repeatIncidentShow"
14563
+            //             ] = true;
14564
+            //           }, 500);
14565
+            //           // }
14566
+            //         } else {
14567
+            //           modalInstance.SweetAlert.swal({
14568
+            //             title: "系统错误",
14569
+            //             text: "账号重复!",
14570
+            //             type: "error",
14571
+            //           });
14572
+            //         }
14573
+            //       });
14574
+            //     }
14575
+            //   },
14576
+            //   function () { }
14577
+            // );
14403 14578
           },
14404 14579
           changeRequeter: function (
14405 14580
             size,

+ 94 - 46
assets/js/controllers/desk/recordCtrl.js

@@ -430,59 +430,107 @@ app.controller("recordCtrl", [
430 430
                 };
431 431
                 $scope.requester = { telephone: recorddata.ano };
432 432
                 $scope.ok = function () {
433
-                  $modalInstance.close($scope.requester);
433
+                  // $modalInstance.close($scope.requester);
434
+                  $scope.selectedItemTodo($scope.requester)
434 435
                 };
435 436
 
437
+                $scope.selectedItemTodo = function(selectedItem){
438
+                  if (selectedItem) {
439
+                    if (selectedItem.telephone && !selectedItem.mphone) {
440
+                      selectedItem.telephone = angular.copy(selectedItem.mphone);
441
+                      delete selectedItem.mphone;
442
+                    }
443
+                    var data = {
444
+                      requester: selectedItem,
445
+                    };
446
+                    api_user_data
447
+                      .addData("requester", data)
448
+                      .then(function (response) {
449
+                        if (response.status == 200) {
450
+                          $modalInstance.dismiss("ok");
451
+                          var data = {
452
+                            model: {
453
+                              requestershow: response.data,
454
+                              recordId: recorddata.id,
455
+                              incident: {
456
+                                requester: response.data,
457
+                                houseNumber: response.data.houseNumber,
458
+                                contactsInformation: response.data.mphone,
459
+                                source: { id: 1548 },
460
+                              },
461
+                            },
462
+                          };
463
+                          if (response.data.branch) {
464
+                            data.model.incident.branch = response.data.branch;
465
+                          }
466
+                          if (response.data.place) {
467
+                            data.model.incident.area = response.data.place.area;
468
+                            data.model.incident.place = response.data.place;
469
+                          }
470
+                          $state.go("app.incident.title", {
471
+                            model: JSON.stringify(data),
472
+                          });
473
+                        }else{
474
+                          modalInstance.SweetAlert.swal({
475
+                            title: "系统错误",
476
+                            text: "账号重复!",
477
+                            type: "error",
478
+                          });
479
+                        }
480
+                      });
481
+                  }
482
+                }
483
+
436 484
                 $scope.cancel = function () {
437 485
                   $modalInstance.dismiss("cancel");
438 486
                 };
439 487
               },
440 488
             });
441
-            modalInstance.result.then(function (selectedItem) {
442
-              if (selectedItem) {
443
-                if (selectedItem.telephone && !selectedItem.mphone) {
444
-                  selectedItem.telephone = angular.copy(selectedItem.mphone);
445
-                  delete selectedItem.mphone;
446
-                }
447
-                var data = {
448
-                  requester: selectedItem,
449
-                };
450
-                api_user_data
451
-                  .addData("requester", data)
452
-                  .then(function (response) {
453
-                    if (response.status == 200) {
454
-                      var data = {
455
-                        model: {
456
-                          requestershow: response.data,
457
-                          recordId: recorddata.id,
458
-                          incident: {
459
-                            requester: response.data,
460
-                            houseNumber: response.data.houseNumber,
461
-                            contactsInformation: response.data.mphone,
462
-                            source: { id: 1548 },
463
-                          },
464
-                        },
465
-                      };
466
-                      if (response.data.branch) {
467
-                        data.model.incident.branch = response.data.branch;
468
-                      }
469
-                      if (response.data.place) {
470
-                        data.model.incident.area = response.data.place.area;
471
-                        data.model.incident.place = response.data.place;
472
-                      }
473
-                      $state.go("app.incident.title", {
474
-                        model: JSON.stringify(data),
475
-                      });
476
-                    }else{
477
-                      modalInstance.SweetAlert.swal({
478
-                        title: "系统错误",
479
-                        text: "账号重复!",
480
-                        type: "error",
481
-                      });
482
-                    }
483
-                  });
484
-              }
485
-            });
489
+            // modalInstance.result.then(function (selectedItem) {
490
+            //   if (selectedItem) {
491
+            //     if (selectedItem.telephone && !selectedItem.mphone) {
492
+            //       selectedItem.telephone = angular.copy(selectedItem.mphone);
493
+            //       delete selectedItem.mphone;
494
+            //     }
495
+            //     var data = {
496
+            //       requester: selectedItem,
497
+            //     };
498
+            //     api_user_data
499
+            //       .addData("requester", data)
500
+            //       .then(function (response) {
501
+            //         if (response.status == 200) {
502
+            //           var data = {
503
+            //             model: {
504
+            //               requestershow: response.data,
505
+            //               recordId: recorddata.id,
506
+            //               incident: {
507
+            //                 requester: response.data,
508
+            //                 houseNumber: response.data.houseNumber,
509
+            //                 contactsInformation: response.data.mphone,
510
+            //                 source: { id: 1548 },
511
+            //               },
512
+            //             },
513
+            //           };
514
+            //           if (response.data.branch) {
515
+            //             data.model.incident.branch = response.data.branch;
516
+            //           }
517
+            //           if (response.data.place) {
518
+            //             data.model.incident.area = response.data.place.area;
519
+            //             data.model.incident.place = response.data.place;
520
+            //           }
521
+            //           $state.go("app.incident.title", {
522
+            //             model: JSON.stringify(data),
523
+            //           });
524
+            //         }else{
525
+            //           modalInstance.SweetAlert.swal({
526
+            //             title: "系统错误",
527
+            //             text: "账号重复!",
528
+            //             type: "error",
529
+            //           });
530
+            //         }
531
+            //       });
532
+            //   }
533
+            // });
486 534
           } else if (myData.list.length == 1) {
487 535
             var data = {
488 536
               model: {

+ 167 - 80
assets/js/controllers/mainCtrl.js

@@ -1217,54 +1217,97 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
1217 1217
                                                                         } else if (angular.isUndefined($scope.requester.mphone) || $scope.requester.mphone == null || $scope.requester.mphone == "") {
1218 1218
                                                                             SweetAlert.swal("报修人电话未填!", "请填写报修人电话", "error");
1219 1219
                                                                         } else {
1220
-                                                                            $modalInstance.close($scope.requester);
1220
+                                                                            // $modalInstance.close($scope.requester);
1221
+                                                                            $scope.selectedItemTodo($scope.requester)
1221 1222
                                                                         }
1222 1223
                                                                     };
1223 1224
 
1225
+                                                                    $scope.selectedItemTodo = function(selectedItem){
1226
+                                                                      if (selectedItem) {
1227
+                                                                        // if (selectedItem.telephone && !selectedItem.mphone) {
1228
+                                                                        //     selectedItem.telephone = angular.copy(selectedItem.mphone);
1229
+                                                                        //     delete selectedItem.mphone;
1230
+                                                                        // }
1231
+                                                                        var data = {
1232
+                                                                            'requester': selectedItem
1233
+                                                                        };
1234
+                                                                        api_user_data.addData('requester', data).then(function(response) {
1235
+                                                                            if (response.status == 200) {
1236
+                                                                              $modalInstance.dismiss("ok");
1237
+                                                                              var data = {
1238
+                                                                                model: {
1239
+                                                                                  requestershow: response.data,
1240
+                                                                                  incident: {
1241
+                                                                                    requester: response.data,
1242
+                                                                                    branch: response.data.branch,
1243
+                                                                                    area: response.data.place?response.data.place.area:undefined,
1244
+                                                                                    place: response.data.place,
1245
+                                                                                    houseNumber: response.data.houseNumber,
1246
+                                                                                    contactsInformation: response.data.telephone,
1247
+                                                                                    contacts:response.data.name,
1248
+                                                                                    callID: cdrid,
1249
+                                                                                    source: { id: 1547 },
1250
+                                                                                  },
1251
+                                                                                },
1252
+                                                                              };
1253
+                                                                              $state.go('app.incident.title', { 'model': JSON.stringify(data) });
1254
+                                                                            }else{
1255
+                                                                              modalInstance.SweetAlert.swal({
1256
+                                                                                title: "系统错误",
1257
+                                                                                text: "账号重复!",
1258
+                                                                                type: "error",
1259
+                                                                              });
1260
+                                                                            }
1261
+                                                                        })
1262
+                                                                      }
1263
+                                                                    }
1264
+
1224 1265
                                                                     $scope.cancel = function() {
1225 1266
                                                                         $modalInstance.dismiss('cancel');
1226 1267
                                                                         $rootScope.setidle();
1227 1268
                                                                     };
1228 1269
                                                                 },
1229 1270
                                                             });
1230
-                                                            modalInstance.result.then(function(selectedItem) {
1231
-                                                                if (selectedItem) {
1232
-                                                                    // if (selectedItem.telephone && !selectedItem.mphone) {
1233
-                                                                    //     selectedItem.telephone = angular.copy(selectedItem.mphone);
1234
-                                                                    //     delete selectedItem.mphone;
1235
-                                                                    // }
1236
-                                                                    var data = {
1237
-                                                                        'requester': selectedItem
1238
-                                                                    };
1239
-                                                                    api_user_data.addData('requester', data).then(function(response) {
1240
-                                                                        if (response.status == 200) {
1241
-                                                                            var data = {
1242
-                                                                              model: {
1243
-                                                                                requestershow: response.data,
1244
-                                                                                incident: {
1245
-                                                                                  requester: response.data,
1246
-                                                                                  branch: response.data.branch,
1247
-                                                                                  area: response.data.place?response.data.place.area:undefined,
1248
-                                                                                  place: response.data.place,
1249
-                                                                                  houseNumber: response.data.houseNumber,
1250
-                                                                                  contactsInformation: response.data.telephone,
1251
-                                                                                  contacts:response.data.name,
1252
-                                                                                  callID: cdrid,
1253
-                                                                                  source: { id: 1547 },
1254
-                                                                                },
1255
-                                                                              },
1256
-                                                                            };
1257
-                                                                            $state.go('app.incident.title', { 'model': JSON.stringify(data) });
1258
-                                                                        }else{
1259
-                                                                          modalInstance.SweetAlert.swal({
1260
-                                                                            title: "系统错误",
1261
-                                                                            text: "账号重复!",
1262
-                                                                            type: "error",
1263
-                                                                          });
1264
-                                                                        }
1265
-                                                                    })
1266
-                                                                }
1267
-                                                            });
1271
+                                                            //#region list1
1272
+                                                            // modalInstance.result.then(function(selectedItem) {
1273
+                                                            //     if (selectedItem) {
1274
+                                                            //         // if (selectedItem.telephone && !selectedItem.mphone) {
1275
+                                                            //         //     selectedItem.telephone = angular.copy(selectedItem.mphone);
1276
+                                                            //         //     delete selectedItem.mphone;
1277
+                                                            //         // }
1278
+                                                            //         var data = {
1279
+                                                            //             'requester': selectedItem
1280
+                                                            //         };
1281
+                                                            //         api_user_data.addData('requester', data).then(function(response) {
1282
+                                                            //             if (response.status == 200) {
1283
+                                                            //                 var data = {
1284
+                                                            //                   model: {
1285
+                                                            //                     requestershow: response.data,
1286
+                                                            //                     incident: {
1287
+                                                            //                       requester: response.data,
1288
+                                                            //                       branch: response.data.branch,
1289
+                                                            //                       area: response.data.place?response.data.place.area:undefined,
1290
+                                                            //                       place: response.data.place,
1291
+                                                            //                       houseNumber: response.data.houseNumber,
1292
+                                                            //                       contactsInformation: response.data.telephone,
1293
+                                                            //                       contacts:response.data.name,
1294
+                                                            //                       callID: cdrid,
1295
+                                                            //                       source: { id: 1547 },
1296
+                                                            //                     },
1297
+                                                            //                   },
1298
+                                                            //                 };
1299
+                                                            //                 $state.go('app.incident.title', { 'model': JSON.stringify(data) });
1300
+                                                            //             }else{
1301
+                                                            //               modalInstance.SweetAlert.swal({
1302
+                                                            //                 title: "系统错误",
1303
+                                                            //                 text: "账号重复!",
1304
+                                                            //                 type: "error",
1305
+                                                            //               });
1306
+                                                            //             }
1307
+                                                            //         })
1308
+                                                            //     }
1309
+                                                            // });
1310
+                                                            //#endregion list1
1268 1311
                                                         } else if (myData.list.length == 1) {
1269 1312
                                                             angular.extend(myData.list[0], { 'telephone': $rootScope.phone });
1270 1313
                                                             var data = {
@@ -1615,56 +1658,100 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
1615 1658
                             SweetAlert.swal("报修人电话未填!", "请填写报修人电话", "error");
1616 1659
                           }
1617 1660
                           else {
1618
-                            $modalInstance.close($scope.requester);
1661
+                            // $modalInstance.close($scope.requester);
1662
+                            $scope.selectedItemTodo($scope.requester);
1619 1663
                           }
1620 1664
                         };
1621 1665
 
1622
-                        $scope.cancel = function () {
1623
-                          $modalInstance.dismiss('cancel');
1624
-                        };
1625
-                      },
1626
-                    });
1627
-                    modalInstance.result.then(function (selectedItem) {
1628
-                      if (selectedItem) {
1629
-                        if (selectedItem.telephone && !selectedItem.mphone) {
1630
-                          selectedItem.telephone = angular.copy(selectedItem.mphone);
1631
-                          delete selectedItem.mphone;
1632
-                        }
1633
-                        var data = {
1634
-                          'requester': selectedItem
1635
-                        };
1636
-                        api_user_data.addData('requester', data).then(function (response) {
1637
-                          if (response.status == 200) {
1666
+                        $scope.selectedItemTodo = function(selectedItem){
1667
+                          if (selectedItem) {
1668
+                            if (selectedItem.telephone && !selectedItem.mphone) {
1669
+                              selectedItem.telephone = angular.copy(selectedItem.mphone);
1670
+                              delete selectedItem.mphone;
1671
+                            }
1638 1672
                             var data = {
1639
-                              'model': {
1640
-                                'requestershow': response.data,
1641
-                                'incident': {
1642
-                                  'requester': response.data,
1643
-                                  'area': response.data.place?response.data.place.area:undefined,
1644
-                                  'place': response.data.place,
1645
-                                  'houseNumber': response.data.houseNumber,
1646
-                                  'callID': cdrid,
1647
-                                  'contacts':response.data.name,
1648
-                                  'contactsInformation': response.data.telephone,
1649
-                                  'source': {
1650
-                                    'id': 1547
1673
+                              'requester': selectedItem
1674
+                            };
1675
+                            api_user_data.addData('requester', data).then(function (response) {
1676
+                              if (response.status == 200) {
1677
+                                $modalInstance.dismiss("ok");
1678
+                                var data = {
1679
+                                  'model': {
1680
+                                    'requestershow': response.data,
1681
+                                    'incident': {
1682
+                                      'requester': response.data,
1683
+                                      'area': response.data.place?response.data.place.area:undefined,
1684
+                                      'place': response.data.place,
1685
+                                      'houseNumber': response.data.houseNumber,
1686
+                                      'callID': cdrid,
1687
+                                      'contacts':response.data.name,
1688
+                                      'contactsInformation': response.data.telephone,
1689
+                                      'source': {
1690
+                                        'id': 1547
1691
+                                      }
1692
+                                    }
1651 1693
                                   }
1652 1694
                                 }
1695
+                                $state.go('app.incident.title', {
1696
+                                  'model': JSON.stringify(data)
1697
+                                });
1698
+                              }else{
1699
+                                modalInstance.SweetAlert.swal({
1700
+                                  title: "系统错误",
1701
+                                  text: "账号重复!",
1702
+                                  type: "error",
1703
+                                });
1653 1704
                               }
1654
-                            }
1655
-                            $state.go('app.incident.title', {
1656
-                              'model': JSON.stringify(data)
1657
-                            });
1658
-                          }else{
1659
-                            modalInstance.SweetAlert.swal({
1660
-                              title: "系统错误",
1661
-                              text: "账号重复!",
1662
-                              type: "error",
1663
-                            });
1705
+                            })
1664 1706
                           }
1665
-                        })
1666
-                      }
1707
+                        }
1708
+
1709
+                        $scope.cancel = function () {
1710
+                          $modalInstance.dismiss('cancel');
1711
+                        };
1712
+                      },
1667 1713
                     });
1714
+                    // modalInstance.result.then(function (selectedItem) {
1715
+                    //   if (selectedItem) {
1716
+                    //     if (selectedItem.telephone && !selectedItem.mphone) {
1717
+                    //       selectedItem.telephone = angular.copy(selectedItem.mphone);
1718
+                    //       delete selectedItem.mphone;
1719
+                    //     }
1720
+                    //     var data = {
1721
+                    //       'requester': selectedItem
1722
+                    //     };
1723
+                    //     api_user_data.addData('requester', data).then(function (response) {
1724
+                    //       if (response.status == 200) {
1725
+                    //         var data = {
1726
+                    //           'model': {
1727
+                    //             'requestershow': response.data,
1728
+                    //             'incident': {
1729
+                    //               'requester': response.data,
1730
+                    //               'area': response.data.place?response.data.place.area:undefined,
1731
+                    //               'place': response.data.place,
1732
+                    //               'houseNumber': response.data.houseNumber,
1733
+                    //               'callID': cdrid,
1734
+                    //               'contacts':response.data.name,
1735
+                    //               'contactsInformation': response.data.telephone,
1736
+                    //               'source': {
1737
+                    //                 'id': 1547
1738
+                    //               }
1739
+                    //             }
1740
+                    //           }
1741
+                    //         }
1742
+                    //         $state.go('app.incident.title', {
1743
+                    //           'model': JSON.stringify(data)
1744
+                    //         });
1745
+                    //       }else{
1746
+                    //         modalInstance.SweetAlert.swal({
1747
+                    //           title: "系统错误",
1748
+                    //           text: "账号重复!",
1749
+                    //           type: "error",
1750
+                    //         });
1751
+                    //       }
1752
+                    //     })
1753
+                    //   }
1754
+                    // });
1668 1755
                   } else if (myData.list.length == 1) {
1669 1756
                     var data = {
1670 1757
                       'model': {