优化

assets/js/controllers/customform/customformCtrl.js

@@ -14181,10 +14181,185 @@ appFormly.config(function config(formlyConfigProvider) {
                       }
                     );
                     console.log($scope.requester);
-                    $modalInstance.close($scope.requester);
+                    // $modalInstance.close($scope.requester);
+                    $scope.selectedItemTodo(sco, $scope.requester)
                   }
                 };
 
+                $scope.selectedItemTodo = function($scope, selectedItem){
+                  if (selectedItem) {
+                    var data = {
+                      requester: selectedItem,
+                    };
+                    $scope.searchKey = selectedItem.account;
+                    // $scope.$parent.$parent.$parent.model['requestershow'] = selectedItem;
+                    // if (selectedItem.place && selectedItem.place.place) {
+                    //     $scope.$parent.$parent.$parent.model.incident.houseNumber = selectedItem.place.area.area + selectedItem.place.place
+                    // }
+                    options.templateOptions.UserService.addData(
+                      "requester",
+                      data
+                    ).then(function (response) {
+                      if (response.status == 200) {
+                        $modalInstance.dismiss("ok");
+                        if (options.model) {
+                          options.model.requester = response.data;
+                          $scope.$parent.$parent.$parent.model.incident.requester =
+                            response.data;
+                          $scope.$parent.$parent.$parent.model.requestershow =
+                            response.data;
+                          if (options.model.place) {
+                            options.model.place.id = "";
+                          }
+                          if (options.model.area) {
+                            options.model.area.id = "";
+                          }
+  
+                          options.model.contacts = selectedItem.name;
+                          if (
+                            selectedItem.mphone &&
+                            selectedItem.mphone != null &&
+                            selectedItem.mphone != ""
+                          ) {
+                            options.model.contactsInformation =
+                              selectedItem.mphone;
+                          } else {
+                            options.model.contactsInformation =
+                              selectedItem.telephone;
+                          }
+                          if (
+                            selectedItem.requesterTypeDTO &&
+                            selectedItem.requesterTypeDTO.id == 2
+                          ) {
+                            $scope.$parent.$parent.$parent.model.incident.priority.id = 2;
+                            // $scope.$parent.$parent.$parent.model.incident.emergency.id = 2;
+                            // $scope.$parent.$parent.$parent.model.incident.influence.id = 1
+                          }
+                        }
+                        if (!response.data.id) {
+                          response.data.id = selectedItem.id;
+                        }
+                        options.value(response.data);
+                        options.value(response.data);
+                        console.log($scope, "0000000");
+                        //新增报修人带入区域地点2020年4月23日19:48:15
+                        $scope.model.selecthouseNumber = selectedItem.place
+                          ? selectedItem.place
+                          : {};
+                        $scope.$root.selecthouseNumber = selectedItem.place
+                          ? selectedItem.place
+                          : {};
+                        if ($scope.$parent.$parent.$parent.model.saveAgain) {
+                          if (selectedItem.place && selectedItem.place.id) {
+                            options.model.place.id = selectedItem.place.id;
+                            options.model.place.area.id = selectedItem.place.area.id;
+                            if(selectedItem.branch && selectedItem.branch.id){
+                              options.model.branch.id = selectedItem.branch.id;
+                              console.log($scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields);
+                              let fields = $scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields;
+                              for (let i = 0; i < fields.length; i++) {
+                                if(fields[i].templateOptions.onlyKey == 'area_start'){
+                                  // 如果是区域
+                                  options.templateOptions.UserService.fetchDataList('area', { idx: 0, sum: 1000, area:{branch:options.model.branch.id} }).then(function(response) {
+                                      if (response.status == 200) {
+                                        fields[i].templateOptions.options = response.list;
+                                      }
+                                  })
+                                }else if(fields[i].templateOptions.onlyKey == 'place_start'){
+                                  // 如果是地点
+                                  options.templateOptions.UserService.fetchDataList('place', { idx: 0, sum: 1000, place:{area:{id:options.model.area.id}} }).then(function(response) {
+                                    if (response.status == 200) {
+                                      fields[i].templateOptions.options = response.list;
+                                    }
+                                })
+                                }
+                              }
+                            }
+                          }
+                        } else {
+                          if (selectedItem.place && selectedItem.place.id) {
+                            options.model.place.id = selectedItem.place.id;
+                            options.model.area.id = selectedItem.place.area.id;
+                            if(selectedItem.branch && selectedItem.branch.id){
+                              options.model.branch.id = selectedItem.branch.id;
+                              console.log($scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields);
+                              let fields = $scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields;
+                              for (let i = 0; i < fields.length; i++) {
+                                if(fields[i].templateOptions.onlyKey == 'area_start'){
+                                  // 如果是区域
+                                  options.templateOptions.UserService.fetchDataList('area', { idx: 0, sum: 1000, area:{branch:options.model.branch.id} }).then(function(response) {
+                                      if (response.status == 200) {
+                                        fields[i].templateOptions.options = response.list;
+                                      }
+                                  })
+                                }else if(fields[i].templateOptions.onlyKey == 'place_start'){
+                                  // 如果是地点
+                                  options.templateOptions.UserService.fetchDataList('place', { idx: 0, sum: 1000, place:{area:{id:options.model.area.id}} }).then(function(response) {
+                                    if (response.status == 200) {
+                                      fields[i].templateOptions.options = response.list;
+                                    }
+                                })
+                                }
+                              }
+                            }
+                          }
+                        }
+                        // if (selectedItem.areaDTO && selectedItem.place.area.id) {
+                        //     options.model.area.id = selectedItem.place.area.id
+                        // }
+                        if (selectedItem.houseNumber) {
+                          options.model.houseNumber = selectedItem.houseNumber;
+                        }
+                        if (selectedItem.room) {
+                          options.model.room.id = selectedItem.room.id;
+                        }
+                        // if (selectedItem.id) {
+                        options.model.account = selectedItem.account;
+                        // 找到表单报修人组件，并使用组件内部方法重新获取增加报修人后的报修人下拉选项
+                        var baoxiuFields =
+                          $scope.$parent.$parent.$parent.$parent.$parent.vm
+                            .fields[1].fields;
+                        var baoxiurenTo;
+                        baoxiuFields.forEach((e, i) => {
+                          if (e.key == "account") {
+                            baoxiurenTo = e.templateOptions;
+                            baoxiurenTo.APIService.fetchDataList("requester", {
+                              idx: 0,
+                              sum: 20,
+                              requester: {
+                                searchKey: selectedItem.account,
+                              },
+                            }).then((res) => {
+                              baoxiurenTo.options = res.list;
+                              options.model.account = selectedItem.account;
+                            });
+                          }
+                        });
+  
+                        // }
+                        // $scope.$parent.$parent.$parent.model.incident.requester = selectedItem
+                        // 选择重复事件侧滑框
+                        // if ($scope.$parent.$parent.$parent.model.incident.category && $scope.$parent.$parent.$parent.model.incident.category.id) {
+                        $scope.$parent.$parent.$parent.model[
+                          "repeatIncidentShow"
+                        ] = false;
+                        setTimeout(() => {
+                          $scope.$parent.$parent.$parent.model[
+                            "repeatIncidentShow"
+                          ] = true;
+                        }, 500);
+                        // }
+                      } else {
+                        modalInstance.SweetAlert.swal({
+                          title: "系统错误",
+                          text: "账号重复!",
+                          type: "error",
+                        });
+                      }
+                    });
+                  }
+                }
+
                 $scope.cancel = function () {
                   $modalInstance.dismiss("cancel");
                 };
