seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/myems/myems into develop

pull/1/head
13621160019@163.com 2021-03-02 12:02:44 +08:00
parent aaf72ba41d ce7553afcb
commit 3e2eae7a77
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/app/controllers/settings/space/space.controller.js
View File

@ -207,7 +207,10 @@ app.controller('SpaceController', function ($scope, $common, $uibModal, SpaceSer
modifiedSpace.parent_space_id = null; modifiedSpace.parent_space_id = null;
} }
modifiedSpace.timezone_id = modifiedSpace.timezone.id; modifiedSpace.timezone_id = modifiedSpace.timezone.id;
modifiedSpace.contact_id = modifiedSpace.contact.id; if (modifiedSpace.contact != null) {
modifiedSpace.contact_id = modifiedSpace.contact.id;
}
modifiedSpace.cost_center_id = modifiedSpace.cost_center.id; modifiedSpace.cost_center_id = modifiedSpace.cost_center.id;
SpaceService.editSpace(modifiedSpace, function (error, status) { SpaceService.editSpace(modifiedSpace, function (error, status) {
if (angular.isDefined(status) && status == 200) { if (angular.isDefined(status) && status == 200) {

2
admin/views/settings/space/space.model.html
View File

@ -30,7 +30,7 @@
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-4 control-label">{{'SETTING.CONTACT' | translate}}</label> <div class="form-group"><label class="col-sm-4 control-label">{{'SETTING.CONTACT' | translate}}</label>
<div class="col-sm-8"> <div class="col-sm-8">
<ui-select ng-model="space.contact.id" name="spacecontact" theme="bootstrap" required> <ui-select ng-model="space.contact.id" name="spacecontact" theme="bootstrap">
<ui-select-match allow-clear="false" placeholder="{{'COMMON.PLACEHOLDER' | translate}}"> <ui-select-match allow-clear="false" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">
{{$select.selected.name}}</ui-select-match> {{$select.selected.name}}</ui-select-match>
<ui-select-choices repeat="contact.id as contact in contacts | filter: $select.search"> <ui-select-choices repeat="contact.id as contact in contacts | filter: $select.search">