Skip to content

T
traffic-front
Commit 6dfba303 authored by eddie.woo's avatar eddie.woo
Browse files
Options

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

parents 37630ce6 6bd7528b
Show whitespace changes
Inline Side-by-side
Showing with 296 additions and 114 deletions
atms-api/src/main/java/pwc/taxtech/atms/common/message/ErrorMessage.java
View file @ 6dfba303
......@@ -4,7 +4,7 @@ public class ErrorMessage {
public static final String SaveFileError = "SaveFileError";
public static final String ParamError = "Param Error";
public static final String SystemError = "SystemError";
public static final String SystemError = "系统错误";
public static final String NoFile = "NoFile";
public static final String DidntSelectedCompany = "Didn't Selected Company";
public static final String DidntSelectedPeriod = "Didn't Selected period";
......
atms-api/src/main/java/pwc/taxtech/atms/controller/ReportController.java
View file @ 6dfba303
......@@ -350,7 +350,7 @@ public class ReportController {
* 批量导出利润表
*/
@RequestMapping("manyExport")
public OperationResultDto manyExport(@RequestBody RequestParameterDto requestParameterDto, HttpServletResponse response, HttpServletRequest request) {
public OperationResultDto manyExport(@RequestBody RequestParameterDto requestParameterDto, HttpServletResponse response, HttpServletRequest request) throws Exception {
OperationResultDto operationResultDto = new OperationResultDto();
String zipName = "利润表";
try {
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/AnalysisServiceImpl.java
View file @ 6dfba303
......@@ -11,7 +11,6 @@ import pwc.taxtech.atms.analysis.entity.*;
import pwc.taxtech.atms.common.message.ErrorMessage;
import pwc.taxtech.atms.common.message.ErrorMessageCN;
import pwc.taxtech.atms.common.util.DateUtils;
import pwc.taxtech.atms.constant.Constant;
import pwc.taxtech.atms.constant.TemplateHeaderCheck;
import pwc.taxtech.atms.constant.enums.EnumAnalysisExpTempPath;
import pwc.taxtech.atms.constant.enums.EnumAnalysisImportType;
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/TemplateServiceImpl.java
View file @ 6dfba303
......@@ -260,23 +260,26 @@ public class TemplateServiceImpl extends AbstractService {
String path = "";
if (templateDb != null) {
TemplateExample example = new TemplateExample();
example.createCriteria().andCodeEqualTo(templateDb.getCode()).andIdEqualTo(templateDb.getId()).andIsActiveAssociationEqualTo(false);
long count = templateMapper.countByExample(example);
if (count > 0) {
path = templateDb.getPath();
//物理删除
deleteIsAtiveAssociation(templateDb);
} else {
if (param.isDeletePermanent() && !templateDb.getIsSystemType()) {
// TemplateExample example = new TemplateExample();
// example.createCriteria().andCodeEqualTo(templateDb.getCode()).andIdEqualTo(templateDb.getId()).andIsActiveAssociationEqualTo(false);
path = templateDb.getPath();
//物理删除
deleteIsAtiveAssociation(templateDb);
} else {
//逻辑删除
logicDeleteIsActiveAssociation(templateDb);
}
}
// long count = templateMapper.countByExample(example);
// if (count > 0) {
// path = templateDb.getPath();
// //物理删除
// deleteIsAtiveAssociation(templateDb);
// } else {
// if (param.isDeletePermanent() && !templateDb.getIsSystemType()) {
// path = templateDb.getPath();
// //物理删除
// deleteIsAtiveAssociation(templateDb);
// } else {
// //逻辑删除
// logicDeleteIsActiveAssociation(templateDb);
// }
// }
}
result.setResult(true);
......@@ -406,10 +409,16 @@ public class TemplateServiceImpl extends AbstractService {
}
private void deleteIsAtiveAssociation(Template templateDb) {
if(templateDb.getId() == null){
return;
}
cellTemplateConfigMapper.deleteCellTemplateConfigByCellTemplate(templateDb.getId());
keyValueReferenceMapper.deleteKeyValueReferenceByCellTemplate(templateDb.getId());
CellTemplateExample example = new CellTemplateExample();
example.createCriteria().andReportTemplateIdEqualTo(templateDb.getId());
cellTemplateMapper.deleteByExample(example);
TemplateExample templateExample = new TemplateExample();
templateExample.createCriteria().andIdEqualTo(templateDb.getId());
templateMapper.deleteByExample(templateExample);
}
}
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
View file @ 6dfba303
......@@ -14,6 +14,7 @@ import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFCell;
import org.apache.poi.xssf.usermodel.XSSFFormulaEvaluator;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.omg.CORBA.SystemException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
......@@ -873,9 +874,9 @@ public class ReportServiceImpl extends BaseService {
} else if (3 == config.getTaxBase()) {//手工录入
} else if (4 == config.getTaxBase()) {//借方发生额
row.getCell(TaxesCalculateReportEnum.Column.Column_9.getIndex()).setCellValue("JFFS(\"" + config.getTbSegment3() + "\"," + project.getYear() + "," + period + ",1,,)");
row.getCell(TaxesCalculateReportEnum.Column.Column_9.getIndex()).setCellValue("JFFS(\"" + config.getBaseDrCode() + "\"," + project.getYear() + "," + period + ",1,,)");
} else if (5 == config.getTaxBase()) {//贷方发生额
row.getCell(TaxesCalculateReportEnum.Column.Column_9.getIndex()).setCellValue("DFFS(\"" + config.getTbSegment3() + "\"," + project.getYear() + "," + period + ",1,,)");
row.getCell(TaxesCalculateReportEnum.Column.Column_9.getIndex()).setCellValue("DFFS(\"" + config.getBaseCrCode() + "\"," + project.getYear() + "," + period + ",1,,)");
} else {
row.getCell(TaxesCalculateReportEnum.Column.Column_9.getIndex()).setCellValue("");
}
......@@ -2380,7 +2381,7 @@ public class ReportServiceImpl extends BaseService {
*
* @param requestParameterDto
*/
public void manyExport(RequestParameterDto requestParameterDto, String zipFileName, HttpServletRequest request, HttpServletResponse response, String zipPath) throws URISyntaxException {
public void manyExport(RequestParameterDto requestParameterDto, String zipFileName, HttpServletRequest request, HttpServletResponse response, String zipPath) throws Exception {
try {
FileOutputStream out = new FileOutputStream(zipFileName);//要输出的文件名字
} catch (FileNotFoundException e) {
......@@ -2416,6 +2417,9 @@ public class ReportServiceImpl extends BaseService {
}
dataList.add(orgTypeList);
}
if(dataList.size() == 0){
throw new Exception("没有可导出的数据");
}
if (template.getIsSystemType()) {
try {
inputStream = new BufferedInputStream(new FileInputStream(templateFile));
......@@ -2465,10 +2469,7 @@ public class ReportServiceImpl extends BaseService {
} catch (IOException e) {
e.printStackTrace();
} catch (InvalidFormatException e) {
e.printStackTrace();
} catch (Exception e) {
e.printStackTrace();
throw new Exception(ErrorMessage.SystemError);
}
}
}
......
atms-api/src/main/resources/conf/conf_profile_uat.properties
View file @ 6dfba303
jdbc_url=jdbc:mysql://172.20.2.218:3300/fintax_test?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
jdbc_user=fintax_user_test
jdbc_password=Fintaxuser@123Test
jdbc_user=fintax_user_test2
jdbc_password=Fintaxuser@123Test2
#jdbc_password=111111
jdbc_admin_db=taxadmin2018
......@@ -15,7 +15,7 @@ mail_jdbc_url=jdbc:sqlserver://192.168.1.102:1434;DatabaseName=MAILMaster
mail_jdbc_user=sa
mail_jdbc_password=atmsunittestSQL
web.url=http://dts.erp.didichuxing.com:9001
web.url=http://dts.erp.didichuxing.com
#web.url=*
jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
jwt.powerToken=xxxx
......@@ -33,7 +33,7 @@ max_file_length=104857600
distributed_id_datacenter=10
distributed_id_machine=15
api.url=http://dts.erp.didichuxing.com:8180
api.url=http://dts.erp.didichuxing.com
# Longi config
longi_api_basic_user=
......@@ -59,7 +59,7 @@ org_sync_token=174af08f
dd_pubkey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKUfMPRKV6I5num1dDWcxTrgTjXf5LctsVj0CpbwHE83mmjUO5CAlvA0Fwy30ajCX5sLmsyi+Eu/4uNmM6GQF3kCAwEAAQ==
ebs_call_url=http://172.20.3.109:8020/ebs-proxy-test/dts
ebs_call_url=http://172.20.201.201:8020/ebs-proxy-test/dts/glMonthlyBal?pageNum=1&pageSize=1000&ledgerId=2021&companyCode=120200&period=2018-11
#tableau config
tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CellTemplateConfigExtendsMapper.xml
View file @ 6dfba303
......@@ -13,10 +13,10 @@
</select>
<delete id="deleteCellTemplateConfigByCellTemplate" parameterType="java.lang.Long">
DELETE FROM cell_template_config A
DELETE FROM cell_template_config
WHERE
id IN (SELECT
id
X.id
FROM
(SELECT
B.id
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/KeyValueReferenceExtendsMapper.xml
View file @ 6dfba303
......@@ -5,11 +5,11 @@
<delete id="deleteKeyValueReferenceByCellTemplate" parameterType="java.lang.Long">
delete
FROM
key_value_reference a
key_value_reference
WHERE
id IN (
SELECT
id
x.id
FROM
(
SELECT
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/TrialBalanceFinalExtendsMapper.xml
View file @ 6dfba303
......@@ -15,7 +15,7 @@
tbf.segment3_name accountExplain,
tbf.segment5_name profitCenterExplain,
tbf.segment6_name productExplain,
tbf.period_dr amount,
tbf.period_cr_beq - tbf.period_dr_beq amount,
rc.name type,
rc.revenue_type category,
rc.tax_type taxOn,
......
atms-web/src/main/resources/conf_profile_uat.properties
View file @ 6dfba303
api.url=http://dts.erp.didichuxing.com:8180/
api.url=http://dts.erp.didichuxing.com
jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
jwt.powerToken=xxxx
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/basicData.json
View file @ 6dfba303
......@@ -403,6 +403,6 @@
"WordLibraryTitle": "字库",
"notAllowDisableMessage": "机构中已关联,不允许停用",
"UnSave": "未点击保存按钮！",
"addFileType": "增加档案类型",
"addFileType": "新建档案类型",
"~MustBeEndOneApp": "I Must be the End One, please!"
}
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/zh-CN/infrastructure.json
View file @ 6dfba303
......@@ -109,7 +109,7 @@
"DocumentTypeSets": "税务档案类型设置",
"Explain": "说明",
"RequiredFields": "必填字段",
"CreateDocFileType":"新建文档类型",
"CreateDocFileType":"新建档案类型",
"State": "状态",
"PCompany": "所属机构",
"Enable": "启用",
......
atms-web/src/main/webapp/app/admin/infrastructure/docManage/doc-manage.html
View file @ 6dfba303
......@@ -187,7 +187,7 @@
></button>&lt;!&ndash;ng-disabled="newDocFileTypeForm.roleName.$invalid || newDocFileTypeForm.service_id.$invalid"&ndash;&gt;
<button type="button" class="btn btn-third" data-dismiss="modal" ng-click="cancelDocFileType()" translate="Cancel"></button>
</div>-->
<div>
<div style="margin-bottom: 20px;">
<center>
<button type="submit" class="btn btn-primary" translate="Confirm"
></button>
......
atms-web/src/main/webapp/app/analysis/table/tb-ebit-form.html
View file @ 6dfba303
......@@ -3,7 +3,7 @@
<div class="row" style=" height: 71px; background: #ccc;">
<div class="col-sm-7" style=" margin-top: 20px;">
<div class="col-sm-8">
<span class="text-bold" translate="SelectedOrganization" style=" top: -11px; position: relative; width: 320px;">:</span>
<span class="text-bold" translate="SelectedOrganization" style=" top: -11px; display: inline!important; position: relative; ">:</span>
<!-- <div id="dx-select-industry" class="tab-content-select industry " style=" display: inline-block;"
dx-select-box="dataSourceIndustryList" dx-item-alias="itemObj">
<div data-options="dxTemplate: { name: 'orgList' }" class="dx-item-content dx-list-item-content"
......
atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.html
View file @ 6dfba303
......@@ -9,12 +9,14 @@
<!--导航栏-->
<div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm">
<div class="form-group" ng-style="setButtonWrapStyle()">
<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">
<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" >
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -43,27 +45,32 @@
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
</div>
</div>
<div class="col-sm-6 rightNav" style="width: 40%; margin-top: 10px;">
<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" style="margin-right:10px;margin-left:30px">
ngf-allow-dir="false" class="btn btn-vat-third" >
{{'SelectFile' | translate}}
</button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
class="btn btn-vat-primary"
translate="TemplateBtn"
ng-click="downloadTemplate()"></button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
class="btn btn-vat-primary topButton"
translate="AddImportBtn"
ng-click="doUploadAT(importEnum.AddImport)"></button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
class="btn btn-vat-primary topButton"
translate="CoverImportBtn"
ng-click="doUploadAT(importEnum.CoverImport)"></button>
</div>
</div>
</div>
</div>
<!--分页栏-->
<!--<div class="form-group page-form-group" ng-show="!fileName">
......
atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.less
View file @ 6dfba303
......@@ -401,3 +401,15 @@
padding-left: 15px;
}
}
@media screen and (max-width:1400px) {
.topButton{
margin-top: 10px;
}
.leftNav{
width: 70%!important;
}
.rightNav{
width: 30% !important;
}
}
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.html
View file @ 6dfba303
......@@ -9,12 +9,14 @@
<!--导航栏-->
<div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm">
<div class="form-group" ng-style="setButtonWrapStyle()">
<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" 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" style="width: 380px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" >
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -43,39 +45,43 @@
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
</div>
</div>
<div class="col-sm-6 rightNav " style="width: 40%;margin-top: 10px;">
<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" style="margin-right:10px;margin-left:30px">
ngf-allow-dir="false" class="btn btn-vat-third">
{{'SelectFile' | translate}}
</button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
class="btn btn-vat-primary"
translate="TemplateBtn"
ng-click="downloadTemplate()"></button>
<button type="button"
<!-- <button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="AddImportBtn"
ng-click="doUploadBS(importEnum.AddImport)"></button>
ng-click="doUploadBS(importEnum.AddImport)"></button>-->
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
class="btn btn-vat-primary topButton"
translate="CoverImportBtn"
ng-click="doUploadBS(importEnum.CoverImport)"></button>
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
<button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="ConverImportBtn"
ng-click="doUploadTbResult(importEnum.CoverImport)"></button>|
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
<button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div>
</div>
</div>
</div>
</div>
<!--分页栏-->
<!--<div class="form-group page-form-group" ng-show="!fileName">
......
atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.less
View file @ 6dfba303
......@@ -343,3 +343,16 @@
padding-left: 15px;
}
}
@media screen and (max-width:1400px) {
.topButton{
margin-top: 10px;
}
.leftNav{
width: 70%!important;
}
.rightNav{
width: 30% !important;
}
}
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.html
View file @ 6dfba303
......@@ -9,12 +9,14 @@
<!--导航栏-->
<div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm">
<div class="form-group" ng-style="setButtonWrapStyle()">
<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" 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" style="width: 380px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" >
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -43,23 +45,25 @@
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
</div>
</div>
<div class="col-sm-6 rightNav" style="width: 40%;margin-top: 10px;">
<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" style="margin-right:10px;margin-left:30px">
ngf-allow-dir="false" class="btn btn-vat-third" >
{{'SelectFile' | translate}}
</button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
class="btn btn-vat-primary"
translate="TemplateBtn"
ng-click="downloadTemplate()"></button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
class="btn btn-vat-primary topButton"
translate="AddImportBtn"
ng-click="doUploadCF(importEnum.AddImport)"></button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
class="btn btn-vat-primary topButton"
translate="CoverImportBtn"
ng-click="doUploadCF(importEnum.CoverImport)"></button>
......@@ -76,6 +80,8 @@
</div>
</div>
</div>
</div>
</div>
<!--分页栏-->
<!--<div class="form-group page-form-group" ng-show="!fileName">
......
atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.less
View file @ 6dfba303
......@@ -343,3 +343,16 @@
padding-left: 15px;
}
}
@media screen and (max-width:1400px) {
.topButton{
margin-top: 10px;
}
.leftNav{
width: 70%;
}
.rightNav{
width: 30%;
}
}
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.html
View file @ 6dfba303
......@@ -9,12 +9,14 @@
<!--导航栏-->
<div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm">
<div class="form-group" ng-style="setButtonWrapStyle()">
<div class="form-group" ng-style="setButtonWrapStyle()" style="width: 100%;margin-bottom: -38px;">
<div class="import-wrapper">
<div class="row">
<div style = "width:60%" class="col-sm-6 leftNav">
<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="auto">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -43,25 +45,29 @@
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
</div>
</div>
<div style = "width:40%; margin-top: 10px;" class="col-sm-6 rightNav">
<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" style="margin-right:10px;margin-left:30px">
ngf-allow-dir="false" class="btn btn-vat-third" >
{{'SelectFile' | translate}}
</button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
class="btn btn-vat-primary"
translate="TemplateBtn"
ng-click="downloadTemplate()"></button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
class="btn btn-vat-primary topButton"
translate="AddImportBtn"
ng-click="doUploadCIL(importEnum.AddImport)"></button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
class="btn btn-vat-primary topButton"
translate="CoverImportBtn"
ng-click="doUploadCIL(importEnum.CoverImport)"></button>
</div>
</div>
</div>
</div>
......
atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.less
View file @ 6dfba303
......@@ -343,3 +343,17 @@
padding-left: 15px;
}
}
@media screen and (max-width:1400px) {
.topButton{
margin-top: 10px;
}
.leftNav{
width: 70%!important;
}
.rightNav{
width: 30%!important;
}
}
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.html
View file @ 6dfba303
......@@ -9,12 +9,13 @@
<!--导航栏-->
<div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm">
<div class="form-group" ng-style="setButtonWrapStyle()">
<div class="form-group" ng-style="setButtonWrapStyle()" style="margin-bottom: -38px; width: 100%;">
<div class="import-wrapper">
<div class="col-sm-6 leftNav">
<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" >
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -43,39 +44,42 @@
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
</div>
</div>
<div class="col-sm-6 rightNav" style="width: 40%;margin-top: 10px;">
<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" style="margin-right:10px;margin-left:30px">
ngf-allow-dir="false" class="btn btn-vat-third" >
{{'SelectFile' | translate}}
</button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
class="btn btn-vat-primary"
translate="TemplateBtn"
ng-click="downloadTemplate()"></button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
<button type="button "
class="btn btn-vat-primary topButton"
translate="AddImportBtn"
ng-click="doUploadCPR(importEnum.AddImport)"></button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
class="btn btn-vat-primary topButton"
translate="CoverImportBtn"
ng-click="doUploadCPR(importEnum.CoverImport)"></button>
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
<button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="ConverImportBtn"
ng-click="doUploadTbResult(importEnum.CoverImport)"></button>|
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
<button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div>
</div>
</div>
</div>
</form>
<div class="dt-init-wrapper">
......
atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.less
View file @ 6dfba303
......@@ -401,3 +401,16 @@
padding-left: 15px;
}
}
@media screen and (max-width:1400px) {
.topButton{
margin-top: 10px;
}
.leftNav{
width: 70%!important;
}
.rightNav{
width: 30% !important;
}
}
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.html
View file @ 6dfba303
......@@ -9,12 +9,14 @@
<!--导航栏-->
<div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm">
<div class="form-group" ng-style="setButtonWrapStyle()">
<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 ">
<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">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -43,13 +45,15 @@
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
</div>
</div>
<div class="col-sm-6 rightNav" style="width: 40%; margin-top: 10px;">
<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" style="margin-right:10px;margin-left:30px">
ngf-allow-dir="false" class="btn btn-vat-third" >
{{'SelectFile' | translate}}
</button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
class="btn btn-vat-primary"
translate="TemplateBtn"
ng-click="downloadTemplate()"></button>
......@@ -59,23 +63,24 @@
ng-click="doUploadID(importEnum.AddImport)"></button>-->
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
class="btn btn-vat-primary topButton"
translate="CoverImportBtn"
ng-click="doUploadID(importEnum.CoverImport)"></button>
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
<button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="ConverImportBtn"
ng-click="doUploadTbResult(importEnum.CoverImport)"></button>|
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
<button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div>
</div>
</div>
</div>
</div>
</form>
<div class="dt-init-wrapper">
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.less
View file @ 6dfba303
......@@ -343,3 +343,16 @@
padding-left: 15px;
}
}
@media screen and (max-width:1400px) {
.topButton{
margin-top: 10px;
}
.leftNav{
width: 70%;
}
.rightNav{
width: 30%;
}
}
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.html
View file @ 6dfba303
......@@ -9,12 +9,14 @@
<!--导航栏-->
<div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm">
<div class="form-group" ng-style="setButtonWrapStyle()">
<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 col-xs-6 col-lg-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" style="width: 380px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" >
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -43,27 +45,32 @@
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
</div>
</div>
<div class="col-sm-6 col-xs-6 col-lg-6 rightNav" style="width: 40%; margin-top: 10px" >
<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" style="margin-right:10px;margin-left:30px">
ngf-allow-dir="false" class="btn btn-vat-third" >
{{'SelectFile' | translate}}
</button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
class="btn btn-vat-primary"
translate="TemplateBtn"
ng-click="downloadTemplate()"></button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
class="btn btn-vat-primary topButton"
translate="AddImportBtn"
ng-click="doUploadIR(importEnum.AddImport)"></button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
class="btn btn-vat-primary topButton"
translate="CoverImportBtn"
ng-click="doUploadIR(importEnum.CoverImport)"></button>
</div>
</div>
</div>
</div>
</form>
<div class="dt-init-wrapper">
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.less
View file @ 6dfba303
......@@ -343,3 +343,16 @@
padding-left: 15px;
}
}
@media screen and (max-width:1400px) {
.topButton{
margin-top: 10px;
}
.leftNav{
width: 70%!important;
}
.rightNav{
width: 30%!important;
}
}
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.html
View file @ 6dfba303
......@@ -9,12 +9,14 @@
<!--导航栏-->
<div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm">
<div class="form-group" ng-style="setButtonWrapStyle()">
<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">
<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" >
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -43,39 +45,43 @@
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
</div>
</div>
<div class="col-sm-6 rightNav" style="width: 40%; margin-top: 10px;">
<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" style="margin-right:10px;margin-left:30px">
ngf-allow-dir="false" class="btn btn-vat-third" >
{{'SelectFile' | translate}}
</button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
class="btn btn-vat-primary"
translate="TemplateBtn"
ng-click="downloadTemplate()"></button>
<button type="button"
<!-- <button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="AddImportBtn"
ng-click="doUploadPL(importEnum.AddImport)"></button>
ng-click="doUploadPL(importEnum.AddImport)"></button>-->
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
class="btn btn-vat-primary topButton"
translate="CoverImportBtn"
ng-click="doUploadPL(importEnum.CoverImport)"></button>
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
<button class="btn topButton btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="ConverImportBtn"
ng-click="doUploadTbResult(importEnum.CoverImport)"></button>|
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
<button class=" topButton btn btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div>
</div>
</div>
</div>
</div>
</form>
<div class="dt-init-wrapper">
......
atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.less
View file @ 6dfba303
......@@ -343,3 +343,16 @@
padding-left: 15px;
}
}
@media screen and (max-width:1400px) {
.topButton{
margin-top: 10px;
}
.leftNav{
width: 70%;
}
.rightNav{
width: 30%;
}
}
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.html
View file @ 6dfba303
......@@ -64,45 +64,43 @@
</div>
</div>
</form>-->
<form class="form-horizontal">
<div class="form-group" style="margin-top: 10px; height: 10px;">
<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 dx-tag-box="selectOrgOptions"></div>
<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%;">
<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="width:20px;position: relative;left: -22px;"></i>
<i class="fa fa-calendar imp-subheader red-color" style=" position: relative; right: relative; right: -100px; top: -26px;"></i>
</div>
</div>
<div class="col-sm-2">
<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" style="margin-right:10px;margin-left:30px;margin-top: 10px;">
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>
</div>
<div class="col-sm-1">
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
class="btn btn-vat-primary"
translate="TemplateBtn"
ng-click="downloadTemplate()"></button>
</div>
<div class="col-sm-1">
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
class="btn btn-vat-primary topButton"
translate="CoverImportBtn"
ng-click="doUploadRLIT(importEnum.CoverImport)"></button>
</div>
<div class="col-sm-1">
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
class="btn btn-vat-primary topButton"
translate="AddImportBtn"
ng-click="doUploadRLIT(importEnum.AddImport)"></button>
</div>
</div>
</div>
</form>
<div class="dt-init-wrapper">
......
atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.less
View file @ 6dfba303
......@@ -403,3 +403,16 @@
padding-left: 15px;
}
}
@media screen and (max-width:1400px) {
.topButton{
margin-top: 10px;
}
.leftNav{
width: 70%!important;
}
.rightNav{
width: 30% !important;
}
}
\ No newline at end of file
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js
View file @ 6dfba303
......@@ -576,7 +576,7 @@ taxDocumentManageModule.directive('dateTimePicker', function () {
minViewMode: $attrs["minViewMode"] ? parseInt($attrs["minViewMode"]) : 0,
autoclose: true,
language: region,
todayBtn: true,
todayBtn: 'linked',
clearBtn: true //清除按钮
}).off("changeDate").on('changeDate', function (ev) {
runCallback(ev);
......@@ -719,6 +719,7 @@ taxDocumentManageModule.directive('multiFileUploader', function () {
};
$scope.openMultiUploadPop = function () {
clearCache();//清空缓存
$("#multiUploadFilePlugin").click();
$scope.multiUploader.clearQueue();
$("#multiUploadFilePlugin").val(null); //这一步主要防止第二次选择相同文件的时候无响应
......
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