@@ -14224,182 +14399,182 @@ appFormly.config(function config(formlyConfigProvider) {
                 },
               },
             });
-            modalInstance.result.then(
-              function (selectedItem) {
-                console.log(selectedItem);
-                if (selectedItem) {
-                  var data = {
-                    requester: selectedItem,
-                  };
-                  $scope.searchKey = selectedItem.account;
-                  // $scope.$parent.$parent.$parent.model['requestershow'] = selectedItem;
-                  // if (selectedItem.place && selectedItem.place.place) {
-                  //     $scope.$parent.$parent.$parent.model.incident.houseNumber = selectedItem.place.area.area + selectedItem.place.place
-                  // }
-                  options.templateOptions.UserService.addData(
-                    "requester",
-                    data
-                  ).then(function (response) {
-                    if (response.status == 200) {
-                      if (options.model) {
-                        options.model.requester = response.data;
-                        $scope.$parent.$parent.$parent.model.incident.requester =
-                          response.data;
-                        $scope.$parent.$parent.$parent.model.requestershow =
-                          response.data;
-                        if (options.model.place) {
-                          options.model.place.id = "";
-                        }
-                        if (options.model.area) {
-                          options.model.area.id = "";
-                        }
-
-                        options.model.contacts = selectedItem.name;
-                        if (
-                          selectedItem.mphone &&
-                          selectedItem.mphone != null &&
-                          selectedItem.mphone != ""
-                        ) {
-                          options.model.contactsInformation =
-                            selectedItem.mphone;
-                        } else {
-                          options.model.contactsInformation =
-                            selectedItem.telephone;
-                        }
-                        if (
-                          selectedItem.requesterTypeDTO &&
-                          selectedItem.requesterTypeDTO.id == 2
-                        ) {
-                          $scope.$parent.$parent.$parent.model.incident.priority.id = 2;
-                          // $scope.$parent.$parent.$parent.model.incident.emergency.id = 2;
-                          // $scope.$parent.$parent.$parent.model.incident.influence.id = 1
-                        }
-                      }
-                      if (!response.data.id) {
-                        response.data.id = selectedItem.id;
-                      }
-                      options.value(response.data);
-                      options.value(response.data);
-                      console.log($scope, "0000000");
-                      //新增报修人带入区域地点2020年4月23日19:48:15
-                      $scope.model.selecthouseNumber = selectedItem.place
-                        ? selectedItem.place
-                        : {};
-                      $scope.$root.selecthouseNumber = selectedItem.place
-                        ? selectedItem.place
-                        : {};
-                      if ($scope.$parent.$parent.$parent.model.saveAgain) {
-                        if (selectedItem.place && selectedItem.place.id) {
-                          options.model.place.id = selectedItem.place.id;
-                          options.model.place.area.id = selectedItem.place.area.id;
-                          if(selectedItem.branch && selectedItem.branch.id){
-                            options.model.branch.id = selectedItem.branch.id;
-                            console.log($scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields);
-                            let fields = $scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields;
-                            for (let i = 0; i < fields.length; i++) {
-                              if(fields[i].templateOptions.onlyKey == 'area_start'){
-                                // 如果是区域
-                                options.templateOptions.UserService.fetchDataList('area', { idx: 0, sum: 1000, area:{branch:options.model.branch.id} }).then(function(response) {
-                                    if (response.status == 200) {
-                                      fields[i].templateOptions.options = response.list;
-                                    }
-                                })
-                              }else if(fields[i].templateOptions.onlyKey == 'place_start'){
-                                // 如果是地点
-                                options.templateOptions.UserService.fetchDataList('place', { idx: 0, sum: 1000, place:{area:{id:options.model.area.id}} }).then(function(response) {
-                                  if (response.status == 200) {
-                                    fields[i].templateOptions.options = response.list;
-                                  }
-                              })
-                              }
-                            }
-                          }
-                        }
-                      } else {
-                        if (selectedItem.place && selectedItem.place.id) {
-                          options.model.place.id = selectedItem.place.id;
-                          options.model.area.id = selectedItem.place.area.id;
-                          if(selectedItem.branch && selectedItem.branch.id){
-                            options.model.branch.id = selectedItem.branch.id;
-                            console.log($scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields);
-                            let fields = $scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields;
-                            for (let i = 0; i < fields.length; i++) {
-                              if(fields[i].templateOptions.onlyKey == 'area_start'){
-                                // 如果是区域
-                                options.templateOptions.UserService.fetchDataList('area', { idx: 0, sum: 1000, area:{branch:options.model.branch.id} }).then(function(response) {
-                                    if (response.status == 200) {
-                                      fields[i].templateOptions.options = response.list;
-                                    }
-                                })
-                              }else if(fields[i].templateOptions.onlyKey == 'place_start'){
-                                // 如果是地点
-                                options.templateOptions.UserService.fetchDataList('place', { idx: 0, sum: 1000, place:{area:{id:options.model.area.id}} }).then(function(response) {
-                                  if (response.status == 200) {
-                                    fields[i].templateOptions.options = response.list;
-                                  }
-                              })
-                              }
-                            }
-                          }
-                        }
-                      }
-                      // if (selectedItem.areaDTO && selectedItem.place.area.id) {
-                      //     options.model.area.id = selectedItem.place.area.id
-                      // }
-                      if (selectedItem.houseNumber) {
-                        options.model.houseNumber = selectedItem.houseNumber;
-                      }
-                      if (selectedItem.room) {
-                        options.model.room.id = selectedItem.room.id;
-                      }
-                      // if (selectedItem.id) {
-                      options.model.account = selectedItem.account;
-                      // 找到表单报修人组件，并使用组件内部方法重新获取增加报修人后的报修人下拉选项
-                      var baoxiuFields =
-                        $scope.$parent.$parent.$parent.$parent.$parent.vm
-                          .fields[1].fields;
-                      var baoxiurenTo;
-                      baoxiuFields.forEach((e, i) => {
-                        if (e.key == "account") {
-                          baoxiurenTo = e.templateOptions;
-                          baoxiurenTo.APIService.fetchDataList("requester", {
-                            idx: 0,
-                            sum: 20,
-                            requester: {
-                              searchKey: selectedItem.account,
-                            },
-                          }).then((res) => {
-                            baoxiurenTo.options = res.list;
-                            options.model.account = selectedItem.account;
-                          });
-                        }
-                      });
+            // modalInstance.result.then(
+            //   function (selectedItem) {
+            //     console.log(selectedItem);
+            //     if (selectedItem) {
+            //       var data = {
+            //         requester: selectedItem,
+            //       };
+            //       $scope.searchKey = selectedItem.account;
+            //       // $scope.$parent.$parent.$parent.model['requestershow'] = selectedItem;
+            //       // if (selectedItem.place && selectedItem.place.place) {
+            //       //     $scope.$parent.$parent.$parent.model.incident.houseNumber = selectedItem.place.area.area + selectedItem.place.place
+            //       // }
+            //       options.templateOptions.UserService.addData(
+            //         "requester",
+            //         data
+            //       ).then(function (response) {
+            //         if (response.status == 200) {
+            //           if (options.model) {
+            //             options.model.requester = response.data;
+            //             $scope.$parent.$parent.$parent.model.incident.requester =
+            //               response.data;
+            //             $scope.$parent.$parent.$parent.model.requestershow =
+            //               response.data;
+            //             if (options.model.place) {
+            //               options.model.place.id = "";
+            //             }
+            //             if (options.model.area) {
+            //               options.model.area.id = "";
+            //             }
 
-                      // }
-                      // $scope.$parent.$parent.$parent.model.incident.requester = selectedItem
-                      // 选择重复事件侧滑框
-                      // if ($scope.$parent.$parent.$parent.model.incident.category && $scope.$parent.$parent.$parent.model.incident.category.id) {
-                      $scope.$parent.$parent.$parent.model[
-                        "repeatIncidentShow"
-                      ] = false;
-                      setTimeout(() => {
-                        $scope.$parent.$parent.$parent.model[
-                          "repeatIncidentShow"
-                        ] = true;
-                      }, 500);
-                      // }
-                    } else {
-                      modalInstance.SweetAlert.swal({
-                        title: "系统错误",
-                        text: "账号重复!",
-                        type: "error",
-                      });
-                    }
-                  });
-                }
-              },
-              function () { }
-            );
+            //             options.model.contacts = selectedItem.name;
+            //             if (
+            //               selectedItem.mphone &&
+            //               selectedItem.mphone != null &&
+            //               selectedItem.mphone != ""
+            //             ) {
+            //               options.model.contactsInformation =
+            //                 selectedItem.mphone;
+            //             } else {
+            //               options.model.contactsInformation =
+            //                 selectedItem.telephone;
+            //             }
+            //             if (
+            //               selectedItem.requesterTypeDTO &&
+            //               selectedItem.requesterTypeDTO.id == 2
+            //             ) {
+            //               $scope.$parent.$parent.$parent.model.incident.priority.id = 2;
+            //               // $scope.$parent.$parent.$parent.model.incident.emergency.id = 2;
+            //               // $scope.$parent.$parent.$parent.model.incident.influence.id = 1
+            //             }
+            //           }
+            //           if (!response.data.id) {
+            //             response.data.id = selectedItem.id;
+            //           }
+            //           options.value(response.data);
+            //           options.value(response.data);
+            //           console.log($scope, "0000000");
+            //           //新增报修人带入区域地点2020年4月23日19:48:15
+            //           $scope.model.selecthouseNumber = selectedItem.place
+            //             ? selectedItem.place
+            //             : {};
+            //           $scope.$root.selecthouseNumber = selectedItem.place
+            //             ? selectedItem.place
+            //             : {};
+            //           if ($scope.$parent.$parent.$parent.model.saveAgain) {
+            //             if (selectedItem.place && selectedItem.place.id) {
+            //               options.model.place.id = selectedItem.place.id;
+            //               options.model.place.area.id = selectedItem.place.area.id;
+            //               if(selectedItem.branch && selectedItem.branch.id){
+            //                 options.model.branch.id = selectedItem.branch.id;
+            //                 console.log($scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields);
+            //                 let fields = $scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields;
+            //                 for (let i = 0; i < fields.length; i++) {
+            //                   if(fields[i].templateOptions.onlyKey == 'area_start'){
+            //                     // 如果是区域
+            //                     options.templateOptions.UserService.fetchDataList('area', { idx: 0, sum: 1000, area:{branch:options.model.branch.id} }).then(function(response) {
+            //                         if (response.status == 200) {
+            //                           fields[i].templateOptions.options = response.list;
+            //                         }
+            //                     })
+            //                   }else if(fields[i].templateOptions.onlyKey == 'place_start'){
+            //                     // 如果是地点
+            //                     options.templateOptions.UserService.fetchDataList('place', { idx: 0, sum: 1000, place:{area:{id:options.model.area.id}} }).then(function(response) {
+            //                       if (response.status == 200) {
+            //                         fields[i].templateOptions.options = response.list;
+            //                       }
+            //                   })
+            //                   }
+            //                 }
+            //               }
+            //             }
+            //           } else {
+            //             if (selectedItem.place && selectedItem.place.id) {
+            //               options.model.place.id = selectedItem.place.id;
+            //               options.model.area.id = selectedItem.place.area.id;
+            //               if(selectedItem.branch && selectedItem.branch.id){
+            //                 options.model.branch.id = selectedItem.branch.id;
+            //                 console.log($scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields);
+            //                 let fields = $scope.$parent.$parent.$parent.$parent.$parent.formData.fields[1].fields;
+            //                 for (let i = 0; i < fields.length; i++) {
+            //                   if(fields[i].templateOptions.onlyKey == 'area_start'){
+            //                     // 如果是区域
+            //                     options.templateOptions.UserService.fetchDataList('area', { idx: 0, sum: 1000, area:{branch:options.model.branch.id} }).then(function(response) {
+            //                         if (response.status == 200) {
+            //                           fields[i].templateOptions.options = response.list;
+            //                         }
+            //                     })
+            //                   }else if(fields[i].templateOptions.onlyKey == 'place_start'){
+            //                     // 如果是地点
+            //                     options.templateOptions.UserService.fetchDataList('place', { idx: 0, sum: 1000, place:{area:{id:options.model.area.id}} }).then(function(response) {
+            //                       if (response.status == 200) {
+            //                         fields[i].templateOptions.options = response.list;
+            //                       }
+            //                   })
+            //                   }
+            //                 }
+            //               }
+            //             }
+            //           }
+            //           // if (selectedItem.areaDTO && selectedItem.place.area.id) {
+            //           //     options.model.area.id = selectedItem.place.area.id
+            //           // }
+            //           if (selectedItem.houseNumber) {
+            //             options.model.houseNumber = selectedItem.houseNumber;
+            //           }
+            //           if (selectedItem.room) {
+            //             options.model.room.id = selectedItem.room.id;
+            //           }
+            //           // if (selectedItem.id) {
+            //           options.model.account = selectedItem.account;
+            //           // 找到表单报修人组件，并使用组件内部方法重新获取增加报修人后的报修人下拉选项
+            //           var baoxiuFields =
+            //             $scope.$parent.$parent.$parent.$parent.$parent.vm
+            //               .fields[1].fields;
+            //           var baoxiurenTo;
+            //           baoxiuFields.forEach((e, i) => {
+            //             if (e.key == "account") {
+            //               baoxiurenTo = e.templateOptions;
+            //               baoxiurenTo.APIService.fetchDataList("requester", {
+            //                 idx: 0,
+            //                 sum: 20,
+            //                 requester: {
+            //                   searchKey: selectedItem.account,
+            //                 },
+            //               }).then((res) => {
+            //                 baoxiurenTo.options = res.list;
+            //                 options.model.account = selectedItem.account;
+            //               });
+            //             }
+            //           });
+
+            //           // }
+            //           // $scope.$parent.$parent.$parent.model.incident.requester = selectedItem
+            //           // 选择重复事件侧滑框
+            //           // if ($scope.$parent.$parent.$parent.model.incident.category && $scope.$parent.$parent.$parent.model.incident.category.id) {
+            //           $scope.$parent.$parent.$parent.model[
+            //             "repeatIncidentShow"
+            //           ] = false;
+            //           setTimeout(() => {
+            //             $scope.$parent.$parent.$parent.model[
+            //               "repeatIncidentShow"
+            //             ] = true;
+            //           }, 500);
+            //           // }
+            //         } else {
+            //           modalInstance.SweetAlert.swal({
+            //             title: "系统错误",
+            //             text: "账号重复!",
+            //             type: "error",
+            //           });
+            //         }
+            //       });
+            //     }
+            //   },
+            //   function () { }
+            // );
           },
           changeRequeter: function (
             size,

assets/js/controllers/desk/recordCtrl.js

@@ -430,59 +430,107 @@ app.controller("recordCtrl", [
                 };
                 $scope.requester = { telephone: recorddata.ano };
                 $scope.ok = function () {
-                  $modalInstance.close($scope.requester);
+                  // $modalInstance.close($scope.requester);
+                  $scope.selectedItemTodo($scope.requester)
                 };
 
+                $scope.selectedItemTodo = function(selectedItem){
+                  if (selectedItem) {
+                    if (selectedItem.telephone && !selectedItem.mphone) {
+                      selectedItem.telephone = angular.copy(selectedItem.mphone);
+                      delete selectedItem.mphone;
+                    }
+                    var data = {
+                      requester: selectedItem,
+                    };
+                    api_user_data
+                      .addData("requester", data)
+                      .then(function (response) {
+                        if (response.status == 200) {
+                          $modalInstance.dismiss("ok");
+                          var data = {
+                            model: {
+                              requestershow: response.data,
+                              recordId: recorddata.id,
+                              incident: {
+                                requester: response.data,
+                                houseNumber: response.data.houseNumber,
+                                contactsInformation: response.data.mphone,
+                                source: { id: 1548 },
+                              },
+                            },
+                          };
+                          if (response.data.branch) {
+                            data.model.incident.branch = response.data.branch;
+                          }
+                          if (response.data.place) {
+                            data.model.incident.area = response.data.place.area;
+                            data.model.incident.place = response.data.place;
+                          }
+                          $state.go("app.incident.title", {
+                            model: JSON.stringify(data),
+                          });
+                        }else{
+                          modalInstance.SweetAlert.swal({
+                            title: "系统错误",
+                            text: "账号重复!",
+                            type: "error",
+                          });
+                        }
+                      });
+                  }
+                }
+
                 $scope.cancel = function () {
                   $modalInstance.dismiss("cancel");
                 };
               },
             });
