区域地点回归，故障地点取消

assets/js/controllers/customform/customformCtrl.js

@@ -9172,11 +9172,9 @@ appFormly.config(
                                     // if (selectedItem.dept.place.place) {
                                     //     scope.$parent.$parent.$parent.model.incident.houseNumber = selectedItem.dept.place.area.area + selectedItem.dept.place.place
                                     // }
-                                    if(selectedItem.houseNumber){//微信web报障传过来的
-                                        scope.$parent.$parent.$parent.model.incident.houseNumber = selectedItem.houseNumber;
-                                    }else if (selectedItem.place&&selectedItem.place.place) {
-                                        scope.$parent.$parent.$parent.model.incident.houseNumber = selectedItem.place.area.area + selectedItem.place.place
-                                    }
+                                    scope.$parent.$parent.$parent.model.incident.houseNumber = selectedItem.houseNumber?selectedItem.houseNumber:'';
+                                    scope.$parent.$parent.$parent.model.incident.area.id = selectedItem.place?selectedItem.place.area.id:null;
+                                    scope.$parent.$parent.$parent.model.incident.place.id = selectedItem.place?selectedItem.place.id:null;
                                     console.log(scope,89898998)
                                     // console.log(scope.formData,'接单页面');
                                     //1，选择报修人后带入区域地点2020年4月23日19:34:17
@@ -9217,9 +9215,9 @@ appFormly.config(
                                                 //         scope.$parent.$parent.$parent.model.incident.area.id = selectedItem.place.area.id
                                                 //     };
                                                 // }
-                                                if(scope.$parent.$parent.$parent.model.incident.area){
-                                                    scope.$parent.$parent.$parent.model.incident.area.id = 1;//teshu
-                                                }
+                                                // if(scope.$parent.$parent.$parent.model.incident.area){
+                                                //     scope.$parent.$parent.$parent.model.incident.area.id = 1;//teshu
+                                                // }
                                                 if (selectedItem.id) {
                                                     scope.$parent.$parent.$parent.model.incident.account = selectedItem.account;
                                                 }
@@ -9264,10 +9262,10 @@ appFormly.config(
                             if ($scope.$parent && $scope.$parent.$parent.$parent.model && $scope.$parent.$parent.$parent.model.incident.area && $scope.$parent.$parent.$parent.model.incident.area.id) {
                                 $scope.options.templateOptions.linkage("place", {
                                     "place": {
-                                        // "areaId": $scope.$parent.$parent.$parent.model.incident.area.id
-                                        area:{
-                                            id:$scope.$parent.$parent.$parent.model.incident.area.id
-                                        }
+                                        "areaId": $scope.$parent.$parent.$parent.model.incident.area.id
+                                        // area:{
+                                        //     id:$scope.$parent.$parent.$parent.model.incident.area.id
+                                        // }
                                     }
                                 }, $scope.$parent.$parent.$parent.model, "incident", "place");
                             }
@@ -11214,9 +11212,9 @@ appFormly.config(
                                     };
                                     $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
-                                    }
+                                    // 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) {
@@ -11252,23 +11250,23 @@ appFormly.config(
                                             //新增报修人带入区域地点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
-                                            //     };
-                                            // } else {
-                                            //     if (selectedItem.place && selectedItem.place.id) {
-                                            //         options.model.place.id = selectedItem.place.id
-                                            //         options.model.area.id = selectedItem.place.area.id
-                                            //     };
-                                            // }
+                                            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
+                                                };
+                                            } else {
+                                                if (selectedItem.place && selectedItem.place.id) {
+                                                    options.model.place.id = selectedItem.place.id
+                                                    options.model.area.id = selectedItem.place.area.id
+                                                };
+                                            }
                                             // 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.houseNumber) {
+                                                options.model.houseNumber = selectedItem.houseNumber
+                                            }
                                             // if (selectedItem.id) {
                                             options.model.account = selectedItem.account;
                                             // 找到表单报修人组件，并使用组件内部方法重新获取增加报修人后的报修人下拉选项
