CIT分配表开发以及导入和预览页面bug修改

atms-dao/src/main/java/pwc/taxtech/atms/dao/CitDistributionMapper.java

+package pwc.taxtech.atms.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyMapper;
+import pwc.taxtech.atms.entity.CitDistribution;
+import pwc.taxtech.atms.entity.CitDistributionExample;
+
+@Mapper
+public interface CitDistributionMapper extends MyMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    long countByExample(CitDistributionExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(CitDistributionExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    int insert(CitDistribution record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    int insertSelective(CitDistribution record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    List<CitDistribution> selectByExampleWithRowbounds(CitDistributionExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    List<CitDistribution> selectByExample(CitDistributionExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    CitDistribution selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") CitDistribution record, @Param("example") CitDistributionExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") CitDistribution record, @Param("example") CitDistributionExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(CitDistribution record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(CitDistribution record);
+}
\ No newline at end of file

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

@@ -2,10 +2,10 @@
     <div class="nav-wrapper">
         <div class="nav-header">{{'AssetList' | translate}}</div>
         <div class="nav-tab">
-            <span ng-click="switchTab($event,1)">{{'AssetListImport' | translate}}</span>&nbsp;&nbsp;
-            <span class="active" ng-click="switchTab($event,2)">{{'FixedAssets' | translate}}</span><span
-                ng-click="switchTab($event,3)">{{'LongTermPrepaid' | translate}}</span><span
-                ng-click="switchTab($event,4)">{{'InvisibleAssets' | translate}}</span>
+            <span style="width: auto" ng-click="switchTab($event,1)">{{'AssetListImport' | translate}}</span>&nbsp;&nbsp;
+            <span style="width: auto" class="active" ng-click="switchTab($event,2)">{{'FixedAssets' | translate}}</span>
+            <span style="width: auto" ng-click="switchTab($event,3)">{{'LongTermPrepaid' | translate}}</span>
+            <span style="width: auto" ng-click="switchTab($event,4)">{{'InvisibleAssets' | translate}}</span>
             <!--税会差异的选择-->
             <!--<div class="option" style="display: inline-block">-->
                 <!--<span>{{'TaxAccountDifference' | translate}}</span>-->
@@ -138,7 +138,7 @@
                             atms-popover ng-mouseenter="prepareSummary()"
                             popover-container="body" popover-auto-hide="true" data-overwrite="true"
                             use-optimized-placement-algorithm="true"
-                            data-placement="left"
+                            data-placement="bottom"
                             data-templateurl="/app/cit/import/cit-import-asset-list/cit-import-asset-list-search.html">
                         <i class="fa fa-filter" aria-hidden="true"></i>
                     </button>

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

@@ -415,7 +415,7 @@
     min-width: 370px;
 
     .arrow {
-        left: 5% !important;
+        left: 0px;
     }
 }
 
@@ -423,9 +423,11 @@
     td {
         text-align: right;
         padding: 6px;
+        vertical-align: middle;
 
         span {
-            float: left;
+            text-align: right;
+            float: right;
         }
     }
 

atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.less

@@ -138,9 +138,11 @@
     td {
         text-align: right;
         padding: 6px;
+        vertical-align: middle;
 
         span {
-            float: left;
+            text-align: right;
+            float: right;
         }
     }
 

atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-generate-ver/cit-preview-tb-generate-ver.html

@@ -9,7 +9,7 @@
             <i class="fa fa-filter" aria-hidden="true"></i>
         </button>
         <span translate="TrialBalanceGeneVer" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;
-        <span class="text-bold" translate="InvoiceQJ" style="display: none"></span>：
+        <span class="text-bold" translate="InvoiceQJ" style="display: none"></span>
         <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;display: none;" id="input-invoice-period-picker" />
         <span ng-click="downloadJE()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
     </div>

atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-generate-ver/cit-preview-tb-generate-ver.less

@@ -138,9 +138,11 @@
     td {
         text-align: right;
         padding: 6px;
+        vertical-align: middle;
 
         span {
-            float: left;
+            text-align: right;
+            float: right;
         }
     }
 

atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-mapping-ver/cit-preview-tb-mapping-ver.html

@@ -9,7 +9,7 @@
             <i class="fa fa-filter" aria-hidden="true"></i>
         </button>
         <span translate="TrialBalanceMappingVer" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;
-        <span class="text-bold" translate="InvoiceQJ" style="display: none"></span>：
+        <span class="text-bold" translate="InvoiceQJ" style="display: none"></span>
         <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;display: none" id="input-invoice-period-picker" />
         <span ng-click="downloadJE()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
     </div>

atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-mapping-ver/cit-preview-tb-mapping-ver.less

@@ -138,9 +138,11 @@
     td {
         text-align: right;
         padding: 6px;
+        vertical-align: middle;
 
         span {
-            float: left;
+            text-align: right;
+            float: right;
         }
     }