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/service/impl/AssetListServiceImpl.java

@@ -480,7 +480,7 @@ public class AssetListServiceImpl extends BaseService {
         switch(enumCitAssetType){
             case FixedAssets:
                 //获取税务折旧期限
-                citAsset.setTaxDepreciationPeriod(Math.max(citAsset.getDepreciationPeriod(),assetDetailGroup.getGroupYear()*12));
+                citAsset.setTaxDepreciationPeriod(Math.max(citAsset.getDepreciationPeriod(),assetGroupResult.getTaxDepreciationPeriod()));
 
                 //把购入日期放入到Calendar
                 cal.setTime(citAsset.getBuyDate());
@@ -524,7 +524,7 @@ public class AssetListServiceImpl extends BaseService {
             case InvisibleAssets:
 
                 //获取税务折旧期限
-                citAsset.setTaxDepreciationPeriod(Math.max(citAsset.getDepreciationPeriod(),assetDetailGroup.getGroupYear()*12));
+                citAsset.setTaxDepreciationPeriod(Math.max(citAsset.getDepreciationPeriod(),assetGroupResult.getTaxDepreciationPeriod()));
 
                 //把购入日期放入到Calendar
                 cal.setTime(citAsset.getBuyDate());
@@ -569,6 +569,8 @@ public class AssetListServiceImpl extends BaseService {
 
     public ApiResultDto updateAssetResultList(List<CitAssetsList> assetsLists, String projectId){
         for(CitAssetsList citAsset:assetsLists){
+            //获取税务每月折旧额,（原值-残值）/税法折旧期间
+            citAsset.setTaxMonthDepreciationAmount((citAsset.getAcquisitionValue().subtract(citAsset.getResidualRate())).divide(new BigDecimal(citAsset.getTaxDepreciationPeriod()), 2));
             assetListMapper.updateByPrimaryKeySelective(citAsset);
         }
         return null;

atms-web/src/main/webapp/app-resources/css/nav.css

@@ -48,7 +48,7 @@
     float: left;
     height: 55px;
     line-height: 55px;
-    width: 155px;
+    width: 180px;
     text-align: center;
 }
 

atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.ctrl.js

@@ -966,7 +966,7 @@
                 });
             }
             assetListService.batchUpdateIsRetain($scope.displayType - 1, projectId, isRetain);
-        }
+        };
 
         //验证信息
         $scope.openTab = function (errorType, rowdata) {

atms-web/src/main/webapp/app/common/controls/edit-equity-modal/edit-equity-modal.less

@@ -67,17 +67,17 @@
         }
 
         .control-label {
-            padding-left: 12px;
+            padding-left: 42px;
             white-space: nowrap;
         }
 
 
         .dropdown-toggle .caret {
-            width: 10px;
-            height: 10px;
-            border: none; //IE
-            margin-top: -2px !important;
-        }
+             width: 10px;
+             height: 10px;
+             border: none; //IE
+             margin-top: -2px !important;
+         }
 
         .dropdown-toggle .caret:before {
             //IE