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

atms-api/src/main/java/pwc/taxtech/atms/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");

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");

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());

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);
@@ -149,18 +150,19 @@ public class EquityServiceImpl extends BaseService{
 
     /**
      * 17/01/2019 20:18 股权变更
-     *  1、根据id（原始）查出旧数据 equity_infomation
-     *  2、旧数据插入历史表 equity_infomation_history
-     *  3、equityInfoDtos 生成新id、createTime、updateTime 插入equity_infomation
-     *  4、根据id（原始）删除旧数据 equity_infomation
-     *  5、记录日志  id（原始）
-     *
-     *  remark:
-     *  1、无股权记录时，为初始变更只进行3、5
-     *  2、// todo 事务过长并发时，可能出现问题
+     * 1、根据id（原始）查出旧数据 equity_infomation
+     * 2、旧数据插入历史表 equity_infomation_history
+     * 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);

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;

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;

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" />

atms-orangeheap/.env.development

-VUE_APP_TABLEAU_API=http://dts.erp.didichuxing.com/OrangeHeap/
+VUE_APP_TABLEAU_API=/OrangeHeap/
\ No newline at end of file

atms-orangeheap/.env.production

-VUE_APP_TABLEAU_API=http://dts.erp.didichuxing.com/OrangeHeap/
+VUE_APP_TABLEAU_API=/OrangeHeap/
\ No newline at end of file

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"

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": "备注：",

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": "证件编号",

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
                         },

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;
 
@@ -996,7 +1022,10 @@
 
                 var node = _.first(_.where(grp.children, {reportId: currentVal}));
                 if (!node) {
-                    return;
+                    node = _.first(_.where(grp2.children, {reportId: currentVal}));
+                    if (!node) {
+                        return;
+                    }
                 }
                 var reportPromiss = citReportService.getReportData(node.reportId).success(function (reportData) {
 

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);
                 }
             });

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();

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
                     },

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"
         };

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 {

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: "已注销"}
 ];
 

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");

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":"待审批",

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"/>

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>
+<!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