Merge branch 'dev_oracle_sherlock' into 'dev_oracle'

key in chinese  bugs

See merge request root/atms!224

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

@@ -884,7 +884,7 @@ public class ReportServiceImpl {
                 cellData.setCellTemplateId(Long.parseLong(data.getCellTemplateId()));
                 cellData.setData(data.getAmount() == null ? null : data.getAmount().toString());
                 cellData.setKeyinData(data.getKeyinData());
-                cellData.setFormulaExp(data.getAmount() == null ? " " : data.getAmount().toString());
+                cellData.setFormulaExp(data.getAmount() == null ? "0.0" : data.getAmount().toString());
                 cellData.setCreateBy("admin");
                 cellData.setCreateTime(new Date());
                 cellData.setUpdateBy("admin");

atms-web/src/main/webapp/app/common/controls/tax-report-cell-detail-modal/tax-report-cell-detail-modal.ctrl.js

@@ -176,10 +176,10 @@
         function doConfirmEventHandler() {
             var r = /^00\d*|^\.\d+|\.$/;
 
-            if ($scope.detail.inputValue && parseFloat($scope.detail.inputValue).toFixed(2) > 9999999999999) {
-                SweetAlert.warning($translate.instant('CheckInputValueLength'));
-                return;
-            }
+            // if ($scope.detail.inputValue && parseFloat($scope.detail.inputValue).toFixed(2) > 9999999999999) {
+            //     SweetAlert.warning($translate.instant('CheckInputValueLength'));
+            //     return;
+            // }
             if ($scope.detail.dataType === 5) {
                 r = /^(-[1-9]\d*|[1-9]\d*|[0]{1,1})$/;
                 if (!r.test($scope.detail.inputValue)) {
@@ -200,7 +200,8 @@
 
             
 
-            if ($scope.detail.inputValue && (isNaN($scope.detail.inputValue) || r.test($scope.detail.inputValue))) {
+            if ($scope.detail.inputValue && ((isNaN($scope.detail.inputValue) || r.test($scope.detail.inputValue))
+            ||parseFloat($scope.detail.inputValue).toFixed(2) > 9999999999999)){
                 // $scope.detail.inputValue;
                 $scope.detail.keyinData = $scope.detail.inputValue;
             } else {

atms-web/src/main/webapp/app/common/controls/vat-report-sheet/vat-report-sheet.js

@@ -602,10 +602,6 @@
                             newVal = newVal.toFixed(4);
                         }
 
-                        if(x.keyinData){
-
-                        }
-
                         var oldVal = x.value;
                         oldVal = PWC.tryParseStringToNum(oldVal);
                         if (_.isBoolean(oldVal)) {

atms-web/src/main/webapp/app/common/controls/vat-report-view/vat-report-view.ctrl.js

@@ -1168,6 +1168,10 @@
 
             for (var i = 0; i < $scope.reportData.length; i++) {
                 var reportD = $scope.reportData[i];
+                if(manualData.keyinData && reportD.rowIndex === cellData.rowIndex
+                    && reportD.columnIndex === cellData.columnIndex){
+                    reportD.keyinData = manualData.keyinData;
+                }
                 for (var j = 0; j < reportD.dataSourceList.length; j++) {
                     if (reportD.dataSourceList[j].rowIndex === cellData.rowIndex
                         && reportD.dataSourceList[j].columnIndex === cellData.columnIndex) {
@@ -1501,6 +1505,8 @@
 
         //单元格详细信息点击确定时执行
         $scope.confirm = function () {
+            if(vatSessionService.month)
+                vatSessionService.project.period=vatSessionService.month;
             vatApproveService.approvalStatus(vatSessionService.project.id,vatSessionService.project.period).success(function(result){
                 if(result&&result=='committed'){
                    SweetAlert.error('报表提审中！');