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

atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitDataPreviewServiceImpl.java

@@ -57,6 +57,7 @@ public class CitDataPreviewServiceImpl extends BaseService {
     public PageInfo<CitJournalAdjustDto> getJournalMergeData(CitJournalAdjustDto citJournalAdjustDto) {
         CitJournalEntryAdjust citJournalEntryAdjust = beanUtil.copyProperties(citJournalAdjustDto, new CitJournalEntryAdjust());
         List<String> orgList = getOrgList(citJournalAdjustDto.getProjectId());
+        //判断选择的期间是否为12月，若为12月份则需查询出到13期的内容
         if (citJournalEntryAdjust.getPeriodEnd() != null && citJournalEntryAdjust.getPeriodEnd() % 100 == 12) {
             citJournalEntryAdjust.setPeriodEnd(citJournalEntryAdjust.getPeriodEnd() / 100 * 100 + 13);
         }

atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitReportServiceImpl.java

@@ -234,7 +234,7 @@ public class CitReportServiceImpl extends BaseService {
                         setStatus(genJob, STATUS_END);
                         periodJobMapper.updateByPrimaryKey(genJob);
 
-                        reportGenerator.citUpdateWorkbookCaclsValueToDb(projectId, periodParam, workbook, resources, isMergeManualData, genJob);
+                        reportGenerator.updateWorkbookCaclsValueToDb(projectId, periodParam, workbook, resources, isMergeManualData, genJob);
 
                         //===============================================start validation compute==========================================================
                         //todo: 1.get the data from workbook, then put the data into new workbook
@@ -1704,7 +1704,7 @@ public class CitReportServiceImpl extends BaseService {
         ByteArrayOutputStream bout = new ByteArrayOutputStream();
         Workbook tWorkbook = null;
         try {
-            tWorkbook = reportGenerator.createWorkBookByPeriodTemplate(dataList);
+            tWorkbook = reportGenerator.createCitWorkBookByPeriodTemplate(dataList);
             tWorkbook.write(bout);
 
 //            FileUpload fileUpload = didiFileUploadService.uploadFile(bout.toByteArray(), "demo.xlsx", FileUploadEnum.BizSource.PERIOD_REPORT_TEMPLATE_UPLOAD.name());

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java

@@ -44,6 +44,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import static org.apache.poi.ss.usermodel.Cell.CELL_TYPE_FORMULA;
 import static pwc.taxtech.atms.common.util.SpringContextUtil.reportMapper;
 import static pwc.taxtech.atms.dto.vatdto.WrapPeriodJobDto.*;
 
@@ -327,252 +328,6 @@ public class ReportGeneratorImpl {
         }
     }
 
-    /**
-     * create by zhikai.z.wei 更改正则表达式，匹配E13-D13这种公式，要不然此单元格设置为允许手工数据后页面不能计算出实际值
-     * @param projectId
-     * @param period
-     * @param workbook
-     * @param resources
-     * @param isMergeMunual
-     * @param job
-     */
-    public void citUpdateWorkbookCaclsValueToDb(String projectId, Integer period, Workbook workbook, PeriodResources resources,
-                                             Boolean isMergeMunual, PeriodJob job) {
-        for (int i = 0; i < workbook.getNumberOfSheets(); i++) {
-            Sheet sheet = workbook.getSheetAt(i);
-            String code = sheet.getSheetName();
-            logger.info("-------------------------------------Begin Job [{}]------------------------------------------------------", code);
-            setStatus(job, STATUS_END);
-            setStatus(job, code, STATUS_BEGIN);
-            job.setCurrentStep(code);
-            periodJobMapper.updateByPrimaryKey(job);
-
-            Optional<PeriodTemplate> periodTemplate = resources.getPeriodTemplates().stream()
-                    .filter(a -> a.getCode().equals(code))
-                    .findFirst();
-            Long templateId;
-            if (periodTemplate.isPresent()) {
-                templateId = periodTemplate.get().getTemplateId();
-            } else {
-                templateId = 0L;
-            }
-
-            if (templateId > 0) {
-                PeriodReport report = new PeriodReport();
-                Long reportId = distributedIdService.nextId();
-                report.setId(reportId);
-                report.setTemplateId(templateId);
-                report.setPeriod(period);
-                report.setProjectId(projectId);
-                report.setCreateBy("Admin");
-                report.setCreateTime(new Date());
-                report.setUpdateBy("Admin");
-                report.setUpdateTime(new Date());
-                report.setProjectId(projectId);
-                reportMapper.insertSelective(report);
-
-                List<PeriodCellTemplateConfig> periodCellTemplateConfigs = resources.getPeriodCellTemplateConfigs().stream()
-                        .filter(a -> a.getReportTemplateId().equals(templateId) && a.getDataSourceType().equals(CellDataSourceType.Formula.getCode()))
-                        .collect(Collectors.toList());
-
-                //update formulablock table reportid field
-                List<Long> cellTemplateConfigIds = periodCellTemplateConfigs.stream()
-                        .map(PeriodCellTemplateConfig::getCellTemplateId)
-                        .collect(Collectors.toList());
-                if (cellTemplateConfigIds.size() > 0) {
-                    periodFormulaBlockMapper.updateReportId(reportId, cellTemplateConfigIds, period, projectId);
-                }
-
-                for (PeriodCellTemplateConfig periodCellTemplateConfig : periodCellTemplateConfigs) {
-
-                    PeriodFormulaBlockExample periodFormulaBlockExample2 = new PeriodFormulaBlockExample();
-                    periodFormulaBlockExample2.createCriteria()
-                            .andProjectIdEqualTo(projectId)
-                            .andCellTemplateIdEqualTo(periodCellTemplateConfig.getCellTemplateId())
-                            .andReportIdEqualTo(reportId)
-                            .andPeriodEqualTo(period);
-                    List<PeriodFormulaBlock> periodFormulaBlocks = periodFormulaBlockMapper.selectByExample(periodFormulaBlockExample2);
-
-                    //TODO：如果formula 为 ND(100) +ND(22) ,需要使用正则表达式拆分出自定义公式，然后根据自定义公式取formulablock 的数据进行替换
-//                    String regex = "[A-Z]*\\([\\-A-Za-z0-9\\\"\\,\\.\\:\\u4e00-\\u9fa5\\%]*\\)";
-                    String regex = "([A-Z]*\\([^(^)]*\\))|(([A-Z]*[0-9]*((\\+|\\-|\\*|\\/))*)*)";
-                    Pattern p = Pattern.compile(regex);
-                    String sourceFormula = StringUtils.isNotBlank(periodCellTemplateConfig.getKeyValueParsedFormula()) ?
-                            periodCellTemplateConfig.getKeyValueParsedFormula() :
-                            periodCellTemplateConfig.getFormula();
-                    String resultFormula = StringUtils.isNotBlank(periodCellTemplateConfig.getKeyValueParsedFormula()) ?
-                            periodCellTemplateConfig.getKeyValueParsedFormula() :
-                            periodCellTemplateConfig.getFormula();
-                    Matcher m = p.matcher(sourceFormula);
-                    Boolean isFind = false;
-                    while (m.find()) {
-                        isFind = true;
-                        //如果有些公式无法用正则匹配，可以做特殊处理
-                        String findStr = m.group();
-                        Optional<PeriodFormulaBlock> formulaBlock = periodFormulaBlocks.stream()
-                                .filter(a -> a.getFormulaExpression().equals(findStr))
-                                .findFirst();
-                        if (formulaBlock.isPresent()) {
-                            resultFormula = resultFormula.replace(findStr, formulaBlock.get().getData());
-                        }
-                    }
-
-                    //如果有正则匹配就进行更新公式解析
-                    if (isFind) {
-                        periodCellTemplateConfig.setParsedFormula(StringUtils.isNotBlank(resultFormula) ? resultFormula : null);
-                        periodCellTemplateConfigMapper.updateByPrimaryKeySelective(periodCellTemplateConfig);
-                    }
-
-                    Optional<PeriodCellTemplate> tempPeriodCellTemplate = resources.getPeriodCellTemplates().stream()
-                            .filter(a -> a.getCellTemplateId().equals(periodCellTemplateConfig.getCellTemplateId()))
-                            .findFirst();
-                    if (tempPeriodCellTemplate.isPresent()) {
-                        PeriodCellData cellData = new PeriodCellData();
-                        Long cellDataId = distributedIdService.nextId();
-                        cellData.setId(cellDataId);
-                        cellData.setReportId(reportId);
-                        cellData.setCellTemplateId(tempPeriodCellTemplate.get().getCellTemplateId());
-                        String data;
-                        if (sheet.getRow(tempPeriodCellTemplate.get().getRowIndex()) != null
-                                && sheet.getRow(tempPeriodCellTemplate.get().getRowIndex())
-                                .getCell(tempPeriodCellTemplate.get().getColumnIndex()) != null) {
-                            Cell cell = sheet.getRow(tempPeriodCellTemplate.get().getRowIndex())
-                                    .getCell(tempPeriodCellTemplate.get().getColumnIndex());
-
-                            data = ((XSSFCell) cell).getRawValue();
-                            if (data != null && data.equals("#VALUE!")) {
-                                FormulaEvaluator formulaEvaluator = new XSSFFormulaEvaluator((XSSFWorkbook) workbook);
-                                try {
-                                    data = formulaEvaluator.evaluate(cell).getStringValue();
-                                } catch (Exception e) {
-                                    logger.error(e.getStackTrace().toString());
-                                    data = "0.0";
-                                }
-                            }
-                        } else {
-                            data = "0.0";
-                        }
-
-                        if (StringUtils.isNotBlank(data)) {
-                            Pattern pattern = Pattern.compile("[0-9.]*");
-                            Matcher isNum = pattern.matcher(data);
-                            if (isNum.matches()) {
-                                cellData.setData(new BigDecimal(data).toString());
-                            } else {
-                                cellData.setData(data);
-                            }
-                        } else {
-                            cellData.setData(data);
-                        }
-                        if (StringUtils.isBlank(resultFormula)) {
-                            resultFormula = " ";
-                        }
-                        cellData.setFormulaExp(resultFormula);
-                        cellData.setCreateBy("Admin");
-                        cellData.setCreateTime(new Date());
-                        cellData.setUpdateBy("Admin");
-                        cellData.setUpdateTime(new Date());
-                        cellData.setProjectId(projectId);
-                        cellData.setPeriod(period);
-
-
-                        //after insert celldata, insert the celldatasource for link celldata and datasource
-                        PeriodDataSourceExample dataSourceExample = new PeriodDataSourceExample();
-                        dataSourceExample.createCriteria().andPeriodEqualTo(period).andProjectIdEqualTo(projectId)
-                                .andCellTemplateIdEqualTo(tempPeriodCellTemplate.get().getCellTemplateId()).andTypeNotEqualTo(10);
-                        List<PeriodDataSource> dataSourceList = SpringContextUtil.periodDataSourceMapper.selectByExample(dataSourceExample);
-
-                        for (int ii = 0; ii < dataSourceList.size(); ii++) {
-                            PeriodDataSource dataSource = dataSourceList.get(ii);
-                            PeriodCellDataSource cellDataSource = new PeriodCellDataSource();
-                            cellDataSource.setId(distributedIdService.nextId());
-                            cellDataSource.setCellTemplateId(tempPeriodCellTemplate.get().getCellTemplateId());
-                            cellDataSource.setCellDataId(cellDataId);
-                            cellDataSource.setDataSourceId(dataSource.getId());
-                            cellDataSource.setCreateTime(new Date());
-                            cellDataSource.setUpdateTime(new Date());
-                            cellDataSource.setPeriod(period);
-                            cellDataSource.setProjectId(projectId);
-
-                            SpringContextUtil.periodCellDataSourceMapper.insertSelective(cellDataSource);
-                        }
-
-                        periodCellDataMapper.insertSelective(cellData);
-                    }
-                }
-                if (isMergeMunual) {
-                    List<PeriodCellTemplateConfig> keyInCellTemplateConfigs = resources.getPeriodCellTemplateConfigs().stream()
-                            .filter(a -> a.getReportTemplateId().equals(templateId) && a.getDataSourceType().equals(CellDataSourceType.KeyIn.getCode()))
-                            .collect(Collectors.toList());
-                    for (PeriodCellTemplateConfig keyInCellTemplateConfig : keyInCellTemplateConfigs) {
-                        PeriodDataSourceExample dataSourceExample = new PeriodDataSourceExample();
-                        dataSourceExample.createCriteria().andPeriodEqualTo(period).andProjectIdEqualTo(projectId)
-                                .andCellTemplateIdEqualTo(keyInCellTemplateConfig.getCellTemplateId()).andTypeEqualTo(10);
-                        List<PeriodDataSource> dataSourceList = SpringContextUtil.periodDataSourceMapper.selectByExample(dataSourceExample);
-                        if (!dataSourceList.isEmpty() && dataSourceList.size() == 1) {
-                            PeriodCellDataExample cellDataExample = new PeriodCellDataExample();
-                            cellDataExample.createCriteria().andPeriodEqualTo(period).andProjectIdEqualTo(projectId)
-                                    .andCellTemplateIdEqualTo(keyInCellTemplateConfig.getCellTemplateId());
-                            List<PeriodCellData> cellDataList = periodCellDataMapper.selectByExample(cellDataExample);
-                            if (cellDataList.size() == 1) {
-                                PeriodCellData cellData = cellDataList.get(0);
-                                PeriodDataSource dataSource = dataSourceList.get(0);
-                                if (StringUtils.isEmpty(cellData.getData().trim()))
-                                    cellData.setData("0.0");
-                                if (StringUtils.isEmpty(cellData.getFormulaExp().trim()))
-                                    cellData.setFormulaExp("0.0");
-
-                                PeriodCellDataSource cellDataSource = new PeriodCellDataSource();
-                                cellDataSource.setId(distributedIdService.nextId());
-                                cellDataSource.setCellTemplateId(keyInCellTemplateConfig.getCellTemplateId());
-                                cellDataSource.setCellDataId(cellData.getId());
-                                cellDataSource.setDataSourceId(dataSource.getId());
-                                cellDataSource.setCreateTime(new Date());
-                                cellDataSource.setUpdateTime(new Date());
-                                cellDataSource.setPeriod(period);
-                                cellDataSource.setProjectId(projectId);
-                                SpringContextUtil.periodCellDataSourceMapper.insertSelective(cellDataSource);
-                                periodCellDataMapper.updateByPrimaryKeySelective(cellData);
-                            } else if (cellDataList.isEmpty()) {
-                                PeriodCellData cellData = new PeriodCellData();
-                                Long cellDataId = distributedIdService.nextId();
-                                cellData.setId(cellDataId);
-                                cellData.setReportId(reportId);
-                                cellData.setCellTemplateId(keyInCellTemplateConfig.getCellTemplateId());
-                                cellData.setCreateBy("Admin");
-                                cellData.setCreateTime(new Date());
-                                cellData.setUpdateBy("Admin");
-                                cellData.setUpdateTime(new Date());
-                                cellData.setProjectId(projectId);
-                                cellData.setPeriod(period);
-
-                                PeriodDataSource dataSource = dataSourceList.get(0);
-                                cellData.setData("0.0");
-                                cellData.setFormulaExp("0.0");
-
-                                PeriodCellDataSource cellDataSource = new PeriodCellDataSource();
-                                cellDataSource.setId(distributedIdService.nextId());
-                                cellDataSource.setCellTemplateId(keyInCellTemplateConfig.getCellTemplateId());
-                                cellDataSource.setCellDataId(cellData.getId());
-                                cellDataSource.setDataSourceId(dataSource.getId());
-                                cellDataSource.setCreateTime(new Date());
-                                cellDataSource.setUpdateTime(new Date());
-                                cellDataSource.setPeriod(period);
-                                cellDataSource.setProjectId(projectId);
-                                SpringContextUtil.periodCellDataSourceMapper.insertSelective(cellDataSource);
-                                periodCellDataMapper.insertSelective(cellData);
-                            } else {
-                                logger.warn("should not be !!!");
-                            }
-                        }
-
-                    }
-                }
-            }
-            logger.info("-------------------------------------End Job [{}]------------------------------------------------------", code);
-        }
-    }
-
     private List<PeriodReport> createReportsByTemplates(Workbook
                                                                 workbook, List<PeriodTemplate> periodTemplateList, String projectId, Integer period) {
         List<PeriodReport> reports = new ArrayList<>();
@@ -832,6 +587,74 @@ public class ReportGeneratorImpl {
         }
     }
 
+    public Workbook createCitWorkBookByPeriodTemplate(List<PeriodTemplate> templates) {
+        {
+            Workbook workbook = new XSSFWorkbook();
+            try {
+                String filePath = this.getClass().getResource("").toURI().getPath();
+                String tempPath = filePath.substring(0, filePath.indexOf("classes") + "\\classes".length());
+                templates.forEach(a -> {
+                    Workbook tWorkbook = null;
+                    File file = null;
+                    if (a.getIsSystemType()) {
+
+                        file = new File(tempPath + a.getPath());
+                        try {
+                            tWorkbook = WorkbookFactory.create(file);
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        } catch (InvalidFormatException e) {
+                            e.printStackTrace();
+                        }
+                    } else {
+                        InputStream is = null;
+                        try {
+                            String path = "";
+                            if (a.getPath().indexOf("/") > 0) {
+                                path = a.getPath();
+                            } else {
+                                DidiFileIUploadParam fileParam = new DidiFileIUploadParam();
+                                fileParam.setUuids(Arrays.asList(a.getPath()));
+                                PageInfo<DidiFileUploadDetailResult> uploadDetail = didiFileUploadService.queryPage(fileParam);
+                                Map<String, String> urlMap = null;
+                                if (CollectionUtils.isNotEmpty(uploadDetail.getList())) {
+                                    path = uploadDetail.getList().get(0).getViewHttpUrl();
+                                }
+                            }
+                            is = httpFileService.getUserTemplate(path);
+                            tWorkbook = WorkbookFactory.create(is);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        } finally {
+                            if (is != null) {
+                                try {
+                                    is.close();
+                                } catch (IOException e) {
+                                    e.printStackTrace();
+                                }
+                            }
+                        }
+                    }
+                    //处理workbook
+                    List<AnalysisSalesValueDto> dataList = periodCellDataMapper.selectReportData(a.getTemplateId(),a.getProjectId(),a.getPeriod());
+                    for(AnalysisSalesValueDto cellData:dataList){
+                        Sheet sheet = tWorkbook.getSheetAt(0);
+                        Cell cell = sheet.getRow(cellData.getRowIndex()).getCell(cellData.getColumnIndex());
+                        sheet.getRow(cellData.getRowIndex()).removeCell(cell);
+                        sheet.getRow(cellData.getRowIndex()).createCell(cellData.getColumnIndex());
+                        sheet.getRow(cellData.getRowIndex()).getCell(cellData.getColumnIndex()).setCellValue(cellData.getData());
+                    }
+                    POIUtil.cloneSheetAndStyle(tWorkbook.getSheetAt(0), workbook.createSheet(a.getCode()),workbook);
+
+                });
+                return workbook;
+            } catch (Exception e) {
+                logger.error("createWorkBookByPeriodTemplate error.", e);
+                throw Exceptions.SERVER_ERROR_EXCEPTION;
+            }
+        }
+    }
+
     /**
      * 注册所有的自定义方法到工作簿
      *

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/TBM.java

@@ -144,7 +144,7 @@ public class TBM extends FunctionBase implements FreeRefFunction {
                     dto.setAmount(balance.getEndBalBeq().multiply(new BigDecimal(-1)));
                 }
             }
-            amount = amount.add(dto.getAmount());
+            amount = amount.add(dto.getAmount()==null?(new BigDecimal(0)):dto.getAmount());
             dto.setPeriod(period);
             dto.setIsOnlyManualInput(Boolean.FALSE);
             dto.setName(Constant.DataSourceName.ReportDataSource);

atms-web/src/main/webapp/app-resources/i18n/en-us/app.json

@@ -868,5 +868,6 @@
     "NumOfBranches":"分公司数量",
     "ConditionColumnNum": "Search Condition Column Num",
     "Condition": "Search Condition",
-    "RevenueTypeConfiguration":"Revenue Type Config"
+    "RevenueTypeConfiguration":"Revenue Type Config",
+    "FinancialStatementsType": "Financial Statements"
 }

atms-web/src/main/webapp/app-resources/i18n/en-us/taxDocumentList.json

 {
-  "DocumentAttr":"DocumentAttr",
-  "DocumentType":"DocumentType",
-  "DocumentName":"DocumentName",
+  "Document Attribute":"Document Attribute",
+  "Document Type":"Document Type",
+  "Document Name":"Document Name",
   "IsRequired":"Is Required",
   "PleaseChecksRequired":"Please Checks Required",
-  "BusinessLine":"BusinessLine",
-  "CorporationName":"CorporationName",
-  "AvailabilityDate":"AvailabilityDate",
-  "Duration":"Duration",
-  "DueDate":"DueDate",
-  "TaxType":"TaxType",
-  "EntityIndex":"EntityIndex",
-  "EntityStorageLocation":"EntityStorageLocation",
-  "EntityCustodian":"EntityCustodian",
-  "ApprovalStatus":"ApprovalStatus",
+  "Business Line":"Business Line",
+  "Company Name":"Company Name",
+  "Effective_Date":"Effective_Date",
+  "Period":"Period",
+  "Due Date":"Due Date",
+  "Tax Type":"Tax Type",
+  "Storage Index":"Storage Index",
+  "Storage Location":"Storage Location",
+  "Custodian":"Custodian",
+  "Approval Status":"Approval Status",
   "ApprovalPass":"ApprovalPass",
   "ApprovalReject":"ApprovalReject",
   "ApprovalStandby":"ApprovalStandby",
-  "UploadDate":"UploadDate",
+  "Upload Date":"Upload Date",
   "Creator":"Creator",
   "Remarks":"Remarks",
-  "MoreFields":"MoreFields",
-  "LessFields":"LessFields",
+  "More":"More",
+  "Less":"Less",
   "Search":"Search",
   "Reset":"Reset",
   "Preview":"Preview",
-  "DelRecord":"DelRecord",
-  "CreateRecord":"CreateRecord",
-  "ExportTable":"ExportTable",
-  "DownloadAttachment":"DownloadAttachment",
+  "Delete Record":"Delete Record",
+  "Create Record":"Create Record",
+  "Export Record":"Export Record",
+  "Download Attachment":"Download Attachment",
   "Log":"Log",
-  "MultiUpload":"MultiUpload",
+  "Multiple File Upload":"Multiple File Upload",
   "MultiUploadFailList":"MultiUploadFailList",
   "UnFile":"UnFile",
   "UnRecord":"UnRecord",
@@ -44,18 +44,20 @@
   "Edited":"Edited",
   "Created":"Created",
   "CoverConfirm":"CoverConfirm",
-  "NoData":"NoData",
-  "PleaseSelected":"PleaseSelected",
-  "PleaseType":"PleaseType",
+  "No Data":"No Data",
+  "Please Select":"Please Select",
+  "Please Type":"Please Type",
   "Tips":"Tips",
   "EntityStorageDescription":"EntityStorageDescription",
   "multiUpload":"multiUpload",
   "UploadAttach":"UploadAttach",
   "Edit":"Edit",
-  "DocumentPath":"DocumentPath",
+  "Document Path":"Document Path",
   "PreviewFile":"PreviewFile",
   "UploadSuccessCount":"UploadSuccessCount",
   "UploadFailCount":"UploadFailCount",
-  "DeleteConfirm":"DeleteConfirm",
-  "FileTimeDateRangeError":"FileTimeDateRangeError"
+  "Confirm delete":"Confirm delete",
+  "FileTimeDateRangeError":"FileTimeDateRangeError",
+  "Warning":"Warning",
+  "Page {0} of {1} ({2} items)":"Page {0} of {1} ({2} items)"
 }
\ No newline at end of file

atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json

@@ -928,5 +928,6 @@
     "ConditionColumnNum": "条件列",
     "Condition": "查询条件",
     "Cancel4Tax": "取消",
+    "FinancialStatementsType": "财务报表",
     "~MustBeEndOneApp": "I Must be the End One, please!"
 }

atms-web/src/main/webapp/app-resources/i18n/zh-CN/taxDocumentList.json

 {
-  "DocumentAttr":"档案属性",
+  "Document Attribute":"档案属性",
   "Document":"档案",
   "IsRequired":"为必填字段，不能为空，请检查",
   "PleaseChecksRequired":"请检查必填字段",
-  "DocumentType":"档案类型",
-  "DocumentName":"档案名称",
-  "BusinessLine":"业务线",
-  "CorporationName":"公司名称",
-  "AvailabilityDate":"文件生效日期",
-  "Duration":"所属期间",
-  "DueDate":"到期日",
-  "TaxType":"税种",
-  "EntityIndex":"实物索引号",
-  "EntityStorageLocation":"实物存放地点",
-  "EntityCustodian":"保管人",
-  "ApprovalStatus":"审批状态",
+  "Document Type":"档案类型",
+  "Document Name":"档案名称",
+  "Business Line":"业务线",
+  "Company Name":"公司名称",
+  "Effective_Date":"文件生效日期",
+  "Period":"所属期间",
+  "Due Date":"到期日",
+  "Tax Type":"税种",
+  "Storage Index":"实物索引号",
+  "Storage Location":"实物存放地点",
+  "Custodian":"保管人",
+  "Approval Status":"审批状态",
   "ApprovalPass":"审批通过",
   "ApprovalReject":"拒绝审批",
   "ApprovalStandby":"待审批",
-  "UploadDate":"上传日期",
+  "Upload Date":"上传日期",
   "Creator":"创建人",
   "Remarks":"档案备注",
-  "MoreFields":"查看更多",
-  "LessFields":"收起",
+  "More":"查看更多",
+  "Less":"收起",
   "Search":"查询",
   "Reset":"重置",
   "Preview":"预览",
-  "DelRecord":"删除记录",
-  "CreateRecord":"新建记录",
-  "ExportTable":"导出列表",
-  "DownloadAttachment":"下载附件",
+  "Delete Record":"删除记录",
+  "Create Record":"新建记录",
+  "Export Record":"导出列表",
+  "Download Attachment":"下载附件",
   "Log":"日志",
-  "MultiUpload":"批量上传",
+  "Multiple File Upload":"批量上传",
   "MultiUploadFailList":"批量上传失败列表",
   "UnFile":"未支持的文件类型",
   "UnRecord":"当前记录没有附件信息",
@@ -46,17 +46,19 @@
   "Created":"新建成功",
   "CoverConfirm":"当前记录已经存在，是否进行覆盖？",
   "NoData":"当前无数据可下载",
-  "PleaseSelected":"请选择",
-  "PleaseType":"请输入",
+  "Please Select":"请选择",
+  "Please Type":"请输入",
   "Tips":"提示讯息",
   "EntityStorageDescription":"请将实物档案存放地址精确到某个档案柜",
   "multiUpload":"批量上传",
   "UploadAttach":"上传附件",
   "Edit":"编辑",
-  "DocumentPath":"档案路径",
+  "Document Path":"档案路径",
   "PreviewFile":"预览文件",
   "UploadSuccessCount":"个档案上传成功:",
   "UploadFailCount":"个档案上传失败:",
-  "DeleteConfirm":"是否确认删除记录？",
-  "FileTimeDateRangeError": "'到期日'不能早于'文件生效日期'"
+  "Confirm delete":"是否确认删除记录？",
+  "FileTimeDateRangeError": "'到期日'不能早于'文件生效日期'",
+  "Warning":"提示",
+  "Page {0} of {1} ({2} items)":"当前 {0}页 /共 {1}页 ({2} 项)"
 }
\ No newline at end of file

atms-web/src/main/webapp/app/admin/systemConfiguration/ruleEngineeConfiguration/fixedAssetsRuleEnginee/fixed-assets-rule-enginee.ctrl.js

@@ -211,7 +211,26 @@
                 var m = data.year.substring(0, data.year.length - 1);
                 $scope.fixedAssetsObject.year = m;
             }
-
+            //根据当前资产的一级分类判断当前modal需要显示的标签
+            if (type == "1"){
+                $scope.assetAdd = "StandardFixedAssetsAdd";
+                $scope.assetEdit = "StandardFixedAssetsEdit";
+                $scope.assetCode = "FixedAssetsCode";
+                $scope.assetName = "FixedAssetsName";
+                $scope.assetAgeLimit = "FixedAssetsAgeLimit";
+            } else if(type == "2") {
+                $scope.assetAdd = "LongTermPendingAdd";
+                $scope.assetEdit = "LongTermPendingEdit";
+                $scope.assetCode = "LongTermPendingCode";
+                $scope.assetName = "LongTermPendingName";
+                $scope.assetAgeLimit = "LongTermPendingAgeLimit";
+            } else if(type == "3") {
+                $scope.assetAdd = "IntangibleAssetsAdd";
+                $scope.assetEdit = "IntangibleAssetsEdit";
+                $scope.assetCode = "IntangibleAssetsCode";
+                $scope.assetName = "IntangibleAssetsName";
+                $scope.assetAgeLimit = "IntangibleAssetsAgeLimit";
+            }
             $(editModalSelector).modal('show');
         };
         $scope.editMapping = function (data) {

atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.ctrl.js

@@ -519,7 +519,7 @@
                                 rowData.taxDepreciationPeriod = null;
                             } else {
                                 rowData.assetDetailGroupId = aseetDetailList[0].id;
-                                rowData.taxDepreciationPeriod = aseetDetailList[0].groupYear;
+                                rowData.taxDepreciationPeriod = aseetDetailList[0].groupYear * 12;
                             }
                             ;
                         },
@@ -543,7 +543,7 @@
                                 return item.id == value;
                             });
                             if (aseetDetailList.length > 0) {
-                                rowData.taxDepreciationPeriod = aseetDetailList[0].groupYear;
+                                rowData.taxDepreciationPeriod = aseetDetailList[0].groupYear * 12;
                             }
                         },
                         lookup: {

atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge-search.html

@@ -21,6 +21,12 @@
                         <input class="form-control input-width-middle" type="text" id="description" ng-model="queryParams.description" />
                     </td>
                 </tr>
+                <tr>
+                    <td>
+                        <span translate="importWay"></span>
+                        <input class="form-control input-width-middle" type="text" id="source" ng-model="queryParams.source" />
+                    </td>
+                </tr>
                 <tr style="display: none">
                     <td>
                         <span translate="orgCode"></span>

atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.ctrl.js

@@ -43,6 +43,7 @@
                 subjectCode: null,
                 subjectName: null,
                 description: null,
+                source: null,
                 orgCode: null,
                 orgName: null,
                 documentDate: null,
@@ -97,6 +98,7 @@
                 subjectCode: null,
                 subjectName: null,
                 description: null,
+                source: null,
                 orgCode: null,
                 orgName: null,
                 documentDate: null,

atms-web/src/main/webapp/app/cit/reduction/cit-calculate-data/cit-calculate-data.ctrl.js

@@ -578,7 +578,6 @@ debugger;
             var tasks = JSON.parse(job.status);
 
             if (job.jobStatus == 'End') {
-
                 items.forEach(function (item, index) {
 
                     item.status = 'completed';
@@ -632,10 +631,11 @@ debugger;
             items.forEach(function (item, index) {
 
                 item.items.forEach(function (_task, index) {
-
+                    var temp = false;
                     tasks.forEach(function (task) {
 
                         if (task.code == _task.code) {
+                            temp = true;
                             if (task.status == 'Error') {
                                 _task.status = 'error';
                             } else if (task.status == 'End') {
@@ -645,7 +645,12 @@ debugger;
                             }
                             _task.text = $translate.instant(_task.status);
                         }
-                    })
+                    });
+                    //此时证明该code还未开始
+                    if(!temp){
+                        _task.status = 'unstarted';
+                        _task.text = $translate.instant(_task.status);
+                    }
                 })
             });
         }

atms-web/src/main/webapp/app/cit/report/cit-report-view/cit-report-view.ctrl.js

@@ -980,7 +980,7 @@
 
         //批量导出EXCEL
         $scope.export = function () {
-debugger;
+            $('#busy-indicator-container').show();
             var grp = _.find($scope.$parent.$parent.groups, function (g) {
                 return g.name == 'TaxReturnType';
             });
@@ -1028,6 +1028,7 @@ debugger;
                 xhr.send(JSON.stringify({
                     reportIds: reportIds
                 }));
+                $('#busy-indicator-container').hide();
                 return;
             }
 
@@ -1048,6 +1049,7 @@ debugger;
                 xhr.send(JSON.stringify({
                     reportIds: reportIds
                 }));
+                $('#busy-indicator-container').hide();
                 return;
             }
 

atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.html

@@ -57,7 +57,7 @@
                                 ng-click="downloadTemplate()"></button>
 
                         <button type="button"
-                                class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
+                                class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;display: none"
                                 translate="AddImportBtn"
                                 ng-click="importFile(importEnum.AddImport)"></button>
 

atms-web/src/main/webapp/app/common/utils/constant.js

@@ -66,7 +66,8 @@ constant.citReportTypeList = [
     {value: 2, name: 'QuarterlyFilingReturnType', orderIndex: 2},
     {value: 3, name: 'WorkingPaperType', orderIndex: 3},
     {value: 4, name: 'DocumentListType', orderIndex: 4},
-    {value: 5, name: 'OtherTaxes', orderIndex: 5}];
+    {value: 5, name: 'FinancialStatementsType', orderIndex: 5},
+    {value: 6, name: 'OtherTaxes', orderIndex: 6}];
 
 constant.cfReportTypeList = [
     {value: 1, name: '企业所得税预算'},

atms-web/src/main/webapp/app/dataImport/log/import-log/import-log.ctrl.js

@@ -107,6 +107,17 @@
                     allowHeaderFiltering: false,
                     width: '15%',
                     caption: $translate.instant('Status')
+                }, {
+                    dataField: "operator",
+                    allowHeaderFiltering: false,
+                    width: '10%',
+                    caption: $translate.instant('Creator')
+                },{
+                    dataField: "createTime",
+                    dataType: "date",
+                    format: "yyyy-MM-dd HH:mm:ss",
+                    width: '15%',
+                    caption: $translate.instant('OperateTime')
                 }
                 ],
                 onContentReady: function (e) {

atms-web/src/main/webapp/app/framework/app-usr-operate-log/app-usr-operate-log.ctrl.js

@@ -78,7 +78,7 @@ frameworkModule.controller('appUsrOperateLogController',
                     },
                     pager: {
                         allowedPageSizes: 5,
-                        infoText: "当前 {0}页 /共 {1}页 ({2} 项)",
+                        infoText:$translate.instant('Page {0} of {1} ({2} items)'),
                         showInfo: true,
                         showNavigationButtons: true,
                         showPageSizeSelector: true,

atms-web/src/main/webapp/app/framework/app-usr-operate-log/app-usr-operate-log.html

@@ -40,7 +40,7 @@
 
                             <button class="btn log-export-btn" ng-click="exportTableData()">
                                 <i class="fa fa-file-excel-o"></i>
-                                <span translate="ExportTable"></span>
+                                <span translate="Export Record"></span>
                             </button>
                             <div dx-data-grid="dataGridOptions"></div>
                         </div>

atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js

@@ -55,27 +55,31 @@ taxDocumentManageModule.controller('taxDocumentListController',
             };
 
             function checkReminder() {
-                var items = $scope.queryFieldModel;
-                var message = "";
+                var items=$scope.queryFieldModel;
+                var message="";
                 if (!PWC.isNullOrEmpty(items.fileBeginTime) && !PWC.isNullOrEmpty(items.fileEndTTime) &&
-                    items.fileBeginTime > items.fileEndTTime) {
-                    message += $translate.instant('AvailabilityDate') + ",";
+                    items.fileBeginTime > items.fileEndTTime)
+                {
+                    message+=$translate.instant('Effective_Date')+",";
                 }
                 if (!PWC.isNullOrEmpty(items.ownBeginTime) && !PWC.isNullOrEmpty(items.ownEndTime) &&
-                    items.ownBeginTime > items.ownEndTime) {
-                    message += $translate.instant('Duration') + ",";
+                    items.ownBeginTime > items.ownEndTime)
+                {
+                    message+=$translate.instant('Duration')+",";
                 }
                 if (!PWC.isNullOrEmpty(items.effectiveBeginTime) && !PWC.isNullOrEmpty(items.effectiveEndTime) &&
-                    items.effectiveBeginTime > items.effectiveEndTime) {
-                    message += $translate.instant('DueDate') + ",";
+                    items.effectiveBeginTime > items.effectiveEndTime)
+                {
+                    message+=$translate.instant('Due Date')+",";
                 }
                 if (!PWC.isNullOrEmpty(items.uploadBeginTime) && !PWC.isNullOrEmpty(items.uploadEndTime) &&
-                    items.uploadBeginTime > items.uploadEndTime) {
-                    message += $translate.instant('UploadDate') + ",";
+                    items.uploadBeginTime > items.uploadEndTime)
+                {
+                    message+=$translate.instant('Upload Date')+",";
                 }
-                if (message) {
+                if(message){
                     message = (message.substring(message.length - 1) == ',') ? message.substring(0, message.length - 1) : message;
-                    message += "-" + $translate.instant('DateWarningSearch');
+                    message+="-"+$translate.instant('DateWarningSearch');
                     window.swal(message);
                     return;
                 }
@@ -153,38 +157,38 @@ taxDocumentManageModule.controller('taxDocumentListController',
                         },
                         {
                             dataField: "fileAttr",
-                            caption: $translate.instant('DocumentAttr'),
+                            caption: $translate.instant('Document Attribute'),
 
                         },
                         {
                             dataField: "fileType",
-                            caption: $translate.instant('DocumentType'),
+                            caption: $translate.instant('Document Type'),
 
                         },
                         {
                             dataField: "fileName",
-                            caption: $translate.instant('DocumentName'),
+                            caption: $translate.instant('Document Name'),
 
                         },
 
                         {
                             dataField: "businessLine",
-                            caption: $translate.instant('BusinessLine'),
+                            caption: $translate.instant('Business Line'),
 
                         },
 
                         {
                             dataField: "companyName",
-                            caption: $translate.instant('CorporationName'),
+                            caption: $translate.instant('Company Name'),
 
                         },
                         {
                             dataField: "taxType",
-                            caption: $translate.instant('TaxType'),
+                            caption: $translate.instant('Tax Type'),
                         },
                         {
                             dataField: "fileTime",
-                            caption: $translate.instant('AvailabilityDate'),
+                            caption: $translate.instant('Effective_Date'),
 
                             cellTemplate: function (container, options) {
                                 try {
@@ -201,7 +205,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
                         },
                         {
                             dataField: "ownTime",
-                            caption: $translate.instant('Duration'),
+                            caption: $translate.instant('Period'),
                             cellTemplate: function (container, options) {
                                 try {
                                     if (options.data.ownTime) {
@@ -209,6 +213,8 @@ taxDocumentManageModule.controller('taxDocumentListController',
                                         // var ownTimeString = options.data.ownTime + "";
                                         // var year = ownTimeString.substr(0, 4);
                                         // var mon = ownTimeString.substr(4, 2);
+                                        //
+                                        // $scope.editFieldModel.ownTime = $scope.queryOwnTime(params.ownTime,"/");
                                         $('<span>').text($scope.queryOwnTime(options.data.ownTime, "/")).appendTo(container);
                                     } else {
                                         $('<span>').text('').appendTo(container);
@@ -220,7 +226,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
                         },
                         {
                             dataField: "effectiveTime",
-                            caption: $translate.instant('DueDate'),
+                            caption: $translate.instant('Due Date'),
 
                             cellTemplate: function (container, options) {
                                 try {
@@ -237,7 +243,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
                         },
                         {
                             dataField: "auditStatus",
-                            caption: $translate.instant('ApprovalStatus'),
+                            caption: $translate.instant('Approval Status'),
                             cellTemplate: function (container, options) {
                                 try {
                                     var content = $scope.transformAuditStatusToView(options.data.auditStatus);
@@ -251,22 +257,22 @@ taxDocumentManageModule.controller('taxDocumentListController',
                         },
                         {
                             dataField: "physicalIndexNumber",
-                            caption: $translate.instant('EntityIndex'),
+                            caption: $translate.instant('Storage Index'),
 
                         },
                         {
                             dataField: "storageArea",
-                            caption: $translate.instant('EntityStorageLocation'),
+                            caption: $translate.instant('Storage Location'),
 
                         },
                         {
                             dataField: "keeper",
-                            caption: $translate.instant('EntityCustodian'),
+                            caption: $translate.instant('Custodian'),
 
                         },
                         {
                             dataField: "uploadTime",
-                            caption: $translate.instant('UploadDate'),
+                            caption: $translate.instant('Upload Date'),
                             cellTemplate: function (container, options) {
                                 try {
                                     if (options.data.uploadTime) {
@@ -297,17 +303,6 @@ taxDocumentManageModule.controller('taxDocumentListController',
 
                             cellTemplate: function (container, options) {
 
-                                // var prevTargetString = '<a style="color:#506bf7;margin-right:1rem;" href="javascript:void(0)" ng-click="viewRemoteFile(\''
-                                //     + options.data.fileName + '\',\'' + encodeURIComponent(options.data.filePositionUrl)
-                                //     + '\')">'
-                                //     + '<span>{{"Preview"|translate}}</span></a>';
-                                // var editTargetString = '<a style="color:#506bf7;" href="javascript:void(0)" ng-click="openSimpleUploadPop(\''
-                                //     + options.data.id
-                                //     + '\')">'
-                                //     + '<span>{{"Edit"|translate}}</span></a>';
-                                // var eventTarget = $(prevTargetString + editTargetString);
-                                // $compile(eventTarget)($scope);
-                                // container.append(eventTarget);
                                 var prevTarget = $('<a style="color:#506bf7;margin-right:1rem;" href="javascript:void(0)"><span>' + $translate.instant('Preview') + '</span></a>');
                                 prevTarget.off('click').on('click', function () {
                                     $scope.viewRemoteFile(options.data.fileName, options.data.filePositionUrl);
@@ -441,6 +436,13 @@ taxDocumentManageModule.controller('taxDocumentListController',
             //弹出框
             $scope.isCreatePop = false;
             var openSimpleUploadPop = function (rowId) {
+                //清空标红*
+                if($scope.requiredField && $scope.requiredField.length>0){
+                    for (var x in $scope.requiredField)
+                    {
+                        $scope.requiredField[x]="";
+                    }
+                }
                 $scope.uploader.clearQueue();
                 $("#uploadFilePlugin").val(null);
                 // 带ID的就是编辑窗口
@@ -711,8 +713,8 @@ taxDocumentManageModule.controller('taxDocumentListController',
                     SweetAlert.warning($translate.instant("NeedChecked"));
                 } else {
                     SweetAlert.swal({
-                            title: '提示',
-                            text: $translate.instant("DeleteConfirm"),
+                            title: $translate.instant("Warning"),
+                            text: $translate.instant("Confirm delete"),
                             type: "warning",
                             showCancelButton: true,
                             confirmButtonColor: "#DD6B55",
@@ -743,6 +745,19 @@ taxDocumentManageModule.controller('taxDocumentListController',
                 }
             };
 
+            $(document).ready(function (e) {
+                var counter = 0;
+                if (window.history && window.history.pushState) {
+                    window.onpopstate = function () {
+                        window.history.pushState('forward', null, '#');
+                        window.history.forward(1);
+                        location.replace(document.referrer);//刷新
+                    };
+                }
+                //在IE中必须得有这两行
+                window.history.pushState('forward', null, '#');
+                window.history.forward(1);
+            });
             (function initialize() {
                 $scope.editFieldModel = {};
                 $scope.uploader = {};
@@ -1205,45 +1220,46 @@ taxDocumentManageModule.directive('multiFileUploader', function () {
                         //     return $scope.requiredField.indexOf($translate.instant(IT8nField)) > -1;
                         // };
                         if (!PWC.isNullOrEmpty(modelItem.fileTime) && !PWC.isNullOrEmpty(modelItem.effectiveTime) &&
-                            modelItem.fileTime > modelItem.effectiveTime) {
-                            alertText = $translate.instant("Document") + (i + 1) + "," + "【" + $translate.instant('FileTimeDateRangeError') + "】";
+                            modelItem.fileTime > modelItem.effectiveTime)
+                        {
+                            alertText = $translate.instant("Document") + (i + 1) + "," + "【"+$translate.instant('FileTimeDateRangeError')+"】";
                             break;
                         }
-                        if (!modelItem.companyName && $scope.isRequired($translate.instant("CompanyName"))) {
-                            alertText += "【" + $translate.instant("CompanyName") + "】"
+                        if(!modelItem.companyName && $scope.isRequired($translate.instant("CompanyName"))){
+                            alertText += "【"+$translate.instant("CompanyName")+"】"
                         }
-                        if (!modelItem.fileType && $scope.isRequired($translate.instant("DocumentType"))) {
-                            alertText += "【" + $translate.instant("DocumentType") + "】"
+                        if(!modelItem.fileType && $scope.isRequired($translate.instant("Document Type"))){
+                            alertText += "【"+$translate.instant("Document Type")+"】"
                         }
-                        if (!modelItem.fileAttr && $scope.isRequired($translate.instant("DocumentAttr"))) {
-                            alertText += "【" + $translate.instant("DocumentAttr") + "】"
+                        if(!modelItem.fileAttr && $scope.isRequired($translate.instant("Document Attribute"))){
+                            alertText += "【"+$translate.instant("Document Attribute")+"】"
                         }
-                        if (!modelItem.taxType && $scope.isRequired($translate.instant("TaxType"))) {
-                            alertText += "【" + $translate.instant("TaxType") + "】"
+                        if(!modelItem.taxType && $scope.isRequired($translate.instant("Tax Type"))){
+                            alertText += "【"+$translate.instant("Tax Type")+"】"
                         }
-                        if (!modelItem.ownTime && $scope.isRequired($translate.instant("Duration"))) {
-                            alertText += "【" + $translate.instant("Duration") + "】"
+                        if(!modelItem.ownTime && $scope.isRequired($translate.instant("Duration"))){
+                            alertText += "【"+$translate.instant("Duration")+"】"
                         }
-                        if (!modelItem.fileTime && $scope.isRequired($translate.instant("AvailabilityDate"))) {
-                            alertText += "【" + $translate.instant("AvailabilityDate") + "】"
+                        if(!modelItem.fileTime && $scope.isRequired($translate.instant("Effective_Date"))){
+                            alertText += "【"+$translate.instant("Effective_Date")+"】"
                         }
-                        if (!modelItem.effectiveTime && $scope.isRequired($translate.instant("DueDate"))) {
-                            alertText += "【" + $translate.instant("DueDate") + "】"
+                        if(!modelItem.effectiveTime && $scope.isRequired($translate.instant("Due Date"))){
+                            alertText += "【"+$translate.instant("Due Date")+"】"
                         }
-                        if (!modelItem.keeper && $scope.isRequired($translate.instant("EntityCustodian"))) {
-                            alertText += "【" + $translate.instant("EntityCustodian") + "】"
+                        if(!modelItem.keeper && $scope.isRequired($translate.instant("Custodian"))){
+                            alertText += "【"+$translate.instant("Custodian")+"】"
                         }
-                        if (!modelItem.storageArea && $scope.isRequired($translate.instant("EntityStorageLocation"))) {
-                            alertText += "【" + $translate.instant("EntityStorageLocation") + "】"
+                        if(!modelItem.storageArea && $scope.isRequired($translate.instant("Storage Location"))){
+                            alertText += "【"+$translate.instant("Storage Location")+"】"
                         }
-                        if (!modelItem.physicalIndexNumber && $scope.isRequired($translate.instant("EntityIndex"))) {
-                            alertText += "【" + $translate.instant("EntityIndex") + "】"
+                        if(!modelItem.physicalIndexNumber && $scope.isRequired($translate.instant("Storage Index"))){
+                            alertText += "【"+$translate.instant("Storage Index")+"】"
                         }
-                        if (!modelItem.remark && $scope.isRequired($translate.instant("Remarks"))) {
-                            alertText += "【" + $translate.instant("Remarks") + "】"
+                        if(!modelItem.remark && $scope.isRequired($translate.instant("Remarks"))){
+                            alertText += "【"+$translate.instant("Remarks")+"】"
                         }
 
-                        if (alertText.length > 0) {
+                        if(alertText.length > 0){
                             alertText = $translate.instant("Document") + (i + 1) + "," + alertText + $translate.instant("IsRequired");
                             break;
                         }
@@ -1763,7 +1779,7 @@ taxDocumentManageModule.directive('helpPop', function () {
                         columns: [
                             {
                                 dataField: "fileAttr",
-                                caption: $translate.instant('DocumentAttr'),
+                                caption: $translate.instant('Document Attribute'),
                                 cellTemplate: function (container, options) {
                                     var target = $('<span name="helpPopRadio" type="radio" ' +
                                         'data-id="helpPop_' + options.data.id + '" ' +
@@ -1786,7 +1802,7 @@ taxDocumentManageModule.directive('helpPop', function () {
 
                             {
                                 dataField: "fileType",
-                                caption: $translate.instant('DocumentType'),
+                                caption: $translate.instant('Document Type'),
 
                             },
                             {

atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.html

@@ -373,16 +373,16 @@
         }
     </style>
     <div class="menu-header TDL-header">
-        <div class="TDL-query-bar" ng-init="MoreFields = false">
+        <div class="TDL-query-bar" ng-init="More = false">
             <div data-id="1" class="TDL-query-row">
                 <div class="TDL-query-block">
                     <div class="TDL-query-des">
-                        <span translate="DocumentAttr"></span>
+                        <span translate="Document Attribute"></span>
                     </div>
                     <div class="TDL-query-val">
                         <select ng-model="queryFieldModel.fileAttr" ng-change="queryFileAttr(queryFieldModel.fileAttr)"
                                 class="form-control radius3"
-                                placeholder="{{'PleaseSelected' | translate}}">
+                                placeholder="{{'Please Select' | translate}}">
                             <option value=""></option>
                             <option  ng-repeat="fileAttr in fileAttrOptions track by $index"
                                      value="{{fileAttr}}">{{fileAttr}}
@@ -394,12 +394,12 @@
                 </div>
                 <div class="TDL-query-block">
                     <div class="TDL-query-des">
-                        <span translate="DocumentType"></span>
+                        <span translate="Document Type"></span>
                     </div>
                     <div class="TDL-query-val">
                         <select ng-model="queryFieldModel.fileType"
                                 class="form-control radius3"
-                                placeholder="{{'PleaseSelected' | translate}}">
+                                placeholder="{{'Please Select' | translate}}">
                             <option value=""></option>
                             <option ng-repeat="fileType in fileTypeOptions track by $index" value="{{fileType}}">
                                 {{fileType}}
@@ -411,11 +411,11 @@
                 </div>
                 <div class="TDL-query-block">
                     <div class="TDL-query-des">
-                        <span translate="AvailabilityDate"></span>
+                        <span translate="Effective_Date"></span>
                     </div>
                     <div class="TDL-query-val">
                         <!--<input type="text" class="form-control radius3"-->
-                        <!--ng-model="queryFieldModel.AvailabilityDate"/>-->
+                        <!--ng-model="queryFieldModel.Effective_Date"/>-->
                         <!--<input type="text" class="form-control radius3" id="period-picker1"/>-->
                         <input type='text' placeholder="From" ng-change="changeDateRangeError(1)"
                                date-time-picker class="form-control TDL-query-val-multi"
@@ -430,11 +430,11 @@
                 </div>
                 <div class="TDL-query-block">
                     <div class="TDL-query-des">
-                        <span translate="Duration"></span>
+                        <span translate="Period"></span>
                     </div>
                     <div class="TDL-query-val">
                         <!--<input type="text" class="form-control radius3"-->
-                        <!--ng-model="queryFieldModel.Duration"/>-->
+                        <!--ng-model="queryFieldModel.Period"/>-->
                         <input type='text' placeholder="From" ng-change="changeDateRangeError(1)"
                                date-time-picker class="form-control TDL-query-val-multi"
                                data-date-format="yyyymm" ng-model="queryFieldModel.ownBeginTime"
@@ -448,10 +448,10 @@
                     </div>
                 </div>
             </div>
-            <div data-id="2" ng-show="MoreFields" class="TDL-query-row">
+            <div data-id="2" ng-show="More" class="TDL-query-row">
                 <div class="TDL-query-block">
                     <div class="TDL-query-des">
-                        <span translate="DocumentName"></span>
+                        <span translate="Document Name"></span>
                     </div>
                     <div class="TDL-query-val">
                         <input type="text" class="form-control radius3"
@@ -460,12 +460,12 @@
                 </div>
                 <div class="TDL-query-block">
                     <div class="TDL-query-des">
-                        <span translate="BusinessLine"></span>
+                        <span translate="Business Line"></span>
                     </div>
                     <div class="TDL-query-val">
                         <select ng-model="queryFieldModel.businessLine"
                                 class="form-control radius3"
-                                placeholder="{{'PleaseSelected' | translate}}">
+                                placeholder="{{'Please Select' | translate}}">
                             <option value=""></option>
                             <option ng-repeat="businessLine in businessLineOptions track by $index" value="{{businessLine.name}}">
                                 {{businessLine.name}}
@@ -477,15 +477,14 @@
                 </div>
                 <div class="TDL-query-block">
                     <div class="TDL-query-des">
-                        <span translate="CorporationName"></span>
+                        <span translate="Company Name"></span>
                     </div>
                     <div class="TDL-query-val">
                         <div dx-select-box="queryOrgOptions" style="height: 33px;position: relative;top: 9px"></div>
-
                         <!--<select ng-model="queryFieldModel.companyName" class="form-control radius3"-->
                                 <!--title="{{queryFieldModel.companyName}}" required-->
                                 <!--ng-change="matchCompanyId(queryFieldModel,companyNameOptionsMap)"-->
-                                <!--placeholder="{{'PleaseSelected' | translate}}">-->
+                                <!--placeholder="{{'Please Select' | translate}}">-->
                             <!--<option value=""></option>-->
                             <!--<option ng-repeat="(key,companyName) in companyNameOptionsMap"-->
                                     <!--ng-slected="queryFieldModel.companyName == companyName"-->
@@ -496,7 +495,7 @@
                 </div>
                 <div class="TDL-query-block">
                     <div class="TDL-query-des">
-                        <span translate="DueDate"></span>
+                        <span translate="Due Date"></span>
                     </div>
                     <div class="TDL-query-val">
                         <!--<input type="text" class="form-control radius3"-->
@@ -512,10 +511,10 @@
                     </div>
                 </div>
             </div>
-            <div data-id="3" ng-show="MoreFields" class="TDL-query-row">
+            <div data-id="3" ng-show="More" class="TDL-query-row">
                 <div class="TDL-query-block">
                     <div class="TDL-query-des">
-                        <span translate="TaxType"></span>
+                        <span translate="Tax Type"></span>
                     </div>
                     <div class="TDL-query-val">
                         <!--<input type="text" class="form-control radius3"-->
@@ -533,7 +532,7 @@
                 </div>
                 <div class="TDL-query-block">
                     <div class="TDL-query-des">
-                        <span translate="EntityIndex"></span>
+                        <span translate="Storage Index"></span>
                     </div>
                     <div class="TDL-query-val">
                         <input type="text" class="form-control radius3"
@@ -542,7 +541,7 @@
                 </div>
                 <div class="TDL-query-block">
                     <div class="TDL-query-des">
-                        <span translate="EntityStorageLocation"></span>
+                        <span translate="Storage Location"></span>
                     </div>
                     <div class="TDL-query-val">
                         <input type="text" class="form-control radius3"
@@ -551,7 +550,7 @@
                 </div>
                 <div class="TDL-query-block">
                     <div class="TDL-query-des">
-                        <span translate="EntityCustodian"></span>
+                        <span translate="Custodian"></span>
                     </div>
                     <div class="TDL-query-val">
                         <input type="text" class="form-control radius3"
@@ -559,10 +558,10 @@
                     </div>
                 </div>
             </div>
-            <div data-id="4" ng-show="MoreFields" class="TDL-query-row">
+            <div data-id="4" ng-show="More" class="TDL-query-row">
                 <div class="TDL-query-block">
                     <div class="TDL-query-des">
-                        <span translate="ApprovalStatus"></span>
+                        <span translate="Approval Status"></span>
                     </div>
                     <div class="TDL-query-val">
                         <!--auditSelectsMap-->
@@ -581,7 +580,7 @@
                 </div>
                 <div class="TDL-query-block">
                     <div class="TDL-query-des">
-                        <span translate="UploadDate"></span>
+                        <span translate="Upload Date"></span>
                     </div>
                     <div class="TDL-query-val">
                         <!--<input type="text" class="form-control radius3"-->
@@ -612,8 +611,8 @@
             </div>
             <div data-id="5" class="TDL-query-row TDL-query-footer">
                 <div class="TDL-query-more">
-                    <a href="javascript:void(0)" ng-click="MoreFields = !MoreFields">
-                        <span>{{MoreFields ? 'LessFields' : 'MoreFields' | translate}}</span>
+                    <a href="javascript:void(0)" ng-click="More = !More">
+                        <span>{{More ? 'Less' : 'More' | translate}}</span>
                         <i class=""></i>
                     </a>
                 </div>
@@ -635,23 +634,23 @@
             <div style="text-align: right;">
                 <button class="btn DTL-create-record" ng-click="openMultiUploadPop()">
                     <i class="fa fa-tasks"></i>
-                    <span translate="MultiUpload"></span>
+                    <span translate="Multiple File Upload"></span>
                 </button>
                 <button class="btn DTL-create-record" ng-click="openSimpleUploadPop()">
                     <i class="fa fa-plus-square"></i>
-                    <span translate="CreateRecord"></span>
+                    <span translate="Create Record"></span>
                 </button>
                 <button class="btn DTL-del-record">
                     <i class="fa fa-trash-o"></i>
-                    <span translate="DelRecord" ng-click="delRecord()"></span>
+                    <span translate="Delete Record" ng-click="delRecord()"></span>
                 </button>
                 <button class="btn">
                     <i class="fa fa-download"></i>
-                    <span translate="DownloadAttachment" ng-click="downloadAttachment()"></span>
+                    <span translate="Download Attachment" ng-click="downloadAttachment()"></span>
                 </button>
                 <button class="btn" ng-click="exportTableData()">
                     <i class="fa fa-file-excel-o"></i>
-                    <span translate="ExportTable"></span>
+                    <span translate="Export Record"></span>
                 </button>
             </div>
         </div>
@@ -674,7 +673,7 @@
                 <form class="form-horizontal" name="newDocFileTypeForm"
                       ng-submit="simpleUploadSubmit(editFieldModel,'simple')">
                     <div class="modal-header">
-                        <div class="modal-title"><span>{{isCreatePop ? 'UploadAttach' : 'Edit' | translate}}</span>
+                        <div class="modal-title"><span>{{isCreatePop ? 'Create Record' : 'Edit' | translate}}</span>
                         </div>
                     </div>
                     <div class="modal-body">
@@ -682,11 +681,11 @@
                         <div ng-if="isCreatePop" class="col-sm-6 form-group">
                             <label class="col-sm-3 control-label edit-panel-left-part">
                                 <span class="required-tip"> * </span>
-                                {{'DocumentPath'|translate}}
+                                {{'Document Path'|translate}}
                             </label>
                             <div class="col-sm-11" style="width:61.67%">
                                 <input class="form-control" title="{{editFieldModel.fileNativePath}}"
-                                       placeholder="{{'PleaseSelected' | translate}}"
+                                       placeholder="{{'Please Select' | translate}}"
                                        readonly
                                        ng-model="editFieldModel.fileNativePath"
                                        required/>
@@ -709,11 +708,11 @@
                         <div class="col-sm-6 form-group">
                             <label class="col-sm-3 control-label edit-panel-left-part">
                                 <span class="required-tip"> * </span>
-                                {{'DocumentName' | translate}}
+                                {{'Document Name' | translate}}
                             </label>
                             <div class="col-sm-11" style="width:61.67%">
                                 <input class="form-control" title="{{editFieldModel.fileName}}"
-                                       placeholder="{{'PleaseType' | translate}}"
+                                       placeholder="{{'Please Type' | translate}}"
                                        ng-model="editFieldModel.fileName"
                                        required/>
                             </div>
@@ -721,13 +720,13 @@
                         <div class="col-sm-6 form-group">
                             <label class="col-sm-3 control-label edit-panel-left-part">
                                 <span class="required-tip"> * </span>
-                                {{'DocumentAttr' | translate}}
+                                {{'Document Attribute' | translate}}
                             </label>
                             <div class="col-sm-11" style="width:61.67%" id="fileAttrOptions">
                                 <select ng-model="editFieldModel.fileAttr"
                                         ng-change="syncFileType(editFieldModel.fileAttr)"
                                         class="form-control"
-                                        required placeholder="{{'PleaseSelected' | translate}}">
+                                        required placeholder="{{'Please Select' | translate}}">
                                     <option value=""></option>
                                     <option ng-repeat="fileAttr in fileAttrEnableOptions track by $index"
                                             ng-selected="(editFieldModel.fileAttr == fileAttr)"
@@ -745,15 +744,14 @@
                         <div class="col-sm-6 form-group">
                             <label class="col-sm-3 control-label edit-panel-left-part">
                                 <span class="required-tip"> * </span>
-                                {{'CorporationName' | translate}}
+                                {{'Company Name' | translate}}
                             </label>
-                            <div class="col-sm-11" style="width:61.67%;height: 13px" id="companyNameOptionsMap">
+                            <div class="col-sm-11" style="width:61.67%" id="companyNameOptionsMap">
                                 <div dx-select-box="editOrgOptions"></div>
-
                                 <!--<select ng-model="editFieldModel.companyName" class="form-control"-->
                                         <!--title="{{editFieldModel.companyName}}" required-->
                                         <!--ng-change="matchCompanyId(editFieldModel,companyNameOptionsMap)"-->
-                                        <!--placeholder="{{'PleaseSelected' | translate}}">-->
+                                        <!--placeholder="{{'Please Select' | translate}}">-->
                                     <!--<option value=""></option>-->
                                     <!--<option ng-repeat="(key,companyName) in companyNameOptionsMap"-->
                                             <!--ng-selected="(editFieldModel.companyName == companyName)"-->
@@ -765,14 +763,14 @@
                         <div class="col-sm-6 form-group">
                             <label class="col-sm-3 control-label edit-panel-left-part">
                                 <span class="required-tip"> * </span>
-                                {{'DocumentType' | translate}}
+                                {{'Document Type' | translate}}
                             </label>
                             <div class="col-sm-11" style="width:61.67%">
                                 <select ng-model="editFieldModel.fileType"
                                         ng-disabled="curFileTypeOptions.length === 0"
                                         class="form-control"
                                         ng-change="syncRequiredFields(editFieldModel)"
-                                        required placeholder="{{'PleaseSelected' | translate}}">
+                                        required placeholder="{{'Please Select' | translate}}">
                                     <option value=""></option>
                                     <option ng-repeat="fileType in curFileTypeOptions track by $index"
                                             ng-selected="(editFieldModel.fileType == fileType)"
@@ -783,19 +781,19 @@
                         </div>
                         <div class="col-sm-6 form-group">
                             <label class="col-sm-3 control-label edit-panel-left-part">
-                                <span class="required-tip" ng-if="isRequired('TaxType')"> * </span>
-                                {{'TaxType' | translate}}
+                                <span class="required-tip" ng-if="isRequired('Tax Type')"> * </span>
+                                {{'Tax Type' | translate}}
                             </label>
                             <div class="col-sm-11" style="width:61.67%">
                                 <!--<input class="form-control"-->
                                 <!--ng-required="isRequired('TaxType')"-->
-                                <!--placeholder="{{'PleaseSelected' | translate}}"-->
+                                <!--placeholder="{{'Please Select' | translate}}"-->
                                 <!--ng-model="editFieldModel.taxType"-->
                                 <!--/>-->
                                 <select ng-model="editFieldModel.taxType"
                                         class="form-control"
-                                        ng-required="isRequired('TaxType')"
-                                        placeholder="{{'PleaseSelected' | translate}}">
+                                        ng-required="isRequired('Tax Type')"
+                                        placeholder="{{'Please Select' | translate}}">
                                     <option value=""></option>
                                     <option ng-repeat="taxType in taxTypeSelects track by $index"
                                             ng-selected="(editFieldModel.taxType == taxType)"
@@ -807,10 +805,10 @@
                         <div class="col-sm-6 form-group">
                             <label class="col-sm-3 control-label edit-panel-left-part">
                                 <span class="required-tip"> * </span>
-                                {{'Duration' | translate}}
+                                {{'Period' | translate}}
                             </label>
                             <div class="col-sm-11" style="width:61.67%">
-                                <input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker
+                                <input type='text' placeholder="{{'Please Select' | translate}}" date-time-picker
                                        data-date-format="yyyy/mm"
                                        class="form-control" ng-model="editFieldModel.ownTime" required
                                        data-min-view-mode="1"/>
@@ -818,37 +816,37 @@
                         </div>
                         <div class="col-sm-6 form-group">
                             <label class="col-sm-3 control-label edit-panel-left-part">
-                                <span class="required-tip" ng-if="isRequired('AvailabilityDate')"> * </span>
-                                {{'AvailabilityDate' | translate}}
+                                <span class="required-tip" ng-if="isRequired('Effective_Date')"> * </span>
+                                {{'Effective_Date' | translate}}
                             </label>
                             <div class="col-sm-11" style="width:61.67%">
-                                <input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker
+                                <input type='text' placeholder="{{'Please Select' | translate}}" date-time-picker
                                        data-date-format="yyyy/mm/dd" ng-change="changeFieldModel(1)"
-                                       ng-required="isRequired('AvailabilityDate')"
+                                       ng-required="isRequired('Effective_Date')"
                                        class="form-control" ng-model="editFieldModel.fileTime"/>
                             </div>
                         </div>
                         <div class="col-sm-6 form-group">
                             <label class="col-sm-3 control-label edit-panel-left-part">
-                                <span class="required-tip" ng-if="isRequired('DueDate')"> * </span>
-                                {{'DueDate' | translate}}
+                                <span class="required-tip" ng-if="isRequired('Due Date')"> * </span>
+                                {{'Due Date' | translate}}
                             </label>
                             <div class="col-sm-11" style="width:61.67%">
-                                <input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker
+                                <input type='text' placeholder="{{'Please Select' | translate}}" date-time-picker
                                        data-date-format="yyyy/mm/dd"
-                                       ng-required="isRequired('DueDate')" ng-change="changeFieldModel(2)"
+                                       ng-required="isRequired('Due Date')" ng-change="changeFieldModel(2)"
                                        class="form-control" ng-model="editFieldModel.effectiveTime"/>
                             </div>
                         </div>
                         <div class="col-sm-6 form-group">
                             <label class="col-sm-3 control-label edit-panel-left-part">
-                                <span class="required-tip" ng-if="isRequired('EntityStorageLocation')"> * </span>
-                                {{'EntityStorageLocation' | translate}}
+                                <span class="required-tip" ng-if="isRequired('Storage Location')"> * </span>
+                                {{'Storage Location' | translate}}
                             </label>
                             <div class="col-sm-11" style="width:61.67%">
                                 <input class="form-control"
-                                       placeholder="{{'PleaseType'|translate}}"
-                                       ng-required="isRequired('EntityStorageLocation')"
+                                       placeholder="{{'Please Type'|translate}}"
+                                       ng-required="isRequired('Storage Location')"
                                        ng-model="editFieldModel.storageArea"
                                 />
                             </div>
@@ -861,27 +859,27 @@
                         </div>
                         <div class="col-sm-6 form-group">
                             <label class="col-sm-3 control-label edit-panel-left-part">
-                                <span class="required-tip" ng-if="isRequired('EntityCustodian')"> * </span>
-                                {{'EntityCustodian' | translate}}
+                                <span class="required-tip" ng-if="isRequired('Custodian')"> * </span>
+                                {{'Custodian' | translate}}
                             </label>
                             <div class="col-sm-11" style="width:61.67%">
                                 <input class="form-control"
-                                       placeholder="{{'PleaseType' | translate}}"
-                                       ng-required="isRequired('EntityCustodian')"
+                                       placeholder="{{'Please Type' | translate}}"
+                                       ng-required="isRequired('Custodian')"
                                        ng-model="editFieldModel.keeper"
                                 />
                             </div>
                         </div>
                         <div class="col-sm-6 form-group">
                             <label class="col-sm-3 control-label edit-panel-left-part">
-                                <span class="required-tip" ng-if="isRequired('EntityIndex')"> * </span>
-                                {{'EntityIndex' | translate}}
+                                <span class="required-tip" ng-if="isRequired('Storage Index')"> * </span>
+                                {{'Storage Index' | translate}}
                             </label>
                             <div class="col-sm-11" style="width:61.67%">
                                 <input class="form-control"
                                        type="text"
-                                       placeholder="{{'PleaseType' | translate}}"
-                                       ng-required="isRequired('EntityIndex')"
+                                       placeholder="{{'Please Type' | translate}}"
+                                       ng-required="isRequired('Storage Index')"
                                        ng-model="editFieldModel.physicalIndexNumber"
                                 />
                             </div>
@@ -892,7 +890,7 @@
                                 {{'Remarks' | translate}}</label></label>
                             <div class="col-sm-11" style="width:87.5%">
                                 <textarea class="form-control"
-                                          placeholder="{{'PleaseType' | translate}}"
+                                          placeholder="{{'Please Type' | translate}}"
                                           ng-required="isRequired('Remarks')"
                                           ng-model="editFieldModel.remark">
                                 </textarea>
@@ -903,7 +901,7 @@
                     <div class="modal-footer">
                         <button type="submit" class="btn btn-primary" translate="Confirm"></button>
                         <button type="button" class="btn btn-third" data-dismiss="modal" ng-click="cancelDocFileType()"
-                                translate="Cancel4Tax"></button>
+                                translate="Cancel"></button>
                     </div>
                 </form>
             </div>
@@ -937,11 +935,11 @@
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label edit-panel-left-part">
                                             <span class="required-tip"> * </span>
-                                            {{'DocumentPath'|translate}}
+                                            {{'Document Path'|translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
                                             <input class="form-control" title="{{editFieldItem.fileNativePath}}"
-                                                   placeholder="{{'PleaseSelected' | translate}}"
+                                                   placeholder="{{'Please Select' | translate}}"
                                                    ng-class="{'upload-fail-mark':!editFieldItem.fileNativePath && editFieldItem.fileNativePath != 0}"
                                                    ng-model="editFieldItem.fileNativePath"/>
                                             <!--<input id="{{multiUploadFilePlugin}}" type="file" style="display:none" nv-file-select uploader="uploader" filters="fileTypeFilter">-->
@@ -953,26 +951,26 @@
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label edit-panel-left-part">
                                             <span class="required-tip"> * </span>
-                                            {{'DocumentName' | translate}}
+                                            {{'Document Name' | translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
                                             <input class="form-control"
                                                    ng-class="{'upload-fail-mark':!editFieldItem.fileName && editFieldItem.fileName != 0}"
                                                    title="{{editFieldItem.fileName}}"
-                                                   placeholder="{{'PleaseType' | translate}}"
+                                                   placeholder="{{'Please Type' | translate}}"
                                                    ng-model="editFieldItem.fileName"/>
                                         </div>
                                     </div>
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label edit-panel-left-part">
                                             <span class="required-tip"> * </span>
-                                            {{'DocumentAttr' | translate}}
+                                            {{'Document Attribute' | translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
                                             <select ng-model="editFieldItem.fileAttr"
                                                     ng-class="{'upload-fail-mark':!editFieldItem.fileAttr}"
                                                     ng-change="syncFileType(editFieldItem.fileAttr)"
-                                                    class="form-control" placeholder="{{'PleaseSelected' | translate}}">
+                                                    class="form-control" placeholder="{{'Please Select' | translate}}">
                                                 <option value=""></option>
                                                 <option ng-repeat="fileAttr in fileAttrOptions track by $index"
                                                         ng-selected="(editFieldItem.fileAttr == fileAttr)"
@@ -989,16 +987,15 @@
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label edit-panel-left-part">
                                             <span class="required-tip"> * </span>
-                                            {{'CorporationName' | translate}}
+                                            {{'Company Name' | translate}}
                                         </label>
-                                        <div class="col-sm-11" style="width:61.67%;height: 13px">
+                                        <div class="col-sm-11" style="width:61.67%">
                                             <div ng-class="{'upload-fail-mark':!editFieldItem.companyName}" dx-select-box="editFieldItemOrgOptions"></div>
-
                                             <!--<select ng-model="editFieldItem.companyName" class="form-control"-->
                                                     <!--title="{{editFieldItem.companyName}}"-->
                                                     <!--ng-class="{'upload-fail-mark':!editFieldItem.companyName}"-->
                                                     <!--ng-change="matchCompanyId(editFieldItem,companyNameOptionsMap)"-->
-                                                    <!--placeholder="{{'PleaseSelected' | translate}}">-->
+                                                    <!--placeholder="{{'Please Select' | translate}}">-->
                                                 <!--<option value=""></option>-->
                                                 <!--<option ng-repeat="(key,companyName) in companyNameOptionsMap"-->
                                                         <!--ng-selected="(editFieldItem.companyName == companyName)"-->
@@ -1010,7 +1007,7 @@
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label edit-panel-left-part">
                                             <span class="required-tip"> * </span>
-                                            {{'DocumentType' | translate}}
+                                            {{'Document Type' | translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
                                             <select ng-model="editFieldItem.fileType"
@@ -1018,7 +1015,7 @@
                                                     ng-change="syncRequiredFields(editFieldItem)"
                                                     class="form-control"
                                                     ng-class="{'upload-fail-mark':!editFieldItem.fileType}"
-                                                    placeholder="{{'PleaseSelected' | translate}}">
+                                                    placeholder="{{'Please Select' | translate}}">
                                                 <option value=""></option>
                                                 <option ng-repeat="fileType in curFileTypeOptions track by $index"
                                                         ng-selected="(editFieldItem.fileType == fileType)"
@@ -1029,15 +1026,15 @@
                                     </div>
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label edit-panel-left-part">
-                                            <span class="required-tip" ng-if="isRequired('TaxType')"> * </span>
-                                            {{'TaxType' | translate}}
+                                            <span class="required-tip" ng-if="isRequired('Tax Type')"> * </span>
+                                            {{'Tax Type' | translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
                                             <select ng-model="editFieldItem.taxType"
                                                     class="form-control"
-                                                    ng-required="isRequired('TaxType')"
-                                                    ng-class="{'upload-fail-mark':isRequired('TaxType') && !editFieldItem.taxType}"
-                                                    placeholder="{{'PleaseSelected' | translate}}">
+                                                    ng-required="isRequired('Tax Type')"
+                                                    ng-class="{'upload-fail-mark':isRequired('Tax Type') && !editFieldItem.taxType}"
+                                                    placeholder="{{'Please Select' | translate}}">
                                                 <option value=""></option>
                                                 <option ng-repeat="taxType in taxTypeSelects track by $index"
                                                         ng-selected="(editFieldItem.taxType == taxType)"
@@ -1049,10 +1046,10 @@
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label edit-panel-left-part">
                                             <span class="required-tip"> * </span>
-                                            {{'Duration' | translate}}
+                                            {{'Period' | translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
-                                            <input type='text' placeholder="{{'PleaseSelected' | translate}}"
+                                            <input type='text' placeholder="{{'Please Select' | translate}}"
                                                    date-time-picker data-date-format="yyyy/mm"
                                                    ng-class="{'upload-fail-mark':!editFieldItem.ownTime}"
                                                    class="form-control" ng-model="editFieldItem.ownTime"
@@ -1061,37 +1058,37 @@
                                     </div>
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label edit-panel-left-part">
-                                            <span class="required-tip" ng-if="isRequired('AvailabilityDate')"> * </span>
-                                            {{'AvailabilityDate' | translate}}
+                                            <span class="required-tip" ng-if="isRequired('Effective_Date')"> * </span>
+                                            {{'Effective_Date' | translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
-                                            <input type='text' placeholder="{{'PleaseSelected' | translate}}" ng-change="changeFieldItem(1)"
-                                                   ng-class="{'upload-fail-mark':isRequired('AvailabilityDate') && !editFieldItem.fileTime}"
+                                            <input type='text' placeholder="{{'Please Select' | translate}}" ng-change="changeFieldItem(1)"
+                                                   ng-class="{'upload-fail-mark':isRequired('Effective_Date') && !editFieldItem.fileTime}"
                                                    date-time-picker data-date-format="yyyy/mm/dd"
                                                    class="form-control" ng-model="editFieldItem.fileTime"/>
                                         </div>
                                     </div>
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label edit-panel-left-part">
-                                            <span class="required-tip" ng-if="isRequired('DueDate')"> * </span>
-                                            {{'DueDate' | translate}}
+                                            <span class="required-tip" ng-if="isRequired('Due Date')"> * </span>
+                                            {{'Due Date' | translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
-                                            <input type='text' placeholder="{{'PleaseSelected' | translate}}" ng-change="changeFieldItem(2)"
-                                                   ng-class="{'upload-fail-mark':isRequired('DueDate') && !editFieldItem.effectiveTime}"
+                                            <input type='text' placeholder="{{'Please Select' | translate}}" ng-change="changeFieldItem(2)"
+                                                   ng-class="{'upload-fail-mark':isRequired('Due Date') && !editFieldItem.effectiveTime}"
                                                    date-time-picker data-date-format="yyyy/mm/dd"
                                                    class="form-control" ng-model="editFieldItem.effectiveTime"/>
                                         </div>
                                     </div>
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label edit-panel-left-part">
-                                            <span class="required-tip" ng-if="isRequired('EntityStorageLocation')"> * </span>
-                                            {{'EntityStorageLocation' | translate}}
+                                            <span class="required-tip" ng-if="isRequired('Storage Location')"> * </span>
+                                            {{'Storage Location' | translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
                                             <input class="form-control"
-                                                   ng-class="{'upload-fail-mark':isRequired('EntityStorageLocation') && !editFieldItem.storageArea}"
-                                                   placeholder="{{'PleaseSelected'|translate}}"
+                                                   ng-class="{'upload-fail-mark':isRequired('Storage Location') && !editFieldItem.storageArea}"
+                                                   placeholder="{{'Please Select'|translate}}"
                                                    ng-model="editFieldItem.storageArea"
                                             />
                                         </div>
@@ -1106,27 +1103,27 @@
                                     </div>
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label edit-panel-left-part">
-                                            <span class="required-tip" ng-if="isRequired('EntityCustodian')"> * </span>
-                                            {{'EntityCustodian' | translate}}
+                                            <span class="required-tip" ng-if="isRequired('Custodian')"> * </span>
+                                            {{'Custodian' | translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
                                             <input class="form-control"
-                                                   ng-class="{'upload-fail-mark':isRequired('EntityCustodian') && !editFieldItem.keeper}"
-                                                   placeholder="{{'PleaseType' | translate}}"
+                                                   ng-class="{'upload-fail-mark':isRequired('Custodian') && !editFieldItem.keeper}"
+                                                   placeholder="{{'Please Type' | translate}}"
                                                    ng-model="editFieldItem.keeper"
                                             />
                                         </div>
                                     </div>
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label edit-panel-left-part">
-                                            <span class="required-tip" ng-if="isRequired('EntityIndex')"> * </span>
-                                            {{'EntityIndex' | translate}}
+                                            <span class="required-tip" ng-if="isRequired('Storage Index')"> * </span>
+                                            {{'Storage Index' | translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
                                             <input class="form-control"
                                                    type="text"
-                                                   placeholder="{{'PleaseType' | translate}}"
-                                                   ng-class="{'upload-fail-mark':isRequired('EntityIndex') && !editFieldItem.physicalIndexNumber && editFieldItem.physicalIndexNumber != 0}"
+                                                   placeholder="{{'Please Type' | translate}}"
+                                                   ng-class="{'upload-fail-mark':isRequired('Storage Index') && !editFieldItem.physicalIndexNumber && editFieldItem.physicalIndexNumber != 0}"
                                                    ng-model="editFieldItem.physicalIndexNumber"
                                                    readonly
                                             />
@@ -1140,7 +1137,7 @@
                                         <div class="col-sm-11" style="width:87.5%">
                                         <textarea class="form-control"
                                                   ng-class="{'upload-fail-mark':isRequired('Remarks') && !editFieldItem.remark && editFieldItem.remark != 0}"
-                                                  placeholder="{{'PleaseType' | translate}}"
+                                                  placeholder="{{'Please Type' | translate}}"
                                                   ng-model="editFieldItem.remark">
                                         </textarea>
                                         </div>
@@ -1154,7 +1151,7 @@
                     <div class="modal-footer">
                         <button type="button" class="btn btn-primary" translate="Confirm" ng-click="multiUploadSubmit_handmade()"></button>
                         <button type="button" class="btn btn-third" data-dismiss="modal" ng-click="closeUploadReview()"
-                                translate="Cancel4Tax"></button>
+                                translate="Cancel"></button>
                     </div>
                 </form>
             </div>
@@ -1187,11 +1184,11 @@
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label edit-panel-left-part">
                                             <span class="required-tip"> * </span>
-                                            {{'DocumentPath'|translate}}
+                                            {{'Document Path'|translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
                                             <input class="form-control" title="{{editFieldItem.fileNativePath}}"
-                                                   placeholder="{{'PleaseSelected' | translate}}"
+                                                   placeholder="{{'Please Select' | translate}}"
                                                    readonly required
                                                    ng-model="editFieldItem.fileNativePath"/>
                                             &lt;!&ndash;<input id="{{multiUploadFilePlugin}}" type="file" style="display:none" nv-file-select uploader="uploader" filters="fileTypeFilter">&ndash;&gt;
@@ -1209,11 +1206,11 @@
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label edit-panel-left-part">
                                             <span class="required-tip"> * </span>
-                                            {{'DocumentName' | translate}}
+                                            {{'Document Name' | translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
                                             <input class="form-control" title="{{editFieldItem.fileName}}"
-                                                   placeholder="{{'PleaseType' | translate}}"
+                                                   placeholder="{{'Please Type' | translate}}"
                                                    ng-model="editFieldItem.fileName"
                                                    required/>
                                         </div>
@@ -1221,13 +1218,13 @@
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label edit-panel-left-part">
                                             <span class="required-tip"> * </span>
-                                            {{'DocumentAttr' | translate}}
+                                            {{'Document Attribute' | translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
                                             <select ng-model="editFieldItem.fileAttr"
                                                     ng-change="syncFileType(editFieldItem.fileAttr)"
                                                     class="form-control"
-                                                    required placeholder="{{'PleaseSelected' | translate}}">
+                                                    required placeholder="{{'Please Select' | translate}}">
                                                 <option ng-repeat="fileAttr in fileAttrOptions track by $index"
                                                         ng-selected="(editFieldItem.fileAttr == fileAttr)"
                                                         value="{{fileAttr}}">{{fileAttr}}
@@ -1243,13 +1240,13 @@
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label edit-panel-left-part">
                                             <span class="required-tip"> * </span>
-                                            {{'CorporationName' | translate}}
+                                            {{'Company Name' | translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
                                             <select ng-model="editFieldItem.companyName" class="form-control"
                                                     title="{{editFieldItem.companyName}}" required
                                                     ng-change="matchCompanyId(editFieldItem,companyNameOptionsMap)"
-                                                    placeholder="{{'PleaseSelected' | translate}}">
+                                                    placeholder="{{'Please Select' | translate}}">
 
                                                 <option ng-repeat="(key,companyName) in companyNameOptionsMap"
                                                         ng-selected="(editFieldItem.companyName == companyName)"
@@ -1261,14 +1258,14 @@
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label edit-panel-left-part">
                                             <span class="required-tip"> * </span>
-                                            {{'DocumentType' | translate}}
+                                            {{'Document Type' | translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
                                             <select ng-model="editFieldItem.fileType"
                                                     ng-disabled="curFileTypeOptions.length === 0"
                                                     ng-change="syncRequiredFields(editFieldItem)"
                                                     class="form-control" required
-                                                    placeholder="{{'PleaseSelected' | translate}}">
+                                                    placeholder="{{'Please Select' | translate}}">
                                                 <option ng-repeat="fileType in curFileTypeOptions track by $index"
                                                         ng-selected="(editFieldItem.fileType == fileType)"
                                                         value="{{fileType}}">{{fileType}}
@@ -1285,7 +1282,7 @@
                                             <select ng-model="editFieldItem.taxType"
                                                     class="form-control"
                                                     ng-required="isRequired('TaxType')"
-                                                    placeholder="{{'PleaseSelected' | translate}}">
+                                                    placeholder="{{'Please Select' | translate}}">
                                                 <option ng-repeat="taxType in taxTypeSelects track by $index"
                                                         ng-selected="(editFieldItem.taxType == taxType)"
                                                         value="{{taxType}}">{{taxType}}
@@ -1296,10 +1293,10 @@
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label edit-panel-left-part">
                                             <span class="required-tip"> * </span>
-                                            {{'Duration' | translate}}
+                                            {{'Period' | translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
-                                            <input type='text' placeholder="{{'PleaseSelected' | translate}}"
+                                            <input type='text' placeholder="{{'Please Select' | translate}}"
                                                    date-time-picker data-date-format="yyyy/mm"
                                                    class="form-control" ng-model="editFieldItem.ownTime" required
                                                    data-min-view-mode="1"/>
@@ -1307,38 +1304,38 @@
                                     </div>
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label edit-panel-left-part">
-                                            <span class="required-tip" ng-if="isRequired('AvailabilityDate')"> * </span>
-                                            {{'AvailabilityDate' | translate}}
+                                            <span class="required-tip" ng-if="isRequired('Effective_Date')"> * </span>
+                                            {{'Effective_Date' | translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
-                                            <input type='text' placeholder="{{'PleaseSelected' | translate}}"
+                                            <input type='text' placeholder="{{'Please Select' | translate}}"
                                                    date-time-picker data-date-format="yyyy/mm/dd"
-                                                   ng-required="isRequired('AvailabilityDate')"
+                                                   ng-required="isRequired('Effective_Date')"
                                                    class="form-control" ng-model="editFieldItem.fileTime"/>
                                         </div>
                                     </div>
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label edit-panel-left-part">
-                                            <span class="required-tip" ng-if="isRequired('DueDate')"> * </span>
-                                            {{'DueDate' | translate}}
+                                            <span class="required-tip" ng-if="isRequired('Due Date')"> * </span>
+                                            {{'Due Date' | translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
-                                            <input type='text' placeholder="{{'PleaseSelected' | translate}}"
+                                            <input type='text' placeholder="{{'Please Select' | translate}}"
                                                    date-time-picker data-date-format="yyyy/mm/dd"
-                                                   ng-required="isRequired('DueDate')"
+                                                   ng-required="isRequired('Due Date')"
                                                    class="form-control" ng-model="editFieldItem.effectiveTime"/>
                                         </div>
                                     </div>
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label edit-panel-left-part">
-                                            <span class="required-tip" ng-if="isRequired('EntityStorageLocation')"> * </span>
-                                            {{'EntityStorageLocation' | translate}}
+                                            <span class="required-tip" ng-if="isRequired('Storage Location')"> * </span>
+                                            {{'Storage Location' | translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
                                             <input class="form-control"
-                                                   placeholder="{{'PleaseSelected'|translate}}"
+                                                   placeholder="{{'Please Select'|translate}}"
                                                    ng-model="editFieldItem.storageArea"
-                                                   ng-required="isRequired('EntityStorageLocation')"
+                                                   ng-required="isRequired('Storage Location')"
                                             />
                                         </div>
                                         <div class="DTL-special-external-btn"
@@ -1352,28 +1349,28 @@
                                     </div>
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label edit-panel-left-part">
-                                            <span class="required-tip" ng-if="isRequired('EntityCustodian')"> * </span>
-                                            {{'EntityCustodian' | translate}}
+                                            <span class="required-tip" ng-if="isRequired('Custodian')"> * </span>
+                                            {{'Custodian' | translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
                                             <input class="form-control"
-                                                   ng-required="isRequired('EntityCustodian')"
-                                                   placeholder="{{'PleaseType' | translate}}"
+                                                   ng-required="isRequired('Custodian')"
+                                                   placeholder="{{'Please Type' | translate}}"
                                                    ng-model="editFieldItem.keeper"
                                             />
                                         </div>
                                     </div>
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label edit-panel-left-part">
-                                            <span class="required-tip" ng-if="isRequired('EntityIndex')"> * </span>
-                                            {{'EntityIndex' | translate}}
+                                            <span class="required-tip" ng-if="isRequired('Storage Index')"> * </span>
+                                            {{'Storage Index' | translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
                                             <input class="form-control"
                                                    type="text"
-                                                   placeholder="{{'PleaseType' | translate}}"
+                                                   placeholder="{{'Please Type' | translate}}"
                                                    ng-model="editFieldItem.physicalIndexNumber"
-                                                   ng-required="isRequired('EntityIndex')"
+                                                   ng-required="isRequired('Storage Index')"
                                             />
                                         </div>
                                     </div>
@@ -1384,7 +1381,7 @@
                                         </label>
                                         <div class="col-sm-11" style="width:87.5%">
                                         <textarea class="form-control"
-                                                  placeholder="{{'PleaseType' | translate}}"
+                                                  placeholder="{{'Please Type' | translate}}"
                                                   ng-required="isRequired('Remarks')"
                                                   ng-model="editFieldItem.remark">
                                         </textarea>
@@ -1399,20 +1396,42 @@
                     <div class="modal-footer">
                         <button type="button" class="btn btn-primary" translate="Confirm" ng-click="multiUploadSubmit()"></button>
                         <button type="button" class="btn btn-third" data-dismiss="modal" ng-click="cancelDocFileType()"
-                                translate="Cancel4Tax"></button>
+                                translate="Cancel"></button>
                     </div>
                 </form>
             </div>
         </div>
     </div>-->
 
-
     <div class="TDL-pdf-layout-dialog" id="filePreviewPop" file-preview >
         <div class="wrapper TDL-pdf-preview-pop" id="excetlContainer">
         </div>
         <button class="TDL-pdf-preview-pop-close-btn" ng-click="hideFilePreviewPop()">×</button>
 
     </div>
+    <!---->
+    <!--<div class="modal fade" id="filePreviewPop" file-preview tabindex="-1" role="dialog" aria-labelledby="myModal"-->
+         <!--data-backdrop="static" data-keyboard="false">-->
+        <!--<div class="modal-dialog" style="width:80%;" role="document">-->
+            <!--<div class="modal-content">-->
+                <!--<div class="modal-header">-->
+                    <!--<span class="close" data-dismiss="modal" aria-hidden="true" ng-click="hideFilePreviewPop()">×</span>-->
+                    <!--<div class="modal-title">{{currentSheetName}}</div>-->
+                <!--</div>-->
+                <!--<div class="modal-body">-->
+                    <!--<div class="dx-viewport demo-container" id="preview_dataGrid">-->
+                    <!--</div>-->
+                <!--</div>-->
+
+            <!--</div>-->
+
+            <!--<button class="TDL-pdf-paging-btn TDL-pdf-paging-btn-prev" ng-click="prevPaging_xls()" title="上一页">&lt;-->
+            <!--</button>-->
+            <!--<button class="TDL-pdf-paging-btn TDL-pdf-paging-btn-next" ng-click="nextPaging_xls()" title="下一页">&gt;-->
+            <!--</button>-->
+        <!--</div>-->
+    <!--</div>-->
+
     <div class="modal fade" id="uploadResultPop" tabindex="-1" role="dialog" aria-labelledby="myModal"
          data-backdrop="static" data-keyboard="false">
         <div class="modal-dialog" style="width:60%;max-width:960px" role="document">
@@ -1437,7 +1456,7 @@
                 </div>
                 <div class="modal-footer">
                     <button class="btn btn-primary" translate="Confirm" ng-click="confirmUploadResult()"></button>
-                    <button type="button" class="btn btn-third" ng-if="multiUploadErrorItems.length" data-dismiss="modal" translate="Cancel4Tax"></button>
+                    <button type="button" class="btn btn-third" ng-if="multiUploadErrorItems.length" data-dismiss="modal" translate="Cancel"></button>
                 </div>
             </div>
         </div>
@@ -1458,7 +1477,7 @@
                 <div class="modal-footer">
                     <button type="button" class="btn btn-primary" translate="Confirm" ng-click="sniffHelpPopRadio()"></button>
                     <button type="button" class="btn btn-third" data-dismiss="modal" ng-click="cancelDocFileType()"
-                            translate="Cancel4Tax"></button>
+                            translate="Cancel"></button>
                 </div>
             </div>
         </div>