报表公式

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

@@ -290,7 +290,8 @@ public class CellTemplateServiceImpl extends AbstractService {
         }
 
         if (nameList.isEmpty()) {
-            return formula;
+//            return formula;
+           return "报表公式";
         } else {
             return String.join("+", nameList);
         }

atms-web/src/main/webapp/app/vat/preview/vat-preview-output-invoice/vat-preview-output-invoice.ctrl.js

@@ -485,7 +485,7 @@
               //     cellTemplate: '<div class="ui-grid-cell-contents" title="{{row.entity.periodID}}"><span>{{row.entity.periodID}}<span></div>'
               // },
                {
-                   name: $translate.instant('InvoiceDate'), width: '10',
+                   name: $translate.instant('InvoiceDate'), width: '10%',
                    cellTemplate: '<div class="ui-grid-cell-contents" ><span>{{row.entity.kprq | date:"yyyy-MM-dd"}}</span></div>'
                },
                  {
@@ -505,7 +505,7 @@
                   cellTemplate: '<div class="ui-grid-cell-contents" title="{{row.entity.gfmc}}"><span>{{row.entity.gfmc}}</span></div>'
               },
               {
-                  name: $translate.instant('BuyerTaxNumber'), width: '17%',
+                  name: $translate.instant('BuyerTaxNumber'), width: '18%',
                   cellTemplate: '<div class="ui-grid-cell-contents" title="{{row.entity.gfsh}}"><span>{{row.entity.gfsh}}</span></div>'
               },
               //{