Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql

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

@@ -623,6 +623,7 @@
   "ImportOutputInvoice": "Import Output Invoices",
   "ImportShipmentList": "Import Departure List",
   "ImportShipmentListGd": "Import Departure List- GD",
+  "ImportPartSuccess": "Part Import Success",
   "ImportSuccess": "Import Success",
   "ImportTrialBalance": "Import TB",
   "ImportTypeTip": "Clear All Imported Financial Data for This Period, Proceed?",
@@ -720,6 +721,7 @@
   "IsConfirmCancelMap": "The System Has Reached the {status} State. Do You Confirm the Cancellation of Correspondence?",
   "IsConfirmManualReClassify": "The System Has Reached the {status} State. Are You Sure to Save Manual Reclassification?",
   "IsConfirmReCalcuate": "The System Has Reached the {status} State. Do You Confirm Recalculation??",
+  "IsConfirmTimeNotSame": "数据处理期间非当前税款所属期，是否继续进行数据处理？",
   "IsConfirmSaveReport": "The System Has Reached the {status} Status. Are You Sure to Save the Report?",
   "IsConfirmToApproveReport": "Whether to Confirm the Approval?",
   "IsConfirmToCompleteDeclaration": "Whether to Confirm the Completion Of the Declaration?",

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

@@ -779,6 +779,7 @@
     "ImportOutputInvoice": "导入销项发票",
     "ImportShipmentList": "导入发车清单",
     "ImportShipmentListGd": "导入发车清单-GD",
+    "ImportPartSuccess": "部分导入成功",
     "ImportSuccess": "导入成功",
     "ImportSuccessCount": "导入成功,验证失败:",
     "ImportTrialBalance": "导入试算平衡表",
@@ -955,6 +956,7 @@
     "IsConfirmCancelMap": "系统已到达{status}状态，是否确认取消对应?",
     "IsConfirmManualReClassify": "系统已到达{status}状态，是否确认保存手工重分类?",
     "IsConfirmReCalcuate": "系统已到达{status}状态，是否确认重新计算?",
+    "IsConfirmTimeNotSame": "数据处理期间非当前税款所属期，是否继续进行数据处理？",
     "IsConfirmSaveReport": "系统已到达{status}状态，是否确认保存报表?",
     "IsConfirmToApproveReport": "是否确认通过审核?",
     "IsConfirmToApproveReportTitle": "是否确定审核通过?",

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