-            modalInstance.result.then(function (selectedItem) {
-              if (selectedItem) {
-                if (selectedItem.telephone && !selectedItem.mphone) {
-                  selectedItem.telephone = angular.copy(selectedItem.mphone);
-                  delete selectedItem.mphone;
-                }
-                var data = {
-                  requester: selectedItem,
-                };
-                api_user_data
-                  .addData("requester", data)
-                  .then(function (response) {
-                    if (response.status == 200) {
-                      var data = {
-                        model: {
-                          requestershow: response.data,
-                          recordId: recorddata.id,
-                          incident: {
-                            requester: response.data,
-                            houseNumber: response.data.houseNumber,
-                            contactsInformation: response.data.mphone,
-                            source: { id: 1548 },
-                          },
-                        },
-                      };
-                      if (response.data.branch) {
-                        data.model.incident.branch = response.data.branch;
-                      }
-                      if (response.data.place) {
-                        data.model.incident.area = response.data.place.area;
-                        data.model.incident.place = response.data.place;
-                      }
-                      $state.go("app.incident.title", {
-                        model: JSON.stringify(data),
-                      });
-                    }else{
-                      modalInstance.SweetAlert.swal({
-                        title: "系统错误",
-                        text: "账号重复!",
-                        type: "error",
-                      });
-                    }
-                  });
-              }
-            });
+            // modalInstance.result.then(function (selectedItem) {
+            //   if (selectedItem) {
+            //     if (selectedItem.telephone && !selectedItem.mphone) {
+            //       selectedItem.telephone = angular.copy(selectedItem.mphone);
+            //       delete selectedItem.mphone;
+            //     }
+            //     var data = {
+            //       requester: selectedItem,
+            //     };
+            //     api_user_data
+            //       .addData("requester", data)
+            //       .then(function (response) {
+            //         if (response.status == 200) {
+            //           var data = {
+            //             model: {
+            //               requestershow: response.data,
+            //               recordId: recorddata.id,
+            //               incident: {
+            //                 requester: response.data,
+            //                 houseNumber: response.data.houseNumber,
+            //                 contactsInformation: response.data.mphone,
+            //                 source: { id: 1548 },
+            //               },
+            //             },
+            //           };
+            //           if (response.data.branch) {
+            //             data.model.incident.branch = response.data.branch;
+            //           }
+            //           if (response.data.place) {
+            //             data.model.incident.area = response.data.place.area;
+            //             data.model.incident.place = response.data.place;
+            //           }
+            //           $state.go("app.incident.title", {
+            //             model: JSON.stringify(data),
+            //           });
+            //         }else{
+            //           modalInstance.SweetAlert.swal({
+            //             title: "系统错误",
+            //             text: "账号重复!",
+            //             type: "error",
+            //           });
+            //         }
+            //       });
+            //   }
+            // });
           } else if (myData.list.length == 1) {
             var data = {
               model: {

assets/js/controllers/mainCtrl.js

@@ -1217,54 +1217,97 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
                                                                         } else if (angular.isUndefined($scope.requester.mphone) || $scope.requester.mphone == null || $scope.requester.mphone == "") {
                                                                             SweetAlert.swal("报修人电话未填!", "请填写报修人电话", "error");
                                                                         } else {
-                                                                            $modalInstance.close($scope.requester);
+                                                                            // $modalInstance.close($scope.requester);
+                                                                            $scope.selectedItemTodo($scope.requester)
                                                                         }
                                                                     };
 
+                                                                    $scope.selectedItemTodo = function(selectedItem){
+                                                                      if (selectedItem) {
+                                                                        // if (selectedItem.telephone && !selectedItem.mphone) {
+                                                                        //     selectedItem.telephone = angular.copy(selectedItem.mphone);
+                                                                        //     delete selectedItem.mphone;
+                                                                        // }
+                                                                        var data = {
+                                                                            'requester': selectedItem
+                                                                        };
+                                                                        api_user_data.addData('requester', data).then(function(response) {
+                                                                            if (response.status == 200) {
+                                                                              $modalInstance.dismiss("ok");
+                                                                              var data = {
+                                                                                model: {
+                                                                                  requestershow: response.data,
+                                                                                  incident: {
+                                                                                    requester: response.data,
+                                                                                    branch: response.data.branch,
+                                                                                    area: response.data.place?response.data.place.area:undefined,
+                                                                                    place: response.data.place,
+                                                                                    houseNumber: response.data.houseNumber,
+                                                                                    contactsInformation: response.data.telephone,
+                                                                                    contacts:response.data.name,
+                                                                                    callID: cdrid,
+                                                                                    source: { id: 1547 },
+                                                                                  },
+                                                                                },
+                                                                              };
+                                                                              $state.go('app.incident.title', { 'model': JSON.stringify(data) });
+                                                                            }else{
+                                                                              modalInstance.SweetAlert.swal({
+                                                                                title: "系统错误",
+                                                                                text: "账号重复!",
+                                                                                type: "error",
+                                                                              });
+                                                                            }
+                                                                        })
+                                                                      }
+                                                                    }
+
                                                                     $scope.cancel = function() {
                                                                         $modalInstance.dismiss('cancel');
                                                                         $rootScope.setidle();
                                                                     };
                                                                 },
                                                             });
