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

e59e12bc · kevin · 5b82ed48 · 40f27bbd · e59e12bc · e59e12bc
Commit e59e12bc authored Apr 11, 2019 by kevin
30 changed files
--- a/atms-api/src/main/java/pwc/taxtech/atms/controller/OperationLogFileTypeController.java
+++ b/atms-api/src/main/java/pwc/taxtech/atms/controller/OperationLogFileTypeController.java
@@ -95,17 +95,12 @@ public class OperationLogFileTypeController {
        try {
            Map<String, String> headers = new LinkedHashMap<>();
            headers.put("id", "id");
-//            headers.put("operation_content", "操作内容");
-//            headers.put("module_name", "模块名称");
-//            headers.put("operation_object", "操作对象");
-            headers.put("operation_action", "操作action");
-//            headers.put("original_state", "原始状态");
-//            headers.put("update_state", "更新状态");
+            headers.put("operation_action", "操作");
            headers.put("update_state", "操作内容");
-            headers.put("operation_user", "操作者");
+            headers.put("operation_user", "操作人员");
            headers.put("ip", "操作ip");
-            headers.put("comment", "内容");
-            headers.put("create_time", "创建时间");
+            headers.put("comment", "备注");
+            headers.put("create_time", "操作时间");
            List<OperationLogFileType> fileTypes = operationLogFileTypeService.selectFileTypesList();
 //            List<OperationLogFileType> operationLogFileTypes = operationLogFileTypeService.selectListForLog(operationLogFileType.getFileTypeIds());
            response.setContentType("multipart/form-data");

--- a/atms-api/src/main/java/pwc/taxtech/atms/controller/OperationLogTaxDocController.java
+++ b/atms-api/src/main/java/pwc/taxtech/atms/controller/OperationLogTaxDocController.java
@@ -74,13 +74,13 @@ public class OperationLogTaxDocController {
    public void exportExcelFile(HttpServletResponse response, @RequestBody OperationLogTaxDocument operationLogTaxDocument) {
        try {
            Map<String, String> headers = new LinkedHashMap<>();
-            headers.put("id", "id");
-            headers.put("operation_action", "操作action");
+            headers.put("id", "序号");
+            headers.put("operation_action", "操作");
            headers.put("update_state", "操作内容");
-            headers.put("operation_user", "操作者");
+            headers.put("operation_user", "操作人员");
            headers.put("ip", "操作ip");
-            headers.put("comment", "内容");
-            headers.put("create_time", "创建时间");
+            headers.put("comment", "备注");
+            headers.put("create_time", "操作时间");
            List<String> ids = operationLogTaxDocument.getIds() == null ? Lists.newArrayList() : operationLogTaxDocument.getIds();
            List<OperationLogTaxDocument> taxDocuments = operationLogTaxDocService.selectListForLog(ids);
            response.setContentType("multipart/form-data");

--- a/atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitReportServiceImpl.java
+++ b/atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitReportServiceImpl.java
@@ -1244,33 +1244,35 @@ public class CitReportServiceImpl extends BaseService {
                    cellData.setFormulaExp(data.getAmount().toString());
                }
                cellData.setData(sumValue);
-                periodCellDataMapper.updateByPrimaryKeySelective(cellData);
-
+                cellData.setUpdateTime(new Date());
+                int i = periodCellDataMapper.updateByPrimaryKeySelective(cellData);

                /*kevin insert  */ // TODO: 3/21/2019  需要验证
-//                PeriodCellTemplateConfigExample example = new PeriodCellTemplateConfigExample();
-//                PeriodCellTemplateConfigExample.Criteria criteria = example.createCriteria();
-//                criteria.andCellTemplateIdEqualTo(Long.parseLong(data.getCellTemplateId()));
-//                criteria.andProjectIdEqualTo(data.getProjectId());
-//                PeriodCellTemplateConfig periodCellTemplateConfig = new PeriodCellTemplateConfig();
-//                periodCellTemplateConfig.setParsedFormula(sumValue);
-//                periodCellTemplateConfigMapper.updateByExampleSelective(periodCellTemplateConfig, example);
-//                //更改选中行相关数据
-//                CitJournalEntryAdjust citJournalEntryAdjust = new CitJournalEntryAdjust();
-//                citJournalEntryAdjust.setIsSelect("1");
-//                CitJournalEntryAdjustExample example1 = new CitJournalEntryAdjustExample();
-//                CitJournalEntryAdjustExample.Criteria criteria1 = example1.createCriteria();
-//                criteria1.andProjectIdEqualTo(data.getProjectId());
-//                criteria1.andSubjectCodeEqualTo(data.getAccountCode());
-//                citJournalEntryAdjustMapper.updateByExample(citJournalEntryAdjust, example1);
-//
-//                JournalEntry journalEntry = new JournalEntry();
-//                journalEntry.setIsSelect("1");
-//                JournalEntryExample example2 = new JournalEntryExample();
-//                JournalEntryExample.Criteria criteria2 = example2.createCriteria();
-//                criteria2.andProjectIdEqualTo(data.getProjectId());
-//                criteria2.andSegment3EqualTo(data.getAccountCode());
-//                journalEntryMapper.updateByExample(journalEntry, example2);
+                if(sumValue !=null){
+                    PeriodCellTemplateConfigExample example = new PeriodCellTemplateConfigExample();
+                    PeriodCellTemplateConfigExample.Criteria criteria = example.createCriteria();
+                    criteria.andCellTemplateIdEqualTo(Long.parseLong(data.getCellTemplateId()));
+                    criteria.andProjectIdEqualTo(data.getProjectId());
+                    PeriodCellTemplateConfig periodCellTemplateConfig = new PeriodCellTemplateConfig();
+                    periodCellTemplateConfig.setParsedFormula(sumValue);
+                    periodCellTemplateConfigMapper.updateByExampleSelective(periodCellTemplateConfig, example);
+                    //更改选中行相关数据
+                    CitJournalEntryAdjust citJournalEntryAdjust = new CitJournalEntryAdjust();
+                    citJournalEntryAdjust.setIsSelect("1");
+                    CitJournalEntryAdjustExample example1 = new CitJournalEntryAdjustExample();
+                    CitJournalEntryAdjustExample.Criteria criteria1 = example1.createCriteria();
+                    criteria1.andProjectIdEqualTo(data.getProjectId());
+                    criteria1.andSubjectCodeEqualTo(data.getAccountCode());
+                    citJournalEntryAdjustMapper.updateByExampleSelective(citJournalEntryAdjust, example1);
+
+                    JournalEntry journalEntry = new JournalEntry();
+                    journalEntry.setIsSelect("1");
+                    JournalEntryExample example2 = new JournalEntryExample();
+                    JournalEntryExample.Criteria criteria2 = example2.createCriteria();
+                    criteria2.andProjectIdEqualTo(data.getProjectId());
+                    criteria2.andSegment3EqualTo(data.getAccountCode());
+                    journalEntryMapper.updateByExampleSelective(journalEntry, example2);
+                }
            }

            List<DataSourceExtendDto> dataSourceExtendDtos = periodDataSourceMapper.getManualDataSource(data.getCellId());

--- a/atms-api/src/main/java/pwc/taxtech/atms/service/impl/EquityServiceImpl.java
+++ b/atms-api/src/main/java/pwc/taxtech/atms/service/impl/EquityServiceImpl.java
@@ -24,7 +24,7 @@ import static pwc.taxtech.atms.common.CommonConstants.CommonFail;
 import static pwc.taxtech.atms.common.CommonConstants.SystemError;

 @Service
-public class EquityServiceImpl extends BaseService{
+public class EquityServiceImpl extends BaseService {

    @Autowired
    private OperationLogServiceImpl operationLogServiceImpl;
@@ -59,35 +59,35 @@ public class EquityServiceImpl extends BaseService{
    }

    public OperationResultDto<Object> insertAll(List<EquityInfoDto> equityInfoDtos) {
-        try{
+        try {
            // todo opt insertAll
-            if(equityInfoDtos.get(0).getId()==null){
+            if (equityInfoDtos.get(0).getId() == null) {
                equityInfoDtos.get(0).setId(idService.nextId());
                equityInfoDtos.get(0).seteNum(1);
            }
            for (EquityInfoDto equityInfoDto : equityInfoDtos) {
                EquityInformation equityInformation = new EquityInformation();
-                BeanUtils.copyProperties(equityInfoDto,equityInformation);
+                BeanUtils.copyProperties(equityInfoDto, equityInformation);
                equityInformationMapper.insert(equityInformation);
            }
-            AddOrgEquityLog(OperationAction.New.value(),LogMessage.AddOrganizationEquity,equityInfoDtos.get(0).getOrganizationId(),OperationModule.Equity.value());
+            AddOrgEquityLog(OperationAction.New.value(), LogMessage.AddOrganizationEquity, equityInfoDtos.get(0).getOrganizationId(), OperationModule.Equity.value());
            return new OperationResultDto(true);
-        }catch (Exception e){
+        } catch (Exception e) {
            logger.error(String.format("写入全部股东信息异常:%s", e.getMessage()));
            return new OperationResultDto(false, CommonFail + SystemError);
        }
    }

    public OperationResultDto<Object> update(EquityInfoDto equityInfoDto) {
-        try{
+        try {
            EquityInformation equityInformation = new EquityInformation();
-            BeanUtils.copyProperties(equityInfoDto,equityInformation);
+            BeanUtils.copyProperties(equityInfoDto, equityInformation);
            EquityInformationExample example = new EquityInformationExample();
            example.createCriteria().andIdEqualTo(equityInformation.getId()).andENumEqualTo(equityInformation.geteNum());
-            equityInformationMapper.updateByExampleSelective(equityInformation,example);
-            AddOrgEquityLog(OperationAction.Update.value(),LogMessage.UpdateOrganizationEquity,equityInfoDto.getOrganizationId(),OperationModule.Equity.value());
+            equityInformationMapper.updateByExampleSelective(equityInformation, example);
+            AddOrgEquityLog(OperationAction.Update.value(), LogMessage.UpdateOrganizationEquity, equityInfoDto.getOrganizationId(), OperationModule.Equity.value());
            return new OperationResultDto(true);
-        }catch (Exception e){
+        } catch (Exception e) {
            logger.error(String.format("更新股东信息异常:%s", e.getMessage()));
            return new OperationResultDto(false, CommonFail + SystemError);
        }
@@ -104,7 +104,7 @@ public class EquityServiceImpl extends BaseService{
            if (delRes > 0) {
                refreshEquityList(id);
            }
-            AddOrgEquityLog(OperationAction.Delete.value(),LogMessage.DeleteOrganizationEquity,String.valueOf(id),OperationModule.Equity.value());
+            AddOrgEquityLog(OperationAction.Delete.value(), LogMessage.DeleteOrganizationEquity, String.valueOf(id), OperationModule.Equity.value());
            return new OperationResultDto(true);
        } catch (Exception e) {
            logger.error(String.format("删除股东信息异常:%s", e.getMessage()));
@@ -116,8 +116,9 @@ public class EquityServiceImpl extends BaseService{
     * 17/01/2019 15:51
     * 变更当前股权信息时，刷新股权信息的序号
     * [id]
-     * @author Gary J Li
+     *
     * @return
+     * @author Gary J Li
     */
    private void refreshEquityList(Long id) {
        EquityInformationExample exampleForENumUp = new EquityInformationExample();
@@ -128,9 +129,9 @@ public class EquityServiceImpl extends BaseService{
            return;
        }
        List<EquityInformation> resList = new ArrayList<>();
-        int i =1;
+        int i = 1;
        for (EquityInformation record : equityInformations) {
-            if(record.geteNum()!=i){
+            if (record.geteNum() != i) {
                record.seteNum(i);
            }
            resList.add(record);
@@ -154,13 +155,14 @@ public class EquityServiceImpl extends BaseService{
     * 3、equityInfoDtos 生成新id、createTime、updateTime 插入equity_infomation
     * 4、根据id（原始）删除旧数据 equity_infomation
     * 5、记录日志  id（原始）
-     *
+     * <p>
     * remark:
     * 1、无股权记录时，为初始变更只进行3、5
     * 2、// todo 事务过长并发时，可能出现问题
     * [equityInfoDtos]
-     * @author Gary J Li
+     *
     * @return OperationResultDto<Object>
+     * @author Gary J Li
     */
    public OperationResultDto<Object> change(String orgName, String comment, List<EquityInfoDto> equityInfoDtos) {

@@ -195,8 +197,8 @@ public class EquityServiceImpl extends BaseService{
            newData.setId(newId);
            newData.seteNum(i);
            float investRadio = 0L;
-            if(CommonUtil.hasDigit(org.getRegistrationCapital())&&null!=newData.getInvestmentAmount()){
-                investRadio = (float)newData.getInvestmentAmount()/(float)CommonUtil.getNum(org.getRegistrationCapital());
+            if (CommonUtil.hasDigit(org.getRegistrationCapital()) && null != newData.getInvestmentAmount()) {
+                investRadio = (float) newData.getInvestmentAmount() / (float) CommonUtil.getNum(org.getRegistrationCapital());
            }
            newData.setInvestmentRadio(investRadio);
            newData.setOrganizationId(orgId);
@@ -237,7 +239,7 @@ public class EquityServiceImpl extends BaseService{
        opLog.setLogType(OperateLogType.OperationLogEquity.value());
        opLog.setEquityLog(true);
        operationLogService.addOperationLog(opLog);
-        AddOrgEquityLog(OperationAction.Update.value(),LogMessage.ChangeOrganizationEquity,orgName,OperationModule.Equity.value());
+        AddOrgEquityLog(OperationAction.Update.value(), LogMessage.ChangeOrganizationEquity, orgName, OperationModule.Equity.value());
        return new OperationResultDto(true, "变更成功!", oldId);
    }

@@ -245,8 +247,9 @@ public class EquityServiceImpl extends BaseService{
     * 18/01/2019 14:03
     * 根据id查询出所有日志，时间排序
     * [ids]
-     * @author Gary J Li
+     *
     * @return List<OperationLogBasicData>
+     * @author Gary J Li
     */
    public List<OperationLogBasicData> getChangeLogByOrgName(String orgName) {
        List<OperationLogBasicData> logListByIds = null;
@@ -268,8 +271,9 @@ public class EquityServiceImpl extends BaseService{
     * 5、根据oldId删除操作日志   operation_log_equity
     * remark : 最初的记录撤销变更仅做3、5
     * [id]
-     * @author Gary J Li
+     *
     * @return OperationResultDto<Object>
+     * @author Gary J Li
     */
    public OperationResultDto<Object> cancelChange(Long oldId, Long newId) {
        if (null != oldId) {
@@ -308,7 +312,7 @@ public class EquityServiceImpl extends BaseService{
            logger.warn(String.format("撤销变更-3 表operation_log_equity 删除操作日志异常.id: [ %s ]", oldId));
            throw new ApplicationException("撤销变更-5 删除操作日志异常");
        }
-        AddOrgEquityLog(OperationAction.Update.value(),LogMessage.CancelChangeUpdateOrganizationEquity,String.valueOf(newId),OperationModule.Equity.value());
+        AddOrgEquityLog(OperationAction.Update.value(), LogMessage.CancelChangeUpdateOrganizationEquity, String.valueOf(newId), OperationModule.Equity.value());
        return new OperationResultDto(true);
    }

@@ -356,10 +360,11 @@ public class EquityServiceImpl extends BaseService{
     * 25/01/2019 14:39
     * [增删改查，操作描述，操作对象，操作模块] 更新、删除需补充oldData、newData
     * [actionValue, content, object, module]
-     * @author Gary J Li
+     *
     * @return
+     * @author Gary J Li
     */
-    private void AddOrgEquityLog(int actionValue,String content,String object,Integer module) {
+    private void AddOrgEquityLog(int actionValue, String content, String object, Integer module) {
        OperationLogDto opLog = new OperationLogDto();
        opLog.setAction(actionValue);
        opLog.setOperationContent(content);

--- a/atms-dao/src/main/java/pwc/taxtech/atms/entity/OperationLogFileType.java
+++ b/atms-dao/src/main/java/pwc/taxtech/atms/entity/OperationLogFileType.java
@@ -58,7 +58,7 @@ public class OperationLogFileType implements Serializable {
     *
     * @mbg.generated
     */
-    @ExcelCell(index=2)
+    @ExcelCell(index=3)
    private String operationAction;

    /**
@@ -77,7 +77,7 @@ public class OperationLogFileType implements Serializable {
     *
     * @mbg.generated
     */
-    @ExcelCell(index=3)
+    @ExcelCell(index=4)
    private String updateState;

    /**
@@ -87,7 +87,7 @@ public class OperationLogFileType implements Serializable {
     *
     * @mbg.generated
     */
-    @ExcelCell(index=4)
+    @ExcelCell(index=5)
    private String operationUser;

    /**
@@ -97,7 +97,7 @@ public class OperationLogFileType implements Serializable {
     *
     * @mbg.generated
     */
-    @ExcelCell(index=5)
+    @ExcelCell(index=6)
    private String ip;

    /**
@@ -107,7 +107,7 @@ public class OperationLogFileType implements Serializable {
     *
     * @mbg.generated
     */
-    @ExcelCell(index=5)
+    @ExcelCell(index=7)
    private String comment;

    /**
@@ -117,7 +117,7 @@ public class OperationLogFileType implements Serializable {
     *
     * @mbg.generated
     */
-    @ExcelCell(index=6)
+    @ExcelCell(index=2)
    private Date createTime;

    private List<String> fileTypeIds;

--- a/atms-dao/src/main/java/pwc/taxtech/atms/entity/OperationLogTaxDocument.java
+++ b/atms-dao/src/main/java/pwc/taxtech/atms/entity/OperationLogTaxDocument.java
@@ -58,7 +58,7 @@ public class OperationLogTaxDocument implements Serializable {
     *
     * @mbg.generated
     */
-    @ExcelCell(index=2)
+    @ExcelCell(index=3)
    private String operationAction;

    /**
@@ -77,7 +77,7 @@ public class OperationLogTaxDocument implements Serializable {
     *
     * @mbg.generated
     */
-    @ExcelCell(index=3)
+    @ExcelCell(index=4)
    private String updateState;

    /**
@@ -87,7 +87,7 @@ public class OperationLogTaxDocument implements Serializable {
     *
     * @mbg.generated
     */
-    @ExcelCell(index=4)
+    @ExcelCell(index=5)
    private String operationUser;

    /**
@@ -97,7 +97,7 @@ public class OperationLogTaxDocument implements Serializable {
     *
     * @mbg.generated
     */
-    @ExcelCell(index=5)
+    @ExcelCell(index=6)
    private String ip;

    /**
@@ -107,7 +107,7 @@ public class OperationLogTaxDocument implements Serializable {
     *
     * @mbg.generated
     */
-    @ExcelCell(index=6)
+    @ExcelCell(index=7)
    private String comment;

    /**
@@ -117,7 +117,7 @@ public class OperationLogTaxDocument implements Serializable {
     *
     * @mbg.generated
     */
-    @ExcelCell(index=7)
+    @ExcelCell(index=2)
    private Date createTime;

    List<String> ids;

--- a/atms-dao/src/main/resources/pwc/taxtech/atms/dao/CitJournalEntryAdjustMapper.xml
+++ b/atms-dao/src/main/resources/pwc/taxtech/atms/dao/CitJournalEntryAdjustMapper.xml
@@ -923,6 +923,9 @@
      <if test="record.updateTime != null">
        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
      </if>
+      <if test="record.isSelect != null">
+        is_select = #{record.isSelect,jdbcType=VARCHAR},
+      </if>
    </set>
    <if test="_parameter != null">
      <include refid="Update_By_Example_Where_Clause" />

--- a/atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/JournalEntryMapper.xml
+++ b/atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/JournalEntryMapper.xml
@@ -929,6 +929,9 @@
      <if test="record.taskId != null">
        task_id = #{record.taskId,jdbcType=VARCHAR},
      </if>
+      <if test="record.isSelect != null">
+        is_select = #{record.isSelect,jdbcType=VARCHAR},
+      </if>
    </set>
    <if test="_parameter != null">
      <include refid="Update_By_Example_Where_Clause" />

--- a/atms-orangeheap/.env.development
+++ b/atms-orangeheap/.env.development
-VUE_APP_TABLEAU_API=http://dts.erp.didichuxing.com/OrangeHeap/
\ No newline at end of file
+VUE_APP_TABLEAU_API=/OrangeHeap/
\ No newline at end of file
--- a/atms-orangeheap/.env.production
+++ b/atms-orangeheap/.env.production
-VUE_APP_TABLEAU_API=http://dts.erp.didichuxing.com/OrangeHeap/
\ No newline at end of file
+VUE_APP_TABLEAU_API=/OrangeHeap/
\ No newline at end of file
--- a/atms-web/src/main/webapp/app-resources/i18n/en-us/app.json
+++ b/atms-web/src/main/webapp/app-resources/i18n/en-us/app.json
@@ -864,7 +864,7 @@
    "ApproveEndTime":"Approved Time",
    "ApproveTaskList":"Approve Task List",
    "ApproveRole":"Approve Role",
-
+    "NumOfBranches":"分公司数量",
    "ConditionColumnNum": "Search Condition Column Num",
    "Condition": "Search Condition",
    "RevenueTypeConfiguration":"Revenue Type Config"

--- a/atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json
+++ b/atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json
@@ -89,7 +89,7 @@
    "BusinessAllottedTimeTo": "营业期限截止",
    "BusinessPromition": "业务宣传费",
    "BusinessScope": "经营范围",
-    "RegStatus": "登记状态",
+    "RegStatus": "工商登记状态",
    "BusinessUnit": "所属业务线",
    "BusinessUnitDesc": "业务线",
    "BusinessUnitID": "业务线",
@@ -371,6 +371,7 @@
    "RegFinancialOfficerEmailAddress": "注册登记财务负责人邮箱",
    "SecondaryApprovalAmount": "二级审批金额",
    "BusinessRegistrationNumber": "Business registration number",
+    "NumOfBranches":"分公司数量",
    "ParValue": "Par Value",
    "IssuedShares": "Issued shares",
    "Directors": "Directors",
@@ -595,7 +596,7 @@
    "UpdateType": "更新方式",
    "RegistrationDate": "注册日期",
    "RegistrationLocation": "注册地址(住所)",
-    "RegistrationLocationEn": "注册地地址(住所)-英文",
+    "RegistrationLocationEn": "注册地址(住所)-英文",
    "RegistrationType": "注册类型",
    "ArchitectureType": "架构类型",
    "RemarkColon": "备注：",

--- a/atms-web/src/main/webapp/app-resources/i18n/zh-CN/infrastructure.json
+++ b/atms-web/src/main/webapp/app-resources/i18n/zh-CN/infrastructure.json
@@ -257,7 +257,7 @@
    "OrganizationMsgClientCodeRequired": "请输入客户代码",
    "OrganizationCode": "公司代码",
    "UnifiedSocialCreditCode": "统一社会信用代码",
-    "RegistrationStatus": "登记状态",
+    "RegistrationStatus": "工商登记状态",
    "LogoutTime": "注销时间",
    "RegistrationAuthority": "登记机关",
    "ChangeType": "变更类型",
@@ -374,7 +374,7 @@
    "CertificateType": "证件类型",
    "IdNum": "证件号码",
    "InvestmentAmount": "投资金额",
-    "InvestmentCurrency": "投资金额币种",
+    "InvestmentCurrency": "投资币种",
    "InvestmentRadio": "投资比例",
    "PayableShareholderName": "实缴投资方信息",
    "PayableShareholderIdNum": "证件编号",

--- a/atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
+++ b/atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
@@ -296,13 +296,13 @@
                            allowHeaderFiltering: false
                        },
                        {
-                            dataField: "investmentAmount",
-                            caption: $translate.instant('InvestmentAmount'),
+                            dataField: "investmentCurrency",
+                            caption: $translate.instant('InvestmentCurrency'),
                            allowHeaderFiltering: false
                        },
                        {
-                            dataField: "investmentCurrency",
-                            caption: $translate.instant('InvestmentCurrency'),
+                            dataField: "investmentAmount",
+                            caption: $translate.instant('InvestmentAmount'),
                            allowHeaderFiltering: false
                        },
                        {
@@ -317,17 +317,18 @@
                        },
                        {
                            dataField: "payableShareholderIdNum",
+                            visible : false,
                            caption: $translate.instant('PayableShareholderIdNum'),
                            allowHeaderFiltering: false
                        },
                        {
-                            dataField: "payableCapitalContributionAmount",
-                            caption: $translate.instant('PayableCapitalContributionAmount'),
+                            dataField: "payableCapitalContributionCurrency",
+                            caption: $translate.instant('PayableCapitalContributionCurrency'),
                            allowHeaderFiltering: false
                        },
                        {
-                            dataField: "payableCapitalContributionCurrency",
-                            caption: $translate.instant('PayableCapitalContributionCurrency'),
+                            dataField: "payableCapitalContributionAmount",
+                            caption: $translate.instant('PayableCapitalContributionAmount'),
                            allowHeaderFiltering: false
                        },
                        {
@@ -598,6 +599,7 @@
                        },
                        {
                            dataField: "payableShareholderIdNum",
+                            visible : false,
                            caption: $translate.instant('PayableShareholderIdNum'),
                            allowHeaderFiltering: false
                        },

--- a/atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html
+++ b/atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html
--- a/atms-web/src/main/webapp/app/cit/reduction/cit-calculate-data/cit-calculate-data.ctrl.js
+++ b/atms-web/src/main/webapp/app/cit/reduction/cit-calculate-data/cit-calculate-data.ctrl.js
-vatModule.controller('citCalculateDataController', ['$scope', '$log', '$timeout','$interval', '$q', '$translate', 'loginContext',
+vatModule.controller('citCalculateDataController', ['$scope', '$log', '$timeout', '$interval', '$q', '$translate', 'loginContext',
    'apiInterceptor', 'Upload', 'dataImportService', 'SweetAlert', 'vatReductionService', 'vatSessionService', 'uiGridConstants',
    'enums', 'modelConfigurationService', 'citReportService', 'vatCommonService', 'BSPLService', 'vatOperationLogService',
    'vatWorkflowService',
@@ -15,7 +15,7 @@

        var initTasks = function () {

-            var task = function (id, status, name,code) {
+            var task = function (id, status, name, code) {
                this.id = id;
                this.name = _.isEmpty(name) ? $translate.instant(id) : name;
                this.status = status;
@@ -181,8 +181,7 @@
                                    updateProgress(data, _this, false);
                                }, 2000);
                            });
-                        }
-                        else {
+                        } else {
                            citReportService.generateAllCitReport(vatSessionService.project.id, true, vatSessionService.logUser.id ? vatSessionService.logUser.id : "").success(function (data) {
                                updateProgress(data, _this);
                            }).error(function () {
@@ -196,7 +195,7 @@
            task.prototype.id = null;
            task.prototype.status = null;
            task.prototype.text = null;
-            task.prototype.code =null;
+            task.prototype.code = null;

            citReportService.getCitTemplate(vatSessionService.project.id, constant.serviceType.CIT).then(function (report) {

@@ -208,8 +207,13 @@
                  var dataValidateCode = [/!*'DA001', 'DA002', 'DA003',*!/ ''];*/

                //数据配置
-                result.push({ name: $translate.instant('ProcessData'), items: [new task('UpdateReportConfig', 'unstarted',"","UpdateConfig")] });
-                result[result.length - 1].items.forEach(function (t) { t.seqNo = result.length - 1 });
+                result.push({
+                    name: $translate.instant('ProcessData'),
+                    items: [new task('UpdateReportConfig', 'unstarted', "", "UpdateConfig")]
+                });
+                result[result.length - 1].items.forEach(function (t) {
+                    t.seqNo = result.length - 1
+                });

                //数据校验
                // var reItem  = [];
@@ -291,48 +295,48 @@
            citReportService.generateAllCitReport(vatSessionService.project.id, isMergeManualDataSource, vatSessionService.logUser.id ? vatSessionService.logUser.id : "").success(function (data) {

                $scope.readonly = true;
-                 if(data && data.result)
+                if (data && data.result)
                    updateTasksStatus(data.data);
-                   if(data.data.jobStatus=='Begin'||data.data.jobStatus=='Running'){
-                     if(!$scope.timer)
-                     $scope.timer= $interval(function(){
+                if (data.data.jobStatus == 'Begin' || data.data.jobStatus == 'Running') {
+                    if (!$scope.timer)
+                        $scope.timer = $interval(function () {

-                       citReportService.getJobStatus(vatSessionService.project.id,0,data.data.id).then(function(result){
+                            citReportService.getJobStatus(vatSessionService.project.id, 0, data.data.id).then(function (result) {

-                           if(result.data && result.status == 200){
+                                if (result.data && result.status == 200) {
                                    updateTasksStatus(result.data);
-                            }else{
-                             if($scope.timer)
+                                } else {
+                                    if ($scope.timer)
                                        $interval.cancel($scope.timer);
                                }
                            });

-                   },1000);
+                        }, 1000);
                }
-               }).error(function (data,status,config,statusText) {
-                  if(status==412){
+            }).error(function (data, status, config, statusText) {
+                if (status == 412) {
                    SweetAlert.error('报表提审中！');
-                  }else if(status == 409){
+                } else if (status == 409) {
                    SweetAlert.error('报表已在处理中！');
                }
            });

        }

-       function isAllEnd(stepCode,status){
+        function isAllEnd(stepCode, status) {
            var statusList = JSON.parse(status);
            var stepCodes = stepCode.split(",");

        }

        var startCaculate = function () {
-            
+debugger;
            var a = vatSessionService.project.projectStatusList;

-            if (vatSessionService.project.projectStatusList[0] >= constant.ProjectStatusEnum.Generated) {
+            if (vatSessionService.project.projectStatusList[-1] >= constant.ProjectStatusEnum.Generated) {
                swal({
                        title: "warning!",
-                        text: $translate.instant('IsConfirmReCalcuate').formatObj({status: vatCommonService.getProjectStautsEnumDesc(vatSessionService.project.projectStatusList[vatSessionService.month])}),
+                        text: $translate.instant('IsConfirmReCalcuate').formatObj({status: vatCommonService.getProjectStautsEnumDesc(vatSessionService.project.projectStatusList[-1])}),
                        type: "warning",
                        showCancelButton: true,
                        confirmButtonColor: "#DD6B55",
@@ -379,13 +383,13 @@
        };

        var startCaculate2 = function () {
-             
+debugger;
            var a = vatSessionService.project.projectStatusList;

-                    if (vatSessionService.project.projectStatusList[vatSessionService.month] >= constant.ProjectStatusEnum.Generated) {
+            if (vatSessionService.project.projectStatusList[-1] >= constant.ProjectStatusEnum.Generated) {
                swal({
                        title: "warning!",
-                                text: $translate.instant('IsConfirmReCalcuate').formatObj({status: vatCommonService.getProjectStautsEnumDesc(vatSessionService.project.projectStatusList[vatSessionService.month])}),
+                        text: $translate.instant('IsConfirmReCalcuate').formatObj({status: vatCommonService.getProjectStautsEnumDesc(vatSessionService.project.projectStatusList[-1])}),
                        type: "warning",
                        showCancelButton: true,
                        confirmButtonColor: "#dd6b55",
@@ -396,7 +400,7 @@
                    },
                    function (isConfirm) {
                        if (isConfirm) {
-                                    citReportService.hasManualDataSource(vatSessionService.project.id, vatSessionService.month).then(function (hasManual) {
+                            citReportService.hasManualDataSource(vatSessionService.project.id, 0).then(function (hasManual) {
                                if (hasManual) {
                                    setTimeout(function () {
                                        swal({
@@ -422,13 +426,11 @@
                                    doStartCaculate2(false);
                                }
                            });
-                                }
-                                else {
+                        } else {
                            swal.close();
                        }
                    });
-                    }
-                    else {
+            } else {
                doStartCaculate2(false);
            }
        };
@@ -462,20 +464,19 @@
                    if (!_.isEmpty($scope.resolveRef)) {
                        readyTasks = _.reject($scope.tasks[task.seqNo + 1].items, function (t) {
                            return _.some($scope.resolveRef, function (x) {
-                                if($scope.tasks[task.seqNo + 1].isReportTask)isReport=true;
+                                if ($scope.tasks[task.seqNo + 1].isReportTask) isReport = true;
                                return !x.resolved && x.referTo === t.id;
                            });
                        });
-                    }
-                    else {
+                    } else {
                        readyTasks = $scope.tasks[task.seqNo + 1].items;
-                        if($scope.tasks[task.seqNo + 1].isReportTask)isReport=true;
+                        if ($scope.tasks[task.seqNo + 1].isReportTask) isReport = true;
                    }

                    readyTasks.forEach(function (t) {
-                        if(isReport&&!isGenedAll){
+                        if (isReport && !isGenedAll) {
                            t.doTask();
-                           isGenedAll=true;
+                            isGenedAll = true;
                        }

                        t.status = 'processing';
@@ -512,25 +513,24 @@
            });

            if (!$scope.readonly) {
-                vatCommonService.setProjectStatus(vatSessionService.project.id, vatSessionService.month, constant.ProjectStatusEnum.Generated
+                vatCommonService.setProjectStatus(vatSessionService.project.id, 0, constant.ProjectStatusEnum.Generated
                    , constant.DictionaryDictKey.WFDataProcess, enums.FinishStatusEnum.Finished);
            }
        };

        var updateProgress = function (data, task, ifWriteLog) {
            if (data && data.result) {
-                if( $scope.tasks[task.seqNo].isReportTask){
+                if ($scope.tasks[task.seqNo].isReportTask) {
                    $scope.tasks[task.seqNo].items.forEach(function (t) {
                        t.status = 'completed';
                        t.text = $translate.instant(t.status);
                    });
-                }else{
+                } else {
                    task.status = 'completed';
                    task.text = $translate.instant(task.status);
                }

-            }
-            else {
+            } else {
                task.status = 'error';
                task.text = $translate.instant(task.status);
                //SweetAlert.error($translate.instant('PleaseContactAdministrator'));
@@ -560,8 +560,8 @@
            logDto.ModuleID = $scope.moduleid;
            logDto.CreatorID = vatSessionService.logUser.ID;
            logDto.OperationObject = $translate.instant('vatCaculateDataDesc');
-            logDto.Comment = vatSessionService.project.name + " " + vatSessionService.project.year + "年" + vatSessionService.month + "月";
-            logDto.Period = vatSessionService.month;
+            logDto.Comment = vatSessionService.project.name + " " + vatSessionService.project.year + "年" + 0 + "月";
+            logDto.Period = 0;

            logDto.ID = PWC.newGuid();
            logDto.CreateTime = new Date();
@@ -573,21 +573,21 @@
            vatOperationLogService.addOperationLog(logDto);
        };

-        var updateTasksStatus = function(job){
+        var updateTasksStatus = function (job) {
            var items = $scope.tasks;
            var tasks = JSON.parse(job.status);

-            if(job.jobStatus == 'End'){
+            if (job.jobStatus == 'End') {

-              items.forEach(function(item,index){
+                items.forEach(function (item, index) {

                    item.status = 'completed';
                    item.text = $translate.instant('completed');
                    item.items.forEach(function (_task, index) {

-                      tasks.forEach(function(task){
+                        tasks.forEach(function (task) {

-                          if(task.code==_task.code){
+                            if (task.code == _task.code) {
                                _task.status = 'completed';
                                _task.text = $translate.instant(_task.status);
                            }
@@ -595,21 +595,21 @@
                    })
                });

-              if($scope.timer){
+                if ($scope.timer) {
                    $interval.cancel($scope.timer);
                    vatCommonService.setProjectStatus(vatSessionService.project.id, -1, constant.ProjectStatusEnum.Generated
                        , constant.DictionaryDictKey.WFDataProcess, enums.FinishStatusEnum.Finished);
                }
-            }else if(job.jobStatus=='Running'|| job.jobStatus=='Error'){
+            } else if (job.jobStatus == 'Running' || job.jobStatus == 'Error') {
                var updateConfig = tasks[0];
-              if(updateConfig.status == 'Error'){
+                if (updateConfig.status == 'Error') {
                    $scope.tasks[0].items[0].status = 'error';
-             }else if(updateConfig.status == 'End'){
+                } else if (updateConfig.status == 'End') {
                    $scope.tasks[0].items[0].status = 'completed';
-             }else if(updateConfig.status == 'Begin'){
+                } else if (updateConfig.status == 'Begin') {
                    $scope.tasks[0].items[0].status = 'processing';
                }
-             $scope.tasks[0].items[0].text= $translate.instant($scope.tasks[0].items[0].status);
+                $scope.tasks[0].items[0].text = $translate.instant($scope.tasks[0].items[0].status);
                /* items.forEach(function(item,index){
                    tasks.forEach(function(task){
                       if(task.code==item.code){
@@ -624,23 +624,23 @@
                       }
                    })
                  });*/
-                if(job.jobStatus == 'Error'){
-                   if($scope.timer)$interval.cancel($scope.timer);
+                if (job.jobStatus == 'Error') {
+                    if ($scope.timer) $interval.cancel($scope.timer);
                }
            }

-            items.forEach(function(item,index){
+            items.forEach(function (item, index) {

                item.items.forEach(function (_task, index) {

-                    tasks.forEach(function(task){
+                    tasks.forEach(function (task) {

-                        if(task.code==_task.code){
-                            if(task.status == 'Error'){
+                        if (task.code == _task.code) {
+                            if (task.status == 'Error') {
                                _task.status = 'error';
-                            }else if(task.status == 'End'){
+                            } else if (task.status == 'End') {
                                _task.status = 'completed';
-                            }else if(task.status == 'Begin'){
+                            } else if (task.status == 'Begin') {
                                _task.status = 'processing';
                            }
                            _task.text = $translate.instant(_task.status);
@@ -650,30 +650,30 @@
            });
        }

-        var getInitTaskStatus = function(){
+        var getInitTaskStatus = function () {

-            citReportService.getRunningJob(vatSessionService.project.id,0).then(function (result) {
+            citReportService.getRunningJob(vatSessionService.project.id, 0).then(function (result) {

-               if(result.data && result.status == 200){
+                if (result.data && result.status == 200) {
                    updateTasksStatus(result.data);
-                   if(result.data.jobStatus=='Begin'||result.data.jobStatus=='Running'){
-                      if(!$scope.timer)
+                    if (result.data.jobStatus == 'Begin' || result.data.jobStatus == 'Running') {
+                        if (!$scope.timer)

-                      $scope.timer= $interval(function(){
+                            $scope.timer = $interval(function () {

-                        citReportService.getJobStatus(vatSessionService.project.id,0,result.data.id)
-                        .then(function(result){
+                                citReportService.getJobStatus(vatSessionService.project.id, 0, result.data.id)
+                                    .then(function (result) {

-                           if(result.data && result.status == 200){
+                                        if (result.data && result.status == 200) {
                                            updateTasksStatus(result.data);
-                             }else{
-                                 if($scope.timer)
+                                        } else {
+                                            if ($scope.timer)
                                                $interval.cancel($scope.timer);
                                        }
                                    });
-                    },1000);
+                            }, 1000);
                    }
-               }else{
+                } else {
                    $log.debug("not running job");
                }
            });
@@ -708,8 +708,8 @@
            initTasks();
            $scope.startCaculate = startCaculate;
            $scope.startCaculate2 = startCaculate2;
-            $scope.$on('$destroy',function(){
-                if($scope.timer)$interval.cancel($scope.timer);
+            $scope.$on('$destroy', function () {
+                if ($scope.timer) $interval.cancel($scope.timer);
            });

        })();

--- a/atms-web/src/main/webapp/app/cit/report/cit-report-view/cit-report-view.ctrl.js
+++ b/atms-web/src/main/webapp/app/cit/report/cit-report-view/cit-report-view.ctrl.js
@@ -897,7 +897,8 @@
        };

        $scope.exportReportTreeOptions = {
-            dataSource: [{id: '0', templateId: '0', name: '纳税申报表', items: [], expanded: true}],
+            dataSource: [{id: '0', templateId: '0', name: '纳税申报表', items: [], expanded: true},
+                {id: '1', templateId: '1', name: '工作底稿', items: [], expanded: true}],
            displayExpr: 'name',
            keyExpr: 'id',
            selectionMode: 'Multiple',
@@ -916,7 +917,7 @@
        $scope.openExportPop = function (evenType) {
            $scope.evenType = evenType;
            var grp = _.find($scope.$parent.$parent.groups, function (g) {
-                return g.name == 'TaxReturnType' || g.name == 'WorkingPaperType';
+                return g.name == 'TaxReturnType';
            });

            if (!grp || !grp.children) {
@@ -928,6 +929,19 @@
                return {id: item.reportId, templateId: item.id, name: item.name, parentId: '0'};
            });

+            var grp2 = _.find($scope.$parent.$parent.groups, function (g) {
+                return  g.name == 'WorkingPaperType'
+            });
+
+            if (!grp2 || !grp2.children) {
+                return;
+            }
+
+            $scope.exportReportTreeOptions.dataSource[1].items = [];
+            $scope.exportReportTreeOptions.dataSource[1].items = _.map(grp2.children, function (item) {
+                return {id: item.reportId, templateId: item.id, name: item.name, parentId: '0'};
+            });
+
            var parentElem = angular.element($('#exportReportFilesContainer'));
            $scope.exportReportInstance = $uibModal.open({
                ariaLabelledBy: 'modal-title',
@@ -958,7 +972,7 @@

        //批量导出EXCEL
        $scope.export = function () {
-
+debugger;
            var grp = _.find($scope.$parent.$parent.groups, function (g) {
                return g.name == 'TaxReturnType';
            });
@@ -967,6 +981,14 @@
                return;
            }

+            var grp2 = _.find($scope.$parent.$parent.groups, function (g) {
+                return  g.name == 'WorkingPaperType'
+            });
+
+            if (!grp2 || !grp2.children) {
+                return;
+            }
+
            if (!$scope.selectedReportIds || $scope.selectedReportIds.length == 0) {
                SweetAlert.warning($translate.instant('ExportReportRequiredCheck'));
                return;
@@ -978,6 +1000,10 @@
                item.orderIndex = orderIndex;
                orderIndex++;
            });
+            _.each(grp2.children, function (item) {
+                item.orderIndex = orderIndex;
+                orderIndex++;
+            });

            var reportArray = $scope.selectedReportIds;

@@ -995,9 +1021,12 @@
            angular.forEach(reportArray, function (currentVal) {

                var node = _.first(_.where(grp.children, {reportId: currentVal}));
+                if (!node) {
+                    node = _.first(_.where(grp2.children, {reportId: currentVal}));
                    if (!node) {
                        return;
                    }
+                }
                var reportPromiss = citReportService.getReportData(node.reportId).success(function (reportData) {

                    if (reportData && reportData.data && reportData.data.cellData) {

--- a/atms-web/src/main/webapp/app/common/controls/add-exist-organization-modal/add-exist-organization-modal.ctrl.js
+++ b/atms-web/src/main/webapp/app/common/controls/add-exist-organization-modal/add-exist-organization-modal.ctrl.js
@@ -68,8 +68,9 @@ controller('addExistOrganizationModalController', ['$scope', '$log', '$translate
        var getOrgList = function () {
            orgService.getOrgListLevel().success(function (data) {
                if (data) {
-                    $scope.DataGridSource = data;
-
+                    $scope.DataGridSource = _.filter(data, function (row) {
+                        return row.isActive == true;
+                    });
                    setSelectItems($scope.selectedKeyItems);
                }
            });

--- a/atms-web/src/main/webapp/app/common/controls/edit-equity-change-modal/edit-equity-change-modal.ctrl.js
+++ b/atms-web/src/main/webapp/app/common/controls/edit-equity-change-modal/edit-equity-change-modal.ctrl.js
-commonModule.
-controller('editEquityChangeModalController', ['$scope', '$log', '$translate', 'uiGridConstants', '$location', '$timeout', '$interval', 'areaRegionService', '$filter', 'SweetAlert', 'regionService', 'orgService', 'enterpriseAccountService', 'organizationStructureService', 'businessUnitService', 'projectService', 'dimensionService','equityService',
-    function ($scope, $log, $translate, uiGridConstants, $location, $timeout, $interval, areaRegionService, $filter, SweetAlert, regionService, orgService, enterpriseAccountService, organizationStructureService, businessUnitService, projectService, dimensionService,equityService) {
+commonModule.controller('editEquityChangeModalController', ['$scope', '$log', '$translate', 'uiGridConstants', '$location', '$timeout', '$interval', 'areaRegionService', '$filter', 'SweetAlert', 'regionService', 'orgService', 'enterpriseAccountService', 'organizationStructureService', 'businessUnitService', 'projectService', 'dimensionService', 'equityService',
+    function ($scope, $log, $translate, uiGridConstants, $location, $timeout, $interval, areaRegionService, $filter, SweetAlert, regionService, orgService, enterpriseAccountService, organizationStructureService, businessUnitService, projectService, dimensionService, equityService) {

        var selectedModel = '.editEquityChangeControlPop'; //'#addOrgControlPop' + $scope.dimensionId;

@@ -21,12 +20,12 @@ controller('editEquityChangeModalController', ['$scope', '$log', '$translate', '

        };

-        $scope.nameKeyUp = function(){
+        $scope.nameKeyUp = function () {
            var hasSpecialChar = window.PWC.hasSpecialChar($scope.editEquityModel.name);

-            if (hasSpecialChar){
+            if (hasSpecialChar) {
                $scope.editEquityModel.nameError = $translate.instant('SpecialChar');
-            } else{
+            } else {
                $scope.editEquityModel.nameError = null;
            }
        };
@@ -41,8 +40,8 @@ controller('editEquityChangeModalController', ['$scope', '$log', '$translate', '
                rows[i].data.organizationId = $scope.editOrgModel.id;
                updateEquity.push(rows[i].data);
            }
-            var comment = $scope.editOrgModel.comment?$scope.editOrgModel.comment:'';
-            equityService.change($scope.editOrgModel.name,comment,updateEquity).success(function (data) {
+            var comment = $scope.editOrgModel.comment ? $scope.editOrgModel.comment : '';
+            equityService.change($scope.editOrgModel.name, comment, updateEquity).success(function (data) {
                if (data && !data.result) {
                    //SweetAlert.info("Disable", orgId);
                    SweetAlert.warning($translate.instant(data.resultMsg));
@@ -70,25 +69,25 @@ controller('editEquityChangeModalController', ['$scope', '$log', '$translate', '
                },
                columns: [
                    {
-                        dataField : "id",
-                        visible : false,
-                        allowHeaderFiltering:false
+                        dataField: "id",
+                        visible: false,
+                        allowHeaderFiltering: false
                    },
                    {
                        dataField: "eNum",
-                        visible : false,
+                        visible: false,
                        sortOrder: "asc",
-                        allowHeaderFiltering:false
+                        allowHeaderFiltering: false
                    },
                    {
                        dataField: "organizationId",
-                        visible : false,
-                        allowHeaderFiltering:false
+                        visible: false,
+                        allowHeaderFiltering: false
                    },
                    {
                        dataField: "investorName",
                        caption: $translate.instant('InvestorName'),
-                        allowHeaderFiltering:false
+                        allowHeaderFiltering: false
                    },
                    {
                        dataField: "investorEconomicNature",
@@ -163,30 +162,29 @@ controller('editEquityChangeModalController', ['$scope', '$log', '$translate', '
                ],
                onContentReady: function (e) {
                    $scope.equityListInstance = e.component;
-                    var totalCount =e.component.totalCount();
-                    if(totalCount>0)
-                    {
-                        $scope.totalCount=totalCount;
+                    var totalCount = e.component.totalCount();
+                    if (totalCount > 0) {
+                        $scope.totalCount = totalCount;
                    }
                },
-                onEditingStart: function(e) {
+                onEditingStart: function (e) {
                },
-                onInitNewRow: function(e) {
+                onInitNewRow: function (e) {
                },
-                onRowInserting: function(e) {
+                onRowInserting: function (e) {
                    SweetAlert.success($translate.instant('ClickEnsureTip'));
                },
-                onRowInserted: function(e) {
+                onRowInserted: function (e) {
                },
-                onRowUpdating: function(e) {
+                onRowUpdating: function (e) {
                    SweetAlert.success($translate.instant('ClickEnsureTip'));
                },
-                onRowUpdated: function(e) {
+                onRowUpdated: function (e) {
                },
-                onRowRemoving: function(e) {
+                onRowRemoving: function (e) {
                    SweetAlert.success($translate.instant('ClickEnsureTip'));
                },
-                onRowRemoved: function(e) {
+                onRowRemoved: function (e) {
                },
                loadPanel: {
                    enabled: false
@@ -257,10 +255,10 @@ controller('editEquityChangeModalController', ['$scope', '$log', '$translate', '
            $(selectedModel).modal('show');
        };

-        var refreshEquity = function (orgId){
+        var refreshEquity = function (orgId) {
            equityService.getEquityList(orgId).success(function (equityData) {
                $scope.EquityList = equityData;
-                if(equityData){
+                if (equityData) {
                    $scope.equityId = equityData[0].id;
                }
                // $scope.equityInfoGridOptions.bindingOptions.dataSource.reload();

--- a/atms-web/src/main/webapp/app/common/controls/edit-equity-modal/edit-equity-modal.ctrl.js
+++ b/atms-web/src/main/webapp/app/common/controls/edit-equity-modal/edit-equity-modal.ctrl.js
@@ -125,6 +125,7 @@ controller('editEquityModalController', ['$scope', '$log', '$translate', 'uiGrid
                    },
                    {
                        dataField: "payableShareholderIdNum",
+                        visible : false,
                        caption: $translate.instant('PayableShareholderIdNum'),
                        allowHeaderFiltering: false
                    },

--- a/atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js
+++ b/atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js
@@ -198,7 +198,14 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
                        return false;
                    }
                });
+            };
+            $('.orgAreaRequired').each( function (index,ele){
+                if(null==ele.innerText||""===ele.innerText){
+                    SweetAlert.error("请检查必填项");
+                    fail = true;
+                    return false;
                }
+            });

            if(fail) return;

@@ -481,6 +488,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
                });

                $scope.editOrgModel = orgData;
+                $scope.editOrgModel.foundationDate=($filter('date')(new Date($scope.editOrgModel.foundationDate), "yyyy-MM-dd"));

                // 设置地区
                loadProvinceList();
@@ -513,6 +521,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '

            if($scope.isInternational){
                $('.localRequired').removeAttr("required");
+                $('.orgAreaRequired').removeAttr("required");
            }

            // set first active page is basic info
@@ -955,6 +964,19 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
        // 说明
        $scope.resources = {
            OrganizationName: $translate.instant('OrganizationName'),
+            OrganizationNameEn: $translate.instant('OrganizationNameEn'),
+            RegistrationCapital: $translate.instant('RegistrationCapital'),
+            LegalPersonName: $translate.instant('LegalPersonName'),
+            NumOfBranches: $translate.instant('NumOfBranches'),
+            BusinessScope: $translate.instant('BusinessScope'),
+            UnifiedSocialCreditCode: $translate.instant('UnifiedSocialCreditCode'),
+            Abbreviation: $translate.instant('Abbreviation'),
+            RegistrationLocationEn: $translate.instant('RegistrationLocationEn'),
+
+            PaidInCapital: $translate.instant('PaidInCapital'),
+            FoundationDate: $translate.instant('FoundationDate'),
+
+            registrationLocation: $translate.instant('RegistrationLocation'),
            OrganizationMsgNameRequired: $translate.instant('OrganizationMsgNameRequired'),
            OrganizationParent: $translate.instant('OrganizationParent'),
            OrganizationLevelType: $translate.instant('OrganizationLevelType'),
@@ -1057,12 +1079,14 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
            $scope.isLocal = false;
            $scope.isInternational = true;
            $('.localRequired').removeAttr("required");
+            $('.orgAreaRequired').removeAttr("required");
        };

        $scope.changeLocal = function () {
            $scope.isLocal = true;
            $scope.isInternational = false;
            $('.localRequired').attr("required",true);
+            $('.orgAreaRequired').attr("required",true);
        };

        // 强制刷新机构控件里的机构
@@ -1094,6 +1118,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
            $scope.trueFalse = constant.trueFalse;
            $scope.countryCNList = constant.countryCNList;
            $('.localRequired').attr("required",true);
+            $('.orgAreaRequired').attr("required",true);

            // $('.localRequired').attr("required","true"); required="required"
        };

--- a/atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.html
+++ b/atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.html
 <div class="edit-organization-modal-wrapper">
-    <div class="modal fade addOrgControlPop" id="addOrgControlPop{{dimensionId}}" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+    <div class="modal fade addOrgControlPop" id="addOrgControlPop{{dimensionId}}" tabindex="-1" role="dialog"
+        aria-labelledby="myModalLabel">
        <div class="modal-dialog" role="document">
            <div class="modal-content">
                <div class="modal-header">
                    <div class="modal-title" ng-if="isAdd">{{'AddOrganization' | translate}}
-                        <button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="changeInternational()" ng-show="isAdd&&isLocal"><i class="mdui-icon material-icons">&#xe428;</i>{{'International' | translate}}</button>
-                        <button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="changeLocal()" ng-show="isAdd&&!isLocal"><i class="mdui-icon material-icons">&#xe428;</i>{{'Local' | translate}}</button>
+                        <button type="button" class="btn btn-in-grid" style="width: 117px;"
+                            ng-click="changeInternational()" ng-show="isAdd&&isLocal"><i
+                                class="mdui-icon material-icons">&#xe428;</i>{{'International' | translate}}</button>
+                        <button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="changeLocal()"
+                            ng-show="isAdd&&!isLocal"><i
+                                class="mdui-icon material-icons">&#xe428;</i>{{'Local' | translate}}</button>
                    </div>
                    <div class="modal-title" ng-if="!isAdd">{{'EditOrganization' | translate}}
-                        <button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="changeInternational()" ng-show="isAdd&&isLocal"><i class="mdui-icon material-icons">&#xe428;</i>{{'International' | translate}}</button>
-                        <button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="changeLocal()" ng-show="isAdd&&!isLocal"><i class="mdui-icon material-icons">&#xe428;</i>{{'Local' | translate}}</button>
+                        <button type="button" class="btn btn-in-grid" style="width: 117px;"
+                            ng-click="changeInternational()" ng-show="isAdd&&isLocal"><i
+                                class="mdui-icon material-icons">&#xe428;</i>{{'International' | translate}}</button>
+                        <button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="changeLocal()"
+                            ng-show="isAdd&&!isLocal"><i
+                                class="mdui-icon material-icons">&#xe428;</i>{{'Local' | translate}}</button>
                    </div>
                </div>
                <div id="orgControlTab" ng-if="isAdd">
@@ -36,7 +45,6 @@
                </div>
                <div id="myTabContent" class="tab-content">
                    <div id="basicdata" class="tab-pane in active">
-
                        <form class="form-horizontal" id="orgControlForm" name="orgControlForm">
                            <div class="local">
                                <div class="bottom-row">
@@ -47,15 +55,15 @@
                                                | translate}}：</label>
                                            <div class="col-sm-9"
                                                ng-class="{'has-error':orgControlForm.name.$invalid && (orgControlForm.name.$dirty || orgControlForm.$submitted)}">
-                                                <!--<input class="form-control localRequired" id="name" ng-model="editOrgModel.name"-->
-                                                <input class="form-control localRequired" id="name" ng-model="editOrgModel.name"
-                                                       name="name" placeholder="{{resources.OrganizationName}}"
-                                                       ng-keyup="nameKeyUp()" maxlength="100">
+                                                <input class="form-control localRequired" id="name"
+                                                    ng-model="editOrgModel.name" name="name"
+                                                    placeholder="{{resources.OrganizationName}}" ng-keyup="nameKeyUp()"
+                                                    maxlength="100">
                                                <p ng-show="orgControlForm.name.$error.required && (orgControlForm.name.$dirty || orgControlForm.$submitted)"
-                                                   class="has-error label">{{resources.OrganizationMsgNameRequired}}</p>
+                                                    class="has-error label">{{resources.OrganizationMsgNameRequired}}
+                                                </p>
                                                <p ng-show="editOrgModel.nameError" class="has-error label">
                                                    {{editOrgModel.nameError}}</p>
-
                                            </div>
                                        </div>

@@ -67,7 +75,7 @@
                                                <input class="form-control" id="englishName"
                                                    ng-model="editOrgModel.englishName" name="englishName"
                                                    placeholder="{{resources.OrganizationNameEn}}"
-                                                       ng-keyup="nameKeyUp()" maxlength="100" >
+                                                    ng-keyup="nameKeyUp()" maxlength="100">
                                            </div>
                                        </div>

@@ -77,8 +85,8 @@
                                                    class="must-input">*</span>{{'OrganizationClientCode' | translate}}：</label>
                                            <div class="col-sm-9"
                                                ng-class="{'has-error':orgControlForm.clientCode.$invalid && (orgControlForm.clientCode.$dirty || orgControlForm.$submitted)}">
-                                                <input class="form-control localRequired" name="clientCode" id="clientCode"
-                                                       ng-model="editOrgModel.clientCode"
+                                                <input class="form-control localRequired" name="clientCode"
+                                                    id="clientCode" ng-model="editOrgModel.clientCode"
                                                    placeholder="{{resources.OrganizationClientCode}}" maxlength="50">
                                                <p ng-show="orgControlForm.clientCode.$error.required && (orgControlForm.clientCode.$dirty || orgControlForm.$submitted)"
                                                    class="has-error label">
@@ -96,11 +104,12 @@
                                                       ng-model="editOrgModel.architectureType"
                                                       placeholder="{{resources.ArchitectureType}}" maxlength="50">
                                            </div>-->
-                                            <label for="architectureType" class="col-sm-3 control-label">{{'ArchitectureType' | translate}}：</label>
+                                            <label for="architectureType"
+                                                class="col-sm-3 control-label">{{'ArchitectureType' | translate}}：</label>
                                            <div class="col-sm-9"
                                                ng-class="{'has-error':orgControlForm.architectureType.$invalid && (orgControlForm.architectureType.$dirty || orgControlForm.$submitted)}">
-                                                <select class="form-control" id='architectureType' name="architectureType"
-                                                        ng-model="editOrgModel.architectureType"
+                                                <select class="form-control" id='architectureType'
+                                                    name="architectureType" ng-model="editOrgModel.architectureType"
                                                    ng-options="item for item in architectureTypeList">
                                                    <option value="">{{resources.ArchitectureType}}</option>
                                                </select>
@@ -116,23 +125,22 @@
                                                | translate}}：</label>
                                            <div class="col-sm-9"
                                                ng-class="{'has-error':orgControlForm.registerAddress.$invalid && (orgControlForm.registerAddress.$dirty || orgControlForm.$submitted)}">
-                                                <input class="form-control" name="registerAddress"
-                                                       id="registerAddress"
+                                                <input class="form-control" name="registerAddress" id="registerAddress"
                                                    ng-model="editOrgModel.registerAddress"
-                                                       placeholder="{{resources.registerAddress}}" maxlength="100">
+                                                    placeholder="{{resources.registrationLocation}}" maxlength="100">
                                            </div>
                                        </div>

                                        <!--注册资本(万元)-->
                                        <div class="form-group">
-                                            <label for="registrationCapital" class="col-sm-3 control-label"><span class="must-input">*</span>{{'RegistrationCapital'
+                                            <label for="registrationCapital" class="col-sm-3 control-label">{{'RegistrationCapital'
                                                | translate}}：</label>
-                                            <div class="col-sm-9"
-                                                 ng-class="{'has-error':orgControlForm.registrationCapital.$invalid && (orgControlForm.registrationCapital.$dirty || orgControlForm.$submitted)}">
+                                            <!-- <div class="col-sm-9"
+                                                 ng-class="{'has-error':orgControlForm.registrationCapital.$invalid && (orgControlForm.registrationCapital.$dirty || orgControlForm.$submitted)}"> -->
+                                            <div class="col-sm-9">
                                                <input class="form-control" name="registrationCapital"
-                                                       id="registrationCapital"
-                                                       ng-model="editOrgModel.registrationCapital"
-                                                       placeholder="{{resources.RegistrationCapital}}" maxlength="50" required>
+                                                    id="registrationCapital" ng-model="editOrgModel.registrationCapital"
+                                                    placeholder="{{resources.RegistrationCapital}}" maxlength="50">
                                            </div>
                                        </div>

@@ -146,7 +154,8 @@
                                                       id="nationalEconomicIndustry"
                                                       ng-model="editOrgModel.nationalEconomicIndustry"
                                                       placeholder="{{resources.NationalEconomicIndustry}}" maxlength="50">-->
-                                                <select class="form-control" id='nationalEconomicIndustry' name="nationalEconomicIndustry"
+                                                <select class="form-control" id='nationalEconomicIndustry'
+                                                    name="nationalEconomicIndustry"
                                                    ng-model="editOrgModel.nationalEconomicIndustry"
                                                    ng-options="x.code as x.type for x in nationalEconomicIndustryList">
                                                    <option value="">{{resources.NationalEconomicIndustry}}</option>
@@ -160,8 +169,7 @@
                                                | translate}}：</label>
                                            <div class="col-sm-9"
                                                ng-class="{'has-error':orgControlForm.legalPersonName.$invalid && (orgControlForm.legalPersonName.$dirty || orgControlForm.$submitted)}">
-                                                <input class="form-control" name="legalPersonName"
-                                                       id="legalPersonName"
+                                                <input class="form-control" name="legalPersonName" id="legalPersonName"
                                                    ng-model="editOrgModel.legalPersonName"
                                                    placeholder="{{resources.LegalPersonName}}" maxlength="50">
                                            </div>
@@ -173,8 +181,7 @@
                                                | translate}}：</label>
                                            <div class="col-sm-9"
                                                ng-class="{'has-error':orgControlForm.numOfBranches.$invalid && (orgControlForm.numOfBranches.$dirty || orgControlForm.$submitted)}">
-                                                <input class="form-control" name="numOfBranches"
-                                                       id="numOfBranches"
+                                                <input class="form-control" name="numOfBranches" id="numOfBranches"
                                                    ng-model="editOrgModel.numOfBranches"
                                                    placeholder="{{resources.NumOfBranches}}" maxlength="50">
                                            </div>
@@ -186,9 +193,10 @@
                                                | translate}}：</label>
                                            <div class="col-sm-9"
                                                ng-class="{'has-error':orgControlForm.logoutTime.$invalid && (orgControlForm.logoutTime.$dirty || orgControlForm.$submitted)}">
-                                                <div class="input-daterange startDatepicker" >
-                                                    <input type="text" id="logoutTime" class="input-sm form-control" name="logoutTime" ng-model="editOrgModel.logoutTime"
-                                                           placeholder="{{resources.LogoutTime}}"/>
+                                                <div class="input-daterange startDatepicker">
+                                                    <input type="text" id="logoutTime" class="input-sm form-control"
+                                                        name="logoutTime" ng-model="editOrgModel.logoutTime"
+                                                        placeholder="{{resources.LogoutTime}}" />
                                                </div>
                                            </div>
                                        </div>
@@ -206,16 +214,16 @@
                                        </div>
                                    </div>
                                    <div class="quarter-div rightUp">
-
-                                        <!--纳税人识别号-->
+                                        <!--统一社会信用代码-->
                                        <div class="form-group" ng-show="isLocal">
-                                            <label for="taxPayerNumber" class="col-sm-3 control-label">{{'UnifiedSocialCreditCode'
+                                            <label for="taxPayerNumber" class="col-sm-3 control-label"><span
+                                                    class="must-input">*</span>{{'UnifiedSocialCreditCode'
                                                | translate}}：</label>
                                            <div class="col-sm-9"
                                                ng-class="{'has-error':orgControlForm.taxPayerNumber.$invalid && (orgControlForm.taxPayerNumber.$dirty || orgControlForm.$submitted)}">
-                                                <input class="form-control" name="taxPayerNumber" id="taxPayerNumber"
-                                                       ng-model="editOrgModel.taxPayerNumber" maxlength="50"
-                                                       placeholder="{{resources.OrganizationTaxPayerNumber}}"
+                                                <input class="form-control localRequired" name="taxPayerNumber"
+                                                    id="taxPayerNumber" ng-model="editOrgModel.taxPayerNumber"
+                                                    maxlength="50" placeholder="{{resources.UnifiedSocialCreditCode}}"
                                                    tax-payer-number-unique>
                                                <p ng-show="orgControlForm.taxPayerNumber.$error.taxPayerNumberUnique && (orgControlForm.taxPayerNumber.$dirty || orgControlForm.$submitted)"
                                                    class="has-error label">
@@ -223,44 +231,45 @@
                                            </div>
                                        </div>

-                                        <!--缩写-->
+                                        <!--公司简称-->
                                        <div class="form-group" ng-show="isLocal">
-                                            <label for="abbreviation" class="col-sm-3 control-label">{{'Abbreviation' |  translate}}：</label>
+                                            <label for="abbreviation" class="col-sm-3 control-label"><span
+                                                    class="must-input">*</span>{{'Abbreviation' |  translate}}：</label>
                                            <div class="col-sm-9"
                                                ng-class="{'has-error':orgControlForm.clientCode.$invalid && (orgControlForm.clientCode.$dirty || orgControlForm.$submitted)}">
-                                                <input class="form-control" name="abbreviation" id="abbreviation"
-                                                       ng-model="editOrgModel.abbreviation"
-                                                       placeholder="{{resources.Abbreviation}}" maxlength="50" >
+                                                <input class="form-control localRequired" name="abbreviation"
+                                                    id="abbreviation" ng-model="editOrgModel.abbreviation"
+                                                    placeholder="{{resources.Abbreviation}}" maxlength="50">
                                            </div>
                                        </div>

                                        <!--工商登记状态-->
                                        <div class="form-group">
-                                            <label for="regStatus" class="col-sm-3 control-label">{{'RegStatus' | translate}}：</label>
+                                            <label for="regStatus"
+                                                class="col-sm-3 control-label">{{'RegStatus' | translate}}：</label>
                                            <div class="col-sm-9"
                                                ng-class="{'has-error':orgControlForm.regStatus.$invalid && (orgControlForm.regStatus.$dirty || orgControlForm.$submitted)}">
                                                <select class="form-control" id='regStatus' name="regStatus"
                                                    ng-model="editOrgModel.regStatus"
                                                    ng-options="x.type as x.type for x in regStatusList ">
                                                </select>
-                                                <p ng-show="orgControlForm.regStatus.$error.required && (orgControlForm.regStatus.$dirty || orgControlForm.$submitted)"
+                                                <!-- <p ng-show="orgControlForm.regStatus.$error.required && (orgControlForm.regStatus.$dirty || orgControlForm.$submitted)"
                                                    class="has-error label">
-                                                    {{resources.OrganizationMsgRegStatusRequired}}</p>
+                                                    {{resources.OrganizationMsgRegStatusRequired}}</p> -->
                                            </div>
                                        </div>

-                                        <!--机构代码-->
+                                        <!--公司代码-->
                                        <div class="form-group" ng-show="isLocal">
-                                            <label for="code" class="col-sm-3 control-label"><span
-                                                    class="must-input">*</span>{{'OrganizationCode' |
+                                            <label for="code" class="col-sm-3 control-label">{{'OrganizationCode' |
                                                translate}}：</label>
                                            <div class="col-sm-9"
                                                ng-class="{'has-error':orgControlForm.code.$invalid && (orgControlForm.code.$dirty || orgControlForm.$submitted)}">
-                                                <input class="form-control localRequired" name="code" ng-disabled="!isAdd" id="code"
+                                                <input class="form-control" name="code" ng-disabled="!isAdd" id="code"
                                                    ng-model="editOrgModel.code"
-                                                       placeholder="{{resources.OrganizationCode}}"
-                                                       maxlength="50" ng-pattern="/^[A-Za-z0-9]+$/" code-unique>
-                                                <p ng-show="orgControlForm.code.$error.required && (orgControlForm.name.$dirty || orgControlForm.$submitted)"
+                                                    placeholder="{{resources.OrganizationCode}}" maxlength="50"
+                                                    ng-pattern="/^[A-Za-z0-9]+$/" code-unique>
+                                                <!-- <p ng-show="orgControlForm.code.$error.required && (orgControlForm.name.$dirty || orgControlForm.$submitted)"
                                                   class="has-error label">{{resources.OrganizationMsgCodeRequired}}</p>
                                                <p ng-show="orgControlForm.code.$error.maxlength"
                                                   class="has-error label">
@@ -268,7 +277,7 @@
                                                <p ng-show="orgControlForm.code.$error.pattern" class="has-error label">
                                                    {{resources.OrganizationMsgCodePattern}}</p>
                                                <p ng-show="orgControlForm.code.$error.codeUnique"
-                                                   class="has-error label">{{resources.OrganizationMsgCodeUnique}}</p>
+                                                   class="has-error label">{{resources.OrganizationMsgCodeUnique}}</p> -->
                                            </div>
                                        </div>

@@ -299,29 +308,36 @@

                                        <!--从事国家限制或禁止行业-->
                                        <div class="form-group" ng-show="isLocal">
-                                            <label for="engageNationalProhibitIndustry" class="col-sm-3 control-label">{{'EngageNationalProhibitIndustry' | translate}}：</label>
+                                            <label for="engageNationalProhibitIndustry"
+                                                class="col-sm-3 control-label">{{'EngageNationalProhibitIndustry' | translate}}：</label>
                                            <div class="col-sm-9"
                                                ng-class="{'has-error':orgControlForm.engageNationalProhibitIndustry.$invalid && (orgControlForm.engageNationalProhibitIndustry.$dirty || orgControlForm.$submitted)}">
-                                                <select class="form-control" id='engageNationalProhibitIndustry' name="engageNationalProhibitIndustry"
+                                                <select class="form-control" id='engageNationalProhibitIndustry'
+                                                    name="engageNationalProhibitIndustry"
                                                    ng-model="editOrgModel.engageNationalProhibitIndustry"
                                                    ng-options="x.code as x.type for x in trueFalse">
-                                                    <option value="">{{resources.EngageNationalProhibitIndustry}}</option>
+                                                    <option value="">{{resources.EngageNationalProhibitIndustry}}
+                                                    </option>
                                                </select>
-                                                <p ng-show="orgControlForm.engageNationalProhibitIndustry.$error.required && (orgControlForm.engageNationalProhibitIndustry.$dirty || orgControlForm.$submitted)"
+                                                <!-- <p ng-show="orgControlForm.engageNationalProhibitIndustry.$error.required && (orgControlForm.engageNationalProhibitIndustry.$dirty || orgControlForm.$submitted)"
                                                    class="has-error label">
-                                                    {{resources.OrganizationMsgEngageNationalProhibitIndustryRequired}}</p>
+                                                    {{resources.OrganizationMsgEngageNationalProhibitIndustryRequired}}
+                                                </p> -->
                                            </div>
                                        </div>

                                        <!--成立日期-->
                                        <div class="form-group">
-                                            <label for="foundationDate" class="col-sm-3 control-label">{{'FoundationDate'
+                                            <label for="foundationDate" class="col-sm-3 control-label"><span
+                                                    class="must-input">*</span>{{'FoundationDate'
                                                | translate}}：</label>
                                            <div class="col-sm-9"
                                                ng-class="{'has-error':orgControlForm.foundationDate.$invalid && (orgControlForm.foundationDate.$dirty || orgControlForm.$submitted)}">
                                                <div class="input-daterange startDatepicker">
-                                                    <input type="text" id="foundationDate" class="input-sm form-control" name="foundationDate" ng-model="editOrgModel.foundationDate"
-                                                           placeholder="{{resources.FoundationDate}}"/>
+                                                    <input type="text" id="foundationDate" class="input-sm form-control"
+                                                        name="foundationDate" ng-model="editOrgModel.foundationDate"
+                                                        required="required"
+                                                        placeholder="{{resources.FoundationDate}}" />
                                                </div>
                                            </div>
                                        </div>
@@ -357,18 +373,19 @@
                                                <org-selector id="OrgParent" selected-org-name="editOrgModel.parentName"
                                                    selected-org-id="editOrgModel.parentID"
                                                    component-selected-org="editOrgModel.componentSelectedOrg"
-                                                              is-show-all=false select-no-option="true"
-                                                              item-max-length="22" is-require="false">
+                                                    is-show-all=false select-no-option="true" item-max-length="22"
+                                                    is-require="false">
                                                </org-selector>
                                            </div>
                                        </div>

-                                        <!--事业部-->
+                                        <!--所属业务线-->
                                        <div class="form-group">
-                                            <label for="selectBusinessUnit" class="col-sm-3 control-label">{{'BusinessUnit'
+                                            <label for="selectBusinessUnit" class="col-sm-3 control-label"><span
+                                                    class="must-input">*</span>{{'BusinessUnit'
                                                | translate}}：</label>
                                            <div class="col-sm-9">
-                                                <select class="form-control" id='selectBusinessUnit'
+                                                <select class="form-control localRequired" id='selectBusinessUnit'
                                                    ng-model="selectBusinessUnit"
                                                    ng-options="item as item.name disable when item.disabled for item in businessUnitList"
                                                    name='selectBusinessUnit'>
@@ -387,8 +404,7 @@
                                                <select class="form-control localRequired" id='selectProjectIndustry'
                                                    ng-model="selectProjectIndustry"
                                                    ng-options="x.name for x in projectIndustryList"
-                                                        name='selectProjectIndustry'
-                                                        ng-change="ProjectIndustryChanged()" >
+                                                    name='selectProjectIndustry' ng-change="ProjectIndustryChanged()">
                                                    <option value="">{{pleaseSelect}}</option>
                                                </select>
                                                <p ng-show="orgControlForm.selectProjectIndustry.$error.required && (orgControlForm.selectProjectIndustry.$dirty || orgControlForm.$submitted)"
@@ -418,24 +434,26 @@
                                    <div class="quarter-div rightDown">
                                        <!--地区-->
                                        <div class="form-group" ng-show="isLocal">
-                                            <label class="col-sm-3 control-label"><span class="must-input">*</span>{{'AdministrativeRegion' | translate}}：</label>
+                                            <label class="col-sm-3 control-label"><span
+                                                    class="must-input">*</span>{{'AdministrativeRegion' | translate}}：</label>
                                            <div class="col-sm-9 row">
-                                                <div class="col-sm-6" style="padding-left: 0px;"
+                                                <div class="col-sm-5" style="padding-left: 0px;"
                                                    ng-class="{'has-error':orgControlForm.selectProvince.$invalid && (orgControlForm.selectProvince.$dirty || orgControlForm.$submitted)}">
                                                    <select class="form-control localRequired" name="selectProvince"
-                                                            style="width: 130px; " ng-change="populateCities()"
+                                                        style="width: 120px; " ng-change="populateCities()"
                                                        ng-model="selectProvince"
-                                                            ng-options="x.regionName for x in ProvinceList" >
+                                                        ng-options="x.regionName for x in ProvinceList">
                                                        <option value="">{{pleaseSelect}}</option>
                                                    </select>
                                                    <p ng-show="orgControlForm.selectProvince.$error.required && (orgControlForm.selectProvince.$dirty || orgControlForm.$submitted)"
                                                        class="has-error label" style="margin-left: -16px">
                                                        {{resources.OrganizationMsgProvinceRequired}}</p>
                                                </div>
-                                                <div class="col-sm-6" style="padding-left: 10px;"
+                                                <div class="col-sm-5" style="padding-left: 10px;"
                                                    ng-class="{'has-error':orgControlForm.selectCity.$invalid && (orgControlForm.selectCity.$dirty || orgControlForm.$submitted)}">
-                                                    <select class="form-control localRequired" name="selectCity" id="selectCity"
-                                                            style="width: 130px; " ng-model="selectRegionID" >
+                                                    <select class="form-control localRequired" name="selectCity"
+                                                        id="selectCity" style="width: 119px; "
+                                                        ng-model="selectRegionID">
                                                        <option value="">{{pleaseSelect}}</option>
                                                        <option ng-repeat="x in CityList" value="{{x.regionID}}"
                                                            title="{{x.regionName}}">{{x.regionName |
@@ -454,8 +472,8 @@
                                                    class="must-input">*</span>{{'OrganizationLevelType' | translate}}：</label>
                                            <div class="col-sm-9"
                                                ng-class="{'has-error':orgControlForm.selectLevelType.$invalid && (orgControlForm.selectLevelType.$dirty || orgControlForm.$submitted)}">
-                                                <select class="form-control localRequired" id='selectLevelType' name="selectLevelType"
-                                                        ng-model="selectLevelType"
+                                                <select class="form-control localRequired" id='selectLevelType'
+                                                    name="selectLevelType" ng-model="selectLevelType"
                                                    ng-options="(x.name | limitString:25) for x in levelTypeList">
                                                    <option value="">{{pleaseSelect}}</option>
                                                </select>
@@ -466,18 +484,20 @@
                                        </div>
                                        <!--区域-->
                                        <div class="form-group">
-                                            <label for="AreaParent" class="col-sm-3 control-label">{{'AreaTabTitle' |
+                                            <label for="AreaParent" class="col-sm-3 control-label"><span
+                                                    class="must-input">*</span>{{'AreaTabTitle' |
                                                translate}}：</label>
                                            <div class="col-sm-9"
                                                ng-class="{'has-error':orgControlForm.AreaName.$invalid && (orgControlForm.AreaName.$dirty || orgControlForm.$submitted)}">
-                                                <area-selector id="AreaParent" name="AreaName"
+                                                <area-selector id="AreaParent" name="AreaName" class="orgAreaRequired"
                                                    selected-area-name="editOrgModel.areaName"
                                                    selected-area-id="editOrgModel.areaID"
                                                    component-selected-area="editOrgModel.componentSelectedArea"
                                                    is-show-all=false>
                                                </area-selector>
                                                <p ng-show="orgControlForm.AreaName.$error.required && (orgControlForm.AreaName.$dirty || orgControlForm.$submitted)"
-                                                   class="has-error label">{{resources.OrganizationMsgAreaRequired}}</p>
+                                                    class="has-error label">{{resources.OrganizationMsgAreaRequired}}
+                                                </p>
                                            </div>
                                        </div>

@@ -503,11 +523,9 @@
                                <div style="clear: both;"></div>
                            </div>
                        </form>
-
                    </div>

                    <div class="tab-pane fade" id="advancedOptions">
-
                        <form class="form-horizontal" id="advancedControlForm" name="advancedControlForm">
                            <div class="level-title">
                                <span>{{'EnterpriseAccountManage'|translate}}</span>
@@ -517,38 +535,54 @@
                                <div ng-repeat="accountModule in orgAccountList track by $index">
                                    <div class="row box-right">
                                        <div class="col-sm-1 box"><span>{{$index + 1}}</span></div>
-
                                        <div class="col-sm-10 box">
-                                            <span class="col-sm-2 AccountName-span">{{'EnterpriseAccountNameShort'|translate}}：</span>
-                                            <div class="col-sm-4" ng-class="{'has-error':accountModule.enterpriseAccountSetSelectError}">
-                                                <select style="width:200px;" class=" form-control account-set-select" id='enterpriseAccountSetSelect' ng-change="checkEnterpriseAccountSetSelect(accountModule)" name="enterpriseAccountSetSelect" ng-model="accountModule.enterpriseAccountSetSelectID" required>
+                                            <span
+                                                class="col-sm-2 AccountName-span">{{'EnterpriseAccountNameShort'|translate}}：</span>
+                                            <div class="col-sm-4"
+                                                ng-class="{'has-error':accountModule.enterpriseAccountSetSelectError}">
+                                                <select style="width:200px;" class=" form-control account-set-select"
+                                                    id='enterpriseAccountSetSelect'
+                                                    ng-change="checkEnterpriseAccountSetSelect(accountModule)"
+                                                    name="enterpriseAccountSetSelect"
+                                                    ng-model="accountModule.enterpriseAccountSetSelectID" required>
                                                    <option value="">{{pleaseSelect}}</option>
-                                                    <option ng-repeat="x in enterpriseAccountSetList" value="{{x.id}}" title="{{x.name}}">{{x.name | limitString:maxdropLength}}</option>
+                                                    <option ng-repeat="x in enterpriseAccountSetList" value="{{x.id}}"
+                                                        title="{{x.name}}">{{x.name | limitString:maxdropLength}}
+                                                    </option>
                                                </select>
-                                                <p ng-show="accountModule.enterpriseAccountSetSelectError" class="has-error label">{{accountModule.enterpriseAccountSetSelectError}}</p>
+                                                <p ng-show="accountModule.enterpriseAccountSetSelectError"
+                                                    class="has-error label">
+                                                    {{accountModule.enterpriseAccountSetSelectError}}</p>
                                            </div>
                                            <span class="col-sm-2 StartTime-span">{{'EffectiveDate' | translate}}</span>

                                            <div class="col-sm-5" ng-class="{'has-error':accountModule.startDateError}">
-                                                <input type="text" class="form_datetime form-control" ng-model="accountModule.startDate" id="{{accountModule.fromID}}" ng-change="checkStartDate(accountModule)" required />
-                                                <p ng-show="accountModule.startDateError" class="has-error label">{{accountModule.startDateError}}</p>
+                                                <input type="text" class="form_datetime form-control"
+                                                    ng-model="accountModule.startDate" id="{{accountModule.fromID}}"
+                                                    ng-change="checkStartDate(accountModule)" required />
+                                                <p ng-show="accountModule.startDateError" class="has-error label">
+                                                    {{accountModule.startDateError}}</p>
                                            </div>
                                            <span class="col-sm-2 To-span">{{'ExpiredDateTo'|translate}}</span>
                                            <div class="col-sm-5" ng-class="{'has-error':accountModule.endDateError}">
-                                                <input type="text" class="form_datetime form-control" ng-model="accountModule.endDate" id="{{accountModule.toID}}" ng-change="checkEndDate(accountModule)" required />
-                                                <p ng-show="accountModule.endDateError" class="has-error label">{{accountModule.endDateError}}</p>
+                                                <input type="text" class="form_datetime form-control"
+                                                    ng-model="accountModule.endDate" id="{{accountModule.toID}}"
+                                                    ng-change="checkEndDate(accountModule)" required />
+                                                <p ng-show="accountModule.endDateError" class="has-error label">
+                                                    {{accountModule.endDateError}}</p>
                                            </div>
-
                                        </div>
-
-                                        <div class="col-sm-1 box"><span ng-click="deleteAccountModule(accountModule)"><i class="material-icons button-icons middle delete">delete</i></span></div>
+                                        <div class="col-sm-1 box"><span ng-click="deleteAccountModule(accountModule)"><i
+                                                    class="material-icons button-icons middle delete">delete</i></span>
+                                        </div>
                                    </div>
-
                                </div>
                                <div class="row box-right box-bottom">
-                                    <div class="col-sm-1 box"><span ng-click="newOrgAccountRow()"><i class="material-icons button-icons middle add">add_circle_outline</i></span></div>
+                                    <div class="col-sm-1 box"><span ng-click="newOrgAccountRow()">
+                                            <i
+                                                class="material-icons button-icons middle add">add_circle_outline</i></span>
+                                    </div>
                                    <div class="col-sm-10 box">
-
                                    </div>
                                    <div class="col-sm-1 box"></div>
                                </div>
@@ -561,19 +595,22 @@
                                <div ng-repeat="serviceModule in isCheckedServiceList track by $index">
                                    <div class="row box-right">
                                        <div class="col-sm-10 box">
-                                            <div class="col-sm-2 serviceCheckBox"><input class="checkService" type="checkbox" ng-model="serviceModule.isChecked"></div>
+                                            <div class="col-sm-2 serviceCheckBox"><input class="checkService"
+                                                    type="checkbox" ng-model="serviceModule.isChecked"></div>
                                            <span class="col-sm-2 ServiceName-span">{{serviceModule.name}}</span>
-                                            <span class="col-sm-2 ReportTemplate-span">{{'ReportTemplate'|translate}}:</span>
-
-                                            <div class="col-sm-5" ng-class="{'has-error':serviceModule.selectedTemplateError}">
-
-                                                <select class="form-control" style="display: inline-block;" ng-change="checkTemplate(serviceModule)" ng-model="serviceModule.selectedTemplate" ng-options="template.name for template in serviceModule.templateGroupList"
+                                            <span
+                                                class="col-sm-2 ReportTemplate-span">{{'ReportTemplate'|translate}}:</span>
+                                            <div class="col-sm-5"
+                                                ng-class="{'has-error':serviceModule.selectedTemplateError}">
+                                                <select class="form-control" style="display: inline-block;"
+                                                    ng-change="checkTemplate(serviceModule)"
+                                                    ng-model="serviceModule.selectedTemplate"
+                                                    ng-options="template.name for template in serviceModule.templateGroupList"
                                                    name="selectedModule">
                                                    <option value="">{{pleaseSelect}}</option>
                                                </select>
-
-                                                <p ng-show="serviceModule.selectedTemplateError" class="has-error label">{{serviceModule.selectedTemplateError}}</p>
-
+                                                <p ng-show="serviceModule.selectedTemplateError"
+                                                    class="has-error label">{{serviceModule.selectedTemplateError}}</p>
                                            </div>
                                        </div>
                                    </div>
@@ -586,7 +623,6 @@
                        <p>权限设置待开发，敬请期待！</p>
                    </div>-->
                </div>
-
                <div class="modal-footer" id="orgModalFooter" style="padding-left:139px;">
                    <button type="submit" class="btn btn-primary" ng-click="saveOrg()">
                        {{'Confirm' | translate}}
@@ -598,6 +634,4 @@
            </div>
        </div>
    </div>
-
 </div>
\ No newline at end of file
-
--- a/atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.less
+++ b/atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.less
@@ -21,6 +21,7 @@

        .btn-default {
            height: 33px;
+            width: 250px;
        }

        input {

--- a/atms-web/src/main/webapp/app/common/utils/constant.js
+++ b/atms-web/src/main/webapp/app/common/utils/constant.js
@@ -1442,7 +1442,14 @@ constant.GroupTypeList = [
    {code: 4, type: "教育费附加"},
    {code: 5, type: "地方教育费附加"},
    {code: 6, type: "个人所得税"},
-    {code: 7, type: "国际税"}
+    {code: 7, type: "水利建设基金"},
+    {code: 8, type: "文化事业建设费"},
+    {code: 9, type: "房产税"},
+    {code: 10, type: "城建土地使用税"},
+    {code: 11, type: "工会经费"},
+    {code: 12, type: "残疾人就业保障基金"},
+    {code: 13, type: "代扣代缴税费"},
+    {code: 14, type: "国际税"}
 ];

 constant.InvoiceTypeList = [
@@ -1479,7 +1486,7 @@ constant.TaxpayerQualificationTypeList = [

 constant.RegStatusList = [
    {code: 0, type: "存续"},
-    {code: 1, type: "存续中"},
+    {code: 1, type: "注销中"},
    {code: 2, type: "已注销"}
 ];


--- a/atms-web/src/main/webapp/app/framework/app-usr-operate-log/app-usr-operate-log.ctrl.js
+++ b/atms-web/src/main/webapp/app/framework/app-usr-operate-log/app-usr-operate-log.ctrl.js
@@ -19,6 +19,10 @@ frameworkModule.controller('appUsrOperateLogController',
                        }
                    });
                }
+                if($scope.thisModuleId.length===0){
+                    SweetAlert.warning($translate.instant("NeedChecked"));
+                    return;
+                }
                var config = {
                    // params: {
                    "ids":$scope.thisModuleId
@@ -32,6 +36,11 @@ frameworkModule.controller('appUsrOperateLogController',
                    $scope.dataGridUpdate(data);
                    $scope.thisModuleId=[];//清空查询id
                })
+                if(!$("#usrOperateLogPop").length){
+                    var usrOperateLogPopTemp = $($("#usrOperateLogPopContainer").html());
+                    $("body").append($compile(usrOperateLogPopTemp)($scope));
+                }
+                $("#usrOperateLogPop").modal("show");
            };
            // $scope.sniffHelpPopRadio = function(){
            //     taxDocumentListService.getDocumentsAttrAndType({params: {}}).then(function (data) {
@@ -182,11 +191,6 @@ frameworkModule.controller('appUsrOperateLogController',

            $scope.openUsrOperateLogPop = function(){
                $scope.loadMainData();
-                if(!$("#usrOperateLogPop").length){
-                    var usrOperateLogPopTemp = $($("#usrOperateLogPopContainer").html());
-                    $("body").append($compile(usrOperateLogPopTemp)($scope));
-                }
-                $("#usrOperateLogPop").modal("show");
            };
            $scope.hideUsrOperateLogPop = function(){
                $("#usrOperateLogPop").modal("hide");

--- a/atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js
+++ b/atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js
@@ -329,7 +329,54 @@ taxDocumentManageModule.controller('taxDocumentListController',
                    }
                };
            };
+            $scope.changeDateRangeError=function(){
+                var items=$scope.queryFieldModel;
+                if (!PWC.isNullOrEmpty(items.fileBeginTime) && !PWC.isNullOrEmpty(items.fileEndTTime) &&
+                    items.fileBeginTime > items.fileEndTTime)
+                {
+                    SweetAlert.warning($translate.instant('DateWarningSearch'));
+                }
+                if (!PWC.isNullOrEmpty(items.ownBeginTime) && !PWC.isNullOrEmpty(items.ownEndTime) &&
+                    items.ownBeginTime > items.ownEndTime)
+                {
+                    SweetAlert.warning($translate.instant('DateWarningSearch'));
+                }
+                if (!PWC.isNullOrEmpty(items.effectiveBeginTime) && !PWC.isNullOrEmpty(items.effectiveEndTime) &&
+                    items.effectiveBeginTime > items.effectiveEndTime)
+                {
+                    SweetAlert.warning($translate.instant('DateWarningSearch'));
+                }
+                if (!PWC.isNullOrEmpty(items.uploadBeginTime) && !PWC.isNullOrEmpty(items.uploadEndTime) &&
+                    items.uploadBeginTime > items.uploadEndTime)
+                {
+                    SweetAlert.warning($translate.instant('DateWarningSearch'));
+                }
+
+                if (!PWC.isNullOrEmpty(items.fileTime) && !PWC.isNullOrEmpty(items.effectiveTime) &&
+                    items.fileTime > items.effectiveTime)
+                {
+                    SweetAlert.warning($translate.instant('DateWarningSearch'));
+                }

+            };
+            $scope.changeFieldModel=function(){
+                //新建记录
+                items=$scope.editFieldModel;
+                if (!PWC.isNullOrEmpty(items.fileTime) && !PWC.isNullOrEmpty(items.effectiveTime) &&
+                    items.fileTime > items.effectiveTime)
+                {
+                    SweetAlert.warning($translate.instant('FileTimeDateRangeError'));
+                }
+            };
+            $scope.changeFieldItem=function(){
+                //批量上传
+                items=$scope.editFieldItem;
+                if (!PWC.isNullOrEmpty(items.fileTime) && !PWC.isNullOrEmpty(items.effectiveTime) &&
+                    items.fileTime > items.effectiveTime)
+                {
+                    SweetAlert.warning($translate.instant('FileTimeDateRangeError'));
+                }
+            };
            //弹出框
            $scope.isCreatePop = false;
            var openSimpleUploadPop = function (rowId) {
@@ -370,7 +417,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
            var simpleUploadSubmit = function () {

                var params = angular.copy($scope.editFieldModel);
-                if (!PWC.isNullOrEmpty(params.fileTime) && !PWC.isNullOrEmpty(params.fileTime) &&
+                if (!PWC.isNullOrEmpty(params.fileTime) && !PWC.isNullOrEmpty(params.effectiveTime) &&
                    params.fileTime > params.effectiveTime)
                {
                    window.swal($translate.instant('FileTimeDateRangeError'));
@@ -494,7 +541,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
                params.filePositionUrl = encodeURIComponent(params.filePositionUrl);
                taxDocumentListService.verifyDuplicate(params).then(function (result) {
                    // 例如 修改1为1 不用弹框 修改1本身就好 但是修改1为2 ,就要去掉1并修改2(保留2的id)
-                    if (result.id==fieldModel.id) {
+                    if ((result.id==null|| result.id==undefined)|| (result.id==fieldModel.id)) {
                        editRecord_Post(fieldModel,type);
                    }else{
                        var hisCellId=result.id;
@@ -1094,6 +1141,12 @@ taxDocumentManageModule.directive('multiFileUploader', function () {
                        // $scope.isRequired = function (IT8nField) {
                        //     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')+"】";
+                            break;
+                        }
                        if(!modelItem.companyName && $scope.isRequired($translate.instant("CompanyName"))){
                            alertText += "【"+$translate.instant("CompanyName")+"】"
                        }
@@ -1711,16 +1764,20 @@ taxDocumentManageModule.directive('tempModule', function () {
        controller: ['$scope', 'taxDocumentListService', '$translate',
            function ($scope, taxDocumentListService, $translate) {
                //税种
-                $scope.taxTypeSelects = [
-                    "纳税申报表",
-                    "税票",
-                    "企业所得税",
-                    "印花税",
-                    "附加税",
-                    "代扣代缴税",
-                    "其它税",
-                    "增值税",
-                ];
+                $scope.taxTypeSelects = [];
+                angular.forEach(constant.GroupTypeList, function (item) {
+                    $scope.taxTypeSelects.push(item.type);
+                });
+                // $scope.taxTypeSelects = [
+                //     "纳税申报表",
+                //     "税票",
+                //     "企业所得税",
+                //     "印花税",
+                //     "附加税",
+                //     "代扣代缴税",
+                //     "其它税",
+                //     "增值税",
+                // ];
                //审批状态
                $scope.auditSelectsMap = {
                    "0":"待审批",

--- a/atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.html
+++ b/atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.html
@@ -415,11 +415,11 @@
                        <!--<input type="text" class="form-control radius3"-->
                        <!--ng-model="queryFieldModel.AvailabilityDate"/>-->
                        <!--<input type="text" class="form-control radius3" id="period-picker1"/>-->
-                        <input type='text' placeholder="From"
+                        <input type='text' placeholder="From" ng-change="changeDateRangeError()"
                               date-time-picker class="form-control TDL-query-val-multi"
                               data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.fileBeginTime"
                               data-min-view-mode="0" />
-                        <input type='text' placeholder="To"
+                        <input type='text' placeholder="To" ng-change="changeDateRangeError()"
                               date-time-picker class="form-control TDL-query-val-multi"
                               data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.fileEndTTime"
                               data-min-view-mode="0" />
@@ -433,11 +433,11 @@
                    <div class="TDL-query-val">
                        <!--<input type="text" class="form-control radius3"-->
                        <!--ng-model="queryFieldModel.Duration"/>-->
-                        <input type='text' placeholder="From"
+                        <input type='text' placeholder="From" ng-change="changeDateRangeError()"
                               date-time-picker class="form-control TDL-query-val-multi"
                               data-date-format="yyyymm" ng-model="queryFieldModel.ownBeginTime"
                               data-min-view-mode="1"/>
-                        <input type='text' placeholder="To"
+                        <input type='text' placeholder="To" ng-change="changeDateRangeError()"
                               date-time-picker class="form-control TDL-query-val-multi"
                               data-date-format="yyyymm" ng-model="queryFieldModel.ownEndTime"
                               data-min-view-mode="1"/>
@@ -497,11 +497,11 @@
                    <div class="TDL-query-val">
                        <!--<input type="text" class="form-control radius3"-->
                        <!--ng-model="queryFieldModel.DueDate"/>-->
-                        <input type='text' placeholder="From"
+                        <input type='text' placeholder="From" ng-change="changeDateRangeError()"
                               date-time-picker class="form-control TDL-query-val-multi"
                               data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.effectiveBeginTime"
                               data-min-view-mode="0"/>
-                        <input type='text' placeholder="To"
+                        <input type='text' placeholder="To" ng-change="changeDateRangeError()"
                               date-time-picker class="form-control TDL-query-val-multi"
                               data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.effectiveEndTime"
                               data-min-view-mode="0"/>
@@ -583,11 +583,11 @@
                        <!--<input type="text" class="form-control radius3"-->
                        <!--ng-model="queryFieldModel.UploadDate"/>-->
                        <!--<input type="text" class="form-control radius3" id="period-picker4" />-->
-                        <input type='text' placeholder="From"
+                        <input type='text' placeholder="From" ng-change="changeDateRangeError()"
                               date-time-picker class="form-control TDL-query-val-multi"
                               data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.uploadBeginTime"
                               data-min-view-mode="0"/>
-                        <input type='text' placeholder="To"
+                        <input type='text' placeholder="To" ng-change="changeDateRangeError()"
                               date-time-picker class="form-control TDL-query-val-multi"
                               data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.uploadEndTime"
                               data-min-view-mode="0"/>
@@ -817,7 +817,7 @@
                            </label>
                            <div class="col-sm-11" style="width:61.67%">
                                <input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker
-                                       data-date-format="yyyy/mm/dd"
+                                       data-date-format="yyyy/mm/dd" ng-change="changeFieldModel()"
                                       ng-required="isRequired('AvailabilityDate')"
                                       class="form-control" ng-model="editFieldModel.fileTime"/>
                            </div>
@@ -830,7 +830,7 @@
                            <div class="col-sm-11" style="width:61.67%">
                                <input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker
                                       data-date-format="yyyy/mm/dd"
-                                       ng-required="isRequired('DueDate')"
+                                       ng-required="isRequired('DueDate')" ng-change="changeFieldModel()"
                                       class="form-control" ng-model="editFieldModel.effectiveTime"/>
                            </div>
                        </div>
@@ -1057,7 +1057,7 @@
                                            {{'AvailabilityDate' | translate}}
                                        </label>
                                        <div class="col-sm-11" style="width:61.67%">
-                                            <input type='text' placeholder="{{'PleaseSelected' | translate}}"
+                                            <input type='text' placeholder="{{'PleaseSelected' | translate}}" ng-change="changeFieldItem()"
                                                   ng-class="{'upload-fail-mark':isRequired('AvailabilityDate') && !editFieldItem.fileTime}"
                                                   date-time-picker data-date-format="yyyy/mm/dd"
                                                   class="form-control" ng-model="editFieldItem.fileTime"/>
@@ -1069,7 +1069,7 @@
                                            {{'DueDate' | translate}}
                                        </label>
                                        <div class="col-sm-11" style="width:61.67%">
-                                            <input type='text' placeholder="{{'PleaseSelected' | translate}}"
+                                            <input type='text' placeholder="{{'PleaseSelected' | translate}}" ng-change="changeFieldItem()"
                                                   ng-class="{'upload-fail-mark':isRequired('DueDate') && !editFieldItem.effectiveTime}"
                                                   date-time-picker data-date-format="yyyy/mm/dd"
                                                   class="form-control" ng-model="editFieldItem.effectiveTime"/>

--- a/atms-web/src/main/webapp/orangeweb/index.html
+++ b/atms-web/src/main/webapp/orangeweb/index.html
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons"><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.cf16809e.css rel=preload as=style><link href=css/chunk-vendors.2f35f377.css rel=preload as=style><link href=js/app.7e09d0db.js rel=preload as=script><link href=js/chunk-vendors.39b13767.js rel=preload as=script><link href=css/chunk-vendors.2f35f377.css rel=stylesheet><link href=css/app.cf16809e.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.39b13767.js></script><script src=js/app.7e09d0db.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons"><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.cf16809e.css rel=preload as=style><link href=css/chunk-vendors.2f35f377.css rel=preload as=style><link href=js/app.c8b0fed0.js rel=preload as=script><link href=js/chunk-vendors.39b13767.js rel=preload as=script><link href=css/chunk-vendors.2f35f377.css rel=stylesheet><link href=css/app.cf16809e.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.39b13767.js></script><script src=js/app.c8b0fed0.js></script></body></html>
\ No newline at end of file
--- a/atms-web/src/main/webapp/orangeweb/js/app.7e09d0db.js
+++ b/atms-web/src/main/webapp/orangeweb/js/app.7e09d0db.js
--- a/atms-web/src/main/webapp/orangeweb/js/app.7e09d0db.js.map
+++ b/atms-web/src/main/webapp/orangeweb/js/app.7e09d0db.js.map