Skip to content

T
traffic-front
Commit 9b2aaa06 authored by chase's avatar chase
Browse files
Options

Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

parents 75adc8ae e8ba17e4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 310 additions and 98 deletions
atms-api/src/main/java/pwc/taxtech/atms/controller/ApprovalController.java
View file @ 9b2aaa06
......@@ -37,7 +37,7 @@ public class ApprovalController {
@ResponseBody
@RequestMapping(value = "/deploy", method = RequestMethod.POST)
public ResponseEntity deploy() {
repositoryService.createDeployment().addClasspathResource("bpmn/approval.bpmn").deploy();
repositoryService.createDeployment().addClasspathResource("bpmn/approval1.bpmn").deploy();
return ResponseEntity.ok().build();
}
......
atms-web/src/main/java/pwc/taxtech/atms/common/DDUserInfo.java 0 → 100644
View file @ 9b2aaa06
package pwc.taxtech.atms.common;
import com.alibaba.fastjson.annotation.JSONField;
/**
* @Auther: Gary J Li
* @Date: 05/03/2019 18:25
* @Description:
*/
public class DDUserInfo {
private int uid;
private String phone;
@JSONField(name = "username_zh")
private String username_zh;
private String email;
private String username;
public int getUid() {
return uid;
}
public void setUid(int uid) {
this.uid = uid;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getUsername_zh() {
return username_zh;
}
public void setUsername_zh(String username_zh) {
this.username_zh = username_zh;
}
}
atms-web/src/main/java/pwc/taxtech/atms/common/DDUserInfoRes.java 0 → 100644
View file @ 9b2aaa06
package pwc.taxtech.atms.common;
import com.alibaba.fastjson.annotation.JSONField;
/**
* @Auther: Gary J Li
* @Date: 05/03/2019 18:25
* @Description:
*/
public class DDUserInfoRes {
private int errno;
@JSONField(name = "data")
private DDUserInfo ddUserInfo;
private String errmsg;
public int getErrno() {
return errno;
}
public void setErrno(int errno) {
this.errno = errno;
}
public DDUserInfo getDdUserInfo() {
return ddUserInfo;
}
public void setDdUserInfo(DDUserInfo ddUserInfo) {
this.ddUserInfo = ddUserInfo;
}
public String getErrmsg() {
return errmsg;
}
public void setErrmsg(String errmsg) {
this.errmsg = errmsg;
}
}
atms-web/src/main/java/pwc/taxtech/atms/web/controller/IndexController.java
View file @ 9b2aaa06
......@@ -130,7 +130,7 @@ public class IndexController {
}catch (Exception e){
logger.error("ddSSOCallback error",e);
}
return "redirect:"+tempContextUrl+"Account/LogOn";
return "redirect:"+tempContextUrl;
}
@RequestMapping(value = {"/admin", "/admin.html"}, method = RequestMethod.GET)
......
atms-web/src/main/webapp/app/admin/infrastructure/docManage/doc-manage.ctrl.js
View file @ 9b2aaa06
......@@ -278,7 +278,8 @@
}
else {
$scope.confirmDocFileType = createDocFileType;
$scope.editModel = {};
//默认为选中
$scope.editModel = {"status":1};
}
createMultiSelect();
$('#editPopDialog').modal('show');
......
atms-web/src/main/webapp/app/admin/infrastructure/docManage/doc-manage.html
View file @ 9b2aaa06
......@@ -162,7 +162,7 @@
|| editModel.status == null
|| editModel.status == undefined
|| editModel.status == ''"
ng-model="editModel.status"/>
ng-model="editModel.status" />
<span translate="Enable"></span>
</label>
<label class="col-sm-5 DM-state-label">
......
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js
View file @ 9b2aaa06
......@@ -133,6 +133,18 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
if ($scope.componentSelectedArea) {
editModel.areaID = $scope.selectedAreaId;
}
//所属业务线校验
if(!editModel.businessUnitID){
SweetAlert.error("请检查必填项");
return;
}
//区域校验
if (editModel.areaID === "") {
SweetAlert.error("请检查必填项");
return;
}
if ($scope.isAdd) {
editModel.isActive = true;
orgService.addOrg(editModel).success(function (orgId) {
......@@ -277,6 +289,17 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
editModel.areaID = $scope.selectedAreaId;
}
//所属业务线校验
if(!editModel.businessUnitID){
SweetAlert.error("请检查必填项");
return;
}
//区域校验
if (editModel.areaID === "") {
SweetAlert.error("请检查必填项");
return;
}
if((typeof $scope.editOrgModel.foundationDate) ==="string"){
if (""!==($scope.editOrgModel.foundationDate)) {
$scope.editOrgModel.foundationDate = new Date($scope.editOrgModel.foundationDate);
......
atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.ctrl.js
View file @ 9b2aaa06
......@@ -738,9 +738,16 @@
logDto.OperationType = enums.vatLogOperationTypeEnum.AddImport;
}
if($scope.checkedCompanyCodeList.length == 0){
SweetAlert.warning($translate.instant('PleaseSelectOrganization'));
return;
}
var period = $scope.UploadPeriodTime;
if(period == null){
SweetAlert.warning($translate.instant('PleaseSelectPeriod'));
return;
}
var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
// var orgIds = $scope.checkedCompanyList;
Upload.upload({
url: $scope.importATExcelFile,
......
atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.html
View file @ 9b2aaa06
......@@ -12,11 +12,11 @@
<div class="form-group" ng-style="setButtonWrapStyle()" style="width: 100%;margin-bottom: -38px;">
<div class="import-wrapper">
<div class="row">
<div class="col-sm-6 leftNav">
<div class="col-sm-6 leftNav" style="width: 60%;">
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" >
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width:200px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -31,7 +31,7 @@
<input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
ng-checked="selectedOne"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
<span style="margin-left:5px;text-align: left;">{{i.name}}</span>
<span style="margin-left:5px;text-align: left;float: left;">{{i.name}}</span>
</div>
</li>
</ul>
......@@ -43,7 +43,7 @@
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div>
</div>
......
atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.ctrl.js
View file @ 9b2aaa06
......@@ -712,7 +712,15 @@
logDto.OperationType = enums.vatLogOperationTypeEnum.AddImport;
}
if($scope.checkedCompanyCodeList.length == 0){
SweetAlert.warning($translate.instant('PleaseSelectOrganization'));
return;
}
var period = $scope.UploadPeriodTime;
if(period == null){
SweetAlert.warning($translate.instant('PleaseSelectPeriod'));
return;
}
var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
Upload.upload({
......
atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.html
View file @ 9b2aaa06
......@@ -16,7 +16,7 @@
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" >
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width:200px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -27,12 +27,12 @@
<li role="separator" class="divider" style="height: 1px;margin: 9px 0;
overflow: hidden;background-color: #e5e5e5;"></li>
<li ng-repeat="i in companyList">
<div class="checkbox-custom checkbox-default">
<input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
ng-checked="selectedOne"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
<span style="margin-left:5px;text-align: left;float: left;">{{i.name}}</span>
</div>
<div class="checkbox-custom checkbox-default">
<input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
ng-checked="selectedOne"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
<span style="margin-left:5px;text-align: left;float: left;">{{i.name}}</span>
</div>
</li>
</ul>
</div>
......@@ -43,7 +43,7 @@
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div>
</div>
<div class="col-sm-6 rightNav " style="width: 40%;margin-top: 10px;">
......
atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.ctrl.js
View file @ 9b2aaa06
......@@ -716,9 +716,16 @@
logDto.OperationType = enums.vatLogOperationTypeEnum.AddImport;
}
if($scope.checkedCompanyCodeList.length == 0){
SweetAlert.warning($translate.instant('PleaseSelectOrganization'));
return;
}
var period = $scope.UploadPeriodTime;
if(period == null){
SweetAlert.warning($translate.instant('PleaseSelectPeriod'));
return;
}
var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
Upload.upload({
url: $scope.importCFExcelFile,
data: {
......
atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.html
View file @ 9b2aaa06
......@@ -16,7 +16,7 @@
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" >
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width:200px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -43,7 +43,7 @@
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div>
</div>
<div class="col-sm-6 rightNav" style="width: 40%;margin-top: 10px;">
......
atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.html
View file @ 9b2aaa06
......@@ -16,7 +16,7 @@
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="auto">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width:200px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -43,7 +43,7 @@
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div>
</div>
<div style = "width:40%; margin-top: 10px;" class="col-sm-6 rightNav">
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-bs-prc-adjust/import-cit-bs-prc-adjust.html
View file @ 9b2aaa06
......@@ -11,7 +11,7 @@
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width:200px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -26,7 +26,7 @@
<input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
ng-checked="selectedOne"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
<span style="margin-left:5px;text-align: left;">{{i.name}}</span>
<span style="margin-left:5px;text-align: left;float: left;">{{i.name}}</span>
</div>
</li>
</ul>
......@@ -38,7 +38,7 @@
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div>
<button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-journal-adjust/import-cit-journal-adjust.html
View file @ 9b2aaa06
......@@ -11,7 +11,7 @@
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -26,7 +26,7 @@
<input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
ng-checked="selectedOne"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
<span style="margin-left:5px;text-align: left;">{{i.name}}</span>
<span style="margin-left:5px;text-align: left;float: left;">{{i.name}}</span>
</div>
</li>
</ul>
......@@ -38,7 +38,7 @@
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div>
<button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-profit-prc-adjust/import-cit-profit-prc-adjust.html
View file @ 9b2aaa06
......@@ -11,7 +11,7 @@
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -26,7 +26,7 @@
<input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
ng-checked="selectedOne"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
<span style="margin-left:5px;text-align: left;">{{i.name}}</span>
<span style="margin-left:5px;text-align: left;float: left;">{{i.name}}</span>
</div>
</li>
</ul>
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-salary-advance/import-cit-salary-advance.html
View file @ 9b2aaa06
......@@ -11,7 +11,7 @@
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -26,7 +26,7 @@
<input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
ng-checked="selectedOne"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
<span style="margin-left:5px;text-align: left;">{{i.name}}</span>
<span style="margin-left:5px;text-align: left;float: left;">{{i.name}}</span>
</div>
</li>
</ul>
......@@ -38,7 +38,7 @@
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div>
<button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.html
View file @ 9b2aaa06
......@@ -11,7 +11,7 @@
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -26,7 +26,7 @@
<input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
ng-checked="selectedOne"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
<span style="margin-left:5px;text-align: left;">{{i.name}}</span>
<span style="margin-left:5px;text-align: left;float: left;">{{i.name}}</span>
</div>
</li>
</ul>
......@@ -38,7 +38,7 @@
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div>
<button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
......
atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.ctrl.js
View file @ 9b2aaa06
......@@ -181,10 +181,16 @@
logDto.OperationName = $translate.instant('AddImportProfitLoss');
logDto.OperationType = enums.vatLogOperationTypeEnum.AddImport;
}
if($scope.checkedCompanyCodeList.length == 0){
SweetAlert.warning($translate.instant('PleaseSelectOrganization'));
return;
}
var period = $scope.UploadPeriodTime;
if(period == null){
SweetAlert.warning($translate.instant('PleaseSelectPeriod'));
return;
}
var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
Upload.upload({
url: $scope.importCPRExcelFile,
data: {
......@@ -209,6 +215,7 @@
logDto.UpdateState = $translate.instant('ImportSuccess');
vatOperationLogService.addOperationLog(logDto);
SweetAlert.success($translate.instant('ImportSuccess'));
$scope.fileNameShow=false;
} else {
if (ret.resultMsg && ret.resultMsg.length > 0) {
SweetAlert.warning($translate.instant(ret.resultMsg));
......@@ -355,6 +362,7 @@
return;
}
$scope.fileName = fileName.name;
$scope.fileNameShow = $scope.fileName?true:false;
//初始化数据
$scope.selectedMappingList = [];
$scope.ImportErrorTab = false;
......@@ -404,7 +412,7 @@
var setButtonWrapStyle = function () {
if ($scope.fileName) {
if ($scope.fileNameShow) {
return { width: "100%" };
}
};
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.ctrl.js
View file @ 9b2aaa06
......@@ -137,7 +137,15 @@
logDto.OperationType = enums.vatLogOperationTypeEnum.AddImport;
}
if($scope.checkedCompanyCodeList.length == 0){
SweetAlert.warning($translate.instant('PleaseSelectOrganization'));
return;
}
var period = $scope.UploadPeriodTime;
if(period == null){
SweetAlert.warning($translate.instant('PleaseSelectPeriod'));
return;
}
var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
Upload.upload({
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.html
View file @ 9b2aaa06
......@@ -12,11 +12,11 @@
<div class="form-group" ng-style="setButtonWrapStyle()" style="width: 100%; margin-bottom: -38px;">
<div class="import-wrapper">
<div class="row">
<div class="col-sm-6 leftNav ">
<div class="col-sm-6 leftNav " style="width: 60%;">
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -43,7 +43,7 @@
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div>
</div>
<div class="col-sm-6 rightNav" style="width: 40%; margin-top: 10px;">
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.ctrl.js
View file @ 9b2aaa06
......@@ -164,10 +164,16 @@
logDto.OperationName = $translate.instant('AddImportProfitLoss');
logDto.OperationType = enums.vatLogOperationTypeEnum.AddImport;
}
if($scope.checkedCompanyCodeList.length == 0){
SweetAlert.warning($translate.instant('PleaseSelectOrganization'));
return;
}
var period = $scope.UploadPeriodTime;
if(period == null){
SweetAlert.warning($translate.instant('PleaseSelectPeriod'));
return;
}
var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
Upload.upload({
url: $scope.importIRExcelFile,
data: {
......@@ -192,6 +198,7 @@
logDto.UpdateState = $translate.instant('ImportSuccess');
vatOperationLogService.addOperationLog(logDto);
SweetAlert.success($translate.instant('ImportSuccess'));
$scope.fileNameShow = false;
} else {
if (ret.resultMsg && ret.resultMsg.length > 0) {
SweetAlert.warning($translate.instant(ret.resultMsg));
......@@ -346,6 +353,7 @@
return;
}
$scope.fileName = fileName.name;
$scope.fileNameShow = $scope.fileName?true:false;
//初始化数据
$scope.selectedMappingList = [];
$scope.ImportErrorTab = false;
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.html
View file @ 9b2aaa06
......@@ -16,7 +16,7 @@
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" >
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -42,8 +42,8 @@
readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
<div ng-show="fileNameShow" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div>
</div>
<div class="col-sm-6 col-xs-6 col-lg-6 rightNav" style="width: 40%; margin-top: 10px" >
......
atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.ctrl.js
View file @ 9b2aaa06
......@@ -166,7 +166,15 @@
logDto.OperationType = enums.vatLogOperationTypeEnum.AddImport;
}
if($scope.checkedCompanyCodeList.length == 0){
SweetAlert.warning($translate.instant('PleaseSelectOrganization'));
return;
}
var period = $scope.UploadPeriodTime;
if(period == null){
SweetAlert.warning($translate.instant('PleaseSelectPeriod'));
return;
}
var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
Upload.upload({
......
atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.html
View file @ 9b2aaa06
......@@ -12,11 +12,11 @@
<div class="form-group" ng-style="setButtonWrapStyle()" style="width: 100%;margin-bottom: -38px;">
<div class="import-wrapper">
<div class="row">
<div class="col-sm-6 leftNav">
<div class="col-sm-6 leftNav" style="width: 60%;">
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" >
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -43,7 +43,7 @@
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div>
</div>
<div class="col-sm-6 rightNav" style="width: 40%; margin-top: 10px;">
......
atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.ctrl.js
View file @ 9b2aaa06
......@@ -165,7 +165,15 @@
logDto.OperationType = enums.vatLogOperationTypeEnum.AddImport;
}
if($scope.checkedCompanyCodeList.length == 0){
SweetAlert.warning($translate.instant('PleaseSelectOrganization'));
return;
}
var period = $scope.UploadPeriodTime;
if(period == null){
SweetAlert.warning($translate.instant('PleaseSelectPeriod'));
return;
}
var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
Upload.upload({
......
atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.html
View file @ 9b2aaa06
......@@ -2,13 +2,14 @@
<!--标题-->
<div class="nav-wrapper">
<div class="nav-header" translate="RedLetterInformationTableTitle"></div>
<div class="alert alert-warning" style="width:400px;margin-bottom:5px;" ng-show="ImportErrorTab" ng-click="toggleErrorTab()">
<div class="alert alert-warning" style="width:400px;margin-bottom:5px;" ng-show="ImportErrorTab"
ng-click="toggleErrorTab()">
<i class="fa fa-exclamation-circle" aria-hidden="true"></i>{{errorMsg}}
</div>
</div>
<!--导航栏-->
<div id="tab_total">
<!-- <form class="form-inline" id="navigationForm" name="navigationForm">
<!-- <form class="form-inline" id="navigationForm" name="navigationForm">
<div class="form-group" >
<div class="import-wrapper1">
<span class="text-bold" translate="SelectedOrganization"></span>:
......@@ -65,53 +66,76 @@
</div>
</form>-->
<form class="form-inline">
<div class="form-group" style="margin-bottom: -38px;width: 100%" >
<div class="row">
<div class="col-sm-6 leftNav" style="width: 60%">
<label class="col-sm-1 control-label marTop">{{'SelectedOrganization' | translate}}：</label>
<div class="col-sm-3 marTop">
<div class="form-group" style="margin-bottom: -38px;width: 100%">
<div class="import-wrapper">
<div class="col-sm-6 leftNav" style="width: 60%;">
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" style="width: 200px;" type="button"
id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
<ul class="dropdown-menu" style="width: 400px;" aria-labelledby="dropdownMenu1">
<li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
<span style="margin-left:5px;float: left;">全选</span></li>
<li role="separator" class="divider" style="height: 1px;margin: 9px 0;
overflow: hidden;background-color: #e5e5e5;"></li>
<li ng-repeat="i in companyList">
<div class="checkbox-custom checkbox-default">
<input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
ng-checked="selectedOne"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
<span style="margin-left:5px;text-align: left;float: left;">{{i.name}}</span>
</div>
</li>
</ul>
</div>
<span class="text-bold" translate="InvoiceQJ"></span>:
<div class="period-picker" style="margin-left:10px">
<input type="text" id="periodDatepicker" class="datepicker imp-subheader"
style="width:120px;" readonly="readonly" ng-model="UploadPeriodTime" />
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
<!-- <label class="col-sm-2 control-label marTop">{{'SelectedOrganization' | translate}}：</label>
<div class="col-sm-5 marTop">
<div dx-tag-box="selectOrgOptions" style="position: relative; left: 33px;"></div>
</div>
<label class="col-sm-1 control-label marTop" style="margin-left: 60px;">{{'InvoiceQJ' | translate}}：</label>
<div class="col-sm-1 marTop" style=" width: 14%;">
<label class="col-sm-2 control-label marTop" style="margin-left: 60px;">{{'InvoiceQJ' | translate}}：</label>
<div class="col-sm-3 marTop" style=" width: 14%;">
<input type="text" id="periodDatepicker" class="datepicker form-control imp-subheader" style="width:120px; display: inline-block"
readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style=" position: relative; right: relative; right: -100px; top: -26px;"></i>
</div> -->
</div>
</div>
<div class="col-sm-6 rightNav" style="margin-top: 10px; width: 40%">
<button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" >
{{'SelectFile' | translate}}
</button>
<span ng-show="fileName" class="marTop" title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
<button type="button"
class="btn btn-vat-primary"
translate="TemplateBtn"
<div class="col-sm-6 rightNav" style="margin-top: 10px; width: 40%">
<button type="button" ngf-select="" type="file" ng-model="importExcelFile"
ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third">
{{'SelectFile' | translate}}
</button>
<span ng-show="fileName" class="marTop"
title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
<button type="button" class="btn btn-vat-primary" translate="TemplateBtn"
ng-click="downloadTemplate()"></button>
<button type="button"
class="btn btn-vat-primary topButton"
translate="CoverImportBtn"
<button type="button" class="btn btn-vat-primary topButton" translate="CoverImportBtn"
ng-click="doUploadRLIT(importEnum.CoverImport)"></button>
<button type="button"
class="btn btn-vat-primary topButton"
translate="AddImportBtn"
<button type="button" class="btn btn-vat-primary topButton" translate="AddImportBtn"
ng-click="doUploadRLIT(importEnum.AddImport)"></button>
</div>
</div>
</div>
</div>
</form>
<div class="dt-init-wrapper">
<div class="dx-viewport grid-container">
<div id="importRLITStatusGridContainer" dx-data-grid="importRLITStatusGridOptions"
style="margin-top: 30px;">
style="margin-top: 30px;">
</div>
</div>
<div class="page-footer">
<ack-pagination page-options="pagingOptions"
refresh-table="refreshConfigGrid()"></ack-pagination>
<ack-pagination page-options="pagingOptions" refresh-table="refreshConfigGrid()"></ack-pagination>
</div>
</div>
</div>
......@@ -137,8 +161,4 @@
</script>
<vat-operate-log period="period" module-type="moduleid" is-show="isShowLog"></vat-operate-log>
</div>
</div>
\ No newline at end of file
atms-web/src/main/webapp/app/framework/app-overview/app-overview.ctrl.js
View file @ 9b2aaa06
......@@ -908,23 +908,23 @@
$state.go('vat.importData.erpImport');
} else if (data[constant.vatPermission.dataPreview.trialBalance.queryCode]) {
$state.go('vat.previewData.trialBalance');
} else if (data[constant.vatPermission.previewData.profitLoss.queryCode]) {
} else if (data[constant.vatPermission.dataPreview.profitLoss.queryCode]) {
$state.go('vat.previewData.profitLoss');
} else if (data[constant.vatPermission.previewData.offBalanceSheet.queryCode]) {
} else if (data[constant.vatPermission.dataPreview.offBalanceSheet.queryCode]) {
$state.go('vat.previewData.offBalanceSheet');
} else if (data[constant.vatPermission.previewData.journal.queryCode]) {
} else if (data[constant.vatPermission.dataPreview.journal.queryCode]) {
$state.go('vat.previewData.journal');
} else if (data[constant.vatPermission.previewData.cashFlow.queryCode]) {
} else if (data[constant.vatPermission.dataPreview.cashFlow.queryCode]) {
$state.go('vat.previewData.cashFlow');
} else if (data[constant.vatPermission.previewData.invoiceRecord.queryCode]) {
} else if (data[constant.vatPermission.dataPreview.invoiceRecord.queryCode]) {
$state.go('vat.previewData.invoiceRecord');
} else if (data[constant.vatPermission.previewData.certifiedInvoicesList.queryCode]) {
} else if (data[constant.vatPermission.dataPreview.certifiedInvoicesList.queryCode]) {
$state.go('vat.previewData.certifiedInvoicesList');
} else if (data[constant.vatPermission.previewData.redLetterInformationTable.queryCode]) {
} else if (data[constant.vatPermission.dataPreview.redLetterInformationTable.queryCode]) {
$state.go('vat.previewData.redLetterInfoTab');
} else if (data[constant.vatPermission.previewData.coupaPurchasingReport.queryCode]) {
} else if (data[constant.vatPermission.dataPreview.coupaPurchasingReport.queryCode]) {
$state.go('vat.previewData.coupaPurchasingReport');
} else if (data[constant.vatPermission.previewData.invoiceData.queryCode]) {
} else if (data[constant.vatPermission.dataPreview.invoiceData.queryCode]) {
$state.go('vat.previewData.invoiceData');
} else if (data[constant.vatPermission.dataManage.caculateDataCode]) {
$state.go('vat.reductionData.caculateData');
......
atms-web/src/main/webapp/app/vat/import/vat-import-output-invoice/vat-import-output-invoice.html
View file @ 9b2aaa06
<div class="vat-import-output-invoice">
<div class="nav-wrapper">
<div class="nav-header" translate="OutputInvoiceTitle"></div>
<div class="nav-tab">
<span class="active" ng-click="switchTab($event)" translate="OutputInvoiceTab"></span><span ng-click="switchTab($event)" >{{ 'EvidenceTab' | translate }}{{evidenceTotalCount}}</span>
</div>
<!-- <div class="nav-tab"> -->
<!-- <span class="active" ng-click="switchTab($event)" translate="OutputInvoiceTab"></span> -->
<!-- <span ng-click="switchTab($event)" >{{ 'EvidenceTab' | translate }}{{evidenceTotalCount}}</span> -->
<!-- </div> -->
</div>
<!--销项界面-->
<div id="tab_total">
......
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