Merge branch 'dev_mysql_ken' of…

Merge branch 'dev_mysql_ken' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql_ken

atms-web/src/main/webapp/app/vat/preview/vat-preview-cash-flow-manual/vat-preview-cash-flow-manual.ctrl.js

@@ -174,7 +174,7 @@
                 autoclose: true,//选中之后自动隐藏日期选择框
                 clearBtn: true,//清除按钮
                 todayBtn: false,//今日按钮
-                format: $scope.dateFormat//日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
+                format: $scope.dateFormatMomth//日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
             }).on('changeDate', function (e) {
                 // 开始月份
                 var startMonth = vatSessionService.project.year * 100 + e.date.getMonth() + 1;

atms-web/src/main/webapp/app/vat/preview/vat-preview-cash-flow-manual/vat-preview-cash-flow-manual.html

@@ -9,8 +9,10 @@
     </div>
 
     <div style="margin-bottom: 10px;margin-left: 20px;margin-top: 10px;">
-        {{'EnterpriseAccountSetName' | translate }}：<span class="numAmount">{{ledgerNameFirst}}</span>&nbsp;&nbsp;&nbsp;
+<!--        {{'EnterpriseAccountSetName' | translate }}：<span class="numAmount">{{ledgerNameFirst}}</span>&nbsp;&nbsp;&nbsp;-->
         {{'ImportTime' | translate }}：<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>
+<!--        {{'ImportTime' | translate }}：<span class="numAmount">{{ importDate| date:'yyyy-MM'}}</span>-->
+
     </div>
 
     <div id="mainAreaDiv" class="main-area">