@@ -191,8 +191,12 @@
                 if (ret.result) {
                     logDto.UpdateState = $translate.instant('ImportSuccess');
                     vatOperationLogService.addOperationLog(logDto);
-                    if(ret.resultMsg){
-                        swal($translate.instant('ImportSuccess'), ret.resultMsg, "warning");
+                    //var errorObj=JSON.parse(ret.resultMsg);
+                    if(ret.resultMsg!=""&&ret.resultMsg){
+                        var reg = new RegExp(";","g");//g,表示全部替换
+                        var error=ret.resultMsg.replace(reg,'\n');
+                        swal($translate.instant('ImportPartSuccess'), error, "warning");
+                        //swal($translate.instant('ImportSuccess'), ret.resultMsg, "warning");
                         //SweetAlert.warning(ret.resultMsg);
                     }else{
                         SweetAlert.success($translate.instant('ImportSuccess'));

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

@@ -198,8 +198,12 @@
                 if (ret.result) {
                     logDto.UpdateState = $translate.instant('ImportSuccess');
                     vatOperationLogService.addOperationLog(logDto);
-                    if(ret.resultMsg){
-                        swal($translate.instant('ImportSuccess'), ret.resultMsg, "warning");
+                    //var errorObj=JSON.parse(ret.resultMsg);
+                    if(ret.resultMsg!=""&&ret.resultMsg){
+                        var reg = new RegExp(";","g");//g,表示全部替换
+                        var error=ret.resultMsg.replace(reg,'\n');
+                        swal($translate.instant('ImportPartSuccess'), error, "warning");
+                        //swal($translate.instant('ImportSuccess'), ret.resultMsg, "warning");
                         //SweetAlert.warning(ret.resultMsg);
                     }else{
                         SweetAlert.success($translate.instant('ImportSuccess'));

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

@@ -744,7 +744,7 @@
                                 <span class="required-tip"> * </span>
                                 {{'Company Name' | translate}}
                             </label>
-                            <div class="col-sm-11" style="width:61.67%" id="companyNameOptionsMap">
+                            <div class="col-sm-11" style="width:61.67%;height: 13px" id="companyNameOptionsMap">
                                 <div dx-select-box="editOrgOptions"></div>
                                 <!--<select ng-model="editFieldModel.companyName" class="form-control"-->
                                         <!--title="{{editFieldModel.companyName}}" required-->
@@ -987,7 +987,7 @@
                                             <span class="required-tip"> * </span>
                                             {{'Company Name' | translate}}
                                         </label>
-                                        <div class="col-sm-11" style="width:61.67%">
+                                        <div class="col-sm-11" style="width:61.67%;height: 13px">
                                             <div ng-class="{'upload-fail-mark':!editFieldItem.companyName}" dx-select-box="editFieldItemOrgOptions"></div>
                                             <!--<select ng-model="editFieldItem.companyName" class="form-control"-->
                                                     <!--title="{{editFieldItem.companyName}}"-->

atms-web/src/main/webapp/app/vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js

@@ -375,6 +375,49 @@
             }
         };
 
+        var checkYearMonthCaculate2 =function (){
+            var now=new Date();
+            var month=now.getMonth()+1;
+            var year=now.getFullYear();
+            var vatMonth=vatSessionService.month;
+            if(vatSessionService.year==year){
+                if(vatMonth<month-1){
+                    return true;
+                }
+            }
+            if(vatSessionService.year==year-1&&vatMonth==12&&month==0){
+                return false;
+            }
+            return true;
+        }
+        var startCaculate3 = function () {
+            var bool=checkYearMonthCaculate2();
+            if(bool){
+               swal({
+                   title: "warning!",
+                   text: $translate.instant('IsConfirmTimeNotSame'),
+                   type: "warning",
+                   showCancelButton: true,
+                   confirmButtonColor: "#dd6b55",
+                   confirmButtonText: $translate.instant('Yes'),
+                   cancelButtonText: $translate.instant('No'),
+                   closeOnConfirm: true,
+                   closeOnCancel: true
+               },
+               function (isConfirm) {
+                   if(isConfirm){
+                    startCaculate2();
+                   }else{
+                       return ;
+                   }
+               })
+            }else{
+                startCaculate2();
+            }
+        }
+
+
+
          var startCaculate2 = function () {
                     if (vatSessionService.project.projectStatusList[vatSessionService.month] >= constant.ProjectStatusEnum.Generated) {
                         swal({
@@ -684,7 +727,7 @@
             $scope.resolveRef = [];
             initTasks();
             $scope.startCaculate = startCaculate;
-            $scope.startCaculate2 = startCaculate2;
+            $scope.startCaculate3 = startCaculate3;
             $scope.$on('$destroy',function(){
                 if($scope.timer)$interval.cancel($scope.timer);
             });

atms-web/src/main/webapp/app/vat/reduction/vat-caculate-data/vat-caculate-data.html

@@ -3,7 +3,7 @@
     <div class="vat-caculate-data-title" ng-if="tasks.length > 0">
         <!--<span translate="vatCaculateDataDesc"></span>-->
         <!--<button class="btn btn-vat-primary" translate="startCaculateData" ng-disabled="readonly" ng-click="startCaculate()"></button>-->
-        <button class="btn btn-vat-primary" translate="startCaculateData" ng-disabled="readonly" ng-click="startCaculate2()"></button>
+        <button class="btn btn-vat-primary" translate="startCaculateData" ng-disabled="readonly" ng-click="startCaculate3()"></button>
         <span ng-click="showOperateLogPop()"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'Remarks' | translate}}</span>
     </div>