来电弹屏加校区及其他优化

assets/js/controllers/customform/customformCtrl.js

@@ -11087,6 +11087,12 @@ appFormly.config(function config(formlyConfigProvider) {
                           }
                         }
                     })
+                  }else{
+                    for (var i = 0; i < scope.fields.length; i++) {
+                      if(scope.fields[i].templateOptions.onlyKey == 'area_start'){
+                        scope.fields[i].templateOptions.options = [];
+                      }
+                    }
                   }
                 if(scope.$parent.$parent.$parent.model.incident.area.id){
                   options.templateOptions.APIService.fetchDataList(
@@ -11099,6 +11105,12 @@ appFormly.config(function config(formlyConfigProvider) {
                         }
                       }
                   })
+                }else{
+                  for (var i = 0; i < scope.fields.length; i++) {
+                    if(scope.fields[i].templateOptions.onlyKey == 'place_start'){
+                      scope.fields[i].templateOptions.options = [];
+                    }
+                  }
                 }
                 console.log(scope, 89898998);
                 // console.log(scope.formData,'接单页面');
@@ -21748,6 +21760,16 @@ appFormly.controller("CustomformCtrl", [
               }
             });
           });
+          if (vm.model.incident && !vm.model.incident.branch.id && !vm.model.incident.area.id && !vm.model.incident.place.id){}else {
+              startsub = false;
+              $scope.ldloading.expand_right = false;
+              SweetAlert.swal({
+                  title: '请填写完整的校区区域地点',
+                  text: "请填写此项!",
+                  type: "error",
+                  confirmButtonColor: "#DD6B55"
+              });
+          }
           // if (vm.model.requestershow && vm.model.requestershow != null && vm.model.requestershow != '') {} else {
           //     startsub = false;
           //     $scope.ldloading.expand_right = false;

assets/js/controllers/mainCtrl.js

@@ -1013,22 +1013,24 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
                                                                         serchdataadd(searchKey);
                                                                     }
                                                                     $scope.getMydata = function(x) {
-                                                                        var reqestdatap = JSON.parse(x[0])
-                                                                            // if ($scope.requester.mphone) {
-                                                                            //     delete reqestdatap.mphone;
-                                                                            // }
-                                                                        if ($scope.requester.telephone) {
-                                                                            delete reqestdatap.telephone;
-                                                                        }
+                                                                        // var reqestdatap = JSON.parse(x[0])
+                                                                        // if ($scope.requester.telephone) {
+                                                                        //     delete reqestdatap.telephone;
+                                                                        // }
+                                                                        // $scope.searchField = JSON.parse(x[0]).account;
+                                                                        // angular.extend($scope.requester, reqestdatap);
+                                                                        // if ($scope.requester.areaDTO && $scope.requester.areaDTO.id && $scope.requester.areaDTO.id != "") {
+                                                                        //     api_user_data.fetchDataList('place', { place: { areaId: $scope.requester.areaDTO.id }, idx: 0, sum: 1000 }).then(function(response) {
+                                                                        //         if (response.status == 200) {
+                                                                        //             $scope.places = response.list;
+                                                                        //         }
+                                                                        //     })
+                                                                        // }
                                                                         $scope.searchField = JSON.parse(x[0]).account;
-                                                                        angular.extend($scope.requester, reqestdatap);
-                                                                        if ($scope.requester.areaDTO && $scope.requester.areaDTO.id && $scope.requester.areaDTO.id != "") {
-                                                                            api_user_data.fetchDataList('place', { place: { areaId: $scope.requester.areaDTO.id }, idx: 0, sum: 1000 }).then(function(response) {
-                                                                                if (response.status == 200) {
-                                                                                    $scope.places = response.list;
-                                                                                }
-                                                                            })
-                                                                        }
+                                                                        $scope.requester = JSON.parse(x[0]);
+                                                                        console.log($scope.requester);
+                                                                        $scope.refreshArea('');
+                                                                        $scope.refresh('');
                                                                     }
                                                                     $scope.getMydataone = function(x) {
                                                                         $scope.searchField = x;
@@ -1056,52 +1058,115 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
                                                                             $scope.myData = myData.list;
                                                                         });
                                                                     }
-                                                                    api_user_data.fetchDataList('area', { idx: 0, sum: 100 }).then(function(response) {
-                                                                            if (response.status == 200) {
-                                                                                $scope.areas = response.list;
-                                                                            }
-                                                                        })
-                                                                        // api_user_data.fetchDataList('place', { idx: 0, sum: 1000 }).then(function(response) {
-                                                                        //         if (response.status == 200) {
-                                                                        //             $scope.places = response.list;
-                                                                        //         }
-                                                                        //     }) //地点
+                                                                    api_user_data.fetchDataList('branch', { idx: 0, sum: 100 }).then(function(response) {
+                                                                        if (response.status == 200) {
+                                                                            $scope.branchs = response.list;
+                                                                        }
+                                                                    })
+                                                                    // api_user_data.fetchDataList('place', { idx: 0, sum: 1000 }).then(function(response) {
+                                                                    //         if (response.status == 200) {
+                                                                    //             $scope.places = response.list;
+                                                                    //         }
+                                                                    //     }) //地点
                                                                     api_user_data.fetchDataList('requesterType', { idx: 0, sum: 100 }).then(function(response) {
                                                                         if (response.status == 200) {
                                                                             $scope.networktypes = response.list;
                                                                         }
                                                                     })