-                                                            modalInstance.result.then(function(selectedItem) {
-                                                                if (selectedItem) {
-                                                                    // if (selectedItem.telephone && !selectedItem.mphone) {
-                                                                    //     selectedItem.telephone = angular.copy(selectedItem.mphone);
-                                                                    //     delete selectedItem.mphone;
-                                                                    // }
-                                                                    var data = {
-                                                                        'requester': selectedItem
-                                                                    };
-                                                                    api_user_data.addData('requester', data).then(function(response) {
-                                                                        if (response.status == 200) {
-                                                                            var data = {
-                                                                              model: {
-                                                                                requestershow: response.data,
-                                                                                incident: {
-                                                                                  requester: response.data,
-                                                                                  branch: response.data.branch,
-                                                                                  area: response.data.place?response.data.place.area:undefined,
-                                                                                  place: response.data.place,
-                                                                                  houseNumber: response.data.houseNumber,
-                                                                                  contactsInformation: response.data.telephone,
-                                                                                  contacts:response.data.name,
-                                                                                  callID: cdrid,
-                                                                                  source: { id: 1547 },
-                                                                                },
-                                                                              },
-                                                                            };
-                                                                            $state.go('app.incident.title', { 'model': JSON.stringify(data) });
-                                                                        }else{
-                                                                          modalInstance.SweetAlert.swal({
-                                                                            title: "系统错误",
-                                                                            text: "账号重复!",
-                                                                            type: "error",
-                                                                          });
-                                                                        }
-                                                                    })
-                                                                }
-                                                            });
+                                                            //#region list1
+                                                            // modalInstance.result.then(function(selectedItem) {
+                                                            //     if (selectedItem) {
+                                                            //         // if (selectedItem.telephone && !selectedItem.mphone) {
+                                                            //         //     selectedItem.telephone = angular.copy(selectedItem.mphone);
+                                                            //         //     delete selectedItem.mphone;
+                                                            //         // }
+                                                            //         var data = {
+                                                            //             'requester': selectedItem
+                                                            //         };
+                                                            //         api_user_data.addData('requester', data).then(function(response) {
+                                                            //             if (response.status == 200) {
+                                                            //                 var data = {
+                                                            //                   model: {
+                                                            //                     requestershow: response.data,
+                                                            //                     incident: {
+                                                            //                       requester: response.data,
+                                                            //                       branch: response.data.branch,
+                                                            //                       area: response.data.place?response.data.place.area:undefined,
+                                                            //                       place: response.data.place,
+                                                            //                       houseNumber: response.data.houseNumber,
+                                                            //                       contactsInformation: response.data.telephone,
+                                                            //                       contacts:response.data.name,
+                                                            //                       callID: cdrid,
+                                                            //                       source: { id: 1547 },
+                                                            //                     },
+                                                            //                   },
+                                                            //                 };
+                                                            //                 $state.go('app.incident.title', { 'model': JSON.stringify(data) });
+                                                            //             }else{
+                                                            //               modalInstance.SweetAlert.swal({
+                                                            //                 title: "系统错误",
+                                                            //                 text: "账号重复!",
+                                                            //                 type: "error",
+                                                            //               });
+                                                            //             }
+                                                            //         })
+                                                            //     }
+                                                            // });
+                                                            //#endregion list1
                                                         } else if (myData.list.length == 1) {
                                                             angular.extend(myData.list[0], { 'telephone': $rootScope.phone });
                                                             var data = {
@@ -1615,56 +1658,100 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
                             SweetAlert.swal("报修人电话未填!", "请填写报修人电话", "error");
                           }
                           else {
-                            $modalInstance.close($scope.requester);
+                            // $modalInstance.close($scope.requester);
+                            $scope.selectedItemTodo($scope.requester);
                           }
                         };
 
