Skip to content

T
traffic-front
Commit 5d488827 authored by Mccoy Z Xia's avatar Mccoy Z Xia
Browse files
Options

calendar控件调整，添加一个测试CalendarController

parent 3547477b
Hide whitespace changes
Inline Side-by-side
Showing with 161 additions and 60 deletions
atms-api/src/main/java/pwc/taxtech/atms/calendar/CalendarController.java 0 → 100644
View file @ 5d488827
package pwc.taxtech.atms.calendar;
import com.alibaba.druid.support.json.JSONUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* <p> @Description </p>
*
* @Author: Mccoy Z Xia (Xia zhixin)
* @Date: 2019-07-04 13:20
* @Version: 1.0
**/
@RestController
@RequestMapping("api/v1/")
public class CalendarController {
@RequestMapping("taxCalendar/getAllTaxProjectList")
@ResponseBody
public Object getAllTaxProjectList(){
Object result = JSONUtils.parse("[{\"id\":\"3D0B4C48-F79B-463F-B675-4413B7740420\",\"taxProjectName\":\"自定义事项\",\"orderIndex\":0,\"createTime\":\"2018-07-18T21:55:35+08:00\",\"updateTime\":\"2018-07-18T21:55:40+08:00\"},{\"id\":\"46C3A2D7-FC0D-4C85-819F-BF5528F7E77D\",\"taxProjectName\":\"企业所得税\",\"orderIndex\":2,\"createTime\":\"2018-07-05T09:05:56.597+08:00\",\"updateTime\":\"2018-07-05T09:05:56.597+08:00\"},{\"id\":\"0E53F69F-4C59-4257-BFBB-90337F0C1B8C\",\"taxProjectName\":\"个税\",\"orderIndex\":3,\"createTime\":\"2018-07-05T09:06:21.853+08:00\",\"updateTime\":\"2018-07-13T17:08:19.517+08:00\"},{\"id\":\"BD35F3E5-09AA-4075-9BCF-F42DD7E3BDBD\",\"taxProjectName\":\"印花税\",\"orderIndex\":4,\"createTime\":\"2018-07-05T09:07:26.197+08:00\",\"updateTime\":\"2018-08-29T18:41:40.347+08:00\"}]");
return result;
}
@RequestMapping("taxCalendar/getWorkPlaceList")
@ResponseBody
public Object getWorkPlaceList(){
Object result = JSONUtils.parse("[{\"id\":\"efc60e20-0c48-4ee0-82b7-6bdce2b8d8d7\",\"name\":\"阿里巴巴总部\",\"createTime\":\"2018-07-06T16:13:08.913+08:00\",\"updateTime\":\"2018-07-06T16:13:08.913+08:00\"},{\"id\":\"6437ece3-6bf0-4b96-88d0-aabcb6bca649\",\"name\":\"北京朝阳区税局\",\"createTime\":\"2018-07-11T13:39:32.47+08:00\",\"updateTime\":\"2018-07-18T11:22:42.227+08:00\"},{\"id\":\"3d258b22-438a-4d0a-a00f-dd78cbebd730\",\"name\":\"北京国贸\",\"createTime\":\"2019-03-07T11:39:08.04+08:00\",\"updateTime\":\"2019-03-07T11:39:08.04+08:00\"},{\"id\":\"9A2C0823-D0CD-4A45-964D-EDFD2E4D55F9\",\"name\":\"北京天安门\",\"createTime\":\"2018-07-05T09:03:13.727+08:00\",\"updateTime\":\"2018-11-22T20:00:45.383+08:00\"},{\"id\":\"b34ee25a-a422-4096-a3fb-7335bb6a50cd\",\"name\":\"北京西二旗\",\"createTime\":\"2019-03-07T11:39:01.993+08:00\",\"updateTime\":\"2019-03-07T11:39:01.993+08:00\"},{\"id\":\"5AEEE006-B63F-4211-A4CC-C62936C7FCBF\",\"name\":\"成都来福士广场\",\"createTime\":\"2018-07-05T09:04:27.95+08:00\",\"updateTime\":\"2018-07-10T16:20:54.18+08:00\"},{\"id\":\"1bbd0d87-1723-4f87-9547-0ca0a6959a85\",\"name\":\"上海黄埔区国家税局\",\"createTime\":\"2018-07-12T17:20:13.287+08:00\",\"updateTime\":\"2018-08-29T18:21:37.603+08:00\"}]");
return result;
}
@RequestMapping("taxCalendar/getTaxCalendarDataForDisplay")
@ResponseBody
public Object getTaxCalendarDataForDisplay(){
return new ArrayList();
}
@RequestMapping("user/getUserOwnOrganization")
@ResponseBody
public Object getUserOwnOrganization(){
Object result = JSONUtils.parse("{\"errors\":null,\"data\":{\"id\":\"A3ECE185-82CC-4375-8E36-0B62137D5367\",\"clientCode\":\"88\",\"name\":\"Bitmain Technologies Limited\",\"code\":\"88\",\"abbreviation\":null,\"parentID\":null,\"taxPayerNumber\":null,\"regionID\":\"110100\",\"parentRegionID\":null,\"structureID\":null,\"industryID\":\"0\",\"isActive\":true,\"createTime\":\"2018-10-26T15:06:58.107+08:00\",\"updateTime\":\"2018-10-26T15:06:58.107+08:00\",\"parentName\":null,\"areaName\":null,\"areaID\":\"e2c4a67d-e7de-4037-939b-e6d437265ab0\",\"businessUnitID\":\"1c5048eb-e886-4fc1-b463-f1efcaedec28\",\"subOrgs\":null,\"sameVehicleroutinglocationList\":null,\"taxControlDiskList\":null,\"legalPersonName\":null,\"manufactureAddress\":\"02-03,15/F,Tower A,Cheung Kei Center,18 Hung Luen Road,Hung Hom,Kowloon,Hong Kong\",\"registerAddress\":\"02-03,15/F,Tower A,Cheung Kei Center,18 Hung Luen Road,Hung Hom,Kowloon,Hong Kong\",\"bankAccountName\":null,\"bankAccountNumber\":null,\"phoneNumber\":\"(00852)28862301\",\"registrationType\":null,\"maximumAmount\":null,\"invoiceEntityType\":null,\"maximumPrintNumber\":null,\"payee\":null,\"reviewer\":null,\"issueBy\":null,\"loginUserAsIssuer\":null,\"districtCode\":null,\"districtName\":null,\"structureName\":null,\"regionName\":null,\"industryName\":null,\"businessUnitName\":null,\"dimensionID\":null,\"dimensionName\":null,\"dimensionValueName\":null,\"dimensionValueID\":null,\"attributeID\":null,\"attributeName\":null,\"isSystemDimension\":false,\"isSyncInputInvoice\":false,\"ratepayer\":null,\"address\":null,\"isLastUseOrgnization\":false,\"foundationDate\":null,\"registrationDate\":null,\"registrationLocation\":null,\"registrationCapital\":null,\"businessAllottedTimeFrom\":null,\"businessAllottedTimeTo\":null,\"legalCode\":null,\"companyCode\":null,\"level\":0,\"interalCustomerID\":\"1072\",\"pLevel\":0,\"maximumSpecialAmount\":null,\"maximumGeneralAmount\":null,\"maximumElectronicAmount\":null,\"canIssueElectricTicket\":false,\"isOverseasCompany\":true,\"enterpriseAccountSetOrgList\":null,\"organizationServiceTemplateGroupList\":null,\"dimensionValueOrgList\":null,\"userRoleList\":null,\"productList\":null,\"authenticationPeriod\":null,\"periodLastUpdateTime\":null,\"periodUpdateResult\":null},\"id\":null,\"result\":true,\"resultMsg\":null,\"returnCode\":0}");
return result;
}
@RequestMapping("taxCalendar/getTaxCalendarUserCompanys/admin")
@ResponseBody
public Object getTaxCalendarUserCompanys(){
Object result = JSONUtils.parse("[{\"id\":\"1782D50E-92EE-4C58-8C15-3D0A49F92793\",\"clientCode\":null,\"name\":\"鄂托克旗哈希云科技有限公司\",\"code\":null,\"abbreviation\":null,\"parentID\":null,\"taxPayerNumber\":null,\"regionID\":null,\"parentRegionID\":null,\"structureID\":null,\"industryID\":null,\"isActive\":false,\"createTime\":\"0001-01-01T00:00:00+08:00\",\"updateTime\":\"0001-01-01T00:00:00+08:00\",\"parentName\":null,\"areaName\":null,\"areaID\":null,\"businessUnitID\":null,\"subOrgs\":null,\"sameVehicleroutinglocationList\":null,\"taxControlDiskList\":null,\"legalPersonName\":null,\"manufactureAddress\":null,\"registerAddress\":null,\"bankAccountName\":null,\"bankAccountNumber\":null,\"phoneNumber\":null,\"registrationType\":null,\"maximumAmount\":null,\"invoiceEntityType\":null,\"maximumPrintNumber\":null,\"payee\":null,\"reviewer\":null,\"issueBy\":null,\"loginUserAsIssuer\":null,\"districtCode\":null,\"districtName\":null,\"structureName\":null,\"regionName\":null,\"industryName\":null,\"businessUnitName\":null,\"dimensionID\":null,\"dimensionName\":null,\"dimensionValueName\":null,\"dimensionValueID\":null,\"attributeID\":null,\"attributeName\":null,\"isSystemDimension\":false,\"isSyncInputInvoice\":null,\"ratepayer\":null,\"address\":null,\"isLastUseOrgnization\":false,\"foundationDate\":null,\"registrationDate\":null,\"registrationLocation\":null,\"registrationCapital\":null,\"businessAllottedTimeFrom\":null,\"businessAllottedTimeTo\":null,\"legalCode\":null,\"companyCode\":null,\"level\":0,\"interalCustomerID\":null,\"pLevel\":0,\"maximumSpecialAmount\":null,\"maximumGeneralAmount\":null,\"maximumElectronicAmount\":null,\"canIssueElectricTicket\":false,\"isOverseasCompany\":false,\"enterpriseAccountSetOrgList\":null,\"organizationServiceTemplateGroupList\":null,\"dimensionValueOrgList\":null,\"userRoleList\":null,\"productList\":null,\"authenticationPeriod\":null,\"periodLastUpdateTime\":null,\"periodUpdateResult\":null}]");
return result;
}
}
atms-web/src/main/webapp/Gruntfile.js
View file @ 5d488827
...@@ -657,6 +657,7 @@ grunt.registerTask('dev', '开发环境', function () { ...@@ -657,6 +657,7 @@ grunt.registerTask('dev', '开发环境', function () {
'concat:scriptsLogin', 'concat:scriptsLogin',
'concat:calendarJs','concat:calendarLess','concat:calendarCss', 'concat:calendarJs','concat:calendarLess','concat:calendarCss',
'concat:appresourcesCss', 'concat:appresourcesCss',
'concat:infrastructureJs',
'less', 'copy', 'clean' 'less', 'copy', 'clean'
]) ])
}); });
atms-web/src/main/webapp/Scripts/app.js
View file @ 5d488827
...@@ -282,6 +282,8 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls', ...@@ -282,6 +282,8 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls',
taxDocumentList: 'taxDocumentList', taxDocumentList: 'taxDocumentList',
backlogManage: 'backlogManage', backlogManage: 'backlogManage',
noPermissionPage: 'noPermissionPage', noPermissionPage: 'noPermissionPage',
infrastructure: 'infrastructure',
systemConfiguration: 'systemConfiguration',
/// <summary> /// <summary>
/// async load translation tables into application for specified part names that required for the view. /// async load translation tables into application for specified part names that required for the view.
/// </summary> /// </summary>
......
atms-web/src/main/webapp/Scripts/module-part1.js
View file @ 5d488827
...@@ -149,7 +149,7 @@ var frameworkModule = angular.module('app.framework', ['app.webservices', 'app.c ...@@ -149,7 +149,7 @@ var frameworkModule = angular.module('app.framework', ['app.webservices', 'app.c
function ($scope, $stateParams, appTranslation) { function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.appPart]); appTranslation.load([appTranslation.appPart]);
}], }],
template: '<app-summary></app-summary>', template: '<app-summary></app-summary>'
} }
}, },
resolve: scriptDependencyProvider.createDependenciesMap(_.flatten([scriptDependencyProvider.summary, scriptDependencyProvider.vat])), resolve: scriptDependencyProvider.createDependenciesMap(_.flatten([scriptDependencyProvider.summary, scriptDependencyProvider.vat])),
......
atms-web/src/main/webapp/WEB-INF/templates/index.html
View file @ 5d488827
...@@ -66,8 +66,8 @@ ...@@ -66,8 +66,8 @@
<!--@Html.AntiForgeryToken()--> <!--@Html.AntiForgeryToken()-->
<div class="wrapper"> <div class="wrapper">
<app-nav></app-nav> <app-nav></app-nav>
<div class="page-wrapper" style="position:relative;overflow-x:hidden;"> <div class="page-wrapper" style="position:relative;overflow-x:hidden;overflow-y: auto;margin-top: 55px;">
<div class="main-contents" ui-view id="topContent" style="margin-top: 55px;height: calc(100%);"></div> <div class="main-contents" ui-view id="topContent"></div>
<div class="data-import-contents" id="_data-import-contents" ui-view="importContent" style="margin-top: 55px;"></div> <div class="data-import-contents" id="_data-import-contents" ui-view="importContent" style="margin-top: 55px;"></div>
<!--style="display: none"--> <!--style="display: none"-->
</div> </div>
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
<!--}--> <!--}-->
// //
<!--else {--> <!--else {-->
window.location.href = '/#/overview/vat'; window.location.href = '/#/calendar';
// //
<!--}--> <!--}-->
// create the back to top button // create the back to top button
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json
View file @ 5d488827
...@@ -412,8 +412,10 @@ ...@@ -412,8 +412,10 @@
"MenuCIT": "企业所得税申报", "MenuCIT": "企业所得税申报",
"MenuRecordManage": "档案管理", "MenuRecordManage": "档案管理",
"MenuBacklogManage": "事项管理", "MenuBacklogManage": "事项管理",
"Calendar" : "Calendar", "MenuCalendar" : "Calendar",
"EntityManagement" : "Entity Management", "MenuEntityManagement" : "Entity Management",
"MenuEntityInformation": "Entity Information",
"MenuOwnershipChart": "Ownership Chart",
"Mid": "中", "Mid": "中",
"MobileManufacturingIndustry": "汽车制造业", "MobileManufacturingIndustry": "汽车制造业",
...@@ -804,14 +806,51 @@ ...@@ -804,14 +806,51 @@
"false": "否", "false": "否",
"ConditionColumnNum": "条件列", "ConditionColumnNum": "条件列",
"Condition": "查询条件", "Condition": "查询条件",
"Cancel": "取消",
"FinancialStatementsType": "财务报表", "FinancialStatementsType": "财务报表",
"Language": "zh-CN", "Language": "zh-CN",
"yyyy-MM": "yyyy-mm", "yyyy-MM": "yyyy-mm",
"Interaction module" : "交互模块", "Interaction module" : "交互模块",
"Finished": "已完成",
"NotFinished": "未完成",
"TaxProjectNameRequire": "请输入事项名称",
"UserDefine": "自定义事项",
"SystemConfig": "日历设置事项",
"UserDefineNotInTaxProjectName": "请配置自定义事项类型",
"TaxProjectNameColon": "事项类别：",
"TaxEventNameColon": "事项名称：",
"CompanyNameColon": "公司名称：",
"WorkPlaceNameColon": "办事地点：",
"RelatedTaxMoneyColon": "涉及税款：",
"OperatorNamesColon": "办事人：",
"TaxEventDateColon": "日期：",
"StatusColon": "状态：",
"UploadAddiction": "上传附件",
"AttachmentRemarkColon": "附言：",
"DownloadAddition": "下载附件",
"DeleteAddtion": "删除附件",
"CompleteUserColon": "完成人：",
"CompleteDateColon": "完成时间：",
"CalculateType": "未开票计算类型",
"JDEReturnType": "取值",
"PredictiveVerify": "同步电子抵账库",
"InvoiceGroupHandling": "发票分组操作",
"InvoiceGroupManage": "发票分组管理",
"taxCalendar": "税务日历",
"RelatedPerson": "相关人员",
"ProductType": "商品名称类型",
"DataCollectType": "数据类型",
"TaxCategory": "税（费）种",
"BeginDateColon": "开始日期：",
"EndDateColon": "结束日期：",
"BeginMonthColon": "开始月份：",
"EndMonthColon": "结束月份：",
"TaxType": "税种",
"Accessable": "可访问",
"~MustBeEndOneApp": "I Must be the End One, please!" "~MustBeEndOneApp": "I Must be the End One, please!"
} }
atms-web/src/main/webapp/app/admin/systemConfiguration/calendarSetting/taxCalendarConfig/tax-calendar-config.less
View file @ 5d488827
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
margin-right: 25px; margin-right: 25px;
margin-top: 25px; margin-top: 25px;
border-radius: 4px; border-radius: 4px;
width: calc(~"100%-50px"); width: calc(~"100% - 50px");
height: auto; height: auto;
line-height: 50px; line-height: 50px;
border: 1px solid #dfdfdf; border: 1px solid #dfdfdf;
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
.search-line { .search-line {
line-height: 50px; line-height: 50px;
display: inline-block; display: inline-block;
width: calc(~"100%-16px"); width: calc(~"100% - 16px");
margin: 0 6px; margin: 0 6px;
.search-part-1 { .search-part-1 {
...@@ -93,31 +93,31 @@ ...@@ -93,31 +93,31 @@
.search-box-100-2 { .search-box-100-2 {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
width: calc(~"100%-55px"); width: calc(~"100% - 55px");
} }
.search-box-100-4 { .search-box-100-4 {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
width: calc(~"100%-80px"); width: calc(~"100% - 80px");
} }
.search-box-50-7 { .search-box-50-7 {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
width: calc(~"50%-124px"); width: calc(~"50% - 124px");
} }
.search-box-50-4 { .search-box-50-4 {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
width: calc(~"50%-80px"); width: calc(~"50% - 80px");
} }
.search-box-50-3 { .search-box-50-3 {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
width: calc(~"50%-70px"); width: calc(~"50% - 70px");
} }
.btn-default { .btn-default {
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
} }
.grid-container { .grid-container {
width: calc(~"100%-50px"); width: calc(~"100% - 50px");
margin: 25px; margin: 25px;
.grid-head-search-container { .grid-head-search-container {
......
atms-web/src/main/webapp/app/admin/systemConfiguration/calendarSetting/taxCalendarConfigEdit/tax-calendar-config-edit.ctrl.js
View file @ 5d488827
systemConfigurationModule.controller('TaxCalendarConfigEditController', ['$scope', '$log', 'uiGridConstants', 'SweetAlert', '$translate', systemConfigurationModule.controller('TaxCalendarConfigEditController', ['$scope', '$log', 'uiGridConstants', 'SweetAlert', '$translate',
'stdAccountService', 'enterpriseAccountService', '$interval', 'orgService', '$timeout', '$q', 'commonWebService', 'loginContext', 'stdAccountService', '$interval', 'orgService', '$timeout', '$q', 'commonWebService', 'loginContext',
'userService', 'taxCalendarService', '$document','$uibModal','$state', 'userService', 'taxCalendarService', '$document','$uibModal','$state',
function ($scope, $log, uiGridConstants, SweetAlert, $translate, stdAccountService, enterpriseAccountService, $interval, orgService, function ($scope, $log, uiGridConstants, SweetAlert, $translate, stdAccountService, $interval, orgService,
$timeout, $q, commonWebService, loginContext, userService, taxCalendarService, $document, $uibModal, $state) { $timeout, $q, commonWebService, loginContext, userService, taxCalendarService, $document, $uibModal, $state) {
'use strict'; 'use strict';
......
atms-web/src/main/webapp/app/admin/systemConfiguration/calendarSetting/taxCalendarConfigEdit/tax-calendar-config-edit.less
View file @ 5d488827
...@@ -25,14 +25,14 @@ ...@@ -25,14 +25,14 @@
margin-right: 5px; margin-right: 5px;
margin-top: 15px; margin-top: 15px;
border-radius: 4px; border-radius: 4px;
width: calc(~"100%-12px"); width: calc(~"100% - 12px");
height: auto; height: auto;
line-height: 50px; line-height: 50px;
.edit-line { .edit-line {
line-height: 50px; line-height: 50px;
display: inline-block; display: inline-block;
width: calc(~"100%-16px"); width: calc(~"100% - 16px");
margin: 0 6px; margin: 0 6px;
.right-link { .right-link {
...@@ -47,20 +47,20 @@ ...@@ -47,20 +47,20 @@
} }
.col-user-define-left { .col-user-define-left {
width: calc(~"50%-55px"); width: calc(~"50% - 55px");
margin-left: 30px; margin-left: 30px;
display: inline-block; display: inline-block;
} }
.col-user-define-right { .col-user-define-right {
width: calc(~"50%-55px"); width: calc(~"50% - 55px");
margin-left: 30px; margin-left: 30px;
margin-right: 40px; margin-right: 40px;
display: inline-block; display: inline-block;
} }
.col-descript-right { .col-descript-right {
width: calc(~"50%-160px"); width: calc(~"50% - 160px");
margin-left: 45px; margin-left: 45px;
margin-right: 10px; margin-right: 10px;
display: inline-block; display: inline-block;
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
} }
.col-remark-right { .col-remark-right {
width: calc(~"50%-68px"); width: calc(~"50% - 68px");
margin-left: 39px; margin-left: 39px;
margin-right: 40px; margin-right: 40px;
display: inline-block; display: inline-block;
...@@ -93,19 +93,19 @@ ...@@ -93,19 +93,19 @@
} }
.yxrq-box { .yxrq-box {
width: calc(~"50%-127px") !important; width: calc(~"50% - 127px") !important;
} }
.bh-box { .bh-box {
width: calc(~"50%-170px"); width: calc(~"50% - 170px");
} }
.common-box { .common-box {
width: calc(~"100%-230px"); width: calc(~"100% - 230px");
} }
.sssx-box { .sssx-box {
width: calc(~"100%-115px"); width: calc(~"100% - 115px");
} }
.title-first { .title-first {
......
atms-web/src/main/webapp/app/calendar/display/calendar-display.ctrl.js
View file @ 5d488827
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
failure: 0, failure: 0,
RecongizeSuccessExaminationFailed: 1, RecongizeSuccessExaminationFailed: 1,
sucess: 2 sucess: 2
}, }
}; };
//全部scope变量初始化 //全部scope变量初始化
...@@ -865,14 +865,14 @@ ...@@ -865,14 +865,14 @@
function setSchedules() { function setSchedules() {
taxCalendarService.getTaxCalendarDataForDisplay(cal.getDateRangeStart(), cal.getDateRangeEnd()).success(function (scheduleDtoList) { taxCalendarService.getTaxCalendarDataForDisplay(cal.getDateRangeStart(), cal.getDateRangeEnd()).success(function (scheduleDtoList) {
//如果登录用户没有查看，则不显示相应的税务日历 //如果登录用户没有查看，则不显示相应的税务日历
userService.getUserPermissionNew(loginContext.userName, function (data) { // userService.getUserPermissionNew(loginContext.userName, function (data) {
$scope.permissionData = data; // $scope.permissionData = data;
if (!window.PWC.isHavePermission($scope.vatPermission.taxCalendarDisplay.sysCalendarView, $scope.permissionData)) { // if (!window.PWC.isHavePermission($scope.vatPermission.taxCalendarDisplay.sysCalendarView, $scope.permissionData)) {
scheduleDtoList = _.filter(scheduleDtoList, function (r) { // scheduleDtoList = _.filter(scheduleDtoList, function (r) {
return r.type != 2; // return r.type != 2;
}) // })
} // }
}); // });
// 自定义事件，只能显示自己自定义的 // 自定义事件，只能显示自己自定义的
scheduleDtoList = _.filter(scheduleDtoList, function (r) { scheduleDtoList = _.filter(scheduleDtoList, function (r) {
if (r.type === constant.EnumTaxEventType.UserDefine && r.operatorIDs != loginContext.userId) { if (r.type === constant.EnumTaxEventType.UserDefine && r.operatorIDs != loginContext.userId) {
...@@ -886,7 +886,7 @@ ...@@ -886,7 +886,7 @@
}).error(function (ex) { }).error(function (ex) {
$log.error(ex); $log.error(ex);
ackMessageBox.warning(dataOptions.translated.SystemException); SweetAlert.warning($translate.instant('SystemException'));
}); });
} }
...@@ -1181,9 +1181,9 @@ ...@@ -1181,9 +1181,9 @@
var createNewScheduleClick = function (e) { var createNewScheduleClick = function (e) {
//如果有编辑自定义事项的权限才能新建 //如果有编辑自定义事项的权限才能新建
if (!window.PWC.isHavePermission($scope.vatPermission.taxCalendarDisplay.userCalendarEdit, $scope.permissionData)) { // if (!window.PWC.isHavePermission($scope.vatPermission.taxCalendarDisplay.userCalendarEdit, $scope.permissionData)) {
return; // return;
} // }
var guide = e.guide; var guide = e.guide;
// use guideEl$'s left, top to locate your schedule creation popup // use guideEl$'s left, top to locate your schedule creation popup
var guideEl$ = guide.guideElement ? var guideEl$ = guide.guideElement ?
......
atms-web/src/main/webapp/app/framework/app-nav/app-nav.ctrl.js
View file @ 5d488827
...@@ -128,7 +128,6 @@ frameworkModule.controller('AppNavController', ['$rootScope', '$scope', '$log', ...@@ -128,7 +128,6 @@ frameworkModule.controller('AppNavController', ['$rootScope', '$scope', '$log',
$scope.adminSettingShow = data[constant.adminPermission.WebAdmin]; $scope.adminSettingShow = data[constant.adminPermission.WebAdmin];
$scope.menuBacklogManageShow = true;
$scope.menuCalendarShow = true; $scope.menuCalendarShow = true;
$scope.menuEntityManagementShow = true; $scope.menuEntityManagementShow = true;
...@@ -154,13 +153,15 @@ frameworkModule.controller('AppNavController', ['$rootScope', '$scope', '$log', ...@@ -154,13 +153,15 @@ frameworkModule.controller('AppNavController', ['$rootScope', '$scope', '$log',
// 这里没想好怎么搞，暂时先这样点击导入按钮更新下display，nav-bar里其他的按钮更新display，其他不做操作 // 这里没想好怎么搞，暂时先这样点击导入按钮更新下display，nav-bar里其他的按钮更新display，其他不做操作
var isNeedHide = angular.equals('notification', toState.name) || var isNeedHide = angular.equals('notification', toState.name) ||
angular.equals('summary', toState.name) || angular.equals('summary', toState.name) ||
angular.equals('taxDocumentManage', toState.name) || // angular.equals('taxDocumentManage', toState.name) ||
angular.equals('overviewCit', toState.name) || // angular.equals('overviewCit', toState.name) ||
angular.equals('overviewAssetsManage', toState.name) || // angular.equals('overviewAssetsManage', toState.name) ||
angular.equals('listApproval', toState.name) || // angular.equals('listApproval', toState.name) ||
angular.equals('overviewVat', toState.name) || // angular.equals('overviewVat', toState.name) ||
angular.equals('taxDocumentManage', toState.name) || // angular.equals('taxDocumentManage', toState.name) ||
angular.equals('overview', toState.name); // angular.equals('overview', toState.name) ||
angular.equals('taxCalendar', toState.name) ||
angular.equals('organization', toState.name);
if (isNeedHide) { if (isNeedHide) {
$('.data-import-contents')[0].style.display = "none"; $('.data-import-contents')[0].style.display = "none";
$('.main-contents')[0].style.width = ""; $('.main-contents')[0].style.width = "";
......
atms-web/src/main/webapp/app/framework/app-nav/app-nav.html
View file @ 5d488827
<nav class="navbar-custom-top" role="navigation" style="margin-bottom: 0;border-radius:0"> <nav class="navbar-custom-top" role="navigation" style="margin-bottom: 0;border-radius:0">
<div class="nav-container" style="min-width:1435px"> <div class="nav-container" style="min-width:1435px">
<div class="nav-element-left" style="width:250px;text-align:left;font-size:17px;"> <div class="nav-element-left" style="width:250px;text-align:left;font-size:17px;">
<!--<i class="fa fa-bullseye" style="color:red;font-size:22px;margin-right:10px"></i>--> <i class="fa fa-bullseye" style="color:red;font-size:22px;margin-right:10px"></i>
<img src="app-resources/images/didi-icon.svg" style="height: 50px;margin-bottom:5px;weight:60px"/> <!---->
<span style="font-weight:bold;">Entity Info Database</span> <span style="font-weight:bold;">Entity Info Database</span>
</div> </div>
<div class="nav-element-left" style="width:130px;" hover-show="first" atms-permission permission-control-type="ngIf" permission-code="{{vatPermission.taxCalendarDisplay.menuControl}}"> <div class="nav-element-left" hover-show="first" atms-permission permission-control-type="ngIf" permission-code="{{vatPermission.taxCalendarDisplay.menuControl}}">
<a ui-sref-active="active" ui-sref="taxCalendar"> <a ui-sref-active="active" ui-sref="taxCalendar">
<span id="taxCalendar" class="nav-icon-color">{{'taxCalendar' | translate}}</span> <span id="taxCalendar" class="nav-icon-color">{{'Calendar' | translate}}</span>
</a> </a>
</div> </div>
<div class="nav-element-left" ng-if="menuEntityManagementShow"> <div class="nav-element-left" hover-show="second" ng-if="menuEntityManagementShow">
<a ui-sref="organization"> <a ui-sref="organization">
<span class="nav-icon-color">{{'EntityManagement' | translate}}</span> <span class="nav-icon-color">{{'EntityManagement' | translate}}</span>
</a> </a>
...@@ -79,23 +78,23 @@ ...@@ -79,23 +78,23 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div class="nav-sub-container first"> <div class="nav-sub-container second">
<div class="element-left"> <div class="element-left">
<a ui-sref-active="active" ui-sref="invoiceManagement.main" ng-if="specialUser!=='simon'"> <a ui-sref-active="active" ui-sref="organization" ng-if="specialUser!=='simon'">
<span class="nav-sub-icon-color">{{'MenuInvoiceManagement' | translate}}</span> <span class="nav-sub-icon-color">{{'MenuEntityInformation' | translate}}</span>
</a> </a>
<a ng-if="specialUser==='simon'"> <a ng-if="specialUser==='simon'">
<span class="nav-sub-icon-color">{{'MenuInvoiceManagement' | translate}}</span> <span class="nav-sub-icon-color">{{'MenuEntityInformation' | translate}}</span>
</a> </a>
</div> </div>
<div class="element-left"> <div class="element-left">
<a ui-sref-active="active" ui-sref="outputInvoiceManage.imported" ng-if="specialUser!=='simon'"> <a ui-sref-active="active" ui-sref="ownershipChart" ng-if="specialUser!=='simon'">
<span class="nav-sub-icon-color">{{'OutMenuInvoiceManagement' | translate}}</span> <span class="nav-sub-icon-color">{{'MenuOwnershipChart' | translate}}</span>
</a> </a>
<a ng-if="specialUser==='simon'"> <a ng-if="specialUser==='simon'">
<span class="nav-sub-icon-color">{{'OutMenuInvoiceManagement' | translate}}</span> <span class="nav-sub-icon-color">{{'MenuOwnershipChart' | translate}}</span>
</a> </a>
</div> </div>
......
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