-                                                                    $scope.requesterAreaid = "";
+                                                                    $scope.onChangeBranch = function (item) {
+                                                                      delete $scope.requester.place;
+                                                                      console.log($scope.requester, 'changeArea');
+                                                                      api_user_data
+                                                                        .fetchDataList("area", {
+                                                                          area: {
+                                                                            branch: item.id,
+                                                                          },
+                                                                          idx: 0,
+                                                                          sum: 1000,
+                                                                        })
+                                                                        .then(function (response) {
+                                                                          if (response.status == 200) {
+                                                                            $scope.areas = response.list;
+                                                                          }
+                                                                        });
+                                                                    };
                                                                     $scope.onChange = function(item) {
-                                                                            $scope.requesterAreaid = item.id;
-                                                                            $scope.requester.place = {};
-                                                                            api_user_data.fetchDataList('place', { place: { areaId: item.id }, idx: 0, sum: 1000 }).then(function(response) {
-                                                                                if (response.status == 200) {
-                                                                                    $scope.places = response.list;
-                                                                                }
-                                                                            })
-                                                                        }
-                                                                        //地点搜索
-                                                                    $scope.refresh = function(searchVal) {
-                                                                        var faildata = {};
-                                                                        if ($scope.requesterAreaid) {
-                                                                            faildata = {
-                                                                                'idx': 0,
-                                                                                'sum': 1000,
-                                                                                'place': { 'areaId': $scope.requesterAreaid, 'place': searchVal, 'selectType': 'pinyin_qs' }
-                                                                            }
-                                                                        } else {
-                                                                            faildata = {
-                                                                                'idx': 0,
-                                                                                'sum': 1000,
-                                                                                'place': { 'place': searchVal, 'selectType': 'pinyin_qs' }
+                                                                      $scope.requester.place = {area: $scope.requester.place.area};
+                                                                      console.log($scope.requester, 'changeArea');
+                                                                        api_user_data.fetchDataList('place', { place: { areaId: item.id }, idx: 0, sum: 1000 }).then(function(response) {
+                                                                            if (response.status == 200) {
+                                                                                $scope.places = response.list;
                                                                             }
-                                                                        }
-                                                                        api_user_data.fetchDataList('place', faildata).then(function(response) {
-                                                                            $scope.places = response.list;
-                                                                            delete $scope.requester.place;
                                                                         })
                                                                     }
+                                                                    // 修改地点
+                                                                    $scope.requesterPlaceid = "";
+                                                                    $scope.onChangePlace = function (item) {
+                                                                      $scope.requesterPlaceid = item.id;
+                                                                      console.log($scope.requester, 'changePlace');
+                                                                      api_user_data
+                                                                        .fetchDataList("room", {
+                                                                          room: {
+                                                                            place: {
+                                                                              id: item.id,
+                                                                            },
+                                                                          },
+                                                                          idx: 0,
+                                                                          sum: 1000,
+                                                                        })
+                                                                        .then(function (response) {
+                                                                          if (response.status == 200) {
+                                                                            $scope.rooms = response.list;
+                                                                          }
+                                                                        });
+                                                                    };
+                                                                    $scope.refreshArea = function (searchVal) {
+                                                                      console.log($scope.requester, 'area');
+                                                                      var faildata = {};
+                                                                      if ($scope.requester.branch) {
+                                                                        faildata = {
+                                                                          idx: 0,
+                                                                          sum: 1000,
+                                                                          area: {
+                                                                            branch: $scope.requester.branch.id,
+                                                                            area: searchVal,
+                                                                            selectType: "pinyin_qs",
+                                                                          },
+                                                                        };
+                                                                      } else {
+                                                                        return;
+                                                                      }
+                                                                      api_user_data
+                                                                        .fetchDataList("area", faildata)
+                                                                        .then(function (response) {
+                                                                          $scope.areas = response.list;
+                                                                          delete $scope.requester.areaDTO;
+                                                                        });
+                                                                    };
+                                                                    //地点搜索
+                                                                    $scope.refresh = function (searchVal) {
+                                                                      console.log($scope.requester, 'place');
+                                                                      var faildata = {};
+                                                                      if ($scope.requester.place && $scope.requester.place.area) {
+                                                                        faildata = {
+                                                                          idx: 0,
+                                                                          sum: 1000,
+                                                                          place: {
+                                                                            areaId: $scope.requester.place.area.id,
+                                                                            place: searchVal,
+                                                                            selectType: "pinyin_qs",
+                                                                          },
+                                                                        };
+                                                                      } else {
+                                                                        return;
+                                                                      }
+                                                                      api_user_data
+                                                                        .fetchDataList("place", faildata)
+                                                                        .then(function (response) {
+                                                                          $scope.places = response.list;
+                                                                          delete $scope.requester.placeDTO;
+                                                                        });
+                                                                    };
                                                                     $scope.requester = { 'telephone': $rootScope.phone };
                                                                     $scope.ok = function() {
                                                                         // $modalInstance.close($scope.requester);
@@ -1136,6 +1201,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
                                                                                 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,
@@ -1158,6 +1224,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
                                                                 requestershow: myData.list[0],
                                                                 incident: {
                                                                   requester: myData.list[0],
+                                                                  branch: myData.list[0].branch,
                                                                   area: myData.list[0].place?myData.list[0].place.area:undefined,
                                                                   place: myData.list[0].place,
                                                                   contactsInformation: myData.list[0].telephone,
@@ -1184,6 +1251,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
                                                                             requestershow: requester,
                                                                             incident: {
                                                                               requester: requester,
+                                                                              branch: requester.branch,
                                                                               area: requester.place?requester.place.area:undefined,
                                                                               place: requester.place,
                                                                               houseNumber: requester.houseNumber,