1、导入分发页面条件框对齐；2、日记账预览去掉多余的列；3、财务数据抽取列的宽度；4、机构展示基本信息时展示出公司代码

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html

@@ -195,7 +195,7 @@
                                             <div class="form-group">
                                                 <div class="col-sm-12">
                                                     <span class="control-label"> {{'OrganizationCode' | translate}}：<span
-                                                            title="{{selectCompany.OrganizationCode}}">{{selectCompany.OrganizationCode }}</span></span>
+                                                            title="{{selectCompany.code}}">{{selectCompany.code }}</span></span>
                                                 </div>
                                             </div>
                                             <!-- 注册地英文地址 -->

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

@@ -223,12 +223,12 @@
                     dataSource: 'gridDataSource'
                 },
                 columns: [
-                    {caption: $translate.instant('ApprovalStatus'),dataField: "approvalStatus",width: 120},
-                    {caption: $translate.instant('Posting'), dataField: "postedStatus",width: 120},
+                    // {caption: $translate.instant('ApprovalStatus'),dataField: "approvalStatus",width: 120},
+                    // {caption: $translate.instant('Posting'), dataField: "postedStatus",width: 120},
                     {caption: $translate.instant('AccountingPeriod'), dataField: "accountPeriod",width: 80},
                     {caption: $translate.instant('DocumentDate'), dataField: "accountingDate", dataType: "date", format: "yyyy-MM-dd",width: 100},
-                    {caption: $translate.instant('JournalSource'), dataField: "journalSource",width: 200},
-                    {caption: $translate.instant('JournalCategory'), dataField: "category",width: 200},
+                    // {caption: $translate.instant('JournalSource'), dataField: "journalSource",width: 200},
+                    // {caption: $translate.instant('JournalCategory'), dataField: "category",width: 200},
                     {caption: $translate.instant('JournalName'), dataField: "name",width: 200},
                     {caption: $translate.instant('DocumentNo'), dataField: "voucherNum",width: 200},
                     {caption: $translate.instant('Summary'), dataField: "description",width: 200},

atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.html

@@ -12,7 +12,7 @@
         <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
             <div class="form-group">
                 <label class="text-bold" translate="SelectedOrganization" style="    top: -6px;    position: relative;"><span>:</span></label>
-                <div dx-tag-box="selectOrgOptions" style="display: inline-block;"></div>
+                <div dx-tag-box="selectOrgOptions" style="display: inline-block;position: relative;    top: 6px;"></div>
             </div>
             <!--  <span class="text-bold" translate="SelectedOrganization"></span>:
               <div class="dropdown" style="margin-left:10px">

atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.html

@@ -12,7 +12,7 @@
         <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
             <div class="form-group">
                 <label class="text-bold" translate="SelectedOrganization" style="    top: -6px;    position: relative;"><span>:</span></label>
-                <div dx-tag-box="selectOrgOptions" style="display: inline-block;"></div>
+                <div dx-tag-box="selectOrgOptions" style="display: inline-block;position: relative;    top: 6px;"></div>
             </div>
             <div class="form-group">
                 <!--  <span class="text-bold" translate="SelectedOrganization"></span>:

atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.html

@@ -11,7 +11,7 @@
         <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
                         <div class="form-group">
                             <label class="text-bold" translate="SelectedOrganization" style="    top: -6px;    position: relative;"><span>:</span></label>
-                            <div dx-tag-box="selectOrgOptions" style="display: inline-block;"></div>
+                            <div dx-tag-box="selectOrgOptions" style="display: inline-block;position: relative;    top: 6px;"></div>
                         </div>
                          <!--   <span class="text-bold" translate="SelectedOrganization"></span>:
                             <div class="dropdown" style="margin-left:10px">

atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.html

@@ -11,7 +11,7 @@
         <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
                        <div class="form-group">
                            <label class="text-bold" translate="SelectedOrganization" style="    top: -6px;    position: relative;"><span>:</span></label>
-                           <div dx-tag-box="selectOrgOptions" style="display: inline-block;"></div>
+                           <div dx-tag-box="selectOrgOptions" style="display: inline-block;position: relative;    top: 6px;"></div>
                        </div>
                       <!--  <div class="col-sm-6 col-xs-6  col-lg-6 leftNav" style="width: 60%;">
                             <span class="text-bold" translate="SelectedOrganization"></span>:

atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.html

@@ -68,7 +68,7 @@
         <form class="form-inline" style="margin-top: 10px;">
                     <div class="form-group">
                         <label class="text-bold" translate="SelectedOrganization" style="    top: -6px;    position: relative;"><span>:</span></label>
-                        <div dx-tag-box="selectOrgOptions" style="display: inline-block;"></div>
+                        <div dx-tag-box="selectOrgOptions" style="display: inline-block;position: relative;    top: 6px;"></div>
                     </div>
                       <!--  <span class="text-bold" translate="SelectedOrganization"></span>:
                         <div class="dropdown" style="margin-left:10px">

atms-web/src/main/webapp/app/dataImport/data-extraction/extract-financial-data/extract-financial-data.ctrl.js

@@ -137,31 +137,32 @@
                 columns: [{
                     dataField: "id",
                     allowHeaderFiltering: false,
+                    width: '70px',
                     caption: $translate.instant('ExtractTaskId')
                 }, {
                     dataField: "taxpayerIdNum",
-                    width: '15%',
+                    width: '150px',
                     allowHeaderFiltering: false,
                     caption: $translate.instant('TaxpayerIdNum')
                 }, {
                     dataField: "companyCode",
                     allowHeaderFiltering: false,
                     caption: $translate.instant('CompanyCode'),
-                    width: '13%'
+                    width: '75px'
                 }, {
                     dataField: "companyName",
                     allowHeaderFiltering: false,
-                    width: '20%',
+                    width: '230px',
                     caption: $translate.instant('CompanyName')
                 }, {
                     dataField: "fileType",
                     allowHeaderFiltering: false,
-                    width: '15%',
+                    width: '140px',
                     caption: $translate.instant('ExtractFile')
                 }, {
                     dataField: "periodYear",
                     allowHeaderFiltering: false,
-                    width: '8%',
+                    width: '60px',
                     caption: $translate.instant('YearPeriod')
                 },
                     /*{
@@ -173,27 +174,27 @@
                     {
                     dataField: "periodMonth",
                     allowHeaderFiltering: false,
-                    width: '8%',
+                    width: '75px',
                     caption: $translate.instant('Period')
                 }, {
                     dataField: "recordSize",
                     allowHeaderFiltering: false,
-                    width: '10%',
+                    width: '75px',
                     caption: $translate.instant('RecordSize')
                 }, {
                     dataField: "errorMsg",
                     allowHeaderFiltering: false,
-                    width: '20%',
+                    width: '350px',
                     caption: $translate.instant('Status')
                 }, {
                         dataField: "operator",
                         allowHeaderFiltering: false,
-                        width: '10%',
+                        width: '100px',
                         caption: $translate.instant('LogOperationUser')
                     }, {
                         dataField: "operateTime",
                         allowHeaderFiltering: false,
-                        width: '18%',
+                        width: '150px',
                         caption: $translate.instant('LogOperationTime'),
                         calculateCellValue: function(data) {
                             return new Date(data.operateTime).formatDateTime('yyyy-MM-dd HH:mm:ss');
@@ -216,14 +217,15 @@
                 paging: {
                     pageSize: 100,
                 },
-                scrolling: {
-                    mode: "virtual"
-                },
+
+                // scrolling: {
+                //     mode: "virtual"
+                // },
                 grouping: {
                     autoExpandAll: false
                 },
                 allowColumnResizing: true,
-                columnAutoWidth: true,
+                // columnAutoWidth: true,
                 showRowLines: true,
                 showColumnLines: true,
                 rowAlternationEnabled: true,  //单双行颜色

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

@@ -307,12 +307,12 @@
                     dataSource: 'gridDataSource'
                 },
                 columns: [
-                    {caption: $translate.instant('ApprovalStatus'),dataField: "approvalStatus",width: 120},
-                    {caption: $translate.instant('Posting'), dataField: "postedStatus",width: 120},
+                    // {caption: $translate.instant('ApprovalStatus'),dataField: "approvalStatus",width: 120},
+                    // {caption: $translate.instant('Posting'), dataField: "postedStatus",width: 120},
                     {caption: $translate.instant('AccountingPeriod'), dataField: "period",width: 100},
                     {caption: $translate.instant('DocumentDate'), dataField: "accountingDate", dataType: "date", format: "yyyy-MM-dd",width: 100},
-                    {caption: $translate.instant('JournalSource'), dataField: "journalSource",width: 200},
-                    {caption: $translate.instant('JournalCategory'), dataField: "category",width: 200},
+                    // {caption: $translate.instant('JournalSource'), dataField: "journalSource",width: 200},
+                    // {caption: $translate.instant('JournalCategory'), dataField: "category",width: 200},
                     {caption: $translate.instant('JournalName'), dataField: "name",width: 200},
                     {caption: $translate.instant('DocumentNo'), dataField: "voucherNum",width: 200},
                     {caption: $translate.instant('Summary'), dataField: "description",width: 200},