-                        $scope.cancel = function () {
-                          $modalInstance.dismiss('cancel');
-                        };
-                      },
-                    });
-                    modalInstance.result.then(function (selectedItem) {
-                      if (selectedItem) {
-                        if (selectedItem.telephone && !selectedItem.mphone) {
-                          selectedItem.telephone = angular.copy(selectedItem.mphone);
-                          delete selectedItem.mphone;
-                        }
-                        var data = {
-                          'requester': selectedItem
-                        };
-                        api_user_data.addData('requester', data).then(function (response) {
-                          if (response.status == 200) {
+                        $scope.selectedItemTodo = function(selectedItem){
+                          if (selectedItem) {
+                            if (selectedItem.telephone && !selectedItem.mphone) {
+                              selectedItem.telephone = angular.copy(selectedItem.mphone);
+                              delete selectedItem.mphone;
+                            }
                             var data = {
-                              'model': {
-                                'requestershow': response.data,
-                                'incident': {
-                                  'requester': response.data,
-                                  'area': response.data.place?response.data.place.area:undefined,
-                                  'place': response.data.place,
-                                  'houseNumber': response.data.houseNumber,
-                                  'callID': cdrid,
-                                  'contacts':response.data.name,
-                                  'contactsInformation': response.data.telephone,
-                                  'source': {
-                                    'id': 1547
+                              'requester': selectedItem
+                            };
+                            api_user_data.addData('requester', data).then(function (response) {
+                              if (response.status == 200) {
+                                $modalInstance.dismiss("ok");
+                                var data = {
+                                  'model': {
+                                    'requestershow': response.data,
+                                    'incident': {
+                                      'requester': response.data,
+                                      'area': response.data.place?response.data.place.area:undefined,
+                                      'place': response.data.place,
+                                      'houseNumber': response.data.houseNumber,
+                                      'callID': cdrid,
+                                      'contacts':response.data.name,
+                                      'contactsInformation': response.data.telephone,
+                                      'source': {
+                                        'id': 1547
+                                      }
+                                    }
                                   }
                                 }
+                                $state.go('app.incident.title', {
+                                  'model': JSON.stringify(data)
+                                });
+                              }else{
+                                modalInstance.SweetAlert.swal({
+                                  title: "系统错误",
+                                  text: "账号重复!",
+                                  type: "error",
+                                });
                               }
-                            }
-                            $state.go('app.incident.title', {
-                              'model': JSON.stringify(data)
-                            });
-                          }else{
-                            modalInstance.SweetAlert.swal({
-                              title: "系统错误",
-                              text: "账号重复!",
-                              type: "error",
-                            });
+                            })
                           }
-                        })
-                      }
+                        }
+
+                        $scope.cancel = function () {
+                          $modalInstance.dismiss('cancel');
+                        };
+                      },
                     });
+                    // modalInstance.result.then(function (selectedItem) {
+                    //   if (selectedItem) {
+                    //     if (selectedItem.telephone && !selectedItem.mphone) {
+                    //       selectedItem.telephone = angular.copy(selectedItem.mphone);
+                    //       delete selectedItem.mphone;
+                    //     }
+                    //     var data = {
+                    //       'requester': selectedItem
+                    //     };
+                    //     api_user_data.addData('requester', data).then(function (response) {
+                    //       if (response.status == 200) {
+                    //         var data = {
+                    //           'model': {
+                    //             'requestershow': response.data,
+                    //             'incident': {
+                    //               'requester': response.data,
+                    //               'area': response.data.place?response.data.place.area:undefined,
+                    //               'place': response.data.place,
+                    //               'houseNumber': response.data.houseNumber,
+                    //               'callID': cdrid,
+                    //               'contacts':response.data.name,
+                    //               'contactsInformation': response.data.telephone,
+                    //               'source': {
+                    //                 'id': 1547
+                    //               }
+                    //             }
+                    //           }
+                    //         }
+                    //         $state.go('app.incident.title', {
+                    //           'model': JSON.stringify(data)
+                    //         });
+                    //       }else{
+                    //         modalInstance.SweetAlert.swal({
+                    //           title: "系统错误",
+                    //           text: "账号重复!",
+                    //           type: "error",
+                    //         });
+                    //       }
+                    //     })
+                    //   }
+                    // });
                   } else if (myData.list.length == 1) {
                     var data = {
                       'model': {