|
@@ -237,6 +237,7 @@ app.controller("recordCtrl", [
|
237
|
237
|
) {
|
238
|
238
|
$scope.title = "新增报修人";
|
239
|
239
|
$scope.requester = {};
|
|
240
|
+ $scope.branchs = [];
|
240
|
241
|
$scope.areas = [];
|
241
|
242
|
$scope.places = [];
|
242
|
243
|
$scope.networktypes = [];
|
|
@@ -255,12 +256,17 @@ app.controller("recordCtrl", [
|
255
|
256
|
serchdataadd(searchKey);
|
256
|
257
|
};
|
257
|
258
|
$scope.getMydata = function (x) {
|
258
|
|
- var reqestdatap = JSON.parse(x[0]);
|
259
|
|
- if ($scope.requester.telephone) {
|
260
|
|
- delete reqestdatap.telephone;
|
261
|
|
- }
|
|
259
|
+ // var reqestdatap = JSON.parse(x[0]);
|
|
260
|
+ // if ($scope.requester.telephone) {
|
|
261
|
+ // delete reqestdatap.telephone;
|
|
262
|
+ // }
|
|
263
|
+ // $scope.searchField = JSON.parse(x[0]).account;
|
|
264
|
+ // angular.extend($scope.requester, reqestdatap);
|
262
|
265
|
$scope.searchField = JSON.parse(x[0]).account;
|
263
|
|
- angular.extend($scope.requester, reqestdatap);
|
|
266
|
+ $scope.requester = JSON.parse(x[0]);
|
|
267
|
+ console.log($scope.requester);
|
|
268
|
+ $scope.refreshArea('');
|
|
269
|
+ $scope.refresh('');
|
264
|
270
|
};
|
265
|
271
|
$scope.getMydataone = function (x) {
|
266
|
272
|
$scope.searchField = x;
|
|
@@ -291,13 +297,13 @@ app.controller("recordCtrl", [
|
291
|
297
|
});
|
292
|
298
|
}
|
293
|
299
|
api_user_data
|
294
|
|
- .fetchDataList("area", {
|
|
300
|
+ .fetchDataList("branch", {
|
295
|
301
|
idx: 0,
|
296
|
302
|
sum: 1000,
|
297
|
303
|
})
|
298
|
304
|
.then(function (response) {
|
299
|
305
|
if (response.status == 200) {
|
300
|
|
- $scope.areas = response.list;
|
|
306
|
+ $scope.branchs = response.list;
|
301
|
307
|
}
|
302
|
308
|
});
|
303
|
309
|
api_wechatfile
|
|
@@ -316,9 +322,26 @@ app.controller("recordCtrl", [
|
316
|
322
|
$scope.networktypes = response;
|
317
|
323
|
}
|
318
|
324
|
});
|
319
|
|
- $scope.requesterAreaid = "";
|
|
325
|
+ $scope.onChangeBranch = function (item) {
|
|
326
|
+ delete $scope.requester.place;
|
|
327
|
+ console.log($scope.requester, 'changeArea');
|
|
328
|
+ api_user_data
|
|
329
|
+ .fetchDataList("area", {
|
|
330
|
+ area: {
|
|
331
|
+ branch: item.id,
|
|
332
|
+ },
|
|
333
|
+ idx: 0,
|
|
334
|
+ sum: 1000,
|
|
335
|
+ })
|
|
336
|
+ .then(function (response) {
|
|
337
|
+ if (response.status == 200) {
|
|
338
|
+ $scope.areas = response.list;
|
|
339
|
+ }
|
|
340
|
+ });
|
|
341
|
+ };
|
320
|
342
|
$scope.onChange = function (item) {
|
321
|
|
- $scope.requesterAreaid = item.id;
|
|
343
|
+ $scope.requester.place = {area: $scope.requester.place.area};
|
|
344
|
+ console.log($scope.requester, 'changeArea');
|
322
|
345
|
api_user_data
|
323
|
346
|
.fetchDataList("place", {
|
324
|
347
|
place: {
|
|
@@ -336,33 +359,71 @@ app.controller("recordCtrl", [
|
336
|
359
|
}
|
337
|
360
|
});
|
338
|
361
|
};
|
339
|
|
- $scope.refresh = function (searchVal) {
|
|
362
|
+ // 修改地点
|
|
363
|
+ $scope.requesterPlaceid = "";
|
|
364
|
+ $scope.onChangePlace = function (item) {
|
|
365
|
+ $scope.requesterPlaceid = item.id;
|
|
366
|
+ console.log($scope.requester, 'changePlace');
|
|
367
|
+ api_user_data
|
|
368
|
+ .fetchDataList("room", {
|
|
369
|
+ room: {
|
|
370
|
+ place: {
|
|
371
|
+ id: item.id,
|
|
372
|
+ },
|
|
373
|
+ },
|
|
374
|
+ idx: 0,
|
|
375
|
+ sum: 1000,
|
|
376
|
+ })
|
|
377
|
+ .then(function (response) {
|
|
378
|
+ if (response.status == 200) {
|
|
379
|
+ $scope.rooms = response.list;
|
|
380
|
+ }
|
|
381
|
+ });
|
|
382
|
+ };
|
|
383
|
+ $scope.refreshArea = function (searchVal) {
|
|
384
|
+ console.log($scope.requester, 'area');
|
340
|
385
|
var faildata = {};
|
341
|
|
- if ($scope.requesterAreaid) {
|
|
386
|
+ if ($scope.requester.branch) {
|
342
|
387
|
faildata = {
|
343
|
388
|
idx: 0,
|
344
|
389
|
sum: 1000,
|
345
|
|
- place: {
|
346
|
|
- areaId: $scope.requesterAreaid,
|
347
|
|
- place: searchVal,
|
|
390
|
+ area: {
|
|
391
|
+ branch: $scope.requester.branch.id,
|
|
392
|
+ area: searchVal,
|
348
|
393
|
selectType: "pinyin_qs",
|
349
|
394
|
},
|
350
|
395
|
};
|
351
|
396
|
} else {
|
|
397
|
+ return;
|
|
398
|
+ }
|
|
399
|
+ api_user_data
|
|
400
|
+ .fetchDataList("area", faildata)
|
|
401
|
+ .then(function (response) {
|
|
402
|
+ $scope.areas = response.list;
|
|
403
|
+ delete $scope.requester.areaDTO;
|
|
404
|
+ });
|
|
405
|
+ };
|
|
406
|
+ $scope.refresh = function (searchVal) {
|
|
407
|
+ console.log($scope.requester, 'place');
|
|
408
|
+ var faildata = {};
|
|
409
|
+ if ($scope.requester.place && $scope.requester.place.area) {
|
352
|
410
|
faildata = {
|
353
|
411
|
idx: 0,
|
354
|
412
|
sum: 1000,
|
355
|
413
|
place: {
|
|
414
|
+ areaId: $scope.requester.place.area.id,
|
356
|
415
|
place: searchVal,
|
357
|
416
|
selectType: "pinyin_qs",
|
358
|
417
|
},
|
359
|
418
|
};
|
|
419
|
+ } else {
|
|
420
|
+ return;
|
360
|
421
|
}
|
361
|
422
|
api_user_data
|
362
|
423
|
.fetchDataList("place", faildata)
|
363
|
424
|
.then(function (response) {
|
364
|
425
|
$scope.places = response.list;
|
365
|
|
- // $scope.requester.place = {};
|
|
426
|
+ delete $scope.requester.placeDTO;
|
366
|
427
|
});
|
367
|
428
|
};
|
368
|
429
|
$scope.requester = { telephone: recorddata.ano };
|
|
@@ -400,6 +461,9 @@ app.controller("recordCtrl", [
|
400
|
461
|
},
|
401
|
462
|
},
|
402
|
463
|
};
|
|
464
|
+ if (response.data.branch) {
|
|
465
|
+ data.model.incident.branch = response.data.branch;
|
|
466
|
+ }
|
403
|
467
|
if (response.data.place) {
|
404
|
468
|
data.model.incident.area = response.data.place.area;
|
405
|
469
|
data.model.incident.place = response.data.place;
|
|
@@ -424,6 +488,9 @@ app.controller("recordCtrl", [
|
424
|
488
|
},
|
425
|
489
|
},
|
426
|
490
|
};
|
|
491
|
+ if (myData.list[0].branch) {
|
|
492
|
+ data.model.incident.branch = myData.list[0].branch;
|
|
493
|
+ }
|
427
|
494
|
if (myData.list[0].place) {
|
428
|
495
|
data.model.incident.area = myData.list[0].place.area;
|
429
|
496
|
data.model.incident.place = myData.list[0].place;
|
|
@@ -454,6 +521,9 @@ app.controller("recordCtrl", [
|
454
|
521
|
},
|
455
|
522
|
},
|
456
|
523
|
};
|
|
524
|
+ if (requester.branch) {
|
|
525
|
+ data.model.incident.branch = requester.branch;
|
|
526
|
+ }
|
457
|
527
|
if (requester.place) {
|
458
|
528
|
data.model.incident.area = requester.place.area;
|
459
|
529
|
data.model.incident.place = requester.place;
|