1、导入分发及数据抽取日期控件改成中英文都正确；2、开票记录与收入类型映射配置导入机构验证；3、修改机构基本信息时放开公司代码的disable属性

atms-api/src/main/java/pwc/taxtech/atms/controller/RevenueConfMappingController.java

@@ -45,7 +45,7 @@ public class RevenueConfMappingController extends BaseController {
 
     @PostMapping("upload")
     public ApiResultDto upload(@RequestParam MultipartFile file, @RequestParam Integer type) throws Exception {
-        mappingService.upload(file, type);
-        return ApiResultDto.success();
+        List<String> unSuccessList = mappingService.upload(file, type);
+        return ApiResultDto.success(unSuccessList);
     }
 }

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

@@ -103,18 +103,23 @@ public class RevenueTypeMappingService extends BaseService {
         }
     }
 
-    public void upload(MultipartFile file, Integer type) throws Exception {
+    public List<String> upload(MultipartFile file, Integer type) throws Exception {
+        List<String> unSuccessList = new ArrayList<>();
         InputStream inputStream = file.getInputStream();
         Workbook workbook = WorkbookFactory.create(inputStream);
         Sheet sheet = workbook.getSheetAt(0);
         List<RevenueTypeMapping> list = new ArrayList<>();
         List<OrgCodeIdDto> orgDtoList = organizationService.getMyOrgCodeList();
         List<String> orgIds = new ArrayList<>();
+        String unSuccessMsg;
         for (int r = sheet.getFirstRowNum()+1; r <= sheet.getLastRowNum(); r++) {
             Row row = sheet.getRow(r);
+            unSuccessMsg = "第"+(r+1)+"行：";
             String orgCode = String.valueOf(new BigDecimal(POIUtil.getCellFormulaString(row.getCell(0))).intValue());
             Optional<OrgCodeIdDto> optional = orgDtoList.stream().filter(o -> StringUtils.equals(o.getCode(), orgCode)).findFirst();
             if (!optional.isPresent()) {
+                unSuccessMsg +="|公司不存在|";
+                unSuccessList.add(unSuccessMsg);
                 continue;
             }
             RevenueTypeMapping mapping = new RevenueTypeMapping();
@@ -143,7 +148,7 @@ public class RevenueTypeMappingService extends BaseService {
             List<List<RevenueTypeMapping>> batchList = CommonUtils.subListWithLen(list, CommonUtils.BATCH_NUM_2000);
             batchList.forEach(l -> typeMappingMapper.batchInsert(l));
         }
-
+        return unSuccessList;
     }
 
 }

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

@@ -869,5 +869,7 @@
     "ConditionColumnNum": "Search Condition Column Num",
     "Condition": "Search Condition",
     "RevenueTypeConfiguration":"Revenue Type Config",
-    "FinancialStatementsType": "Financial Statements"
+    "FinancialStatementsType": "Financial Statements",
+    "Language": "en-US",
+    "yyyy-MM": "yyyy-mm"
 }

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

@@ -929,5 +929,7 @@
     "Condition": "查询条件",
     "Cancel": "取消",
     "FinancialStatementsType": "财务报表",
+    "Language": "zh-CN",
+    "yyyy-MM": "yyyy-mm",
     "~MustBeEndOneApp": "I Must be the End One, please!"
 }

atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.html

@@ -265,7 +265,7 @@
                                                 translate}}：</label>
                                             <div class="col-sm-9"
                                                 ng-class="{'has-error':orgControlForm.code.$invalid && (orgControlForm.code.$dirty || orgControlForm.$submitted)}">
-                                                <input class="form-control" name="code" ng-disabled="!isAdd" id="code"
+                                                <input class="form-control" name="code" id="code"
                                                     ng-model="editOrgModel.code"
                                                     placeholder="{{resources.OrganizationCode}}" maxlength="50"
                                                     ng-pattern="/^[A-Za-z0-9]+$/" code-unique>

atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.ctrl.js

