Commit f30165c9 authored by frank.xa.zhang's avatar frank.xa.zhang

fixed org -- frank

parent da552a57
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pwc.taxtech.atms.dao.DimensionValueOrgMapper">
<resultMap id="UnionDimensionValueOrg" type="pwc.taxtech.atms.dto.dimension.UnionDimensionValueOrg">
<id column="ID" jdbcType="VARCHAR" property="id"/>
<result column="DIMENSION_VALUE_ID" jdbcType="VARCHAR" property="dimensionValueId"/>
<result column="ORGANIZATION_ID" jdbcType="VARCHAR" property="organizationId"/>
<result column="DIMENSION_ID" jdbcType="VARCHAR" property="dimensionId"/>
<result column="DIMENSION_VALUE_NAME" jdbcType="VARCHAR" property="dimensionValueName"/>
</resultMap>
<select id="selectUnionDimensionValueOrgByDimension" parameterType="pwc.taxtech.atms.dto.DimensionParamDto" resultMap="UnionDimensionValueOrg">
SELECT
*
FROM
(
SELECT
#{organizationStructureId} AS ID,
structure_id AS DIMENSION_VALUE_ID,
id AS ORGANIZATION_ID
FROM
organization
UNION
SELECT
#{businessUnitId} AS ID,
business_unit_id AS DIMENSION_VALUE_ID,
id AS ORGANIZATION_ID
FROM
organization
UNION
SELECT
#{areaId} AS ID,
area_id AS DIMENSION_VALUE_ID,
id AS ORGANIZATION_ID
FROM
organization
UNION
SELECT
id as ID,
dimension_value_id as DimensionValueID,
organization_id as OrganizationID
FROM
dimension_value_org
)
Q
JOIN
(
SELECT
id AS DIMENSION_VALUE_ID,
name AS DIMENSION_VALUE_NAME,
is_active AS IS_ACTIVE,
#{organizationStructureId} AS DIMENSION_ID,
create_time AS CREATE_TIME,
update_time AS UPDATE_TIME
FROM
organization_structure
WHERE
is_active=1
UNION
SELECT
id AS DIMENSION_VALUE_ID,
name AS DIMENSION_VALUE_NAME,
is_active AS IS_ACTIVE,
#{businessUnitId} AS DIMENSION_ID,
create_time AS CREATE_TIME,
update_time AS UPDATE_TIME
FROM
business_unit
WHERE
is_active=1
UNION
SELECT
id AS DIMENSION_VALUE_ID,
name AS DIMENSION_VALUE_NAME,
is_active AS IS_ACTIVE,
#{areaId} AS DIMENSION_ID,
SYSDATE() AS CREATE_TIME,
SYSDATE() AS UPDATE_TIME
FROM
area
WHERE
is_active=1
UNION
SELECT
id AS DIMENSION_VALUE_ID,
name AS DIMENSION_VALUE_NAME,
is_active AS IS_ACTIVE,
dimension_id AS DIMENSION_ID,
create_time AS CREATE_TIME,
update_time AS UPDATE_TIME
FROM
dimension_value
WHERE
is_active=1
)
P
ON
P.dimension_value_id = Q.dimension_value_id
JOIN
dimension R
ON
R.is_active = 1
AND P.dimension_id = R.id
</select>
</mapper>
\ No newline at end of file
...@@ -360,15 +360,15 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls', ...@@ -360,15 +360,15 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls',
}; };
$rootScope.changeLanguage(region); $rootScope.changeLanguage(region);
waterMark({ // waterMark({
systemId: '2500', // systemId: '2500',
//当前用户ID // //当前用户ID
userId: loginContext.localName, // userId: loginContext.localName,
textStyle: 'rgba(0,0,0,0.05)', // textStyle: 'rgba(0,0,0,0.05)',
imgHeightDis: 230, // imgHeightDis: 230,
imgWidthDis: 230, // imgWidthDis: 230,
containerEl: document.querySelector('body') // containerEl: document.querySelector('body')
}); // });
// publish unbeforeunload event to child scopes // publish unbeforeunload event to child scopes
$scope.onbeforeunload = function () { $scope.onbeforeunload = function () {
......
...@@ -313,7 +313,8 @@ ...@@ -313,7 +313,8 @@
$log.error(e); $log.error(e);
} }
} }
}, { },
{
dataField: "code", dataField: "code",
allowHeaderFiltering: false, allowHeaderFiltering: false,
caption: $translate.instant('OrganizationCode') caption: $translate.instant('OrganizationCode')
...@@ -780,7 +781,7 @@ ...@@ -780,7 +781,7 @@
} }
], ],
masterDetail: { masterDetail: {
enabled: true, enabled: false,
template: "detail" template: "detail"
}, },
onContentReady: function (e) { onContentReady: function (e) {
...@@ -826,7 +827,7 @@ ...@@ -826,7 +827,7 @@
cancel: $translate.instant('Cancel'), cancel: $translate.instant('Cancel'),
ok: $translate.instant('Confirm'), ok: $translate.instant('Confirm'),
emptyValue: $translate.instant('Empty'), emptyValue: $translate.instant('Empty'),
selectAllText: $translate.instant('SelectAll'), selectAllText: $translate.instant('SelectAll')
} }
} }
//columnHidingEnabled: true, //自定义显示列 //columnHidingEnabled: true, //自定义显示列
......
...@@ -52,21 +52,20 @@ ...@@ -52,21 +52,20 @@
</div> </div>
<div class="user-grid" style="margin-top: 10px;"> <div class="user-grid" style="margin-top: 10px;">
<span style="margin-left:30px; position: absolute;left: 249px;top: 132px;z-index: 999;">{{'TotalHave'| translate}}<span style="color:red; padding:0px 2px">{{totalCount}}</span>{{'Records'| translate}}</span> <span class="totalHave">{{'TotalHave'| translate}}<span class="totalCount">{{totalCount}}</span>{{'Records'| translate}}</span>
<div class="dx-viewport grid-container"> <div class="dx-viewport grid-container">
<div id="orgGridContainer" dx-data-grid="orgUserGridOptions" dx-item-alias="orgInfo" style="margin-top: -9px;"> <div id="orgGridContainer" dx-data-grid="orgUserGridOptions" dx-item-alias="orgInfo" style="margin-top: -9px;">
<div data-options="dxTemplate: {name: 'detail'}"> <!--<div data-options="dxTemplate: {name: 'detail'}">-->
<div dx-data-grid="getDetailGridSettings(orgInfo)"></div> <!--<div dx-data-grid="getDetailGridSettings(orgInfo)"></div>-->
</div> <!--</div>-->
</div> </div>
<!--分页栏 方便搜索机构,前台分页--> <!--分页栏 方便搜索机构,前台分页-->
<!--<div class="form-group page-form-group"> <!--<div class="form-group page-form-group">-->
<div class="page-footer"> <!--<div class="page-footer">-->
<ack-pagination page-options="pagingOptions" refresh-table="pagingService.refreshOrgDataGrid()" hide-page-size-selector="true"></ack-pagination> <!--<ack-pagination page-options="pagingOptions" refresh-table="pagingService.refreshOrgDataGrid()" hide-page-size-selector="true"></ack-pagination>-->
</div> <!--</div>-->
</div>--> <!--</div>-->
</div> </div>
</div> </div>
</div> </div>
......
...@@ -94,6 +94,19 @@ ...@@ -94,6 +94,19 @@
border-radius: 5px;*/ border-radius: 5px;*/
margin-bottom: 6px; margin-bottom: 6px;
.totalHave{
margin-left:30px;
position: absolute;
left: 249px;
top: 132px;
z-index: 999;
}
.totalCount{
color:red;
padding:0px 2px;
}
.master-detail-caption { .master-detail-caption {
padding: 0 0 5px 10px; padding: 0 0 5px 10px;
font-size: 14px; font-size: 14px;
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
id: i, id: i,
color: tabColor[row.dimensionType], color: tabColor[row.dimensionType],
isEdit: true, isEdit: true,
data: row, data: row
}; };
// 变成灰色 // 变成灰色
......
...@@ -69,11 +69,11 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', ' ...@@ -69,11 +69,11 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
} }
$scope.orgAccountList = []; // $scope.orgAccountList = [];
$scope.serviceList = []; $scope.serviceList = [];
$scope.isCheckedServiceList = []; $scope.isCheckedServiceList = [];
$scope.OrgAccountRowIndex = 1; // $scope.OrgAccountRowIndex = 1;
$scope.newOrgAccountRow(); // $scope.newOrgAccountRow();
$scope.selfDimensionModel = getAddOrgSetDimension(); $scope.selfDimensionModel = getAddOrgSetDimension();
// initIsCheckedServiceList(); // initIsCheckedServiceList();
...@@ -895,13 +895,13 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', ' ...@@ -895,13 +895,13 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
// 添加一行账套设置 // 添加一行账套设置
$scope.newOrgAccountRow = function () { $scope.newOrgAccountRow = function () {
var index = $scope.OrgAccountRowIndex; var index = $scope.OrgAccountRowIndex;
var enterpriseAccountSetList = copyArray($scope.enterpriseAccountSetList); // var enterpriseAccountSetList = copyArray($scope.enterpriseAccountSetList);
var d = new Date(); var d = new Date();
var now = d.formatDateTime('yyyy-MM'); var now = d.formatDateTime('yyyy-MM');
var row = { var row = {
enterpriseAccountSetList: enterpriseAccountSetList, // enterpriseAccountSetList: enterpriseAccountSetList,
enterpriseAccountSetSelect: null, // enterpriseAccountSetSelect: null,
startDate: null, startDate: null,
endDate: null, endDate: null,
fromID: 'orgFrom' + index, fromID: 'orgFrom' + index,
......
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