Skip to content

T
traffic-front
Commit 5f5521a2 authored by gary's avatar gary
Browse files
Options

1、fixbug

parent 08ba7683
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 20 deletions
atms-dao/src/main/java/pwc/taxtech/atms/dao/OrganizationMapper.java
View file @ 5f5521a2
...@@ -133,14 +133,14 @@ public interface OrganizationMapper extends MyMapper { ...@@ -133,14 +133,14 @@ public interface OrganizationMapper extends MyMapper {
List<OrgGeneralInfoMiddleDto> selectJoinToOrgGeneralInfo(); List<OrgGeneralInfoMiddleDto> selectJoinToOrgGeneralInfo();
@Select("select tb.id,tb.name from user_organization ta left join organization tb on ta.organization_id = tb.id " + @Select("select tb.id,tb.name from organization tb left join user_organization ta on ta.organization_id = tb.id " +
"where ta.user_id = #{uid}") "where ta.user_id = #{uid}")
List<OrgSelectDto> getMyOrgSelectList(String uid); List<OrgSelectDto> getMyOrgSelectList(String uid);
@Select("select id, name from organization;") @Select("select id, name from organization;")
List<OrgSelectDto> getAllOrgSelectList(); List<OrgSelectDto> getAllOrgSelectList();
@Select("select tb.id,tb.code from user_organization ta left join organization tb on ta.organization_id = tb.id " + @Select("select tb.id,tb.code from organization tb left join user_organization ta on ta.organization_id = tb.id " +
"where ta.user_id = #{uid}") "where ta.user_id = #{uid}")
List<OrgCodeIdDto> getMyOrgCodeList(String uid); List<OrgCodeIdDto> getMyOrgCodeList(String uid);
......
atms-web/src/main/webapp/app/admin/homePage/admin-home-page.less
View file @ 5f5521a2
...@@ -46,6 +46,10 @@ ...@@ -46,6 +46,10 @@
/* .menu-width{ /* .menu-width{
width: 160px; width: 160px;
}*/ }*/
.popover.bottom > .arrow{
left: 50% !important;
}
.popover.bottom > .arrow:after { .popover.bottom > .arrow:after {
border-bottom-color: @color-light-gray-e4; border-bottom-color: @color-light-gray-e4;
} }
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
View file @ 5f5521a2
...@@ -2135,34 +2135,50 @@ ...@@ -2135,34 +2135,50 @@
// 编辑机构其他信息 // 编辑机构其他信息
$scope.updateOrgExtra = function () { $scope.updateOrgExtra = function () {
$('.extra-organization-info .control-label span').attr("hidden","hidden"); $('.extra-organization-info .col-sm-4 span').attr("hidden", "hidden");
$('.extra-organization-info .col-sm-8 span').attr("hidden", "hidden");
$('.extra-organization-info .right-option .button2position').removeAttr("hidden"); $('.extra-organization-info .right-option .button2position').removeAttr("hidden");
$('.extra-organization-info .right-option .updOrgBtn').attr("hidden","hidden"); $('.extra-organization-info .right-option .updOrgBtn').attr("hidden", "hidden");
for (var i = 0; i < $('.extra-organization-info .control-label input').length; i++) { for (var i = 0; i < $('.extra-organization-info .col-sm-4 input').length; i++) {
$('.extra-organization-info .control-label input')[i].style.display = "inline"; $('.extra-organization-info .col-sm-4 input')[i].style.display = "inline";
} }
for (var i = 0; i < $('.extra-organization-info .control-label select').length; i++) { for (var i = 0; i < $('.extra-organization-info .col-sm-4 select').length; i++) {
$('.extra-organization-info .control-label select')[i].style.display = "inline"; $('.extra-organization-info .col-sm-4 select')[i].style.display = "inline";
} }
$scope.comExtraOldData=$scope.selectCompanyExtra; for (var i = 0; i < $('.extra-organization-info .col-sm-8 input').length; i++) {
$('.extra-organization-info .col-sm-8 input')[i].style.display = "inline";
}
for (var i = 0; i < $('.extra-organization-info .col-sm-8 select').length; i++) {
$('.extra-organization-info .col-sm-8 select')[i].style.display = "inline";
}
$scope.editOldData = angular.copy($scope.editOrgExtraModel);
$scope.comExtraOldData = angular.copy($scope.selectCompanyExtra);
}; };
// 取消编辑机构其他信息 // 取消编辑机构其他信息
$scope.updateOrgExtraCancel = function () { $scope.updateOrgExtraCancel = function () {
$scope.selectCompanyExtra=$scope.comExtraOldData; $scope.selectCompanyExtra = $scope.comExtraOldData;
$scope.editOrgExtraModel = $scope.editOldData;
generalSelectCompanyExtraText(); generalSelectCompanyExtraText();
cancelWebChange(); cancelWebChange();
}; };
var cancelWebChange = function(){ var cancelWebChange = function(){
$('.extra-organization-info .control-label span').removeAttr("hidden"); $('.extra-organization-info .col-sm-8 span').removeAttr("hidden");
$('.extra-organization-info .col-sm-4 span').removeAttr("hidden");
$('.extra-organization-info .right-option .button2position').attr("hidden","hidden"); $('.extra-organization-info .right-option .button2position').attr("hidden","hidden");
$('.extra-organization-info .right-option .updOrgBtn').removeAttr("hidden"); $('.extra-organization-info .right-option .updOrgBtn').removeAttr("hidden");
for (var i = 0; i < $('.extra-organization-info .control-label input').length; i++) { for (var i = 0; i < $('.extra-organization-info .col-sm-4 input').length; i++) {
$('.extra-organization-info .control-label input')[i].style.display = "none"; $('.extra-organization-info .col-sm-4 input')[i].style.display = "none";
}
for (var i = 0; i < $('.extra-organization-info .col-sm-4 select').length; i++) {
$('.extra-organization-info .col-sm-4 select')[i].style.display = "none";
}
for (var i = 0; i < $('.extra-organization-info .col-sm-8 input').length; i++) {
$('.extra-organization-info .col-sm-8 input')[i].style.display = "none";
} }
for (var i = 0; i < $('.extra-organization-info .control-label select').length; i++) { for (var i = 0; i < $('.extra-organization-info .col-sm-8 select').length; i++) {
$('.extra-organization-info .control-label select')[i].style.display = "none"; $('.extra-organization-info .col-sm-8 select')[i].style.display = "none";
} }
}; };
...@@ -2202,6 +2218,7 @@ ...@@ -2202,6 +2218,7 @@
return; return;
} }
$scope.editOrgExtraModel = angular.copy(data); $scope.editOrgExtraModel = angular.copy(data);
$scope.selectCompanyExtra = data;
generalSelectCompanyExtraText(); generalSelectCompanyExtraText();
cancelWebChange(); cancelWebChange();
SweetAlert.success($translate.instant('OrganizationExtraInfoEditSuccess')); SweetAlert.success($translate.instant('OrganizationExtraInfoEditSuccess'));
......
atms-web/src/main/webapp/app/admin/infrastructure/userDetail/user-detail-view.ctrl.js
View file @ 5f5521a2
...@@ -484,9 +484,9 @@ ...@@ -484,9 +484,9 @@
// 修改用户 // 修改用户
$scope.updateUser = function (user) { $scope.updateUser = function (user) {
if (!$scope.hasEditPermission) { /*if (!$scope.hasEditPermission) {
return; return;
} }*/
if ($scope.userOperateType === constant.Operation.Edit) { if ($scope.userOperateType === constant.Operation.Edit) {
$scope.userOperateType = null; $scope.userOperateType = null;
......
atms-web/src/main/webapp/app/admin/infrastructure/userDetail/user-detail-view.html
View file @ 5f5521a2
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
<div class="user-name">&nbsp;<span title="{{user.userName}}">{{user.userName | limitString:26}}</span></div> <div class="user-name">&nbsp;<span title="{{user.userName}}">{{user.userName | limitString:26}}</span></div>
<div class="user-modify"> <div class="user-modify">
<i class="fa fa-pencil-square-o icon-user-modify" aria-hidden="true"></i> <i class="fa fa-pencil-square-o icon-user-modify" aria-hidden="true"></i>
<span class="str-modify" ng-class="{false:'no-permission'}[hasEditPermission]" ng-click="updateUser(user)">修改</span> <!--<span class="str-modify" ng-class="{false:'no-permission'}[hasEditPermission]" ng-click="updateUser(user)">修改</span>-->
<span class="str-modify" ng-click="updateUser(user)">修改</span>
</div> </div>
<div class="user-disabled"> <div class="user-disabled">
<i class="material-icons icon-user-disabled" ng-if="user.status==1">&#xE033;</i> <i class="material-icons icon-user-disabled" ng-if="user.status==1">&#xE033;</i>
......
atms-web/src/main/webapp/app/common/webservices/organization.svc.js
View file @ 5f5521a2
...@@ -110,8 +110,8 @@ webservices.factory('orgService', ['$http', 'apiConfig', function ($http, apiCon ...@@ -110,8 +110,8 @@ webservices.factory('orgService', ['$http', 'apiConfig', function ($http, apiCon
getOrgInfoList: function () { getOrgInfoList: function () {
return $http.get('/org/getOrgInfoList', apiConfig.create()); return $http.get('/org/getOrgInfoList', apiConfig.create());
}, },
getOrgListByUserId: function (userId) { getOrgListByUserId: function () {
return $http.get('/org/getOrgListByUserId?userId=' + userId, apiConfig.create()); return $http.get('/org/getOrgListByUserId', apiConfig.create());
}, },
updateOrgToDimension: function (dimensionValueID, parentDimensionID, orgList) { updateOrgToDimension: function (dimensionValueID, parentDimensionID, orgList) {
return $http.post('/org/updateOrgToDimension', { dimensionValueID: dimensionValueID, dimensionID: parentDimensionID, orgDtoList: orgList }, apiConfig.create()); return $http.post('/org/updateOrgToDimension', { dimensionValueID: dimensionValueID, dimensionID: parentDimensionID, orgDtoList: orgList }, apiConfig.create());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment