增加房间号

assets/js/controllers/customform/customformCtrl.js

@@ -13750,6 +13750,7 @@ appFormly.config(function config(formlyConfigProvider) {
                 $scope.title = "新增报修人";
                 $scope.requester = {};
                 $scope.searchData = {};
+                $scope.isRoom = sessionStorage.getItem('ifRoom') == 1;
                 if (angular.isDefined($stateParams.model) && $stateParams.model != "") {
                   var paramsModel = JSON.parse($stateParams.model)
                   //来电-添加报修人-回显电话
@@ -13862,6 +13863,26 @@ appFormly.config(function config(formlyConfigProvider) {
                       }
                     });
                 };
+                // 修改地点
+                $scope.requesterPlaceid = "";
+                $scope.onChangePlace = function (item) {
+                  $scope.requesterPlaceid = item.id;
+                  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.refresh = function (searchVal) {
                   var faildata = {};
                   if ($scope.requesterAreaid) {
@@ -13891,6 +13912,32 @@ appFormly.config(function config(formlyConfigProvider) {
                       delete $scope.requester.placeDTO;
                     });
                 };
+                // 初始化房间号
+                $scope.refreshPlace = function () {
+                  var faildata = {};
+                  if ($scope.requesterPlaceid) {
+                    faildata = {
+                      idx: 0,
+                      sum: 1000,
+                      room: {
+                        place: {id:$scope.requesterPlaceid},
+                      },
+                    };
+                  } else {
+                    faildata = {
+                      idx: 0,
+                      sum: 1000,
+                      room: {
+                        place: {id:$scope.requesterPlaceid},
+                      },
+                    };
+                  }
+                  api_user_data
+                    .fetchDataList("room", faildata)
+                    .then(function (response) {
+                      $scope.rooms = response.list;
+                    });
+                };
                 $scope.refreshDepts = function (key) {
                   var filterData = {
                     idx: 0,
@@ -13970,7 +14017,7 @@ appFormly.config(function config(formlyConfigProvider) {
                             newObj;
                         }
                       }
-                    ); //lmm
+                    );
                     console.log($scope.requester);
                     $modalInstance.close($scope.requester);
                   }
@@ -14097,6 +14144,9 @@ appFormly.config(function config(formlyConfigProvider) {
                       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;
                       // 找到表单报修人组件，并使用组件内部方法重新获取增加报修人后的报修人下拉选项
@@ -20742,6 +20792,8 @@ appFormly.controller("CustomformCtrl", [
     var formKey = "";
     var pdKey = "";
     var modelWatch = "";
+    // 房间号是否显示
+    vm.model.isRoom = sessionStorage.getItem('ifRoom') == 1;
     if (angular.isDefined($stateParams.model) && $stateParams.model != "") {
       modelWatch = JSON.parse($stateParams.model);
       // console.log("modelWatch:"+ JSON.stringify(modelWatch));

assets/js/controllers/loginCtrl.js

@@ -24,25 +24,22 @@ app.controller('LoginCtrl', ['$rootScope', '$scope', '$state', '$translate', '$l
                     if (res.status == 200) {
                         //存储报修主体到缓存
                         var list = res.list;
-                        var repairMain = list.find((v) => v.keyconfig == "repairMain"); //报修主体
-                        var incidentWithConsumable = list.find(
-                        (v) => v.keyconfig == "incidentWithConsumable"
-                        ); //是否绑定耗材
-                        var wxIncidentWithCmdb = list.find(
-                        (v) => v.keyconfig == "wxIncidentWithCmdb"
-                        ); //是否绑定资产
-                        sessionStorage.setItem(
-                        "repair_main",
-                        JSON.stringify(repairMain)
-                        );
-                        sessionStorage.setItem(
-                        "incidentWithConsumable",
-                        incidentWithConsumable.valueconfig
-                        );
-                        sessionStorage.setItem(
-                        "wxIncidentWithCmdb",
-                        wxIncidentWithCmdb.valueconfig
-                        );
+                        list.forEach(v => {
+                            switch (v.keyconfig) {
+                              case "repairMain": //报修主体
+                                sessionStorage.setItem("repair_main", JSON.stringify(v));
+                                break;
+                              case "incidentWithConsumable": //是否绑定耗材
+                                sessionStorage.setItem("incidentWithConsumable", v.valueconfig);
+                                break;
+                              case "wxIncidentWithCmdb": //是否绑定资产
+                                sessionStorage.setItem("wxIncidentWithCmdb", v.valueconfig);
+                                break;
+                              case "ifRoom": //是否增加房间号选择
+                                sessionStorage.setItem("ifRoom", v.valueconfig);
+                                break;
+                            }
+                        });
                     }
                 })
                 .catch(function (err) {

assets/js/controllers/system/systemFormCtrl.js

@@ -478,7 +478,8 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
                             id: data.incident.departmentDTO.id
                         },
                         'sourceType': data.incident.sourceType,
-                        'fileUrl': data.incident.fileUrl
+                        'fileUrl': data.incident.fileUrl,
+                        room:data.incident.room
                     },
                     'requestershow': data.incident.requester,
                     'flow': data.incident.id

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

@@ -79,7 +79,7 @@
             <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" theme="bootstrap">
+                    <ui-select ng-model="requester.place" theme="bootstrap" ng-change="onChangePlace(requester.place)">
                         <ui-select-match placeholder="地点">
                             {{$select.selected.place}}
                         </ui-select-match>
@@ -90,6 +90,20 @@
 
                 </div>
             </div>
+            <div class="margin-bottom-15 anline" ng-if="isRoom">
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">房间号:</div>
+                <div class="pull-right openaddinput">
+                    <ui-select ng-model="requester.room" theme="bootstrap">
+                        <ui-select-match placeholder="房间号">
+                            {{$select.selected.room}}
+                        </ui-select-match>
+                        <ui-select-choices repeat="item in rooms" refresh="refreshPlace()">
+                            <div ng-bind-html="item.room | 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">