diff --git a/atms-api/src/main/java/pwc/taxtech/atms/common/message/ErrorMessage.java b/atms-api/src/main/java/pwc/taxtech/atms/common/message/ErrorMessage.java
index b7934519bdcfae27ad34d7a4b5cea946c11c358f..bec51d29fa0dce47f62ef22763486815fed597ee 100644
--- a/atms-api/src/main/java/pwc/taxtech/atms/common/message/ErrorMessage.java
+++ b/atms-api/src/main/java/pwc/taxtech/atms/common/message/ErrorMessage.java
@@ -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";
diff --git a/atms-api/src/main/java/pwc/taxtech/atms/common/util/SpringContextUtil.java b/atms-api/src/main/java/pwc/taxtech/atms/common/util/SpringContextUtil.java
index f96059db2529e29c38714b9345b50f37381d2726..bcba632f7fe5ac60adae37560f42f3a5a657db32 100644
--- a/atms-api/src/main/java/pwc/taxtech/atms/common/util/SpringContextUtil.java
+++ b/atms-api/src/main/java/pwc/taxtech/atms/common/util/SpringContextUtil.java
@@ -59,6 +59,7 @@ public class SpringContextUtil implements ApplicationContextAware {
public static AdjustmentTableMapper adjustmentTableMapper;
public static TrialBalanceFinalMapper trialBalanceFinalMapper;
public static ProfitLossStatementMapper profitLossStatementMapper;
+ public static RevenueConfigMapper revenueConfigMapper;
public static RevenueTypeMappingMapper revenueTypeMappingMapper;
public static InvoiceRecordMapper invoiceRecordMapper;
public static CertifiedInvoicesListMapper certifiedInvoicesListMapper;
@@ -148,6 +149,7 @@ public class SpringContextUtil implements ApplicationContextAware {
invoiceRecordMapper = webApplicationContext.getBean(InvoiceRecordMapper.class);
certifiedInvoicesListMapper = webApplicationContext.getBean(CertifiedInvoicesListMapper.class);
trialBalanceMappingMapper = webApplicationContext.getBean(TrialBalanceMappingMapper.class);
+ revenueConfigMapper = webApplicationContext.getBean(RevenueConfigMapper.class);
/* map.put("balance_sheet", balanceMapper);
map.put("profit_loss_statement",profitLossStatementMapper);
map.put("cash_flow", cashFlowMapper);
diff --git a/atms-api/src/main/java/pwc/taxtech/atms/controller/ReportController.java b/atms-api/src/main/java/pwc/taxtech/atms/controller/ReportController.java
index f959fbd713ea50ca71fab600479f9874d610bf3d..3a89773fdca19bcf920dbd59fa729d887dcb79f3 100644
--- a/atms-api/src/main/java/pwc/taxtech/atms/controller/ReportController.java
+++ b/atms-api/src/main/java/pwc/taxtech/atms/controller/ReportController.java
@@ -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 {
diff --git a/atms-api/src/main/java/pwc/taxtech/atms/dto/billDetail/BillDetailResult.java b/atms-api/src/main/java/pwc/taxtech/atms/dto/billDetail/BillDetailResult.java
index 41e27218ed23582b826b0bdea15d73aeb6650790..723600a6264e08215e2fe1bde559a94c43206558 100644
--- a/atms-api/src/main/java/pwc/taxtech/atms/dto/billDetail/BillDetailResult.java
+++ b/atms-api/src/main/java/pwc/taxtech/atms/dto/billDetail/BillDetailResult.java
@@ -42,6 +42,27 @@ public class BillDetailResult implements Serializable {
@JsonSerialize(using = PwCIdSerialize.class)
private Long revenueCofId;
+ @JsonSerialize(using = PwCIdSerialize.class)
+ private Long modifyRevenueCofId;
+
+ private String modifyRevenueCofName;
+
+ public Long getModifyRevenueCofId() {
+ return modifyRevenueCofId;
+ }
+
+ public void setModifyRevenueCofId(Long modifyRevenueCofId) {
+ this.modifyRevenueCofId = modifyRevenueCofId;
+ }
+
+ public String getModifyRevenueCofName() {
+ return modifyRevenueCofName;
+ }
+
+ public void setModifyRevenueCofName(String modifyRevenueCofName) {
+ this.modifyRevenueCofName = modifyRevenueCofName;
+ }
+
private Integer emptyCode;
public Long getId() {
diff --git a/atms-api/src/main/java/pwc/taxtech/atms/service/impl/AnalysisServiceImpl.java b/atms-api/src/main/java/pwc/taxtech/atms/service/impl/AnalysisServiceImpl.java
index cd223556e3a92b7034f4792fb6a5f40d415fe329..1db4b4d4c06639e0c7b5645bfc3492d94279878c 100644
--- a/atms-api/src/main/java/pwc/taxtech/atms/service/impl/AnalysisServiceImpl.java
+++ b/atms-api/src/main/java/pwc/taxtech/atms/service/impl/AnalysisServiceImpl.java
@@ -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;
diff --git a/atms-api/src/main/java/pwc/taxtech/atms/service/impl/BillDetailService.java b/atms-api/src/main/java/pwc/taxtech/atms/service/impl/BillDetailService.java
index d409c34ca4c64e00c4e310e31c04f9363a762e0f..aef4900fa8852714c00009cea02dcdc950ec99e8 100644
--- a/atms-api/src/main/java/pwc/taxtech/atms/service/impl/BillDetailService.java
+++ b/atms-api/src/main/java/pwc/taxtech/atms/service/impl/BillDetailService.java
@@ -21,22 +21,32 @@ public class BillDetailService extends BaseService {
private InvoiceRecordMapper invoiceRecordMapper;
-
public PageInfo<BillDetailResult> queryPage(BillDetailParam param) {
Page page = PageHelper.startPage(param.getPageInfo().getPageIndex(), param.getPageInfo().getPageSize());
List<BillDetailDto> dataList = invoiceRecordMapper.queryBillWithRevenueConf(param.getBillType(), param.getCustomer(), param.getBillNumber(), param.getRevenueCofId(), param.getBillContent(), param.getDepartment(), param.getBillTaxRat(), param.getBillDate(), param.getProjectId(), param.getPeriod(), param.getQueryDate());
PageInfo<BillDetailResult> pageInfo = new PageInfo<>(dataList.stream()
- .map(o -> beanUtil.copyProperties(o, new BillDetailResult())).collect(Collectors.toList()));
+ .map(o -> {
+ BillDetailResult detailResult = new BillDetailResult();
+ beanUtil.copyProperties(o, detailResult);
+ if (detailResult.getModifyRevenueCofId() != null) {
+ detailResult.setRevenueCofId(detailResult.getModifyRevenueCofId());
+ detailResult.setRevenueConfName(detailResult.getModifyRevenueCofName());
+ }
+ return detailResult;
+ }).collect(Collectors.toList()));
pageInfo.setTotal(page.getTotal());
return pageInfo;
}
- public List<String> queryBillTypeGroupBy(String projectId,Integer period){
- return invoiceRecordMapper.queryBillTypeGroupBy(projectId,period);
+ public List<String> queryBillTypeGroupBy(String projectId, Integer period) {
+ return invoiceRecordMapper.queryBillTypeGroupBy(projectId, period);
}
public void updateBillDetail(InvoiceRecord billDetail) {
+ if (billDetail.getRevenueCofId() != null && billDetail.getId() != null) {
+ billDetail.setModifyRevenueCofId(billDetail.getRevenueCofId());
+ invoiceRecordMapper.updateByPrimaryKeySelective(billDetail);
+ }
- invoiceRecordMapper.updateByPrimaryKeySelective(billDetail);
}
}
diff --git a/atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java b/atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java
index 9f0289ddc44ad6c082d5c84f2c1d06ff034824ba..739b08fae250f1dd0bf686c9dd9466f8a6819a6f 100644
--- a/atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java
+++ b/atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java
@@ -1,6 +1,4 @@
package pwc.taxtech.atms.service.impl;
-import java.util.Date;
-
import com.alibaba.fastjson.JSON;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
@@ -37,7 +35,6 @@ import pwc.taxtech.atms.dto.OperationResultDto;
import pwc.taxtech.atms.dto.dataimport.DataImportAllParam;
import pwc.taxtech.atms.dto.dataimport.DataImportParam;
import pwc.taxtech.atms.dto.dataimport.DataProcessParam;
-import pwc.taxtech.atms.dto.ebsdto.EbsCallRateResp;
import pwc.taxtech.atms.dto.ebsdto.EbsCallResp;
import pwc.taxtech.atms.dto.vatdto.TrialBalanceDto;
import pwc.taxtech.atms.dto.vatdto.TrialBalanceParam;
@@ -324,7 +321,7 @@ public class DataImportService extends BaseService {
SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyyHH:mm:ss");
Date dataDate = sdf.parse(dataDateStr);
- for (int j = 11; j < sheet.getLastRowNum(); j++) {
+ for (int j = 11; j <= sheet.getLastRowNum(); j++) {
Long plId = idService.nextId();
ProfitLossStatement pl = new ProfitLossStatement();
pl.setId(plId);
@@ -498,7 +495,7 @@ public class DataImportService extends BaseService {
String dataDateStr = getCellStringValue(sheet.getRow(0).getCell(4)).substring(3).replace(" ", "");
SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyyHH:mm:ss");
Date dataDate = sdf.parse(dataDateStr);
- for (int j = 11; j < sheet.getLastRowNum(); j++) {
+ for (int j = 11; j <= sheet.getLastRowNum(); j++) {
Long plId = idService.nextId();
BalanceSheet bl = new BalanceSheet();
bl.setId(plId);
@@ -646,7 +643,7 @@ public class DataImportService extends BaseService {
continue;
}
- for (int j = 6; j < sheet.getLastRowNum(); j++) {
+ for (int j = 6; j <= sheet.getLastRowNum(); j++) {
Long id = idService.nextId();
CashFlow cf = new CashFlow();
cf.setId(id);
@@ -1326,7 +1323,7 @@ public class DataImportService extends BaseService {
continue;
}
String unit = getCellStringValue(sheet.getRow(1).getCell(11)).replace(" ", "").substring(3);
- for (int j = 3; j < sheet.getLastRowNum(); j++) {
+ for (int j = 3; j <= sheet.getLastRowNum(); j++) {
Long plId = idService.nextId();
CertifiedInvoicesList cil = new CertifiedInvoicesList();
cil.setId(plId);
diff --git a/atms-api/src/main/java/pwc/taxtech/atms/service/impl/TaxDocumentServiceImpl.java b/atms-api/src/main/java/pwc/taxtech/atms/service/impl/TaxDocumentServiceImpl.java
index 9ea0c88520d7c387975b445538b449d95c1bcf3e..c2ddba330715f25852f45dea648070948ababffb 100644
--- a/atms-api/src/main/java/pwc/taxtech/atms/service/impl/TaxDocumentServiceImpl.java
+++ b/atms-api/src/main/java/pwc/taxtech/atms/service/impl/TaxDocumentServiceImpl.java
@@ -201,12 +201,12 @@ public class TaxDocumentServiceImpl {
taxDocument.setCreatorId(authUserHelper.getCurrentUserId());
taxDocument.setUploadTime(new Date());
taxDocument.setYearRedundancy(Calendar.getInstance().get(Calendar.YEAR));
- int num = taxDocumentMapper.insert(taxDocument);
//鏍规嵁鍏徃Id 璁剧疆涓氬姟绾�
String businessLine = organizationService.queryBusinessByCompanyId(taxDocument.getCompanyId());
if (StringUtils.isNotBlank(businessLine)) {
taxDocument.setBusinessLine(businessLine);
}
+ int num = taxDocumentMapper.insert(taxDocument);
if (num > 0) {
OperationLogTaxDocument actionEntity = buildOperationLogTaxDocument();
actionEntity.setId(taxDocument.getId().toString());
diff --git a/atms-api/src/main/java/pwc/taxtech/atms/service/impl/TemplateServiceImpl.java b/atms-api/src/main/java/pwc/taxtech/atms/service/impl/TemplateServiceImpl.java
index 5e6667169ae064bdf455f501f4e3112b08caaf42..36c296fdd87bcb8653fc8a3c7729be933531cf4a 100644
--- a/atms-api/src/main/java/pwc/taxtech/atms/service/impl/TemplateServiceImpl.java
+++ b/atms-api/src/main/java/pwc/taxtech/atms/service/impl/TemplateServiceImpl.java
@@ -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()) {
- path = templateDb.getPath();
+// TemplateExample example = new TemplateExample();
+// example.createCriteria().andCodeEqualTo(templateDb.getCode()).andIdEqualTo(templateDb.getId()).andIsActiveAssociationEqualTo(false);
+ path = templateDb.getPath();
//鐗╃悊鍒犻櫎
- deleteIsAtiveAssociation(templateDb);
- } else {
- //閫昏緫鍒犻櫎
- logicDeleteIsActiveAssociation(templateDb);
- }
- }
+ deleteIsAtiveAssociation(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);
}
}
diff --git a/atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java b/atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
index b26633c7e2f262f0d73cd98e09ff54fed37b18ec..ce305a93b1a8fdeb7b56da7aedcc1e67f7af3bde 100644
--- a/atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
+++ b/atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
@@ -9,7 +9,6 @@ import com.google.common.collect.Sets;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFCell;
import org.apache.poi.xssf.usermodel.XSSFFormulaEvaluator;
@@ -56,7 +55,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.math.BigDecimal;
-import java.net.URISyntaxException;
import java.util.*;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
@@ -307,7 +305,7 @@ public class ReportServiceImpl extends BaseService {
private void updateConfig(String projectId, Integer period, Boolean isMergeManualData, List<Template> templates, PeriodJob job) {
List<Long> exceptTemplateIds = templateMapper.getIdsForExceptTemplate();
//鏍规嵁鏀跺叆绫诲瀷鏄犲皠鐢熸垚寮€绁ㄨ褰曞叧鑱旀暟鎹�
- assembleInvoiceRecord(projectId, period);
+ assembleInvoiceRecord(projectId, period,isMergeManualData);
//鐢熸垚trial_balance_final鏁版嵁
assembleTrialBalanceFinal(projectId, period);
clearPeriodData(projectId, period, exceptTemplateIds, isMergeManualData);
@@ -335,7 +333,7 @@ public class ReportServiceImpl extends BaseService {
trialBalanceFinalMapper.generateFinalData(projectId, Integer.valueOf(queryPeriod), lastProject == null ? "0" : lastProject.getId(), Integer.valueOf(lastPeriod));
}
- public void assembleInvoiceRecord(String projectId, Integer period) {
+ public void assembleInvoiceRecord(String projectId, Integer period,Boolean isMergeManualData) {
Project project = projectMapper.selectByPrimaryKey(projectId);
MyAsserts.assertNotNull(project, Exceptions.NOT_FOUND_REPORT_EXCEPTION);
String queryDate = project.getYear() + "-" + (period < 10 ? ("0" + period) : (period + ""));
@@ -344,6 +342,17 @@ public class ReportServiceImpl extends BaseService {
andStartDateLessThanOrEqualTo(queryDate).andEndDateGreaterThanOrEqualTo(queryDate).
andStatusEqualTo(0);
List<RevenueTypeMapping> mappingList = revenueTypeMappingMapper.selectByExample(mappingExample);
+ //鍏堟竻闄ゆ暟鎹�
+ InvoiceRecord delRecord = new InvoiceRecord();
+ delRecord.setRevenueCofId(null);
+ if(!isMergeManualData){
+ delRecord.setModifyRevenueCofId(null);
+ }
+ InvoiceRecordExample delExample = new InvoiceRecordExample();
+ delExample.createCriteria().andProjectIdEqualTo(projectId)
+ .andProjectIdEqualTo(projectId).
+ andPeriodEqualTo(Integer.valueOf(queryDate.replace("-", "")));
+ invoiceRecordMapper.deleteByExample(delExample);
Map<String, Long> map = new HashMap<>();
for (RevenueTypeMapping mapping : mappingList) {
if (!map.containsKey(mapping.getContent())) {
@@ -873,9 +882,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("");
}
@@ -2329,7 +2338,7 @@ public class ReportServiceImpl extends BaseService {
}
- @Autowired
+ @Resource
private EbitSpreadDataMapper ebitSpreadDataMapper;
public OperationResultDto spreadToDb(RequestParameterDto.EbitParam ebitParam) {
@@ -2380,7 +2389,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 +2425,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 +2477,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);
}
}
}
diff --git a/atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/KPSR.java b/atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/KPSR.java
index 19129f7198905ddd79d252dc66ba1ef7f49d2ee6..b9cf33a72b9620f28110ccd79928fb6a3401ab7c 100644
--- a/atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/KPSR.java
+++ b/atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/KPSR.java
@@ -12,19 +12,17 @@ import pwc.taxtech.atms.constant.enums.EnumOperationType;
import pwc.taxtech.atms.constant.enums.FormulaDataSourceDetailType;
import pwc.taxtech.atms.constant.enums.KeyValueConfigResultType;
import pwc.taxtech.atms.dto.vatdto.OutputInvoiceDataSourceDto;
-import pwc.taxtech.atms.vat.entity.InvoiceRecord;
-import pwc.taxtech.atms.vat.entity.InvoiceRecordExample;
-import pwc.taxtech.atms.vat.entity.RevenueTypeMapping;
-import pwc.taxtech.atms.vat.entity.RevenueTypeMappingExample;
+import pwc.taxtech.atms.vat.entity.*;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
/**
- * 鏍规嵁鏀跺叆绫诲瀷閰嶇疆鏌ヨ寮€绁ㄦ敹鍏ュ紑绁ㄩ噾棰濇€昏
+ * 鏍规嵁鏀跺叆绫诲瀷閰嶇疆鏌ヨ寮€绁ㄦ敹鍏ュ紑绁ㄩ噾棰濇€昏
*/
public class KPSR extends FunctionBase implements FreeRefFunction {
public KPSR(FormulaContext formulaContext) {
@@ -40,10 +38,10 @@ public class KPSR extends FunctionBase implements FreeRefFunction {
String revenueTypeName = getStringParam(args[0], ec);//鏀跺叆绫诲瀷鍚嶇О
Integer billType = getIntParam(args[1], ec);//鍙戠エ绫诲瀷
Integer amountType = getIntParam(args[2], ec);//閲戦绫诲瀷
- String formulaExpression = "KPSR(\"" + revenueTypeName + "\","+billType+ ","+amountType+")";
+ String formulaExpression = "KPSR(\"" + revenueTypeName + "\"," + billType + "," + amountType + ")";
logger.debug(formulaExpression);
List<OutputInvoiceDataSourceDto> dataSource = new ArrayList<>();
- double result = assembleData(revenueTypeName,dataSource,billType,amountType,ec);
+ double result = assembleData(revenueTypeName, dataSource, billType, amountType, ec);
Long dataSoureId = saveDataSource(ec, Collections.singletonList(dataSource), FormulaDataSourceDetailType.OutputInvoiceDataSourceDto, new BigDecimal(result), formulaContext.getPeriod(),
formulaContext.getReportTemplateGroupId(), formulaContext.getProjectId());
saveFormulaBlock(formulaContext.getPeriod(), ec, formulaExpression, new BigDecimal(result), dataSoureId, formulaContext.getProjectId());
@@ -51,9 +49,9 @@ public class KPSR extends FunctionBase implements FreeRefFunction {
}
- private double assembleData(String revenueTypeName, List<OutputInvoiceDataSourceDto> contain, Integer billType,Integer amountType,OperationEvaluationContext ec) {
+ private double assembleData(String revenueTypeName, List<OutputInvoiceDataSourceDto> contain, Integer billType, Integer amountType, OperationEvaluationContext ec) {
- String queryDate = formulaContext.getYear()+(formulaContext.getPeriod()<10?("0"+formulaContext.getPeriod()):(formulaContext.getPeriod()+""));
+ String queryDate = formulaContext.getYear() + (formulaContext.getPeriod() < 10 ? ("0" + formulaContext.getPeriod()) : (formulaContext.getPeriod() + ""));
RevenueTypeMappingExample typeMappingExample = new RevenueTypeMappingExample();
typeMappingExample.createCriteria().andOrgIdEqualTo(formulaContext.getOrganizationId())
.andRevenueTypeNameEqualTo(revenueTypeName).andStartDateLessThanOrEqualTo(queryDate)
@@ -62,17 +60,43 @@ public class KPSR extends FunctionBase implements FreeRefFunction {
if (CollectionUtils.isEmpty(typeMappingList)) {
return 0.0;
}
- List<String> contens = typeMappingList.stream()
- .map(o -> o.getContent()).collect(Collectors.toList());
- if (CollectionUtils.isEmpty(contens)) {
+ List<String> revenueTypes = typeMappingList.stream()
+ .map(o -> o.getRevenueTypeName()).collect(Collectors.toList());
+ RevenueConfigExample configExample = new RevenueConfigExample();
+ configExample.createCriteria().andOrgIdEqualTo(formulaContext.getOrganizationId()).andStartDateLessThanOrEqualTo(queryDate)
+ .andEndDateGreaterThanOrEqualTo(queryDate).andNameIn(revenueTypes);
+ List<RevenueConfig> configDatas = SpringContextUtil.revenueConfigMapper.selectByExample(configExample);
+ if (CollectionUtils.isEmpty(configDatas)) {
return 0.0;
}
+ List<Long> revenueTypeIds = configDatas.stream()
+ .map(o -> o.getId()).collect(Collectors.toList());
+ List<InvoiceRecord> billDetails = new ArrayList<>();
+
InvoiceRecordExample invoiceRecordExample = new InvoiceRecordExample();
- InvoiceRecordExample.Criteria c = invoiceRecordExample.createCriteria().andBillingContentIn(contens)
+ invoiceRecordExample.createCriteria().andRevenueCofIdIn(revenueTypeIds)
+ .andProjectIdEqualTo(formulaContext.getProjectId())
+ .andPeriodEqualTo(Integer.valueOf(queryDate))
+ .andInvoiceTypeEqualTo(InvoiceRecordEnum.InvoiceType.MAPPING.get(billType));
+ List<InvoiceRecord> billDetails1 = SpringContextUtil.invoiceRecordMapper.selectByExample(invoiceRecordExample);
+ if(CollectionUtils.isNotEmpty(billDetails1)){
+ Iterator<InvoiceRecord> iterator = billDetails1.iterator();
+ while (iterator.hasNext()){
+ if(iterator.next().getModifyRevenueCofId()!=null){
+ iterator.remove();
+ }
+ }
+ billDetails.addAll(billDetails1);
+ }
+ invoiceRecordExample = new InvoiceRecordExample();
+ invoiceRecordExample.createCriteria().andModifyRevenueCofIdIn(revenueTypeIds)
.andProjectIdEqualTo(formulaContext.getProjectId())
.andPeriodEqualTo(Integer.valueOf(queryDate))
.andInvoiceTypeEqualTo(InvoiceRecordEnum.InvoiceType.MAPPING.get(billType));
- List<InvoiceRecord> billDetails = SpringContextUtil.invoiceRecordMapper.selectByExample(invoiceRecordExample);
+ List<InvoiceRecord> billDetails2 = SpringContextUtil.invoiceRecordMapper.selectByExample(invoiceRecordExample);
+ if(CollectionUtils.isNotEmpty(billDetails2)){
+ billDetails.addAll(billDetails2);
+ }
for (InvoiceRecord invoiceRecord : billDetails) {
OutputInvoiceDataSourceDto outputInvoiceDataSourceDto = new OutputInvoiceDataSourceDto();
outputInvoiceDataSourceDto.setAmount(FormulaHelper.roundValue(invoiceRecord.getInvoiceAmount(),
@@ -91,9 +115,9 @@ public class KPSR extends FunctionBase implements FreeRefFunction {
outputInvoiceDataSourceDto.setOperationType(EnumOperationType.Single.getCode());
contain.add(outputInvoiceDataSourceDto);
}
- if(InvoiceRecordEnum.AmountType.INVOICE_AMOUNT.getCode().equals(amountType)){
+ if (InvoiceRecordEnum.AmountType.INVOICE_AMOUNT.getCode().equals(amountType)) {
return billDetails.stream().mapToDouble(a -> a.getInvoiceAmount().doubleValue()).sum();
- }else if (InvoiceRecordEnum.AmountType.TAX_AMOUNT.getCode().equals(amountType)){
+ } else if (InvoiceRecordEnum.AmountType.TAX_AMOUNT.getCode().equals(amountType)) {
return billDetails.stream().mapToDouble(a -> a.getTaxAmount().doubleValue()).sum();
}
return 0;
diff --git a/atms-api/src/main/resources/conf/conf_profile_uat.properties b/atms-api/src/main/resources/conf/conf_profile_uat.properties
index 70ce9a505138a4fd3fdf399fab5ae083bd60dc92..f323dc2985d3ce0ad921f2eef18ff3ce883551ef 100644
--- a/atms-api/src/main/resources/conf/conf_profile_uat.properties
+++ b/atms-api/src/main/resources/conf/conf_profile_uat.properties
@@ -1,6 +1,6 @@
-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_url=jdbc:mysql://10.88.128.65:8806/fintax_stage?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+jdbc_user=fintax_user_stage
+jdbc_password=Fintaxuser@123Stage
#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
@@ -31,9 +31,9 @@ max_file_length=104857600
#Distributed ID Generate
distributed_id_datacenter=10
-distributed_id_machine=15
+distributed_id_machine=16
-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
diff --git a/atms-dao/etc/generator-mysql/vatGeneratorConfig.xml b/atms-dao/etc/generator-mysql/vatGeneratorConfig.xml
index fc01d0d816554d0c21f1cd6e05dcb7b904aa53c2..ef89770540f9404ff90883ae721b98d66ae752bc 100644
--- a/atms-dao/etc/generator-mysql/vatGeneratorConfig.xml
+++ b/atms-dao/etc/generator-mysql/vatGeneratorConfig.xml
@@ -45,7 +45,10 @@
<property name="ignoreQualifiersAtRuntime" value="true"/>
</table>
-
+<table tableName="invoice_record" domainObjectName="InvoiceRecord">
+ <property name="useActualColumnNames" value="false"/>
+ <property name="ignoreQualifiersAtRuntime" value="true"/>
+ </table>
<!--
diff --git a/atms-dao/src/main/java/pwc/taxtech/atms/dpo/BillDetailDto.java b/atms-dao/src/main/java/pwc/taxtech/atms/dpo/BillDetailDto.java
index e5a20203cf8ef9a825cc11ff5a7bfa58b8d51ea8..60f698dfcf8d522e9423a8fb49313d6addd2fec2 100644
--- a/atms-dao/src/main/java/pwc/taxtech/atms/dpo/BillDetailDto.java
+++ b/atms-dao/src/main/java/pwc/taxtech/atms/dpo/BillDetailDto.java
@@ -40,6 +40,26 @@ public class BillDetailDto implements Serializable {
private Integer emptyCode;
+ private Long modifyRevenueCofId;
+
+ private String modifyRevenueCofName;
+
+ public Long getModifyRevenueCofId() {
+ return modifyRevenueCofId;
+ }
+
+ public void setModifyRevenueCofId(Long modifyRevenueCofId) {
+ this.modifyRevenueCofId = modifyRevenueCofId;
+ }
+
+ public String getModifyRevenueCofName() {
+ return modifyRevenueCofName;
+ }
+
+ public void setModifyRevenueCofName(String modifyRevenueCofName) {
+ this.modifyRevenueCofName = modifyRevenueCofName;
+ }
+
public Long getId() {
return id;
}
diff --git a/atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/InvoiceRecord.java b/atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/InvoiceRecord.java
index 57dc1d32a17f4e6febb37980f5770f922dad2acf..211e5ad122f85ec482abbf7076f72682a8a2efec 100644
--- a/atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/InvoiceRecord.java
+++ b/atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/InvoiceRecord.java
@@ -1,10 +1,9 @@
package pwc.taxtech.atms.vat.entity;
-import pwc.taxtech.atms.entity.BaseEntity;
-
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
+import pwc.taxtech.atms.entity.BaseEntity;
/**
*
@@ -366,6 +365,17 @@ public class InvoiceRecord extends BaseEntity implements Serializable {
*/
private Long revenueCofId;
+ /**
+ * Database Column Remarks:
+ * 淇敼鍚庢敹鍏ョ被鍨媔d
+ *
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column invoice_record.modify_revenue_cof_id
+ *
+ * @mbg.generated
+ */
+ private Long modifyRevenueCofId;
+
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table invoice_record
@@ -1142,6 +1152,30 @@ public class InvoiceRecord extends BaseEntity implements Serializable {
this.revenueCofId = revenueCofId;
}
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column invoice_record.modify_revenue_cof_id
+ *
+ * @return the value of invoice_record.modify_revenue_cof_id
+ *
+ * @mbg.generated
+ */
+ public Long getModifyRevenueCofId() {
+ return modifyRevenueCofId;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column invoice_record.modify_revenue_cof_id
+ *
+ * @param modifyRevenueCofId the value for invoice_record.modify_revenue_cof_id
+ *
+ * @mbg.generated
+ */
+ public void setModifyRevenueCofId(Long modifyRevenueCofId) {
+ this.modifyRevenueCofId = modifyRevenueCofId;
+ }
+
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table invoice_record
@@ -1186,6 +1220,7 @@ public class InvoiceRecord extends BaseEntity implements Serializable {
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append(", revenueCofId=").append(revenueCofId);
+ sb.append(", modifyRevenueCofId=").append(modifyRevenueCofId);
sb.append("]");
return sb.toString();
}
diff --git a/atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/InvoiceRecordExample.java b/atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/InvoiceRecordExample.java
index 25b2427f5fd5d5f6620a708f275d492d99f2eb20..e39711954e7c15b684ccdf569a4870e7e44aca3d 100644
--- a/atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/InvoiceRecordExample.java
+++ b/atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/InvoiceRecordExample.java
@@ -2285,6 +2285,66 @@ public class InvoiceRecordExample {
addCriterion("revenue_cof_id not between", value1, value2, "revenueCofId");
return (Criteria) this;
}
+
+ public Criteria andModifyRevenueCofIdIsNull() {
+ addCriterion("modify_revenue_cof_id is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andModifyRevenueCofIdIsNotNull() {
+ addCriterion("modify_revenue_cof_id is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andModifyRevenueCofIdEqualTo(Long value) {
+ addCriterion("modify_revenue_cof_id =", value, "modifyRevenueCofId");
+ return (Criteria) this;
+ }
+
+ public Criteria andModifyRevenueCofIdNotEqualTo(Long value) {
+ addCriterion("modify_revenue_cof_id <>", value, "modifyRevenueCofId");
+ return (Criteria) this;
+ }
+
+ public Criteria andModifyRevenueCofIdGreaterThan(Long value) {
+ addCriterion("modify_revenue_cof_id >", value, "modifyRevenueCofId");
+ return (Criteria) this;
+ }
+
+ public Criteria andModifyRevenueCofIdGreaterThanOrEqualTo(Long value) {
+ addCriterion("modify_revenue_cof_id >=", value, "modifyRevenueCofId");
+ return (Criteria) this;
+ }
+
+ public Criteria andModifyRevenueCofIdLessThan(Long value) {
+ addCriterion("modify_revenue_cof_id <", value, "modifyRevenueCofId");
+ return (Criteria) this;
+ }
+
+ public Criteria andModifyRevenueCofIdLessThanOrEqualTo(Long value) {
+ addCriterion("modify_revenue_cof_id <=", value, "modifyRevenueCofId");
+ return (Criteria) this;
+ }
+
+ public Criteria andModifyRevenueCofIdIn(List<Long> values) {
+ addCriterion("modify_revenue_cof_id in", values, "modifyRevenueCofId");
+ return (Criteria) this;
+ }
+
+ public Criteria andModifyRevenueCofIdNotIn(List<Long> values) {
+ addCriterion("modify_revenue_cof_id not in", values, "modifyRevenueCofId");
+ return (Criteria) this;
+ }
+
+ public Criteria andModifyRevenueCofIdBetween(Long value1, Long value2) {
+ addCriterion("modify_revenue_cof_id between", value1, value2, "modifyRevenueCofId");
+ return (Criteria) this;
+ }
+
+ public Criteria andModifyRevenueCofIdNotBetween(Long value1, Long value2) {
+ addCriterion("modify_revenue_cof_id not between", value1, value2, "modifyRevenueCofId");
+ return (Criteria) this;
+ }
}
/**
diff --git a/atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CellTemplateConfigExtendsMapper.xml b/atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CellTemplateConfigExtendsMapper.xml
index 9d31d16a1380d99cac0e46447ddf57b2c1fa0271..37ebcfc78b0f6631ffc5a6e95552f6c3527fbc5d 100644
--- a/atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CellTemplateConfigExtendsMapper.xml
+++ b/atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CellTemplateConfigExtendsMapper.xml
@@ -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
diff --git a/atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/KeyValueReferenceExtendsMapper.xml b/atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/KeyValueReferenceExtendsMapper.xml
index 7a00a1245a9bdbafec69c587bc1f74f89809c6f2..39a7162599c424a5dbe435bff850bc47254ca5a4 100644
--- a/atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/KeyValueReferenceExtendsMapper.xml
+++ b/atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/KeyValueReferenceExtendsMapper.xml
@@ -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
diff --git a/atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/InvoiceRecordMapper.xml b/atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/InvoiceRecordMapper.xml
index 359a3626efcaa26197ef811a989a84c1b3410309..831653c0f3c20e374e4485493c4bee73df9cf329 100644
--- a/atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/InvoiceRecordMapper.xml
+++ b/atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/InvoiceRecordMapper.xml
@@ -38,6 +38,7 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="revenue_cof_id" jdbcType="BIGINT" property="revenueCofId" />
+ <result column="modify_revenue_cof_id" jdbcType="BIGINT" property="modifyRevenueCofId" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
@@ -115,7 +116,7 @@
oa_application_num, contract_no, contract_amount, department, application_date, billing_date,
billing_month, invoice_code, invoice_num, invoices_amount, customer_company_tax_num,
contract_source_system, tax_rate, tax_amount, invoice_status, remarks, create_time,
- update_time, revenue_cof_id
+ update_time, revenue_cof_id, modify_revenue_cof_id
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.InvoiceRecordExample" resultMap="BaseResultMap">
<!--
@@ -178,7 +179,8 @@
invoice_num, invoices_amount, customer_company_tax_num,
contract_source_system, tax_rate, tax_amount,
invoice_status, remarks, create_time,
- update_time, revenue_cof_id)
+ update_time, revenue_cof_id, modify_revenue_cof_id
+ )
values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR},
#{tmsPeriod,jdbcType=INTEGER}, #{period,jdbcType=INTEGER}, #{seqNo,jdbcType=INTEGER},
#{source,jdbcType=VARCHAR}, #{billingBody,jdbcType=VARCHAR}, #{customerCompanyName,jdbcType=VARCHAR},
@@ -189,7 +191,8 @@
#{invoiceNum,jdbcType=VARCHAR}, #{invoicesAmount,jdbcType=INTEGER}, #{customerCompanyTaxNum,jdbcType=VARCHAR},
#{contractSourceSystem,jdbcType=VARCHAR}, #{taxRate,jdbcType=DECIMAL}, #{taxAmount,jdbcType=DECIMAL},
#{invoiceStatus,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
- #{updateTime,jdbcType=TIMESTAMP}, #{revenueCofId,jdbcType=BIGINT})
+ #{updateTime,jdbcType=TIMESTAMP}, #{revenueCofId,jdbcType=BIGINT}, #{modifyRevenueCofId,jdbcType=BIGINT}
+ )
</insert>
<insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.InvoiceRecord">
<!--
@@ -294,6 +297,9 @@
<if test="revenueCofId != null">
revenue_cof_id,
</if>
+ <if test="modifyRevenueCofId != null">
+ modify_revenue_cof_id,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@@ -392,6 +398,9 @@
<if test="revenueCofId != null">
#{revenueCofId,jdbcType=BIGINT},
</if>
+ <if test="modifyRevenueCofId != null">
+ #{modifyRevenueCofId,jdbcType=BIGINT},
+ </if>
</trim>
</insert>
<select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.InvoiceRecordExample" resultType="java.lang.Long">
@@ -507,6 +516,9 @@
<if test="record.revenueCofId != null">
revenue_cof_id = #{record.revenueCofId,jdbcType=BIGINT},
</if>
+ <if test="record.modifyRevenueCofId != null">
+ modify_revenue_cof_id = #{record.modifyRevenueCofId,jdbcType=BIGINT},
+ </if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
@@ -549,7 +561,8 @@
remarks = #{record.remarks,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
- revenue_cof_id = #{record.revenueCofId,jdbcType=BIGINT}
+ revenue_cof_id = #{record.revenueCofId,jdbcType=BIGINT},
+ modify_revenue_cof_id = #{record.modifyRevenueCofId,jdbcType=BIGINT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
@@ -654,6 +667,9 @@
<if test="revenueCofId != null">
revenue_cof_id = #{revenueCofId,jdbcType=BIGINT},
</if>
+ <if test="modifyRevenueCofId != null">
+ modify_revenue_cof_id = #{modifyRevenueCofId,jdbcType=BIGINT},
+ </if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
@@ -693,7 +709,8 @@
remarks = #{remarks,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
- revenue_cof_id = #{revenueCofId,jdbcType=BIGINT}
+ revenue_cof_id = #{revenueCofId,jdbcType=BIGINT},
+ modify_revenue_cof_id = #{modifyRevenueCofId,jdbcType=BIGINT}
where id = #{id,jdbcType=BIGINT}
</update>
<select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.InvoiceRecordExample" resultMap="BaseResultMap">
diff --git a/atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/InvoiceRecordExtendsMapper.xml b/atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/InvoiceRecordExtendsMapper.xml
index 65aa95c8e2892a07760eede71836db7e24797d44..4d888c6a0064d4d35286418599f5ee0cd042b054 100644
--- a/atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/InvoiceRecordExtendsMapper.xml
+++ b/atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/InvoiceRecordExtendsMapper.xml
@@ -186,6 +186,8 @@
bd.billing_date as billDate,
bd.invoice_code as billCode,
bd.invoice_num as billNumber,
+ modfiy_rc.id as modifyRevenueCofId,
+ modfiy_rc.name as modifyRevenueCofName,
rc.id as revenueCofId,
rc.name as revenueConfName,
case
@@ -195,6 +197,7 @@
end as emptyCode
from invoice_record as bd
left join revenue_config as rc on rc.org_id = bd.organization_id and rc.id = bd.revenue_cof_id
+ left join revenue_config as modfiy_rc on modfiy_rc.id = bd.modify_revenue_cof_id
where bd.project_id = #{projectId}
and bd.period = #{period}
<if test="billType != null and billType != ''">
@@ -207,7 +210,7 @@
and bd.invoice_num like concat('%',#{billNumber},'%')
</if>
<if test="revenueCofId != null">
- and bd.revenue_cof_id = #{revenueCofId}
+ and if(bd.modify_revenue_cof_id is null,bd.revenue_cof_id = #{revenueCofId},bd.modify_revenue_cof_id = #{revenueCofId})
</if>
<if test="billContent != null and billContent != ''">
and bd.billing_content like concat('%',#{billContent},'%')
diff --git a/atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/TrialBalanceFinalExtendsMapper.xml b/atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/TrialBalanceFinalExtendsMapper.xml
index 43c2032656bdecee63cc2fba63dd11eeff5e62a6..31e8c54f91f390434cd72b101140e57ae433f12b 100644
--- a/atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/TrialBalanceFinalExtendsMapper.xml
+++ b/atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/TrialBalanceFinalExtendsMapper.xml
@@ -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,
diff --git a/atms-web/src/main/resources/conf_profile_uat.properties b/atms-web/src/main/resources/conf_profile_uat.properties
index b74a9975fdc3ee3ab353268f71c733843fb3e439..4d379f05d4c0b6734eb4c53e7c6158d8ce942e0b 100644
--- a/atms-web/src/main/resources/conf_profile_uat.properties
+++ b/atms-web/src/main/resources/conf_profile_uat.properties
@@ -1,4 +1,4 @@
-api.url=http://dts.erp.didichuxing.com:8180/
+api.url=http://dts.erp.didichuxing.com
jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
jwt.powerToken=xxxx
diff --git a/atms-web/src/main/webapp/Scripts/app.js b/atms-web/src/main/webapp/Scripts/app.js
index 67f7e910e23dc43db6159ce27cd0f413169a295b..a087538978dc6ed6ce68a16362cef7510242ff63 100644
--- a/atms-web/src/main/webapp/Scripts/app.js
+++ b/atms-web/src/main/webapp/Scripts/app.js
@@ -343,7 +343,7 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls',
langs = obj;
}
} catch(e) {}
- var region = langs[loginContext.userName] || 'en-us';
+ var region = langs[loginContext.userName] || 'zh-CN';
var flag = window.localStorage.langTemp;
$rootScope.changeLanguage = function(lang){
$translate.use(lang);
diff --git a/atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json b/atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json
index 1ff846d4a04838e5becc5e86ee3f57b60a206970..3a350e8cf781f9b486e46f09448a1eeede8f5622 100644
--- a/atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json
+++ b/atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json
@@ -174,7 +174,7 @@
"DashboardOTRiskDashboard": "椋庨櫓浠〃鐩�",
"DashboardOTRiskWarning": "椋庨櫓鎻愮ず",
"DashboardOTSubtotal": "绋庤礋姹囨€绘儏鍐�",
- "DashboardOTSubtotalByBusinessUnit": "浜嬩笟閮ㄦ眹鎬�",
+ "DashboardOTSubtotalByBusinessUnit": "涓氬姟绾挎眹鎬�",
"DashboardOTSubtotalByOrganization": "鏈烘瀯姹囨€�",
"DashboardOTSubtotalByRegion": "鍖哄煙姹囨€�",
"DashboardOTTaxBurdenDistribution": "绋庤礋鍒嗗竷",
@@ -660,7 +660,7 @@
"ShowPageItem": "鏉�",
"ShowPerPageCount": "姣忛〉鏄剧ず",
"ShowRelevantAmount": "鍊熻捶鏂圭浉鍏抽噾棰�",
- "SortByBusinessUnit": "鎸変簨涓氶儴",
+ "SortByBusinessUnit": "鎸変笟鍔＄嚎",
"SortByOrganization": "鎸夋満鏋�",
"SortByRegion": "鎸夊尯鍩�",
"SortByTaxBurdenAmount": "鎸夌◣璐熼",
diff --git a/atms-web/src/main/webapp/app-resources/i18n/zh-CN/basicData.json b/atms-web/src/main/webapp/app-resources/i18n/zh-CN/basicData.json
index 813fb06e5e474dc4ac0b2dfbfd6f026200af61d7..8f33be09bc2ad208cc64a46282b55859fc941c92 100644
--- a/atms-web/src/main/webapp/app-resources/i18n/zh-CN/basicData.json
+++ b/atms-web/src/main/webapp/app-resources/i18n/zh-CN/basicData.json
@@ -51,27 +51,27 @@
"BeginImport": "寮€濮嬪鍏�",
"Browse": "娴忚...",
"BusinessUnitActive": "宸插惎鐢�",
- "BusinessUnitAddNew": "娣诲姞浜嬩笟閮�",
+ "BusinessUnitAddNew": "娣诲姞涓氬姟绾�",
"BusinessUnitAddSuccess": "娣诲姞鎴愬姛",
"BusinessUnitCancel": "鍙栨秷",
"BusinessUnitDeleteSuccess": "鍒犻櫎鎴愬姛",
"BusinessUnitDisabled": "宸插仠鐢�",
"BusinessUnitDisabledNode": "鍋滅敤",
- "BusinessUnitDuplicateNode": "浜嬩笟閮ㄥ悕绉伴噸澶�",
+ "BusinessUnitDuplicateNode": "涓氬姟绾垮悕绉伴噸澶�",
"BusinessUnitEdit": "缂栬緫",
"BusinessUnitEditSuccess": "淇敼鎴愬姛",
- "BusinessUnitEmptyNode": "浜嬩笟閮ㄥ悕绉颁笉鑳戒负绌�,涓旇嚦灏戦渶瑕�2涓瓧绗�",
+ "BusinessUnitEmptyNode": "涓氬姟绾垮悕绉颁笉鑳戒负绌�,涓旇嚦灏戦渶瑕�2涓瓧绗�",
"BusinessUnitEnableNode": "鍚敤",
- "BusinessUnitName": "浜嬩笟閮ㄥ悕绉�",
+ "BusinessUnitName": "涓氬姟绾垮悕绉�",
"BusinessUnitNoSelected": "鏈€夋嫨鎿嶄綔鏁版嵁琛�",
"BusinessUnitOperation": "鎿嶄綔",
"BusinessUnitOperationSuccess": "鎿嶄綔鎴愬姛",
- "BusinessUnitOutOfLengthNode": "浜嬩笟閮ㄥ悕绉颁笉鑳借秴杩�50涓瓧绗�",
+ "BusinessUnitOutOfLengthNode": "涓氬姟绾垮悕绉颁笉鑳借秴杩�50涓瓧绗�",
"BusinessUnitSave": "淇濆瓨",
"BusinessUnitStatus": "浣跨敤鐘舵€�",
- "BusinessUnitStatusUnsureness": "浜嬩笟閮ㄧ姸鎬佷笉纭畾",
- "BusinessUnitTitle": "浜嬩笟閮�",
- "BusinessUnitUpdate": "淇敼浜嬩笟閮ㄤ俊鎭�",
+ "BusinessUnitStatusUnsureness": "涓氬姟绾跨姸鎬佷笉纭畾",
+ "BusinessUnitTitle": "涓氬姟绾�",
+ "BusinessUnitUpdate": "淇敼涓氬姟绾夸俊鎭�",
"CannotDeleteAreaTips": "瀛樺湪浣跨敤璇ュ尯鍩熺殑鏈烘瀯锛屼笉鑳藉仠鐢紒",
"CannotDeleteRegionTips": "璇ュ尯鍩�:{name}涓嬭繕鏈夊瓙鍖哄煙涓嶈兘鍒犻櫎!",
"CannotFindAreaByID": "鏈煡鍒癐D涓猴細{id}鐨勫尯鍩熴€�",
@@ -213,7 +213,7 @@
"ExpiredDateTo": "鑷�",
"ExtraRole": "闄勫姞瑙掕壊",
"FieldareaName": "鍖哄煙",
- "FieldbusinessUnitName": "浜嬩笟閮�",
+ "FieldbusinessUnitName": "涓氬姟绾�",
"FieldindustryName": "琛屼笟",
"FieldorgCode": "鏈烘瀯浠ｇ爜",
"FieldorgName": "鏈烘瀯鍚嶇О",
@@ -256,7 +256,7 @@
"OperationAddInvalid": "璇峰厛淇濆瓨淇敼鎿嶄綔",
"OperationEditInvalid": "璇峰厛淇濆瓨鏂板鎿嶄綔",
"OrangizationStructureTabTitle": "鏈烘瀯灞傜骇",
- "OrganizationBusinessUnitNameRequired": "璇烽€夋嫨浜嬩笟閮�",
+ "OrganizationBusinessUnitNameRequired": "璇烽€夋嫨涓氬姟绾�",
"OrganizationDetailsList": "鏈烘瀯璇︾粏鍒楄〃",
"OrganizationManageTitle": "缁勭粐鏈烘瀯绠＄悊",
"OrganizationStructureActive": "宸插惎鐢�",
@@ -371,7 +371,7 @@
"TaxableState": "搴旂◣鐘舵€�",
"TemplateName": "鎶ヨ〃鍚嶇О",
"UpdateArea": "淇敼鍖哄煙",
- "UpdateBusinessUnit": "淇敼浜嬩笟閮�",
+ "UpdateBusinessUnit": "淇敼涓氬姟绾�",
"UpdateCustomer": "淇敼瀹㈡埛鍒楄〃",
"UpdateEnterpriseAccount": "淇敼绉戠洰",
"UpdateEnterpriseAccountSet": "淇敼璐﹀",
@@ -403,6 +403,6 @@
"WordLibraryTitle": "瀛楀簱",
"notAllowDisableMessage": "鏈烘瀯涓凡鍏宠仈,涓嶅厑璁稿仠鐢�",
"UnSave": "鏈偣鍑讳繚瀛樻寜閽紒",
- "addFileType": "澧炲姞妗ｆ绫诲瀷",
+ "addFileType": "鏂板缓妗ｆ绫诲瀷",
"~MustBeEndOneApp": "I Must be the End One, please!"
}
\ No newline at end of file
diff --git a/atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json b/atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json
index 45f089b493e63046a61681a5f1f9873f34f1dfcc..f13dcb7594b7f6765e956bc79031e5825ba156ec 100644
--- a/atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json
+++ b/atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json
@@ -240,7 +240,7 @@
"After": "浠ュ悗",
"AgriculturalProduct": "鍐滀骇鍝佸彂绁�",
"AllArea": "鎵€鏈夊尯鍩�",
- "AllBusinessUnit": "鎵€鏈変簨涓氶儴",
+ "AllBusinessUnit": "鎵€鏈変笟鍔＄嚎",
"AllMappingStatus": "鎵€鏈夊搴旂姸鎬�",
"AllOrganization": "鎵€鏈夋満鏋�",
"AllTask": "鍏ㄩ儴",
diff --git a/atms-web/src/main/webapp/app-resources/i18n/zh-CN/infrastructure.json b/atms-web/src/main/webapp/app-resources/i18n/zh-CN/infrastructure.json
index 9abe1a382cb4395498919b314bd05f31e55b8751..339a7ea5309a980649c6bab91585ae439b4403c5 100644
--- a/atms-web/src/main/webapp/app-resources/i18n/zh-CN/infrastructure.json
+++ b/atms-web/src/main/webapp/app-resources/i18n/zh-CN/infrastructure.json
@@ -84,7 +84,7 @@
"DefaultRole": "瑙掕壊锛�",
"PDefaultRole": "榛樿瑙掕壊",
"PIndustry": "琛屼笟",
- "Business": "浜嬩笟閮�",
+ "Business": "涓氬姟绾�",
"Area": "鍖哄煙",
"ProjectList": "椤圭洰鍒楄〃",
"ProjectNameCol": "椤圭洰鍚嶇О",
@@ -109,7 +109,7 @@
"DocumentTypeSets": "绋庡姟妗ｆ绫诲瀷璁剧疆",
"Explain": "璇存槑",
"RequiredFields": "蹇呭～瀛楁",
- "CreateDocFileType":"鏂板缓鏂囨。绫诲瀷",
+ "CreateDocFileType":"鏂板缓妗ｆ绫诲瀷",
"State": "鐘舵€�",
"PCompany": "鎵€灞炴満鏋�",
"Enable": "鍚敤",
@@ -148,7 +148,7 @@
"ComfirmUpdate": "纭淇敼锛�",
"UpdateOrgExtraInfoTips": "灏嗕慨鏀规満鏋�-鍏朵粬淇℃伅锛屾槸鍚︾‘璁や慨鏀癸紵",
"CancelChangeEquityInfoTips": "灏嗘挙閿€鍙樻洿-鑲℃潈淇℃伅锛屾槸鍚︾‘璁や慨鏀癸紵",
- "BusinessUnitTitleName": "浜嬩笟閮�",
+ "BusinessUnitTitleName": "涓氬姟绾�",
"AreaTitleName": "鍖哄煙",
"IndustryTitleName": "琛屼笟",
"UserTitleName": "鐢ㄦ埛",
@@ -482,7 +482,7 @@
"LocalEducationAttach": "鍦版柟鏁欒偛璐归檮鍔�",
"WaterFund": "姘村埄鍩洪噾",
"StampTax": "鍗拌姳绋�",
- "AllBusinessUnit": "鎵€鏈変簨涓氶儴",
+ "AllBusinessUnit": "鎵€鏈変笟鍔＄嚎",
"AllArea": "鎵€鏈夊尯鍩�",
"AllOrganization": "鎵€鏈夋満鏋�",
"AllTax": "鎵€鏈夌◣绉�",
diff --git a/atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json b/atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
index 112c9f6ba7364c9c883f7fb58cd4996b3c5fd25d..00d74a7fe0b0c12d94f89a39b628f2ed9ff84ca1 100644
--- a/atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
+++ b/atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
@@ -163,7 +163,7 @@
"After": "浠ュ悗",
"AgriculturalProduct": "鍐滀骇鍝佸彂绁�",
"AllArea": "鎵€鏈夊尯鍩�",
- "AllBusinessUnit": "鎵€鏈変簨涓氶儴",
+ "AllBusinessUnit": "鎵€鏈変笟鍔＄嚎",
"AllMappingStatus": "鎵€鏈夊搴旂姸鎬�",
"AllOrganization": "鎵€鏈夋満鏋�",
"AllTax": "鎵€鏈夌◣绉�",
@@ -2231,6 +2231,8 @@
"Operater": "鎿嶄綔鍛�",
"OperateTime": "鎿嶄綔鏃堕棿",
+ "HistoryVersion": "鍘嗗彶鐗堟湰",
+
"ReportUploadDetail": "鍘嗗彶鐗堟湰璁＄畻琛�",
"RepUploadDtlColSerialNo": "搴忓彿",
"RepUploadDtlColCreateTime": "淇濆瓨鏃堕棿",
diff --git a/atms-web/src/main/webapp/app/admin/infrastructure/docManage/doc-manage.html b/atms-web/src/main/webapp/app/admin/infrastructure/docManage/doc-manage.html
index cc7aa46babb6355380472a501e3f803f85ca6c55..29f9a105188e7823cc107b0c33c4513ff51e7f46 100644
--- a/atms-web/src/main/webapp/app/admin/infrastructure/docManage/doc-manage.html
+++ b/atms-web/src/main/webapp/app/admin/infrastructure/docManage/doc-manage.html
@@ -187,7 +187,7 @@
></button><!–ng-disabled="newDocFileTypeForm.roleName.$invalid || newDocFileTypeForm.service_id.$invalid"–>
<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>
diff --git a/atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html b/atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html
index 387ee79b815919ca9b083e39c59710e6c4e9251b..f3c618d343d08e7b7ae9943da9c3254cb768d01e 100644
--- a/atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html
+++ b/atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html
@@ -1215,15 +1215,15 @@
<!-- 鏈夋晥寮€濮嬫椂闂� -->
<span class="block-span col-sm-4" ng-show="!selectCompany.isUpdate">{{set.effectiveDateStr}}</span>
- <div ng-show="selectCompany.isUpdate" class="col-sm-4 fix-height" ng-show="selectCompany.isUpdate" ng-class="{'has-error':set.startDateError}">
+ <div ng-show="selectCompany.isUpdate" class="col-sm-4 fix-height" style="width: 33.33%!important;" ng-show="selectCompany.isUpdate" ng-class="{'has-error':set.startDateError}">
<input type="text" class="form_datetime form-control" ng-model="set.effectiveDateStr" id="{{set.fromID}}" ng-change="checkStartDate(set)" required />
<p ng-show="set.startDateError" class="has-error label">{{set.startDateError}}</p>
</div>
- <span class="col-sm-1 block-span"> {{'ExpiredDateTo'|translate}} </span>
+ <span class="col-sm-1 block-span"style="margin-top: -24px;"> {{'ExpiredDateTo'|translate}} </span>
<!-- 鏈夋晥缁撴潫鏃堕棿 -->
<span class="block-span col-sm-4" ng-show="!selectCompany.isUpdate"> {{set.expiredDateStr}}</span>
- <div ng-show="selectCompany.isUpdate" class="col-sm-4 fix-height" ng-show="selectCompany.isUpdate" ng-class="{'has-error':set.endDateError}">
+ <div ng-show="selectCompany.isUpdate" class="col-sm-4 fix-height" style="width:33.33%!important;" ng-show="selectCompany.isUpdate" ng-class="{'has-error':set.endDateError}">
<input type="text" class="form_datetime form-control" ng-change="checkEndDate(set)" ng-model="set.expiredDateStr" id="{{set.toID}}" />
<!--<p ng-show="set.endDateError" class="has-error label">{{set.endDateError}}</p>-->
</div>
diff --git a/atms-web/src/main/webapp/app/analysis/table/tb-ebit-form.html b/atms-web/src/main/webapp/app/analysis/table/tb-ebit-form.html
index 14426073f0b1b31ea05ce2f23157a7ba366a2c13..058f1d81f542f7430839340f8edc00c9dd9b88cc 100644
--- a/atms-web/src/main/webapp/app/analysis/table/tb-ebit-form.html
+++ b/atms-web/src/main/webapp/app/analysis/table/tb-ebit-form.html
@@ -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"
diff --git a/atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.html b/atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.html
index 72af5ae419a4636b7018c539817c8946bff768b7..57d421bd805fa90322f7090755b01b06a5822f33 100644
--- a/atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.html
+++ b/atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.html
@@ -9,59 +9,66 @@
<!--瀵艰埅鏍�-->
<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">
- <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;">
- {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
- <span class="caret" style="float: right "></span>
- </button>
- <ul class="dropdown-menu" style="width: 380px;" 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;
+ <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" >
+ {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
+ <span class="caret" style="float: right "></span>
+ </button>
+ <ul class="dropdown-menu" style="width: 380px;" 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;">{{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>
- <div ng-show="fileName" style="display:inline-block">
- <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
- </div>
- <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">
- {{'SelectFile' | translate}}
- </button>
- <button type="button"
- class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
- translate="TemplateBtn"
- ng-click="downloadTemplate()"></button>
+ <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;">{{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>
+ <div ng-show="fileName" style="display:inline-block">
+ <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
+ </div>
+ </div>
- <button type="button"
- class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
- translate="AddImportBtn"
- ng-click="doUploadAT(importEnum.AddImport)"></button>
+ <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" >
+ {{'SelectFile' | translate}}
+ </button>
+ <button type="button"
+ 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;"
- translate="CoverImportBtn"
- ng-click="doUploadAT(importEnum.CoverImport)"></button>
+ <button type="button"
+ class="btn btn-vat-primary topButton"
+ translate="AddImportBtn"
+ ng-click="doUploadAT(importEnum.AddImport)"></button>
+
+ <button type="button"
+ class="btn btn-vat-primary topButton"
+ translate="CoverImportBtn"
+ ng-click="doUploadAT(importEnum.CoverImport)"></button>
+ </div>
+ </div>
</div>
</div>
diff --git a/atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.less b/atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.less
index 6a67f9ad135c3fc6f2736ec0b5496c1633130daa..f28115b274f62dd4f7cef2322f9e17983e177d27 100644
--- a/atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.less
+++ b/atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.less
@@ -400,4 +400,16 @@
float:left;
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
diff --git a/atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.html b/atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.html
index 638f4371b5b1afd39fdff304ae6117113451ee72..d8aad7e4f4f5bdc0bdaee627d841d1f5520bdf1a 100644
--- a/atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.html
+++ b/atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.html
@@ -9,71 +9,77 @@
<!--瀵艰埅鏍�-->
<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">
- <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;">
- {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
- <span class="caret" style="float: right "></span>
- </button>
- <ul class="dropdown-menu" style="width: 380px;" 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;
+ <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" >
+ {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
+ <span class="caret" style="float: right "></span>
+ </button>
+ <ul class="dropdown-menu" style="width: 380px;" 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>
- <div ng-show="fileName" style="display:inline-block">
- <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
- </div>
- <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">
- {{'SelectFile' | translate}}
- </button>
- <button type="button"
- class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
- translate="TemplateBtn"
- ng-click="downloadTemplate()"></button>
+ <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>
+ <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">
+ {{'SelectFile' | translate}}
+ </button>
+ <button type="button"
+ 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;"
- translate="AddImportBtn"
- 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;"
+ translate="AddImportBtn"
+ 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;"
- translate="CoverImportBtn"
- ng-click="doUploadBS(importEnum.CoverImport)"></button>
+ <button type="button"
+ 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"
- 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"
- permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
- translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
- </div>
+ <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
+ <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 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>
diff --git a/atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.less b/atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.less
index a59bef6de66fe8124dcabcbe1942a68693743610..c73e869ed79c48916a759d3955d9383e0f4df001 100644
--- a/atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.less
+++ b/atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.less
@@ -342,4 +342,17 @@
float:left;
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
diff --git a/atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.html b/atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.html
index bbb58f0b8bbb039a14bda9f8c0c468d27901e224..3b9309793e850b4f07dbc49750cf2ab5a2a5234e 100644
--- a/atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.html
+++ b/atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.html
@@ -9,70 +9,76 @@
<!--瀵艰埅鏍�-->
<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">
- <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;">
- {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
- <span class="caret" style="float: right "></span>
- </button>
- <ul class="dropdown-menu" style="width: 380px;" 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;
+ <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" >
+ {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
+ <span class="caret" style="float: right "></span>
+ </button>
+ <ul class="dropdown-menu" style="width: 380px;" 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>
- <div ng-show="fileName" style="display:inline-block">
- <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
- </div>
- <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">
- {{'SelectFile' | translate}}
- </button>
- <button type="button"
- class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
- translate="TemplateBtn"
- ng-click="downloadTemplate()"></button>
+ <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>
+ <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" >
+ {{'SelectFile' | translate}}
+ </button>
+ <button type="button"
+ 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;"
- translate="AddImportBtn"
- ng-click="doUploadCF(importEnum.AddImport)"></button>
+ <button type="button"
+ 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;"
- translate="CoverImportBtn"
- ng-click="doUploadCF(importEnum.CoverImport)"></button>
+ <button type="button"
+ class="btn btn-vat-primary topButton"
+ translate="CoverImportBtn"
+ ng-click="doUploadCF(importEnum.CoverImport)"></button>
- <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
- <button class="btn 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"
- permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
- translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
+ <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
+ <button class="btn 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"
+ permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+ translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
+ </div>
+ </div>
</div>
</div>
</div>
diff --git a/atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.less b/atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.less
index 99691c9a846e6175a94370dd561c26b5a6d8b4b8..be0defbcc12318cbc864bd583b7864f29fc74bdc 100644
--- a/atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.less
+++ b/atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.less
@@ -342,4 +342,17 @@
float:left;
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
diff --git a/atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.html b/atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.html
index 8bc462f331af485b23b75305dfae4b02072827f3..99c52c09ae9d907bc695cc20d720978d40f84bbf 100644
--- a/atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.html
+++ b/atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.html
@@ -9,59 +9,65 @@
<!--瀵艰埅鏍�-->
<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">
- <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;">
- {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
- <span class="caret" style="float: right "></span>
- </button>
- <ul class="dropdown-menu" style="width: 380px;" 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;
+ <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="auto">
+ {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
+ <span class="caret" style="float: right "></span>
+ </button>
+ <ul class="dropdown-menu" style="width: 380px;" 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>
- <div ng-show="fileName" style="display:inline-block">
- <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
- </div>
- <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">
- {{'SelectFile' | translate}}
- </button>
- <button type="button"
- class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
- translate="TemplateBtn"
- ng-click="downloadTemplate()"></button>
+ <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>
+ <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" >
+ {{'SelectFile' | translate}}
+ </button>
+ <button type="button"
+ 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;"
- translate="AddImportBtn"
- ng-click="doUploadCIL(importEnum.AddImport)"></button>
+ <button type="button"
+ 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;"
- translate="CoverImportBtn"
- ng-click="doUploadCIL(importEnum.CoverImport)"></button>
+ <button type="button"
+ class="btn btn-vat-primary topButton"
+ translate="CoverImportBtn"
+ ng-click="doUploadCIL(importEnum.CoverImport)"></button>
+ </div>
+ </div>
</div>
</div>
diff --git a/atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.less b/atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.less
index 80f3fa72484bf28f33433d3a7cc3421878712e15..d27fc3c0e2d6f340ab99683edd6312707cd8ae91 100644
--- a/atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.less
+++ b/atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.less
@@ -342,4 +342,18 @@
float:left;
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
diff --git a/atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.html b/atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.html
index 0515558a6c516031d7bbf2382fd2438ff397f921..9cfde9fa04b9cfa91adf390874765537e53cd21a 100644
--- a/atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.html
+++ b/atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.html
@@ -9,71 +9,75 @@
<!--瀵艰埅鏍�-->
<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">
- <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;">
- {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
- <span class="caret" style="float: right "></span>
- </button>
- <ul class="dropdown-menu" style="width: 380px;" 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;
+ <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" >
+ {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
+ <span class="caret" style="float: right "></span>
+ </button>
+ <ul class="dropdown-menu" style="width: 380px;" 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;">{{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>
- <div ng-show="fileName" style="display:inline-block">
- <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
- </div>
- <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">
- {{'SelectFile' | translate}}
- </button>
- <button type="button"
- class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
- translate="TemplateBtn"
- ng-click="downloadTemplate()"></button>
+ <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;">{{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>
+ <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" >
+ {{'SelectFile' | translate}}
+ </button>
+ <button type="button"
+ 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;"
- translate="AddImportBtn"
- ng-click="doUploadCPR(importEnum.AddImport)"></button>
+ <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;"
- translate="CoverImportBtn"
- ng-click="doUploadCPR(importEnum.CoverImport)"></button>
+ <button type="button"
+ 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"
- 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"
- permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
- translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
- </div>
+ <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
+ <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 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>
diff --git a/atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.less b/atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.less
index fe10a76d87d0bf468da228526388b7b7242371cb..5e5eb60cfe1be6eae877a2fb3816eb7118f36b79 100644
--- a/atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.less
+++ b/atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.less
@@ -400,4 +400,17 @@
float:left;
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
diff --git a/atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.html b/atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.html
index 58853feb14cefbe30b57c9fd339e2b2767bec307..6ddbc995903effe05a75f70acfc019e4a5e8408f 100644
--- a/atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.html
+++ b/atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.html
@@ -9,70 +9,75 @@
<!--瀵艰埅鏍�-->
<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">
- <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;">
- {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
- <span class="caret" style="float: right "></span>
- </button>
- <ul class="dropdown-menu" style="width: 380px;" 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;
+ <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">
+ {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
+ <span class="caret" style="float: right "></span>
+ </button>
+ <ul class="dropdown-menu" style="width: 380px;" 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>
- <div ng-show="fileName" style="display:inline-block">
- <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
- </div>
- <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">
- {{'SelectFile' | translate}}
- </button>
- <button type="button"
- class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
- 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;"
- translate="AddImportBtn"
- ng-click="doUploadID(importEnum.AddImport)"></button>-->
+ <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>
+ <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" >
+ {{'SelectFile' | translate}}
+ </button>
+ <button type="button"
+ 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;"
- translate="CoverImportBtn"
- ng-click="doUploadID(importEnum.CoverImport)"></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="doUploadID(importEnum.AddImport)"></button>-->
+ <button type="button"
+ 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"
- 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"
- permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
- translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
+ <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
+ <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 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>
diff --git a/atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.less b/atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.less
index dce16f68a919133f5766780ddef3eb27231d9c0e..666e12bcc80e52d8e2523726e3f0461ce719a71f 100644
--- a/atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.less
+++ b/atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.less
@@ -342,4 +342,17 @@
float:left;
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
diff --git a/atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.html b/atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.html
index 2d464a130a0b9411fc8eebe917b43f7cadaab4a0..a6a3e36a35a259e51270b3181e4c6954aa5fa1b0 100644
--- a/atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.html
+++ b/atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.html
@@ -9,63 +9,70 @@
<!--瀵艰埅鏍�-->
<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">
- <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;">
- {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
- <span class="caret" style="float: right "></span>
- </button>
- <ul class="dropdown-menu" style="width: 380px;" 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;
+ <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" >
+ {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
+ <span class="caret" style="float: right "></span>
+ </button>
+ <ul class="dropdown-menu" style="width: 380px;" 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>
- <div ng-show="fileName" style="display:inline-block">
- <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
- </div>
- <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">
- {{'SelectFile' | translate}}
- </button>
- <button type="button"
- class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
- translate="TemplateBtn"
- ng-click="downloadTemplate()"></button>
+ <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>
+ <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" >
+ {{'SelectFile' | translate}}
+ </button>
+ <button type="button"
+ 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;"
- translate="AddImportBtn"
- ng-click="doUploadIR(importEnum.AddImport)"></button>
+ <button type="button"
+ class="btn btn-vat-primary topButton"
+ translate="AddImportBtn"
+ ng-click="doUploadIR(importEnum.AddImport)"></button>
+
+ <button type="button"
+ class="btn btn-vat-primary topButton"
+ translate="CoverImportBtn"
+ ng-click="doUploadIR(importEnum.CoverImport)"></button>
+ </div>
+ </div>
- <button type="button"
- class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
- translate="CoverImportBtn"
- ng-click="doUploadIR(importEnum.CoverImport)"></button>
</div>
</div>
</form>
-
+
<div class="dt-init-wrapper">
<div class="dx-viewport grid-container">
<div id="importIRStatusGridContainer" dx-data-grid="importIRStatusGridOptions"
diff --git a/atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.less b/atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.less
index 0a62ad9a180d9e2b5576f2a8bd2e335b1259b2e4..08d0d030c08c38e311b427179f94d75577bf8fa3 100644
--- a/atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.less
+++ b/atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.less
@@ -342,4 +342,17 @@
float:left;
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
diff --git a/atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.html b/atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.html
index ec5c33a20938b06af1ab8a11f0ebd437a56c54a4..89e773e335c3e60d791f0703a52eb7bb70504b0a 100644
--- a/atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.html
+++ b/atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.html
@@ -9,70 +9,76 @@
<!--瀵艰埅鏍�-->
<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">
- <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;">
- {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
- <span class="caret" style="float: right "></span>
- </button>
- <ul class="dropdown-menu" style="width: 380px;" 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;
+ <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" >
+ {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
+ <span class="caret" style="float: right "></span>
+ </button>
+ <ul class="dropdown-menu" style="width: 380px;" 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>
- <div ng-show="fileName" style="display:inline-block">
- <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
- </div>
- <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">
- {{'SelectFile' | translate}}
- </button>
- <button type="button"
- class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
- translate="TemplateBtn"
- ng-click="downloadTemplate()"></button>
+ <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>
+ <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" >
+ {{'SelectFile' | translate}}
+ </button>
+ <button type="button"
+ 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;"
- translate="AddImportBtn"
- 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;"
+ translate="AddImportBtn"
+ 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;"
- translate="CoverImportBtn"
- ng-click="doUploadPL(importEnum.CoverImport)"></button>
+ <button type="button"
+ 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"
- 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"
- permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
- translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
+ <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
+ <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=" 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>
diff --git a/atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.less b/atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.less
index 2f348c04384e1f1992c526b8ea361fac146f6558..7e7775a8ece2a2a634d046fcc303c0e92eb0d3fe 100644
--- a/atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.less
+++ b/atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.less
@@ -342,4 +342,17 @@
float:left;
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
diff --git a/atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.html b/atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.html
index 4196708f8534027d5b490fb9cfd2764b9a3e3d81..390b90f69c7aee93b060dc903c3565832f53431c 100644
--- a/atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.html
+++ b/atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.html
@@ -64,43 +64,41 @@
</div>
</div>
</form>-->
- <form class="form-horizontal">
- <div class="form-group" style="margin-top: 10px; height: 10px;">
- <label class="col-sm-1 control-label marTop">{{'SelectedOrganization' | translate}}锛�</label>
- <div class="col-sm-3 marTop">
- <div dx-tag-box="selectOrgOptions"></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>
- </div>
- <div class="col-sm-2">
- <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;">
- {{'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;"
- 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;"
- 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;"
- translate="AddImportBtn"
- ng-click="doUploadRLIT(importEnum.AddImport)"></button>
+ <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" 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=" position: relative; right: relative; right: -100px; top: -26px;"></i>
+ </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"
+ ng-click="downloadTemplate()"></button>
+ <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"
+ ng-click="doUploadRLIT(importEnum.AddImport)"></button>
+ </div>
</div>
</div>
</form>
diff --git a/atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.less b/atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.less
index 330f206461f1addf1f884c6f35c1297b1324b4bc..e6884ac8abd57363cef0c7478adde48298b96502 100644
--- a/atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.less
+++ b/atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.less
@@ -402,4 +402,17 @@
float:left;
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
diff --git a/atms-web/src/main/webapp/app/dataImport/data-extraction/extract-financial-data/extract-financial-data.html b/atms-web/src/main/webapp/app/dataImport/data-extraction/extract-financial-data/extract-financial-data.html
index f39d6f59837cdf3490eb2fa9eed9bfffacf0acde..4d141f2e8bd38e52426e149fc6aea98fc8892766 100644
--- a/atms-web/src/main/webapp/app/dataImport/data-extraction/extract-financial-data/extract-financial-data.html
+++ b/atms-web/src/main/webapp/app/dataImport/data-extraction/extract-financial-data/extract-financial-data.html
@@ -24,11 +24,17 @@
<div dx-tag-box="selectTypeOptions"></div>
</div>
<div class="col-sm-2">
- <button type="button" atms-permission permission-control-type="ngIf"
- permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+
+ <button type="button"
class="btn btn-vat-primary"
translate="ImportBtn" style="min-width: 50px;"
ng-click="callFinancialApi()"></button>
+
+<!-- <button type="button" atms-permission permission-control-type="ngIf"-->
+<!-- permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"-->
+<!-- class="btn btn-vat-primary"-->
+<!-- translate="ImportBtn" style="min-width: 50px;"-->
+<!-- ng-click="callFinancialApi()"></button>-->
<button type="button" class="btn btn-vat-primary" translate="Refresh"
ng-click="refreshConfigGrid()" style="min-width: 50px;"></button>
</div>
diff --git a/atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js b/atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js
index f2dbaa47fa1bc96464d254aae04b52798e2dfeff..555704cb797658870d1a670cadfde82fb4dd7196 100644
--- a/atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js
+++ b/atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js
@@ -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); //杩欎竴姝ヤ富瑕侀槻姝㈢浜屾閫夋嫨鐩稿悓鏂囦欢鐨勬椂鍊欐棤鍝嶅簲
diff --git a/atms-web/src/main/webapp/app/vat/report/vat-report-layout/vat-report-layout.ctrl.js b/atms-web/src/main/webapp/app/vat/report/vat-report-layout/vat-report-layout.ctrl.js
index 5d3b4e9964a3a46b2ad2011922d5e599e5c67e6b..4758ec19433a3872a6d817d8f2547dd6e95feb90 100644
--- a/atms-web/src/main/webapp/app/vat/report/vat-report-layout/vat-report-layout.ctrl.js
+++ b/atms-web/src/main/webapp/app/vat/report/vat-report-layout/vat-report-layout.ctrl.js
@@ -203,6 +203,18 @@
$scope.hasTaxReturnPermission = data[reportTemp.taxReturnCode];
$scope.hasQueryTaxReturnPermission = data[reportTemp.taxReturn.queryCode];
$scope.hasEditTaxReturnPermission = data[reportTemp.taxReturn.editCode];
+
+
+
+ // TODO 涓存椂浠ｇ爜,寰呭垹闄�
+ $scope.hasBsPlPermission = true;
+ $scope.hasBsPermission = true;
+ $scope.hasPlPermission = true;
+ $scope.hasTaxReturnPermission = true;
+ $scope.hasQueryTaxReturnPermission = true;
+ $scope.hasEditTaxReturnPermission = true;
+
+
});
};
var toggleGroup = function (group) {
diff --git a/atms-web/src/main/webapp/app/vat/report/vat-report-layout/vat-report-layout.html b/atms-web/src/main/webapp/app/vat/report/vat-report-layout/vat-report-layout.html
index a9f3d1dfa18b1081ff1158e49a9a5492da38b399..d10f14b5b2c410859ecf4eb894ce037916bc1110 100644
--- a/atms-web/src/main/webapp/app/vat/report/vat-report-layout/vat-report-layout.html
+++ b/atms-web/src/main/webapp/app/vat/report/vat-report-layout/vat-report-layout.html
@@ -26,7 +26,7 @@
<div class="group-section" ng-click="uploadliShow=!uploadliShow;">
<i class="fa toggle-group-icon" ng-class="'fa-chevron-down'"
aria-hidden="true"></i>
- <label class="tree-toggle nav-header" translate="">鍘嗗彶鐗堟湰</label>
+ <label class="tree-toggle nav-header" translate="">{{'HistoryVersion' | translate }}</label>
</div>
<div class="divider"></div>
@@ -34,7 +34,7 @@
<div class="li tree">
<a ng-class="'active'" ui-sref-active="active"
ui-sref=".reportUploadView()"
- class="active">鍘嗗彶鐗堟湰璁＄畻琛�</a>
+ class="active">{{'ReportUploadDetail' | translate }}</a>
</div>
</div>
</li>
diff --git a/atms-web/src/main/webapp/app/vat/vat-layout/vat-layout.ctrl.js b/atms-web/src/main/webapp/app/vat/vat-layout/vat-layout.ctrl.js
index ba8b3d15b41cf8316c4f961063176825be1b5b7e..c1b06233206c96212ee2cf4a509d1e14f9505ee2 100644
--- a/atms-web/src/main/webapp/app/vat/vat-layout/vat-layout.ctrl.js
+++ b/atms-web/src/main/webapp/app/vat/vat-layout/vat-layout.ctrl.js
@@ -429,6 +429,7 @@
url: '#/vat/previewData/coupaPurchasingReport'
});
} else if (data[constant.vatPermission.dataPreview.invoiceData.queryCode]) {
+
$scope.menus.push({
name: 'previewData',
state: 'previewData',
@@ -446,7 +447,8 @@
}
- // TODO
+ // TODO 寰呭垹闄�1
+ // TODO Delete
// TODO 寰呭垹闄�
@@ -592,11 +594,11 @@
url: '#/vat/generateReport'
});
subMenus.push({
- name: 'generateReport',
- state: 'generateReport',
+ name: 'generateReport.reportView',
+ state: 'generateReport.reportView',
num: 4,
- permission: constant.vatPermission.reportView.reportViewCode,
- url: '#/vat/generateReport'
+ permission: constant.vatPermission.reportView.bsplCode,
+ url: '#/vat/generateReport/reportView'
});
}
diff --git a/atms-web/src/main/webapp/package-lock.json b/atms-web/src/main/webapp/package-lock.json
index f7903e41fd6ce68d91bd4a597af3bdca45b9b425..a7cee7d94aea4ec91543d1fb965687e51b3ab354 100644
--- a/atms-web/src/main/webapp/package-lock.json
+++ b/atms-web/src/main/webapp/package-lock.json
@@ -1710,11 +1710,6 @@
}
}
},
- "viewerjs": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.3.2.tgz",
- "integrity": "sha512-P9Ac9H+GJ1jE9B5x8foRYm/xZvpWFR6L4GC9mr6181P9amOzQPDkplQrFj8l7mdnv8EyH2dO8XJJfoylir316A=="
- },
"websocket-driver": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
diff --git a/atms-web/src/test/File1.sql b/atms-web/src/test/File1.sql
new file mode 100644
index 0000000000000000000000000000000000000000..0c3d8008d15ba4858a43745c17ac222200df0c18
--- /dev/null
+++ b/atms-web/src/test/File1.sql
@@ -0,0 +1,56 @@
+
+
+浼佷笟鎵€寰楃◣鐢虫姤 03
+
+鏁版嵁瀵煎叆 03.001.011
+
+鏁版嵁棰勮 03.002
+鏃ヨ璐� 03.002.003
+璇曠畻骞宠 鐢熸垚鐗� 03.002.004
+璇曠畻骞宠 Mapping鐗� 03.002.005
+璧勪骇娓呭崟 03.002.006
+棰勬彁閲嶅垎绫� 03.002.007
+EAM璧勪骇澶勭疆閲戦璁板綍琛� 03.002.008
+
+鏁版嵁鏁寸悊 03.003
+鏁版嵁澶勭悊 03.003.002
+CIT.WP01901_鍥哄畾璧勪骇 03.003.003
+鎬诲垎鏈烘瀯鍒嗛厤琛� 03.003.004 闇€瑕佸啀娆＄⒑瑾�
+
+鏌ョ湅鎶ヨ〃 03.004
+
+
+
+
+澧炲€肩◣鐢虫姤 02
+
+鏁版嵁瀵煎叆 02.001
+璇曠畻骞宠 琛� 02.001.001
+杩涢」鍙戠エ 02.001.011
+閿€椤瑰彂绁� 02.001.009
+
+鏁版嵁棰勮 02.002
+绉戠洰浣欓琛� 02.002.016
+鍒╂鼎琛≒RC 02.002.013
+璧勪骇璐熷€鸿〃PRC 02.002.017
+鏃ヨ璐� 02.002.018
+鐜伴噾娴侀噺琛� 02.002.019
+宸插紑澧炲€肩◣鍙戠エ璁板綍 02.002.007
+宸茶璇佸彂绁ㄦ竻鍗� 02.002.008
+绾㈠瓧淇℃伅琛� 02.002.009
+Coupa閲囪喘鎶ュ憡 02.002.010
+鍙戠エ璧勬枡 02.002.020
+
+
+鏁版嵁鏁寸悊 02.003
+鏁版嵁澶勭悊 02.003.003
+鏀跺叆鏄庣粏 02.003.004
+寮€绁ㄦ槑缁� 02.003.005
+
+
+鏌ョ湅鎶ヨ〃 02.004
+
+
+
+妗ｆ绠＄悊 06
+鎶ヨ〃瀹℃壒 07