@@ -16616,13 +16614,13 @@ appFormly.controller('CustomformCtrl', ['$rootScope', '$scope', '$parse', '$inje
             // console.log("modelWatch:"+ JSON.stringify(modelWatch));
             // 进入页面时判断有无携带区域地点2020年4月24日10:30:41
             console.log(modelWatch,$rootScope)
-            if(modelWatch.model.incident){
-                if(modelWatch.model.incident.place){
-                    $rootScope.selecthouseNumber = modelWatch.modle.incident.place;
-                }else{
-                    $rootScope.selecthouseNumber = undefined;
-                }
-            }
+            // if(modelWatch.model.incident){
+            //     if(modelWatch.model.incident.place){
+            //         $rootScope.selecthouseNumber = modelWatch.modle.incident.place;
+            //     }else{
+            //         $rootScope.selecthouseNumber = undefined;
+            //     }
+            // }
         }
         if (angular.isDefined($state.current.pdKey) && $state.current.pdKey != "") {
             pdKey = $state.current.pdKey;

assets/js/controllers/incident/incidentCtrl.js

@@ -242,10 +242,10 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             },
             {
                 name: 'houseNumber',
-                displayName: '故障地点',
+                displayName: '区域地点',
                 width: '14%',
                 enableFiltering: false,
-                cellTemplate: '<div><div class="ui-grid-cell-contents">{{row.entity.houseNumber}}</div></div>'
+                cellTemplate: '<div><div class="ui-grid-cell-contents">{{grid.appScope.areaplace(row.entity)}}</div></div>'
             },
             {
                 name: 'acceptUser.name',

assets/js/controllers/system/systemFormCtrl.js

@@ -447,8 +447,8 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
                 'model': {
                     'incident': {
                         'requester': data.incident.requester,
-                        // 'area': data.incident.place.area,
-                        // 'place': data.incident.place,
+                        'area': data.incident.place.area,
+                        'place': data.incident.place,
                         'houseNumber': data.incident.address,
                         'contacts': data.incident.contacts,
                         'contactsInformation': data.incident.contactsInformation,

assets/views/desk/jry_wxDetail.html

@@ -164,9 +164,9 @@
           <div class="message" ng-show="repairMain.valueconfig ==2"></div>
           <div class="message">联系人：{{model.contacts}}</div>
           <div class="message">联系电话：{{model.contactsInformation}}</div>
-          <!-- <div class="message">区域：{{model.place.area.area}}</div> -->
-          <!-- <div class="message">地点：{{model.place.place}}</div> -->
-          <div class="message">故障地点：{{model.address}}</div>
+          <div class="message">区域：{{model.place.area.area}}</div>
+          <div class="message">地点：{{model.place.place}}</div>
+          <div class="message">详细地址：{{model.address}}</div>
           <div class="messageCont">报修内容：{{model.incidentDescription}}</div>
         </div>
       </div>

assets/views/incident/list.html

@@ -110,11 +110,9 @@
                             </div>
                         </div>
 
-                        <div class="form-group incidentsearch  wt_width">
+                        <!-- <div class="form-group incidentsearch  wt_width">
                             <div class="">
                                 <div class="control-label pull-left margin-top-5">故障地点:</div>
-                                <!-- <input class=" inputcolor wt_width1 wt_width3 pull-right" type="text"
-                                    ng-model="searchkeys.houseNumber" placeholder="" /> -->
                                 <div class="address-wrap pull-right wt_width1 wt_width3">
                                     <input class=" inputcolor"
                                         type="text" ng-model="searchkeys.houseNumber" id="bx_address" placeholder=""
@@ -125,6 +123,34 @@
                                     </ul>
                                 </div>
                             </div>
+                        </div> -->
+                        <div class="form-group incidentsearch wt_width">
+                            <!-- <div class="pull-right"> -->
+                            <div class="control-label pull-left margin-top-5 ">区域:</div>
+                            <ui-select class="pull-right selectzise wt_width1 wt_width3" ng-model="searchkeys.area" theme="bootstrap"
+                                ng-change="onChangearea(searchkeys)">
+                                <ui-select-match placeholder="">
+                                    {{$select.selected.area}}
+                                </ui-select-match>
+                                <ui-select-choices repeat="item in outarea | filter: $select.search">
+                                    <div ng-bind-html="item.area | highlight: $select.search"></div>
+                                </ui-select-choices>
+                            </ui-select>
+                            <!-- </div> -->
+                        </div>
+                        <div class="form-group incidentsearch wt_width">
+                            <!-- <div class="pull-right"> -->
+                            <div class="control-label pull-left margin-top-5">地点:</div>
+                            <ui-select class="pull-right selectzise wt_width1 wt_width3" ng-model="searchkeys.place" theme="bootstrap"
+                                ng-change="onChangeplace(key)">
+                                <ui-select-match placeholder="">
+                                    {{$select.selected.place}}
+                                </ui-select-match>
+                                <ui-select-choices repeat="item in outplace | filter: $select.search">
+                                    <div ng-bind-html="item.place | highlight: $select.search"></div>
+                                </ui-select-choices>
+                            </ui-select>
+                            <!-- </div> -->
                         </div>
                         <div class="form-group incidentsearch  wt_width">
                             <div class="control-label pull-left margin-top-5">状态:</div>