Merge remote-tracking branch 'origin/dev_mysql_ken' into dev_mysql_ken

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

@@ -354,7 +354,7 @@ public class DataPreviewSerivceImpl extends BaseService {
             header.setCompanyNameCn(org.getName());
             header.setPeriodStart(param.getPeriodStart());
             header.setPeriodEnd(param.getPeriodEnd());
-            header.setEntityCode(balanceSheets.get(0).getEntityCode());
+            header.setEntityCode(org.getCode());
             header.setLedgerName(balanceSheets.get(0).getLedgerName());
             header.setLedgerCurrencyCode(balanceSheets.get(0).getLedgerCurrencyCode());
         }
@@ -386,7 +386,7 @@ public class DataPreviewSerivceImpl extends BaseService {
             header.setCompanyNameCn(org.getName());
             header.setPeriodStart(param.getPeriodStart());
             header.setPeriodEnd(param.getPeriodEnd());
-            header.setEntityCode(profitLossStatements.get(0).getEntityCode());
+            header.setEntityCode(org.getCode());
             header.setLedgerName(profitLossStatements.get(0).getLedgerName());
             header.setLedgerCurrencyCode(profitLossStatements.get(0).getLedgerCurrencyCode());
         }

atms-web/src/main/webapp/app/vat/preview/vat-preview-adjustment-tab/vat-preview-adjustment-tab-search.html

@@ -18,13 +18,13 @@
                 <tr>
                     <td>
                         <span translate="ProfitCenterCode"></span>
-                        <input class="form-control input-width-middle" type="text" id="segment2" ng-model="queryParams.segment2" />
+                        <input class="form-control input-width-middle" type="text" id="segment5" ng-model="queryParams.segment5" />
                     </td>
                 </tr>
                 <tr>
                     <td>
                         <span translate="ProfitCenterName"></span>
-                        <input class="form-control input-width-middle" type="text" id="segment2Name" ng-model="queryParams.segment2Name" />
+                        <input class="form-control input-width-middle" type="text" id="segment5Name" ng-model="queryParams.segment5Name" />
                     </td>
                 </tr>
                 <tr>

atms-web/src/main/webapp/app/vat/preview/vat-preview-adjustment-tab/vat-preview-adjustment-tab.ctrl.js

@@ -220,7 +220,7 @@
         //在popover打开时执行事件
         var showPopover = function () {
             $timeout(function () {
-                initDatePicker();
+               // initDatePicker();
             }, 500);
         };
 
@@ -275,7 +275,7 @@
                  { name: $translate.instant('CostCenter'), width: 100,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment2}}</span></div>' },
                  { name: $translate.instant('Subject'), width: 100,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment3}}</span></div>' },
                  { name: $translate.instant('AuxiliarySubject'), width: 100,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment4}}</span></div>' },
-                 { name: $translate.instant('ProfitCenter'), width: 100,cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.segment5}}">{{row.entity.segment1}}</span></div>' },
+                 { name: $translate.instant('ProfitCenter'), width: 100,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment5}}</span></div>' },
                  { name: $translate.instant('Product'), width: 100,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.segment6}}</span></div>' },
                  { name: $translate.instant('ProjectName'),  width: 100,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.segment7}}</span></div>' },
                  { name: $translate.instant('BetweenCompanies'), width: 100,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment8}}</span></div>' },

atms-web/src/main/webapp/app/vat/preview/vat-preview-adjustment-tab/vat-preview-adjustment-tab.html

@@ -10,7 +10,7 @@
         </button>
         <span translate="AdjustmentTableTitle" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
         <input type="text" id="periodDatepicker" class="datepicker imp-subheader form-control periodInput"
-                                   readonly="readonly" ng-model="UploadPeriodTime" style="position:relative;top:-30px;left:150px;width: 120px;"/>
+                                    style="position:relative;top:-30px;left:150px;width: 120px;"/>
         <div style="position: relative; top: -56px; left: 72%;width: 380px;">
             {{'ImportTime' | translate}} : <span  style=" width: 150px;display: inline-block; ">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>&nbsp;&nbsp;
             <!-- <span translate="ImportTime" style="position: relative; top: -61px; left: 75%;"></span><span style="position: relative; top: -61px; left: 75%;">: {{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span> -->

atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet-prc-manual/vat-preview-off-balance-sheet-prc-manual.ctrl.js

@@ -211,7 +211,7 @@
         //在popover打开时执行事件
         var showPopover = function () {
             $timeout(function () {
-                initDatePicker1();
+                //initDatePickers1();
             }, 500);
         };
 

atms-web/src/main/webapp/app/vat/preview/vat-preview-profit-loss-prc-manual/vat-preview-profit-loss-prc-manual.ctrl.js

@@ -206,7 +206,7 @@
         //在popover打开时执行事件
         var showPopover = function () {
             $timeout(function () {
-                initDatePicker();
+                //initDatePicker();
             }, 500);
         };
         //发票类型转换

atms-web/src/main/webapp/app/vat/preview/vat-preview-profit-loss-prc-manual/vat-preview-profit-loss-prc-manual.html

@@ -10,7 +10,7 @@
         </button>-->
         <span translate="profitLossPRCManual" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
         <input type="text" id="periodDatepicker" class="datepicker imp-subheader form-control periodInput"
-                                   readonly="readonly" ng-model="UploadPeriodTime" style="position:relative;top:-30px;left:200px;width: 120px;"/>
+                                 style="position:relative;top:-30px;left:200px;width: 120px;"/>
         <span ng-click="downloadPL()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
     </div>