提交

assets/js/controllers/customform/customformCtrl.js

@@ -13846,6 +13846,8 @@ appFormly.config(function config(formlyConfigProvider) {
                   $scope.searchField = JSON.parse(x[0]).account;
                   $scope.requester = JSON.parse(x[0]);
                   console.log($scope.requester);
+                  $scope.refreshArea('');
+                  $scope.refresh('');
                 };
                 $scope.getMydataone = function (x) {
                   $scope.searchField = x;
@@ -13886,15 +13888,25 @@ appFormly.config(function config(formlyConfigProvider) {
                     });
                 }
                 api_user_data
-                  .fetchDataList("area", {
+                  .fetchDataList("branch", {
                     idx: 0,
                     sum: 1000,
                   })
                   .then(function (response) {
                     if (response.status == 200) {
-                      $scope.areas = response.list;
+                      $scope.branchs = response.list;
                     }
                   });
+                // api_user_data
+                //   .fetchDataList("area", {
+                //     idx: 0,
+                //     sum: 1000,
+                //   })
+                //   .then(function (response) {
+                //     if (response.status == 200) {
+                //       $scope.areas = response.list;
+                //     }
+                //   });
                 api_wechatfile
                   .getDictionary(
                     {
@@ -13911,9 +13923,26 @@ appFormly.config(function config(formlyConfigProvider) {
                       $scope.networktypes = response;
                     }
                   });
-                $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 = {area: $scope.requester.place.area};
+                  console.log($scope.requester, 'changeArea');
                   api_user_data
                     .fetchDataList("place", {
                       place: {
@@ -13935,6 +13964,7 @@ appFormly.config(function config(formlyConfigProvider) {
                 $scope.requesterPlaceid = "";
                 $scope.onChangePlace = function (item) {
                   $scope.requesterPlaceid = item.id;
+                  console.log($scope.requester, 'changePlace');
                   api_user_data
                     .fetchDataList("room", {
                       room: {
@@ -13951,27 +13981,44 @@ appFormly.config(function config(formlyConfigProvider) {
                       }
                     });
                 };
-                $scope.refresh = function (searchVal) {
+                $scope.refreshArea = function (searchVal) {
+                  console.log($scope.requester, 'area');
                   var faildata = {};
-                  if ($scope.requesterAreaid) {
+                  if ($scope.requester.branch) {
                     faildata = {
                       idx: 0,
                       sum: 1000,
-                      place: {
-                        areaId: $scope.requesterAreaid,
-                        place: searchVal,
+                      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)
@@ -13981,7 +14028,7 @@ appFormly.config(function config(formlyConfigProvider) {
                     });
                 };
                 // 初始化房间号
-                $scope.refreshPlace = function () {
+                $scope.refreshRoom = function () {
                   var faildata = {};
                   if ($scope.requesterPlaceid) {
                     faildata = {
@@ -14197,13 +14244,56 @@ appFormly.config(function config(formlyConfigProvider) {
                       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;
+                          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) {

assets/views/customform/tpl/modal-add-callrequester.html

@@ -63,13 +63,26 @@
                 </div>
             </div>
             <div class="margin-bottom-15 anline">
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">校区:</div>
+                <div class="pull-right openaddinput">
+                    <ui-select ng-model="requester.branch" theme="bootstrap" ng-change="onChangeBranch(requester.branch)">
+                        <ui-select-match placeholder="校区">
+                            {{$select.selected.hosName}}
+                        </ui-select-match>
+                        <ui-select-choices repeat="item in branchs | filter: $select.search">
+                            <div ng-bind-html="item.hosName | highlight: $select.search"></div>
+                        </ui-select-choices>
+                    </ui-select>
+                </div>
+            </div>
+            <div class="margin-bottom-15 anline">
                 <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">区域:</div>
                 <div class="pull-right openaddinput">
                     <ui-select ng-model="requester.place.area" theme="bootstrap" ng-change="onChange(requester.place.area)">
                         <ui-select-match placeholder="区域">
                             {{$select.selected.area}}
                         </ui-select-match>
-                        <ui-select-choices repeat="item in areas | filter: $select.search">
+                        <ui-select-choices repeat="item in areas | filter: $select.search" refresh="refreshArea($select.search)">
                             <div ng-bind-html="item.area | highlight: $select.search"></div>
                         </ui-select-choices>
                     </ui-select>
@@ -97,7 +110,7 @@
                         <ui-select-match placeholder="房间号">
                             {{$select.selected.room}}
                         </ui-select-match>
-                        <ui-select-choices repeat="item in rooms" refresh="refreshPlace()">
+                        <ui-select-choices repeat="item in rooms" refresh="refreshRoom()">
                             <div ng-bind-html="item.room | highlight: $select.search"></div>
                         </ui-select-choices>
                     </ui-select>

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

@@ -96,7 +96,7 @@
             class="btn btn-addbutton  addbutton col-md-offset-5 col-md-12">添加报修人</button>
         <button style=" margin: 8px 0 0;line-height: 10px;" ng-click="quickCopy(options.model)"
             class="btn btn-addbutton  addbutton col-md-offset-5 col-md-12">一键复制</button>
-        <div style="margin-top: 8px;float: left;"><input type="checkbox" ng-click="selectGradeBox()" ng-checked="saveReqPlace" id="saveAreaPlace" ng-disabled="!(model.place.id&&model.area.id)"><label for="saveAreaPlace" style="user-select: none;font-size: 15px;margin-left:8px;font-weight: bold;cursor: pointer;color: #333;">报修人区域地点保存</label></div>
+        <div style="margin-top: 8px;float: left;"><input type="checkbox" ng-click="selectGradeBox()" ng-checked="saveReqPlace" id="saveAreaPlace" ng-disabled="!(model.branch.id&&model.place.id&&model.area.id)"><label for="saveAreaPlace" style="user-select: none;font-size: 15px;margin-left:8px;font-weight: bold;cursor: pointer;color: #333;">报修人校区区域地点保存</label></div>
         <!-- <button class="btn btn-default default col-md-4 col-md-offset-1" ng-click="options.templateOptions['changeRequeter']('lg',options,to.modal,model)">修改</button> -->
         <!-- </div> -->
     </div>