@@ -993,6 +993,7 @@
         var initDatePicker = function () {
             var ele1 = $("#periodDatepicker");
             ele1.datepicker({
+                language: $translate.instant('Language'),
                 startDate: $scope.startDate,
                 endDate: $scope.endDate,
                 viewMode: $scope.viewMode,

atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.ctrl.js

@@ -1162,6 +1162,7 @@
         var initDatePicker = function () {
             var ele1 = $("#periodDatepicker");
             ele1.datepicker({
+                language: $translate.instant('Language'),
                 startDate: $scope.startDate,
                 endDate: $scope.endDate,
                 viewMode: $scope.viewMode,

atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.ctrl.js

@@ -1032,6 +1032,7 @@
         var initDatePicker = function () {
             var ele1 = $("#periodDatepicker");
             ele1.datepicker({
+                language: $translate.instant('Language'),
                 startDate: $scope.startDate,
                 endDate: $scope.endDate,
                 viewMode: $scope.viewMode,

atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.ctrl.js

@@ -481,6 +481,7 @@
         var initDatePicker = function () {
             var ele1 = $("#periodDatepicker");
             ele1.datepicker({
+                language: $translate.instant('Language'),
                 startDate: $scope.startDate,
                 endDate: $scope.endDate,
                 viewMode: $scope.viewMode,

atms-web/src/main/webapp/app/common/controls/import/import-cit-bs-prc-adjust/import-cit-bs-prc-adjust.ctrl.js

@@ -396,6 +396,7 @@
         var initDatePicker = function () {
             var ele1 = $("#periodDatepicker");
             ele1.datepicker({
+                language: $translate.instant('Language'),
                 startDate: $scope.startDate,
                 endDate: $scope.endDate,
                 viewMode: $scope.viewMode,

atms-web/src/main/webapp/app/common/controls/import/import-cit-draft-account-mapping/import-cit-draft-account-mapping.ctrl.js

@@ -390,6 +390,7 @@
         var initDatePicker = function () {
             var ele1 = $("#periodDatepicker");
             ele1.datepicker({
+                language: $translate.instant('Language'),
                 startDate: $scope.startDate,
                 endDate: $scope.endDate,
                 viewMode: $scope.viewMode,

atms-web/src/main/webapp/app/common/controls/import/import-cit-eam-assets-disposal/import-cit-eam-assets-disposal.ctrl.js

@@ -389,6 +389,7 @@
         var initDatePicker = function () {
             var ele1 = $("#periodDatepicker");
             ele1.datepicker({
+                language: $translate.instant('Language'),
                 startDate: $scope.startDate,
                 endDate: $scope.endDate,
                 viewMode: $scope.viewMode,

atms-web/src/main/webapp/app/common/controls/import/import-cit-journal-adjust/import-cit-journal-adjust.ctrl.js

@@ -405,6 +405,7 @@
         var initDatePicker = function () {
             var ele1 = $("#periodDatepicker");
             ele1.datepicker({
+                language: $translate.instant('Language'),
                 startDate: $scope.startDate,
                 endDate: $scope.endDate,
                 viewMode: $scope.viewMode,

atms-web/src/main/webapp/app/common/controls/import/import-cit-profit-prc-adjust/import-cit-profit-prc-adjust.ctrl.js

@@ -398,6 +398,7 @@
         var initDatePicker = function () {
             var ele1 = $("#periodDatepicker");
             ele1.datepicker({
+                language: $translate.instant('Language'),
                 startDate: $scope.startDate,
                 endDate: $scope.endDate,
                 viewMode: $scope.viewMode,

atms-web/src/main/webapp/app/common/controls/import/import-cit-salary-advance/import-cit-salary-advance.ctrl.js

@@ -423,6 +423,7 @@
         var initDatePicker = function () {
             var ele1 = $("#periodDatepicker");
             ele1.datepicker({
+                language: $translate.instant('Language'),
                 startDate: $scope.startDate,
                 endDate: $scope.endDate,
                 viewMode: $scope.viewMode,

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

@@ -401,6 +401,7 @@
         var initDatePicker = function () {
             var ele1 = $("#periodDatepicker");
             ele1.datepicker({
+                language: $translate.instant('Language'),
                 startDate: $scope.startDate,
                 endDate: $scope.endDate,
                 viewMode: $scope.viewMode,

atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.ctrl.js

@@ -446,6 +446,7 @@
         var initDatePicker = function () {
             var ele1 = $("#periodDatepicker");
             ele1.datepicker({
+                language: $translate.instant('Language'),
                 startDate: $scope.startDate,
                 endDate: $scope.endDate,
                 viewMode: $scope.viewMode,

atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.ctrl.js

@@ -486,6 +486,7 @@
         var initDatePicker = function () {
             var ele1 = $("#periodDatepicker");
             ele1.datepicker({
+                language: $translate.instant('Language'),
                 startDate: $scope.startDate,
                 endDate: $scope.endDate,
                 viewMode: $scope.viewMode,

atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.ctrl.js

@@ -501,6 +501,7 @@
         var initDatePicker = function () {
             var ele1 = $("#periodDatepicker");
             ele1.datepicker({
+                language: $translate.instant('Language'),
                 startDate: $scope.startDate,
                 endDate: $scope.endDate,
                 viewMode: $scope.viewMode,

atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.ctrl.js

@@ -432,6 +432,7 @@
         var initDatePicker = function () {
             var ele1 = $("#periodDatepicker");
             ele1.datepicker({
+                language: $translate.instant('Language'),
                 startDate: $scope.startDate,
                 endDate: $scope.endDate,
                 viewMode: $scope.viewMode,

atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.ctrl.js

@@ -444,6 +444,7 @@
         var initDatePicker = function () {
             var ele1 = $("#periodDatepicker");
             ele1.datepicker({
+                language: $translate.instant('Language'),
                 startDate: $scope.startDate,
                 endDate: $scope.endDate,
                 viewMode: $scope.viewMode,

atms-web/src/main/webapp/app/dataImport/data-extraction/extract-financial-data/extract-financial-data.ctrl.js

@@ -47,7 +47,7 @@
         $scope.startDate = new Date(year - 20, 1, 1);
         $scope.endDate = new Date(year + 20, 1, 1);
         $scope.viewMode = 1;
-        $scope.dateFormat = $translate.instant('dateFormat4YearMonth');
+        $scope.dateFormat = $translate.instant('yyyy-MM');
 
         $scope.importExcelFile = null;
         $scope.UploadPeriodTime = null;
@@ -367,17 +367,19 @@
             };
 
             //日期
-            $scope.dateBoxStart = {
-                width: '100%',
-                acceptCustomValue: false,
-                openOnFieldClick: true,
-                displayFormat: 'yyyy-MM',
-                maxZoomLevel: "year",
-                dateSerializationFormat: 'yyyy-MM',
-                bindingOptions: {
-                    value: 'formParam.period'
-                }
-            };
+            var ele1 = $("#periodDatepicker");
+            ele1.datepicker({
+                language: $translate.instant('Language'),
+                startDate: $scope.startDate,
+                endDate: $scope.endDate,
+                viewMode: $scope.viewMode,
+                minViewMode: $scope.viewMode,
+                autoclose: true, //选中之后自动隐藏日期选择框
+                clearBtn: true, //清除按钮
+                todayBtn: false, //今日按钮
+                format: $scope.dateFormat //日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
+            });
+            ele1.datepicker("setDate", $scope.selectedDate);
             initParam();
             checkUserOrganizationPermissionList();
             getUserPermission();

atms-web/src/main/webapp/app/dataImport/data-extraction/extract-financial-data/extract-financial-data.html

@@ -17,7 +17,11 @@
                 </div>
                 <label class="col-sm-1 control-label">{{'InvoiceQJ' | translate}}：</label>
                 <div class="col-sm-2">
-                    <div dx-date-box="dateBoxStart"></div>
+                    <div class="period-picker" style="display: inline-block;width: 150px;">
+                        <input type="text" id="periodDatepicker" class="datepicker form-control imp-subheader"
+                               style="width:120px;display: inline-block" readonly="readonly" ng-model="formParam.period" />
+                        <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
+                    </div>
                 </div>
                 <label class="col-sm-1 control-label">{{'SelectedDataType' | translate}}：</label>
                 <div class="col-sm-2">

atms-web/src/main/webapp/app/dataImport/data-extraction/extract-invoice-data/extract-invoice-data.ctrl.js

@@ -273,6 +273,7 @@
         var initDatePicker = function () {
             var ele1 = $("#periodDatepicker");
             ele1.datepicker({
+                language: $translate.instant('Language'),
                 startDate: $scope.startDate,
                 endDate: $scope.endDate,
                 viewMode: $scope.viewMode,

atms-web/src/main/webapp/app/dataImport/vat-revenue-conf-mapping/vat-revenue-conf-mapping.ctrl.js

@@ -185,7 +185,15 @@
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (res && res.data && 0 === res.data.code) {
+                    if(res.data.data.length==0){
                         SweetAlert.success($translate.instant('ImportSuccess'));
+                    }else{
+                        var msg = '';
+                        angular.forEach(res.data.data,function (item) {
+                            msg += item +" \n ";
+                        });
+                        SweetAlert.success(msg);
+                    }
                     $scope.refreshConfigGrid();
                 } else {
                     SweetAlert.error($translate.instant('SystemError'));

atms-web/src/main/webapp/app/dataImport/vat-revenue-conf-mapping/vat-revenue-conf-mapping.less

@@ -177,7 +177,7 @@
     .dt-init-wrapper {
       margin: 30px 0;
       max-width: 99%;
-      height: calc(~'100% - 25px');
+      height: calc(100% - 200px);
       position: relative;
 
       .dropdown {
@@ -188,15 +188,8 @@
         }
       }
 
-      .importPLStatusGridContainer {
-        height: calc(~'100% - 30px');
-        overflow: hidden;
-        position: absolute;
-        top: 0;
-        bottom: 136px; /* 130 + 6 */
-        left: 0;
-        right: 0;
-        background-color: #FFF;
+      #revenueGridContainer{
+        height: 460px;
       }
     }