Skip to content

T
traffic-front
Commit d51f078a authored by eddie.woo's avatar eddie.woo
Browse files
Options

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

parents 39d1f1d8 645167ca
Show whitespace changes
Inline Side-by-side
Showing with 548 additions and 283 deletions
atms-web/src/main/webapp/app/analysis/data-import/domestic-data-import/domestic-data-import.ctrl.js
View file @ d51f078a
...@@ -475,7 +475,7 @@ ...@@ -475,7 +475,7 @@
pageSize: constant.page.pageSize pageSize: constant.page.pageSize
}, },
pager: { pager: {
showPageSizeSelector: true, showPageSizeSelector: false,
allowedPageSizes: constant.page.pageSizeArrary, allowedPageSizes: constant.page.pageSizeArrary,
showInfo: true showInfo: true
} }
......
atms-web/src/main/webapp/app/analysis/data-import/international-data-import/international-data-import.html
View file @ d51f078a
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<select class="selectpicker show-tick dropup" multiple data-live-search="true" <select class="selectpicker show-tick dropup" multiple data-live-search="true"
data-max-options="1" data-max-options="1"
data-size="10" data-size="10"
data-style="btn-primary" id ="contryList" data-style="btn-info" id ="contryList"
data-header="国家列表" data-header="国家列表"
data-content = "true" data-content = "true"
data-none-selected-text = "选择国家" data-none-selected-text = "选择国家"
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<select class="selectpicker show-tick dropup" multiple data-live-search="true" <select class="selectpicker show-tick dropup" multiple data-live-search="true"
data-width="auto" data-max-options="1" data-width="auto" data-max-options="1"
data-size="10" data-size="10"
data-style="btn-primary" id ="orgList" data-style="btn-info" id ="orgList"
data-header="公司列表" data-header="公司列表"
data-content = "true" data-content = "true"
data-icon-base = "tickIcon" data-icon-base = "tickIcon"
......
atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.ctrl.js
View file @ d51f078a
...@@ -1011,6 +1011,19 @@ ...@@ -1011,6 +1011,19 @@
}); });
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
......
atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.html
View file @ d51f078a
...@@ -2,18 +2,19 @@ ...@@ -2,18 +2,19 @@
<!--标题--> <!--标题-->
<div class="nav-wrapper"> <div class="nav-wrapper">
<div class="nav-header" translate="AdjustmentTableTitle"></div> <div class="nav-header" translate="AdjustmentTableTitle"></div>
<div class="alert alert-warning" style="width:400px;margin-bottom:5px;" ng-show="ImportErrorTab" ng-click="toggleErrorTab()"> <div class="alert alert-warning" style="width:400px;margin-bottom:5px;" ng-show="ImportErrorTab"
ng-click="toggleErrorTab()">
<i class="fa fa-exclamation-circle" aria-hidden="true"></i>{{errorMsg}} <i class="fa fa-exclamation-circle" aria-hidden="true"></i>{{errorMsg}}
</div> </div>
</div> </div>
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm"> <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
<div class="form-group" ng-style="setButtonWrapStyle()" style="width: 100%;margin-bottom: -38px;"> <div class="form-group">
<div class="import-wrapper"> <label class="text-bold" translate="SelectedOrganization" style=" top: -6px; position: relative;"><span>:</span></label>
<div class="row"> <div dx-tag-box="selectOrgOptions" style="display: inline-block;"></div>
<div class="col-sm-6 leftNav" style="width: 60%;"> </div>
<span class="text-bold" translate="SelectedOrganization"></span>: <!-- <span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width:200px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width:200px;">
...@@ -35,10 +36,12 @@ ...@@ -35,10 +36,12 @@
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>-->
<div class="form-group">
<span class="text-bold" translate="InvoiceQJ"></span>: <span class="text-bold" translate="InvoiceQJ"></span>:
<div class="period-picker" style="margin-left:10px"> <div class="period-picker" style="display: inline-block">
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;" <input type="text" id="periodDatepicker" class="datepicker imp-subheader form-control"
style="width:120px;"
readonly="readonly" ng-model="UploadPeriodTime"/> readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div> </div>
...@@ -47,10 +50,11 @@ ...@@ -47,10 +50,11 @@
</div> </div>
</div> </div>
<div class="col-sm-6 rightNav" style="width: 40%; margin-top: 10px;"> <div class="form-group">
<button type="button" <button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false" ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'"
ngf-allow-dir="false" class="btn btn-vat-third" > accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third">
{{'SelectFile' | translate}} {{'SelectFile' | translate}}
</button> </button>
<button type="button" <button type="button"
...@@ -68,9 +72,6 @@ ...@@ -68,9 +72,6 @@
translate="CoverImportBtn" translate="CoverImportBtn"
ng-click="doUploadAT(importEnum.CoverImport)"></button> ng-click="doUploadAT(importEnum.CoverImport)"></button>
</div> </div>
</div>
</div>
</div>
<!--分页栏--> <!--分页栏-->
<!--<div class="form-group page-form-group" ng-show="!fileName"> <!--<div class="form-group page-form-group" ng-show="!fileName">
...@@ -97,7 +98,9 @@ ...@@ -97,7 +98,9 @@
<script type="text/ng-template" id="tb-model-period-dropdown.html" class="tb-model-period-dropdow-popup"> <script type="text/ng-template" id="tb-model-period-dropdown.html" class="tb-model-period-dropdow-popup">
<div class="modal-header"> <div class="modal-header">
<div class="modal-title" style="margin-bottom:10px"> <div class="modal-title" style="margin-bottom:10px">
{{remarksTitle}}<i class="fa fa-times" aria-hidden="true" style="float: right; font-size: 11px; color: #CF2D1B" ng-click="closePeriodSelectModal()"></i> {{remarksTitle}}<i class="fa fa-times" aria-hidden="true"
style="float: right; font-size: 11px; color: #CF2D1B"
ng-click="closePeriodSelectModal()"></i>
</div> </div>
</div> </div>
<div class="modal-body"> <div class="modal-body">
......
atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.ctrl.js
View file @ d51f078a
...@@ -1183,6 +1183,19 @@ ...@@ -1183,6 +1183,19 @@
$scope.setGridStyle = setGridStyle; $scope.setGridStyle = setGridStyle;
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
......
atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.html
View file @ d51f078a
...@@ -2,22 +2,24 @@ ...@@ -2,22 +2,24 @@
<!--标题--> <!--标题-->
<div class="nav-wrapper"> <div class="nav-wrapper">
<div class="nav-header" translate="OffBalanceSheetTitle"></div> <div class="nav-header" translate="OffBalanceSheetTitle"></div>
<div class="alert alert-warning" style="width:400px;margin-bottom:5px;" ng-show="ImportErrorTab" ng-click="toggleErrorTab()"> <div class="alert alert-warning" style="width:400px;margin-bottom:5px;" ng-show="ImportErrorTab"
ng-click="toggleErrorTab()">
<i class="fa fa-exclamation-circle" aria-hidden="true"></i>{{errorMsg}} <i class="fa fa-exclamation-circle" aria-hidden="true"></i>{{errorMsg}}
</div> </div>
</div> </div>
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm"> <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
<div class="form-group" ng-style="setButtonWrapStyle()" style="width:100%;margin-bottom: -38px;"> <div class="form-group">
<div class="import-wrapper"> <label class="text-bold" translate="SelectedOrganization" style=" top: -6px; position: relative;"><span>:</span></label>
<div class="row"> <div dx-tag-box="selectOrgOptions" style="display: inline-block;position: relative; top: 6px;"></div>
<div class="col-sm-6 leftNav" style="width: 60%;"> </div>
<span class="text-bold" translate="SelectedOrganization"></span>: <!--<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width:200px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width:200px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}} {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect'
| translate)}}
<span class="caret" style="float: right "></span> <span class="caret" style="float: right "></span>
</button> </button>
<ul class="dropdown-menu" style="width: 380px;" aria-labelledby="dropdownMenu1"> <ul class="dropdown-menu" style="width: 380px;" aria-labelledby="dropdownMenu1">
...@@ -34,11 +36,11 @@ ...@@ -34,11 +36,11 @@
<span style="margin-left:5px;text-align: left;float: left;">{{i.name}}</span> <span style="margin-left:5px;text-align: left;float: left;">{{i.name}}</span>
</div> </div>
</li> </li>
</ul> </ul>-->
</div> <div class="form-group">
<span class="text-bold" translate="InvoiceQJ"></span>: <span class="text-bold" translate="InvoiceQJ"></span>:
<div class="period-picker" style="margin-left:10px"> <div class="period-picker" style="display: inline-block;">
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;" <input type="text" id="periodDatepicker" class="datepicker form-control imp-subheader" style="width:120px;"
readonly="readonly" ng-model="UploadPeriodTime"/> readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div> </div>
...@@ -46,9 +48,10 @@ ...@@ -46,9 +48,10 @@
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span> <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div> </div>
</div> </div>
<div class="col-sm-6 rightNav " style="width: 40%;margin-top: 10px;"> <div class="form-group">
<button type="button" <button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false" ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'"
accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third"> ngf-allow-dir="false" class="btn btn-vat-third">
{{'SelectFile' | translate}} {{'SelectFile' | translate}}
</button> </button>
...@@ -56,32 +59,24 @@ ...@@ -56,32 +59,24 @@
class="btn btn-vat-primary" class="btn btn-vat-primary"
translate="TemplateBtn" translate="TemplateBtn"
ng-click="downloadTemplate()"></button> ng-click="downloadTemplate()"></button>
<!-- <button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="AddImportBtn"
ng-click="doUploadBS(importEnum.AddImport)"></button>-->
<button type="button" <button type="button"
class="btn btn-vat-primary topButton" class="btn btn-vat-primary "
translate="CoverImportBtn" translate="CoverImportBtn"
ng-click="doUploadBS(importEnum.CoverImport)"></button> ng-click="doUploadBS(importEnum.CoverImport)"></button>
</div>
<div class="form-group">
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn"> <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf" <button class="btn btn-vat-primary " atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="ConverImportBtn" translate="ConverImportBtn"
ng-click="doUploadTbResult(importEnum.CoverImport)"></button>| ng-click="doUploadTbResult(importEnum.CoverImport)"></button>
<button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf" |
<button class="btn btn-vat-primary " atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button> translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div> </div>
</div> </div>
</div>
</div>
</div>
<!--分页栏--> <!--分页栏-->
<!--<div class="form-group page-form-group" ng-show="!fileName"> <!--<div class="form-group page-form-group" ng-show="!fileName">
...@@ -108,7 +103,9 @@ ...@@ -108,7 +103,9 @@
<script type="text/ng-template" id="tb-model-period-dropdown.html" class="tb-model-period-dropdow-popup"> <script type="text/ng-template" id="tb-model-period-dropdown.html" class="tb-model-period-dropdow-popup">
<div class="modal-header"> <div class="modal-header">
<div class="modal-title" style="margin-bottom:10px"> <div class="modal-title" style="margin-bottom:10px">
{{remarksTitle}}<i class="fa fa-times" aria-hidden="true" style="float: right; font-size: 11px; color: #CF2D1B" ng-click="closePeriodSelectModal()"></i> {{remarksTitle}}<i class="fa fa-times" aria-hidden="true"
style="float: right; font-size: 11px; color: #CF2D1B"
ng-click="closePeriodSelectModal()"></i>
</div> </div>
</div> </div>
<div class="modal-body"> <div class="modal-body">
......
atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.ctrl.js
View file @ d51f078a
...@@ -929,6 +929,18 @@ ...@@ -929,6 +929,18 @@
$scope.pagingOptions.totalItems = totalItemsCount; $scope.pagingOptions.totalItems = totalItemsCount;
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.html
View file @ d51f078a
...@@ -2,22 +2,24 @@ ...@@ -2,22 +2,24 @@
<!--标题--> <!--标题-->
<div class="nav-wrapper"> <div class="nav-wrapper">
<div class="nav-header" translate="CashFlowDDTitle"></div> <div class="nav-header" translate="CashFlowDDTitle"></div>
<div class="alert alert-warning" style="width:400px;margin-bottom:5px;" ng-show="ImportErrorTab" ng-click="toggleErrorTab()"> <div class="alert alert-warning" style="width:400px;margin-bottom:5px;" ng-show="ImportErrorTab"
ng-click="toggleErrorTab()">
<i class="fa fa-exclamation-circle" aria-hidden="true"></i>{{errorMsg}} <i class="fa fa-exclamation-circle" aria-hidden="true"></i>{{errorMsg}}
</div> </div>
</div> </div>
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm"> <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
<div class="form-group" ng-style="setButtonWrapStyle()" style="width: 100%;margin-bottom: -38px;"> <div class="form-group">
<div class="import-wrapper"> <label class="text-bold" translate="SelectedOrganization" style=" top: -6px; position: relative;"><span>:</span></label>
<div class="row"> <div dx-tag-box="selectOrgOptions" style="display: inline-block;position: relative; top: 6px;"></div>
<div class="col-sm-6" style="width: 60%;"> </div>
<span class="text-bold" translate="SelectedOrganization"></span>: <!-- <span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width:200px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width:200px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}} {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' |
translate)}}
<span class="caret" style="float: right "></span> <span class="caret" style="float: right "></span>
</button> </button>
<ul class="dropdown-menu" style="width: 380px;" aria-labelledby="dropdownMenu1"> <ul class="dropdown-menu" style="width: 380px;" aria-labelledby="dropdownMenu1">
...@@ -35,10 +37,11 @@ ...@@ -35,10 +37,11 @@
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>-->
<div class="form-group">
<span class="text-bold" translate="InvoiceQJ"></span>: <span class="text-bold" translate="InvoiceQJ"></span>:
<div class="period-picker" style="margin-left:10px"> <div class="period-picker" style="display:inline-block;">
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;" <input type="text" id="periodDatepicker" class="datepicker imp-subheader form-control" style="width:120px;"
readonly="readonly" ng-model="UploadPeriodTime"/> readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div> </div>
...@@ -46,10 +49,11 @@ ...@@ -46,10 +49,11 @@
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span> <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div> </div>
</div> </div>
<div class="col-sm-6 rightNav" style="width: 40%;margin-top: 10px;"> <div class="form-group">
<button type="button" <button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false" ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'"
ngf-allow-dir="false" class="btn btn-vat-third" > accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third">
{{'SelectFile' | translate}} {{'SelectFile' | translate}}
</button> </button>
<button type="button" <button type="button"
...@@ -58,30 +62,29 @@ ...@@ -58,30 +62,29 @@
ng-click="downloadTemplate()"></button> ng-click="downloadTemplate()"></button>
<button type="button" <button type="button"
class="btn btn-vat-primary topButton" class="btn btn-vat-primary "
translate="AddImportBtn" translate="AddImportBtn"
ng-click="doUploadCF(importEnum.AddImport)"></button> ng-click="doUploadCF(importEnum.AddImport)"></button>
<button type="button" <button type="button"
class="btn btn-vat-primary topButton" class="btn btn-vat-primary "
translate="CoverImportBtn" translate="CoverImportBtn"
ng-click="doUploadCF(importEnum.CoverImport)"></button> ng-click="doUploadCF(importEnum.CoverImport)"></button>
</div>
<div class="form-group">
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn"> <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf" <button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="ConverImportBtn" translate="ConverImportBtn"
ng-click="doUploadTbResult(importEnum.CoverImport)"></button>| ng-click="doUploadTbResult(importEnum.CoverImport)"></button>
|
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf" <button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button> translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div> </div>
</div> </div>
</div>
</div>
</div>
<!--分页栏--> <!--分页栏-->
<!--<div class="form-group page-form-group" ng-show="!fileName"> <!--<div class="form-group page-form-group" ng-show="!fileName">
...@@ -108,7 +111,9 @@ ...@@ -108,7 +111,9 @@
<script type="text/ng-template" id="tb-model-period-dropdown.html" class="tb-model-period-dropdow-popup"> <script type="text/ng-template" id="tb-model-period-dropdown.html" class="tb-model-period-dropdow-popup">
<div class="modal-header"> <div class="modal-header">
<div class="modal-title" style="margin-bottom:10px"> <div class="modal-title" style="margin-bottom:10px">
{{remarksTitle}}<i class="fa fa-times" aria-hidden="true" style="float: right; font-size: 11px; color: #CF2D1B" ng-click="closePeriodSelectModal()"></i> {{remarksTitle}}<i class="fa fa-times" aria-hidden="true"
style="float: right; font-size: 11px; color: #CF2D1B"
ng-click="closePeriodSelectModal()"></i>
</div> </div>
</div> </div>
<div class="modal-body"> <div class="modal-body">
......
atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.ctrl.js
View file @ d51f078a
...@@ -368,7 +368,18 @@ ...@@ -368,7 +368,18 @@
var initPagingControl = function (totalItemsCount) { var initPagingControl = function (totalItemsCount) {
$scope.pagingOptions.totalItems = totalItemsCount; $scope.pagingOptions.totalItems = totalItemsCount;
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
......
atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.html
View file @ d51f078a
...@@ -2,18 +2,20 @@ ...@@ -2,18 +2,20 @@
<!--标题--> <!--标题-->
<div class="nav-wrapper"> <div class="nav-wrapper">
<div class="nav-header" translate="CertifiedInvoicesListTitle"></div> <div class="nav-header" translate="CertifiedInvoicesListTitle"></div>
<div class="alert alert-warning" style="width:400px;margin-bottom:5px;" ng-show="ImportErrorTab" ng-click="toggleErrorTab()"> <div class="alert alert-warning" style="width:400px;margin-bottom:5px;" ng-show="ImportErrorTab"
ng-click="toggleErrorTab()">
<i class="fa fa-exclamation-circle" aria-hidden="true"></i>{{errorMsg}} <i class="fa fa-exclamation-circle" aria-hidden="true"></i>{{errorMsg}}
</div> </div>
</div> </div>
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm"> <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
<div class="form-group" ng-style="setButtonWrapStyle()" style="width: 100%;margin-bottom: -38px;"> <div class="form-group">
<div class="import-wrapper"> <label class="text-bold" translate="SelectedOrganization" style=" top: -6px; position: relative;"><span>:</span></label>
<div class="row"> <div dx-tag-box="selectOrgOptions" style="display: inline-block;"></div>
<div style = "width:60%" class="col-sm-6 leftNav"> </div>
<span class="text-bold" translate="SelectedOrganization"></span>: <div class="form-group">
<!-- <span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width:200px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width:200px;">
...@@ -35,10 +37,11 @@ ...@@ -35,10 +37,11 @@
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>-->
<span class="text-bold" translate="InvoiceQJ"></span>: <label class="text-bold" translate="InvoiceQJ"><span>:</span></label>
<div class="period-picker" style="margin-left:10px"> <div class="period-picker" style="display: inline-block">
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;" <input type="text" id="periodDatepicker" class="datepicker form-control imp-subheader"
style="width:120px;"
readonly="readonly" ng-model="UploadPeriodTime"/> readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div> </div>
...@@ -46,10 +49,11 @@ ...@@ -46,10 +49,11 @@
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span> <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div> </div>
</div> </div>
<div style = "width:40%; margin-top: 10px;" class="col-sm-6 rightNav"> <div class="form-group">
<button type="button" <button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false" ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'"
ngf-allow-dir="false" class="btn btn-vat-third" > accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third">
{{'SelectFile' | translate}} {{'SelectFile' | translate}}
</button> </button>
<button type="button" <button type="button"
...@@ -58,19 +62,15 @@ ...@@ -58,19 +62,15 @@
ng-click="downloadTemplate()"></button> ng-click="downloadTemplate()"></button>
<button type="button" <button type="button"
class="btn btn-vat-primary topButton" class="btn btn-vat-primary "
translate="AddImportBtn" translate="AddImportBtn"
ng-click="doUploadCIL(importEnum.AddImport)"></button> ng-click="doUploadCIL(importEnum.AddImport)"></button>
<button type="button" <button type="button"
class="btn btn-vat-primary topButton" class="btn btn-vat-primary "
translate="CoverImportBtn" translate="CoverImportBtn"
ng-click="doUploadCIL(importEnum.CoverImport)"></button> ng-click="doUploadCIL(importEnum.CoverImport)"></button>
</div> </div>
</div>
</div>
</div>
</form> </form>
<div class="dt-init-wrapper"> <div class="dt-init-wrapper">
...@@ -90,7 +90,9 @@ ...@@ -90,7 +90,9 @@
<script type="text/ng-template" id="tb-model-period-dropdown.html" class="tb-model-period-dropdow-popup"> <script type="text/ng-template" id="tb-model-period-dropdown.html" class="tb-model-period-dropdow-popup">
<div class="modal-header"> <div class="modal-header">
<div class="modal-title" style="margin-bottom:10px"> <div class="modal-title" style="margin-bottom:10px">
{{remarksTitle}}<i class="fa fa-times" aria-hidden="true" style="float: right; font-size: 11px; color: #CF2D1B" ng-click="closePeriodSelectModal()"></i> {{remarksTitle}}<i class="fa fa-times" aria-hidden="true"
style="float: right; font-size: 11px; color: #CF2D1B"
ng-click="closePeriodSelectModal()"></i>
</div> </div>
</div> </div>
<div class="modal-body"> <div class="modal-body">
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-bs-prc-adjust/import-cit-bs-prc-adjust.ctrl.js
View file @ d51f078a
...@@ -413,7 +413,18 @@ ...@@ -413,7 +413,18 @@
} }
}); });
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-bs-prc-adjust/import-cit-bs-prc-adjust.html
View file @ d51f078a
...@@ -5,10 +5,12 @@ ...@@ -5,10 +5,12 @@
</div> </div>
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm"> <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
<div class="form-group" ng-style="setButtonWrapStyle()"> <div class="form-group">
<div class="import-wrapper"> <label class="text-bold" translate="SelectedOrganization" style=" top: -6px; position: relative;"><span>:</span></label>
<span class="text-bold" translate="SelectedOrganization"></span>: <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"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width:200px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width:200px;">
...@@ -30,19 +32,22 @@ ...@@ -30,19 +32,22 @@
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>-->
<div class="form-group">
<span class="text-bold" translate="InvoiceQJ"></span>: <span class="text-bold" translate="InvoiceQJ"></span>:
<div class="period-picker" style="margin-left:10px"> <div class="period-picker" style="display: inline-block">
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;" <input type="text" id="periodDatepicker" class="datepicker form-control imp-subheader" style="width:120px;"
readonly="readonly" ng-model="UploadPeriodTime"/> readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div> </div>
<div ng-show="fileName" style="display:inline-block"> <div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span> <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div> </div>
</div>
<div class="form-group">
<button type="button" <button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false" ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px"> ngf-allow-dir="false" class="btn btn-vat-third" style="margin-top: 8px;">
{{'SelectFile' | translate}} {{'SelectFile' | translate}}
</button> </button>
<button type="button" <button type="button"
...@@ -59,9 +64,11 @@ ...@@ -59,9 +64,11 @@
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;" class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="CoverImportBtn" translate="CoverImportBtn"
ng-click="importFile(importEnum.CoverImport)"></button> ng-click="importFile(importEnum.CoverImport)"></button>
</div>
<div class="form-group">
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn"> <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf" <button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
...@@ -71,9 +78,8 @@ ...@@ -71,9 +78,8 @@
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button> translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div> </div>
</div>
</div>
</div>
<!--分页栏--> <!--分页栏-->
<!--<div class="form-group page-form-group" ng-show="!fileName"> <!--<div class="form-group page-form-group" ng-show="!fileName">
<div class="page-footer"> <div class="page-footer">
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-journal-adjust/import-cit-journal-adjust.ctrl.js
View file @ d51f078a
...@@ -424,6 +424,18 @@ ...@@ -424,6 +424,18 @@
}); });
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-journal-adjust/import-cit-journal-adjust.html
View file @ d51f078a
...@@ -5,10 +5,12 @@ ...@@ -5,10 +5,12 @@
</div> </div>
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm"> <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
<div class="form-group" ng-style="setButtonWrapStyle()"> <div class="form-group">
<div class="import-wrapper"> <label class="text-bold" translate="SelectedOrganization" style=" top: -6px; position: relative;"><span>:</span></label>
<span class="text-bold" translate="SelectedOrganization"></span>: <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"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
...@@ -30,19 +32,22 @@ ...@@ -30,19 +32,22 @@
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>-->
<div class="form-group">
<span class="text-bold" translate="InvoiceQJ"></span>: <span class="text-bold" translate="InvoiceQJ"></span>:
<div class="period-picker" style="margin-left:10px"> <div class="period-picker" style="display: inline-block;">
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;" <input type="text" id="periodDatepicker" class="datepicker form-control imp-subheader" style="width:120px;"
readonly="readonly" ng-model="UploadPeriodTime"/> readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div> </div>
<div ng-show="fileName" style="display:inline-block"> <div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span> <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div> </div>
</div>
<div class="form-group">
<button type="button" <button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false" ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px"> ngf-allow-dir="false" class="btn btn-vat-third" style="margin-top: 8px;">
{{'SelectFile' | translate}} {{'SelectFile' | translate}}
</button> </button>
<button type="button" <button type="button"
...@@ -60,8 +65,10 @@ ...@@ -60,8 +65,10 @@
translate="CoverImportBtn" translate="CoverImportBtn"
ng-click="importFile(importEnum.CoverImport)"></button> ng-click="importFile(importEnum.CoverImport)"></button>
</div>
<div class="form-group">
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn"> <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf" <button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
...@@ -71,9 +78,8 @@ ...@@ -71,9 +78,8 @@
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button> translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div> </div>
</div>
</div>
</div>
<!--分页栏--> <!--分页栏-->
<!--<div class="form-group page-form-group" ng-show="!fileName"> <!--<div class="form-group page-form-group" ng-show="!fileName">
<div class="page-footer"> <div class="page-footer">
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-profit-prc-adjust/import-cit-profit-prc-adjust.ctrl.js
View file @ d51f078a
...@@ -416,6 +416,18 @@ ...@@ -416,6 +416,18 @@
}); });
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-profit-prc-adjust/import-cit-profit-prc-adjust.html
View file @ d51f078a
...@@ -5,10 +5,12 @@ ...@@ -5,10 +5,12 @@
</div> </div>
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm"> <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
<div class="form-group" ng-style="setButtonWrapStyle()"> <div class="form-group">
<div class="import-wrapper"> <label class="text-bold" translate="SelectedOrganization" style=" top: -6px; position: relative;"><span>:</span></label>
<span class="text-bold" translate="SelectedOrganization"></span>: <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"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
...@@ -30,19 +32,22 @@ ...@@ -30,19 +32,22 @@
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>-->
<div class="form-group">
<span class="text-bold" translate="InvoiceQJ"></span>: <span class="text-bold" translate="InvoiceQJ"></span>:
<div class="period-picker" style="margin-left:10px"> <div class="period-picker" style="display: inline-block;">
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;" <input type="text" id="periodDatepicker" class="datepicker form-control imp-subheader" style="width:120px;"
readonly="readonly" ng-model="UploadPeriodTime"/> readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div> </div>
<div ng-show="fileName" style="display:inline-block"> <div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span> <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
</div> </div>
</div>
<div class="form-group">
<button type="button" <button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false" ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px"> ngf-allow-dir="false" class="btn btn-vat-third" style="margin-top: 8px;">
{{'SelectFile' | translate}} {{'SelectFile' | translate}}
</button> </button>
<button type="button" <button type="button"
...@@ -59,9 +64,11 @@ ...@@ -59,9 +64,11 @@
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;" class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="CoverImportBtn" translate="CoverImportBtn"
ng-click="importFile(importEnum.CoverImport)"></button> ng-click="importFile(importEnum.CoverImport)"></button>
</div>
<div class="form-group">
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn"> <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf" <button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
...@@ -72,7 +79,6 @@ ...@@ -72,7 +79,6 @@
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button> translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div> </div>
</div> </div>
</div>
<!--分页栏--> <!--分页栏-->
<!--<div class="form-group page-form-group" ng-show="!fileName"> <!--<div class="form-group page-form-group" ng-show="!fileName">
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-salary-advance/import-cit-salary-advance.ctrl.js
View file @ d51f078a
...@@ -440,7 +440,18 @@ ...@@ -440,7 +440,18 @@
} }
}); });
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-salary-advance/import-cit-salary-advance.html
View file @ d51f078a
...@@ -5,10 +5,12 @@ ...@@ -5,10 +5,12 @@
</div> </div>
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm"> <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
<div class="form-group" ng-style="setButtonWrapStyle()"> <div class="form-group">
<div class="import-wrapper"> <label class="text-bold" translate="SelectedOrganization" style=" top: -6px; position: relative;"><span>:</span></label>
<span class="text-bold" translate="SelectedOrganization"></span>: <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"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
...@@ -30,24 +32,29 @@ ...@@ -30,24 +32,29 @@
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>-->
<!--本年底、下年初的选择--> <!--本年底、下年初的选择-->
<span class="text-bold" translate="PreClassified"></span>: <div class="form-group">
<label class="text-bold" translate="PreClassified"><span>:</span></label>
<div class="option" style="display: inline-block"> <div class="option" style="display: inline-block">
<div id="endBeginButton" dx-select-box="endBeginOptions" style="width: 130px"></div> <div id="endBeginButton" dx-select-box="endBeginOptions" style="width: 130px"></div>
</div> </div>
</div>
<div class="form-group">
<span class="text-bold" translate="InvoiceQJ"></span>: <span class="text-bold" translate="InvoiceQJ"></span>:
<div class="period-picker" style="margin-left:10px"> <div class="period-picker" style="display: inline-block;">
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;" <input type="text" id="periodDatepicker" class="datepicker form-control imp-subheader" style="width:120px;"
readonly="readonly" ng-model="UploadPeriodTime"/> readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div> </div>
<div ng-show="fileName" style="display:inline-block"> <div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span> <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div> </div>
</div>
<div class="form-group">
<button type="button" <button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false" ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px"> ngf-allow-dir="false" class="btn btn-vat-third" style=" margin-top: 8px;">
{{'SelectFile' | translate}} {{'SelectFile' | translate}}
</button> </button>
<button type="button" <button type="button"
...@@ -64,9 +71,11 @@ ...@@ -64,9 +71,11 @@
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;" class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="CoverImportBtn" translate="CoverImportBtn"
ng-click="importFile(importEnum.CoverImport)"></button> ng-click="importFile(importEnum.CoverImport)"></button>
</div>
<div class="form-group">
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn"> <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf" <button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
...@@ -77,7 +86,6 @@ ...@@ -77,7 +86,6 @@
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button> translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div> </div>
</div> </div>
</div>
<!--分页栏--> <!--分页栏-->
<!--<div class="form-group page-form-group" ng-show="!fileName"> <!--<div class="form-group page-form-group" ng-show="!fileName">
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.ctrl.js
View file @ d51f078a
...@@ -418,6 +418,19 @@ ...@@ -418,6 +418,19 @@
} }
}); });
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.html
View file @ d51f078a
...@@ -5,14 +5,17 @@ ...@@ -5,14 +5,17 @@
</div> </div>
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm"> <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
<div class="form-group" ng-style="setButtonWrapStyle()"> <div class="form-group">
<div class="import-wrapper"> <label class="text-bold" translate="SelectedOrganization" style=" top: -6px; position: relative;"><span>:</span></label>
<span class="text-bold" translate="SelectedOrganization"></span>: <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"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}} {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' |
translate)}}
<span class="caret" style="float: right "></span> <span class="caret" style="float: right "></span>
</button> </button>
<ul class="dropdown-menu" style="width: 380px;" aria-labelledby="dropdownMenu1"> <ul class="dropdown-menu" style="width: 380px;" aria-labelledby="dropdownMenu1">
...@@ -30,19 +33,22 @@ ...@@ -30,19 +33,22 @@
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>-->
<div class="form-group">
<span class="text-bold" translate="InvoiceQJ"></span>: <span class="text-bold" translate="InvoiceQJ"></span>:
<div class="period-picker" style="margin-left:10px"> <div class="period-picker" style="display: inline-block;">
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;" <input type="text" id="periodDatepicker" class="datepicker form-control imp-subheader" style="width:120px;"
readonly="readonly" ng-model="UploadPeriodTime"/> readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div> </div>
</div>
<div ng-show="fileName" style="display:inline-block"> <div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span> <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div> </div>
<div class="form-group">
<button type="button" <button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false" ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px"> ngf-allow-dir="false" class="btn btn-vat-third" style="margin-top: 8px;">
{{'SelectFile' | translate}} {{'SelectFile' | translate}}
</button> </button>
<button type="button" <button type="button"
...@@ -60,8 +66,10 @@ ...@@ -60,8 +66,10 @@
translate="CoverImportBtn" translate="CoverImportBtn"
ng-click="importFile(importEnum.CoverImport)"></button> ng-click="importFile(importEnum.CoverImport)"></button>
</div>
<div class="form-group">
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn"> <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf" <button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
...@@ -72,7 +80,6 @@ ...@@ -72,7 +80,6 @@
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button> translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div> </div>
</div> </div>
</div>
<!--分页栏--> <!--分页栏-->
<!--<div class="form-group page-form-group" ng-show="!fileName"> <!--<div class="form-group page-form-group" ng-show="!fileName">
......
atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.ctrl.js
View file @ d51f078a
...@@ -464,6 +464,19 @@ ...@@ -464,6 +464,19 @@
}); });
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
......
atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.html
View file @ d51f078a
...@@ -9,11 +9,12 @@ ...@@ -9,11 +9,12 @@
</div> </div>
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm"> <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
<div class="form-group" ng-style="setButtonWrapStyle()" style="margin-bottom: -38px; width: 100%;"> <div class="form-group">
<div class="import-wrapper"> <label class="text-bold" translate="SelectedOrganization" style=" top: -6px; position: relative;"><span>:</span></label>
<div class="col-sm-6 leftNav" style="width: 60%;"> <div dx-tag-box="selectOrgOptions" style="display: inline-block;position: relative; top: 6px;"></div>
<span class="text-bold" translate="SelectedOrganization"></span>: </div>
<!--<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" style="width:200px;" type="button" <button class="btn btn-default dropdown-toggle" style="width:200px;" type="button"
id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
...@@ -35,10 +36,11 @@ ...@@ -35,10 +36,11 @@
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>-->
<span class="text-bold" translate="InvoiceQJ"></span>: <div class="form-group">
<div class="period-picker" style="margin-left:10px"> <label class="text-bold" translate="InvoiceQJ"><span>:</span></label>
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" <div class="period-picker" style="display: inline-block;">
<input type="text" id="periodDatepicker" class="datepicker form-control imp-subheader"
style="width:120px;" readonly="readonly" ng-model="UploadPeriodTime" /> style="width:120px;" readonly="readonly" ng-model="UploadPeriodTime" />
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div> </div>
...@@ -46,7 +48,7 @@ ...@@ -46,7 +48,7 @@
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span> <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div> </div>
</div> </div>
<div class="col-sm-6 rightNav" style="width: 40%;margin-top: 10px;"> <div class="form-group">
<button type="button" ngf-select="" type="file" ng-model="importExcelFile" <button type="button" ngf-select="" type="file" ng-model="importExcelFile"
ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third"> ngf-allow-dir="false" class="btn btn-vat-third">
...@@ -60,9 +62,7 @@ ...@@ -60,9 +62,7 @@
<button type="button" class="btn btn-vat-primary topButton" translate="CoverImportBtn" <button type="button" class="btn btn-vat-primary topButton" translate="CoverImportBtn"
ng-click="doUploadCPR(importEnum.CoverImport)"></button> ng-click="doUploadCPR(importEnum.CoverImport)"></button>
</div>
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn"> <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf" <button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
...@@ -72,9 +72,6 @@ ...@@ -72,9 +72,6 @@
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button> translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div> </div>
</div>
</div>
</div>
</form> </form>
<div class="dt-init-wrapper"> <div class="dt-init-wrapper">
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.ctrl.js
View file @ d51f078a
...@@ -384,7 +384,18 @@ ...@@ -384,7 +384,18 @@
var initPagingControl = function (totalItemsCount) { var initPagingControl = function (totalItemsCount) {
$scope.pagingOptions.totalItems = totalItemsCount; $scope.pagingOptions.totalItems = totalItemsCount;
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.html
View file @ d51f078a
...@@ -8,12 +8,12 @@ ...@@ -8,12 +8,12 @@
</div> </div>
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm"> <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
<div class="form-group" ng-style="setButtonWrapStyle()" style="width: 100%; margin-bottom: -38px;"> <div class="form-group">
<div class="import-wrapper"> <label class="text-bold" translate="SelectedOrganization" style=" top: -6px; position: relative;"><span>:</span></label>
<div class="row"> <div dx-tag-box="selectOrgOptions" style="display: inline-block;"></div>
<div class="col-sm-6 leftNav " style="width: 60%;"> </div>
<span class="text-bold" translate="SelectedOrganization"></span>: <!-- <span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
...@@ -35,10 +35,11 @@ ...@@ -35,10 +35,11 @@
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>-->
<div class="form-group">
<span class="text-bold" translate="InvoiceQJ"></span>: <span class="text-bold" translate="InvoiceQJ"></span>:
<div class="period-picker" style="margin-left:10px"> <div class="period-picker" style="display: inline-block">
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;" <input type="text" id="periodDatepicker" class=" form-control datepicker imp-subheader" style="width:120px;"
readonly="readonly" ng-model="UploadPeriodTime"/> readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div> </div>
...@@ -46,7 +47,7 @@ ...@@ -46,7 +47,7 @@
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span> <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div> </div>
</div> </div>
<div class="col-sm-6 rightNav" style="width: 40%; margin-top: 10px;"> <div class="form-group">
<button type="button" <button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false" ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" > ngf-allow-dir="false" class="btn btn-vat-third" >
...@@ -56,17 +57,11 @@ ...@@ -56,17 +57,11 @@
class="btn btn-vat-primary" class="btn btn-vat-primary"
translate="TemplateBtn" translate="TemplateBtn"
ng-click="downloadTemplate()"></button> ng-click="downloadTemplate()"></button>
<!--<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="AddImportBtn"
ng-click="doUploadID(importEnum.AddImport)"></button>-->
<button type="button" <button type="button"
class="btn btn-vat-primary topButton" class="btn btn-vat-primary topButton"
translate="CoverImportBtn" translate="CoverImportBtn"
ng-click="doUploadID(importEnum.CoverImport)"></button> ng-click="doUploadID(importEnum.CoverImport)"></button>
</div>
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn"> <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf" <button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf"
...@@ -77,10 +72,6 @@ ...@@ -77,10 +72,6 @@
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button> translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div> </div>
</div>
</div>
</div>
</div>
</form> </form>
<div class="dt-init-wrapper"> <div class="dt-init-wrapper">
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.ctrl.js
View file @ d51f078a
...@@ -419,6 +419,19 @@ ...@@ -419,6 +419,19 @@
} }
}; };
//-------------------------------------kevin insert begin -------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------kevin insert end -------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.html
View file @ d51f078a
...@@ -8,11 +8,12 @@ ...@@ -8,11 +8,12 @@
</div> </div>
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm"> <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
<div class="form-group" ng-style="setButtonWrapStyle()" style="width: 100%; margin-bottom: -38px;"> <div class="form-group">
<div class="import-wrapper"> <label class="text-bold" translate="SelectedOrganization" style=" top: -6px; position: relative;"><span>:</span></label>
<div class="row"> <div dx-tag-box="selectOrgOptions" style="display: inline-block;"></div>
<div class="col-sm-6 col-xs-6 col-lg-6 leftNav" style="width: 60%;"> </div>
<!-- <div class="col-sm-6 col-xs-6 col-lg-6 leftNav" style="width: 60%;">
<span class="text-bold" translate="SelectedOrganization"></span>: <span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
...@@ -36,17 +37,22 @@ ...@@ -36,17 +37,22 @@
</li> </li>
</ul> </ul>
</div> </div>
</div>-->
<div class="form-group">
<span class="text-bold" translate="InvoiceQJ"></span>: <span class="text-bold" translate="InvoiceQJ"></span>:
<div class="period-picker" style="margin-left:10px"> <div class="period-picker" style="display: inline-block">
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;" <input type="text" id="periodDatepicker" class="datepicker form-control imp-subheader" style="width:120px;"
readonly="readonly" ng-model="UploadPeriodTime"/> readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div> </div>
</div>
<div class="form-group">
<div ng-show="fileNameShow" style="display:inline-block"> <div ng-show="fileNameShow" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span> <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div> </div>
</div> </div>
<div class="col-sm-6 col-xs-6 col-lg-6 rightNav" style="width: 40%; margin-top: 10px" > <div class="form-group">
<button type="button" <button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false" ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" > ngf-allow-dir="false" class="btn btn-vat-third" >
...@@ -58,19 +64,15 @@ ...@@ -58,19 +64,15 @@
ng-click="downloadTemplate()"></button> ng-click="downloadTemplate()"></button>
<button type="button" <button type="button"
class="btn btn-vat-primary topButton" class="btn btn-vat-primary "
translate="AddImportBtn" translate="AddImportBtn"
ng-click="doUploadIR(importEnum.AddImport)"></button> ng-click="doUploadIR(importEnum.AddImport)"></button>
<button type="button" <button type="button"
class="btn btn-vat-primary topButton" class="btn btn-vat-primary "
translate="CoverImportBtn" translate="CoverImportBtn"
ng-click="doUploadIR(importEnum.CoverImport)"></button> ng-click="doUploadIR(importEnum.CoverImport)"></button>
</div> </div>
</div>
</div>
</div>
</form> </form>
<div class="dt-init-wrapper"> <div class="dt-init-wrapper">
......
atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.ctrl.js
View file @ d51f078a
...@@ -459,7 +459,18 @@ ...@@ -459,7 +459,18 @@
} }
}); });
}; };
//-------------------------------------------------kevin insert begin ---------------------------------------------
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
//-------------------------------------------------kevin insert end ---------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
......
atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.html
View file @ d51f078a
...@@ -2,22 +2,24 @@ ...@@ -2,22 +2,24 @@
<!--标题--> <!--标题-->
<div class="nav-wrapper"> <div class="nav-wrapper">
<div class="nav-header" translate="ProfitLossTitle"></div> <div class="nav-header" translate="ProfitLossTitle"></div>
<div class="alert alert-warning" style="width:400px;margin-bottom:5px;" ng-show="ImportErrorTab" ng-click="toggleErrorTab()"> <div class="alert alert-warning" style="width:400px;margin-bottom:5px;" ng-show="ImportErrorTab"
ng-click="toggleErrorTab()">
<i class="fa fa-exclamation-circle" aria-hidden="true"></i>{{errorMsg}} <i class="fa fa-exclamation-circle" aria-hidden="true"></i>{{errorMsg}}
</div> </div>
</div> </div>
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm"> <form class="form-inline" id="navigationForm" name="navigationForm" style="margin-top: 10px;">
<div class="form-group" ng-style="setButtonWrapStyle()" style="width: 100%;margin-bottom: -38px;"> <div class="form-group">
<div class="import-wrapper"> <label class="text-bold" translate="SelectedOrganization" style=" top: -6px; position: relative;"><span>:</span></label>
<div class="row"> <div dx-tag-box="selectOrgOptions" style="display: inline-block;position: relative; top: 6px;"></div>
<div class="col-sm-6 leftNav" style="width: 60%;"> </div>
<span class="text-bold" translate="SelectedOrganization"></span>: <!-- <span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}} {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' |
translate)}}
<span class="caret" style="float: right "></span> <span class="caret" style="float: right "></span>
</button> </button>
<ul class="dropdown-menu" style="width: 380px;" aria-labelledby="dropdownMenu1"> <ul class="dropdown-menu" style="width: 380px;" aria-labelledby="dropdownMenu1">
...@@ -35,10 +37,11 @@ ...@@ -35,10 +37,11 @@
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>-->
<div class="form-group">
<span class="text-bold" translate="InvoiceQJ"></span>: <span class="text-bold" translate="InvoiceQJ"></span>:
<div class="period-picker" style="margin-left:10px"> <div class="period-picker" style="display: inline-block">
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;" <input type="text" id="periodDatepicker" class="datepicker imp-subheader form-control" style="width:120px;"
readonly="readonly" ng-model="UploadPeriodTime"/> readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div> </div>
...@@ -46,10 +49,11 @@ ...@@ -46,10 +49,11 @@
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span> <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div> </div>
</div> </div>
<div class="col-sm-6 rightNav" style="width: 40%; margin-top: 10px;"> <div class="form-group">
<button type="button" <button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false" ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'"
ngf-allow-dir="false" class="btn btn-vat-third" > accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third">
{{'SelectFile' | translate}} {{'SelectFile' | translate}}
</button> </button>
<button type="button" <button type="button"
...@@ -63,25 +67,24 @@ ...@@ -63,25 +67,24 @@
ng-click="doUploadPL(importEnum.AddImport)"></button>--> ng-click="doUploadPL(importEnum.AddImport)"></button>-->
<button type="button" <button type="button"
class="btn btn-vat-primary topButton" class="btn btn-vat-primary "
translate="CoverImportBtn" translate="CoverImportBtn"
ng-click="doUploadPL(importEnum.CoverImport)"></button> ng-click="doUploadPL(importEnum.CoverImport)"></button>
</div>
<div class="form-group">
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn"> <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn topButton btn-vat-primary" atms-permission permission-control-type="ngIf" <button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="ConverImportBtn" translate="ConverImportBtn"
ng-click="doUploadTbResult(importEnum.CoverImport)"></button>| ng-click="doUploadTbResult(importEnum.CoverImport)"></button>
<button class=" topButton btn btn-vat-primary" atms-permission permission-control-type="ngIf" |
<button class=" btn btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button> translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div> </div>
</div> </div>
</div>
</div>
</div>
</form> </form>
<div class="dt-init-wrapper"> <div class="dt-init-wrapper">
...@@ -100,7 +103,9 @@ ...@@ -100,7 +103,9 @@
<script type="text/ng-template" id="tb-model-period-dropdown.html" class="tb-model-period-dropdow-popup"> <script type="text/ng-template" id="tb-model-period-dropdown.html" class="tb-model-period-dropdow-popup">
<div class="modal-header"> <div class="modal-header">
<div class="modal-title" style="margin-bottom:10px"> <div class="modal-title" style="margin-bottom:10px">
{{remarksTitle}}<i class="fa fa-times" aria-hidden="true" style="float: right; font-size: 11px; color: #CF2D1B" ng-click="closePeriodSelectModal()"></i> {{remarksTitle}}<i class="fa fa-times" aria-hidden="true"
style="float: right; font-size: 11px; color: #CF2D1B"
ng-click="closePeriodSelectModal()"></i>
</div> </div>
</div> </div>
<div class="modal-body"> <div class="modal-body">
......
atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.ctrl.js
View file @ d51f078a
...@@ -230,33 +230,18 @@ ...@@ -230,33 +230,18 @@
}; };
/------------------------------------------kevin insert -----------------------------------------/ //-------------------------------------------------kevin insert begin ---------------------------------------------
//机构下拉设置
$scope.selectOrgOptions = {
displayExpr: 'name',
valueExpr: 'id',
width: '95%',
bindingOptions: {
value: 'checkedCompanyCodeList',
dataSource: 'companyList'
},
height: '30px',
placeholder: $translate.instant('PleaseSelected'),
showClearButton: true,
searchEnabled: true,
noDataText: $translate.instant('RevenueNoOrgData'),
showSelectionControls: true
};
var initCompanyList = function () { var exp = {
orgService.getOrgListByUserId().success(function (data) { showDropDownButton : true,
if (data) { bindingOptions : {
$scope.companyList = data; value : 'checkedCompanyCodeList',
dataSource : 'companyList'
} }
}); }
}; PWC.orgManySelect($scope, $translate, exp);
//----------------------------------------------------------------------------------------------- //-------------------------------------------------kevin insert end ---------------------------------------------
var getGridHeight = function () { var getGridHeight = function () {
if ($scope.isLoadComplete) { if ($scope.isLoadComplete) {
......
atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.html
View file @ d51f078a
...@@ -65,11 +65,12 @@ ...@@ -65,11 +65,12 @@
</div> </div>
</div> </div>
</form>--> </form>-->
<form class="form-inline"> <form class="form-inline" style="margin-top: 10px;">
<div class="form-group" style="margin-bottom: -38px;width: 100%"> <div class="form-group">
<div class="import-wrapper"> <label class="text-bold" translate="SelectedOrganization" style=" top: -6px; position: relative;"><span>:</span></label>
<div class="col-sm-6 leftNav" style="width: 60%;"> <div dx-tag-box="selectOrgOptions" style="display: inline-block;"></div>
<span class="text-bold" translate="SelectedOrganization"></span>: </div>
<!-- <span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" style="width: 200px;" type="button" <button class="btn btn-default dropdown-toggle" style="width: 200px;" type="button"
id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;"> id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
...@@ -91,13 +92,15 @@ ...@@ -91,13 +92,15 @@
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>-->
<div class="form-group">
<span class="text-bold" translate="InvoiceQJ"></span>: <span class="text-bold" translate="InvoiceQJ"></span>:
<div class="period-picker" style="margin-left:10px"> <div class="period-picker" style="display: inline-block">
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" <input type="text" id="periodDatepicker" class="datepicker form-control imp-subheader"
style="width:120px;" readonly="readonly" ng-model="UploadPeriodTime" /> style="width:120px;" readonly="readonly" ng-model="UploadPeriodTime" />
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div> </div>
</div>
<!-- <label class="col-sm-2 control-label marTop">{{'SelectedOrganization' | translate}}：</label> <!-- <label class="col-sm-2 control-label marTop">{{'SelectedOrganization' | translate}}：</label>
<div class="col-sm-5 marTop"> <div class="col-sm-5 marTop">
<div dx-tag-box="selectOrgOptions" style="position: relative; left: 33px;"></div> <div dx-tag-box="selectOrgOptions" style="position: relative; left: 33px;"></div>
...@@ -108,8 +111,7 @@ ...@@ -108,8 +111,7 @@
readonly="readonly" ng-model="UploadPeriodTime"/> readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style=" position: relative; right: relative; right: -100px; top: -26px;"></i> <i class="fa fa-calendar imp-subheader red-color" style=" position: relative; right: relative; right: -100px; top: -26px;"></i>
</div> --> </div> -->
</div> <div class="form-group">
<div class="col-sm-6 rightNav" style="margin-top: 10px; width: 40%">
<button type="button" ngf-select="" type="file" ng-model="importExcelFile" <button type="button" ngf-select="" type="file" ng-model="importExcelFile"
ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third"> ngf-allow-dir="false" class="btn btn-vat-third">
...@@ -119,13 +121,12 @@ ...@@ -119,13 +121,12 @@
title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span> title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
<button type="button" class="btn btn-vat-primary" translate="TemplateBtn" <button type="button" class="btn btn-vat-primary" translate="TemplateBtn"
ng-click="downloadTemplate()"></button> ng-click="downloadTemplate()"></button>
<button type="button" class="btn btn-vat-primary topButton" translate="CoverImportBtn" <button type="button" class="btn btn-vat-primary " translate="CoverImportBtn"
ng-click="doUploadRLIT(importEnum.CoverImport)"></button> ng-click="doUploadRLIT(importEnum.CoverImport)"></button>
<button type="button" class="btn btn-vat-primary topButton" translate="AddImportBtn" <button type="button" class="btn btn-vat-primary " translate="AddImportBtn"
ng-click="doUploadRLIT(importEnum.AddImport)"></button> ng-click="doUploadRLIT(importEnum.AddImport)"></button>
</div> </div>
</div>
</div>
</form> </form>
<div class="dt-init-wrapper"> <div class="dt-init-wrapper">
......
atms-web/src/main/webapp/app/common/utils/pwc-util.js
View file @ d51f078a
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
if (!Number.prototype.formatAmount) { if (!Number.prototype.formatAmount) {
Number.prototype.formatAmount = function (decPlaces, type) { Number.prototype.formatAmount = function (decPlaces, type) {
if(type){ if (type) {
return Number(decPlaces.toFixed(2)); return Number(decPlaces.toFixed(2));
} }
decPlaces = isNaN(decPlaces = Math.abs(decPlaces)) ? 2 : decPlaces; decPlaces = isNaN(decPlaces = Math.abs(decPlaces)) ? 2 : decPlaces;
...@@ -132,9 +132,11 @@ ...@@ -132,9 +132,11 @@
} }
s = a.join("").replace(new RegExp("(\\d+)(\\d{" + d + "})\\d$"), "$1.$2"); s = a.join("").replace(new RegExp("(\\d+)(\\d{" + d + "})\\d$"), "$1.$2");
} if (b) s = s.substr(1); }
if (b) s = s.substr(1);
return (pm + s).replace(/\.$/, ""); return (pm + s).replace(/\.$/, "");
} return this + ""; }
return this + "";
}; };
...@@ -324,7 +326,7 @@ ...@@ -324,7 +326,7 @@
} }
value = new String(value); value = new String(value);
for (var i = 0, zeros = ''; i < (length - value.length) ; i++) { for (var i = 0, zeros = ''; i < (length - value.length); i++) {
zeros += '0'; zeros += '0';
} }
return zeros + value; return zeros + value;
...@@ -402,8 +404,18 @@ ...@@ -402,8 +404,18 @@
if (!Date.prototype.dateAdd) { if (!Date.prototype.dateAdd) {
Date.prototype.dateAdd = function (interval, number) { Date.prototype.dateAdd = function (interval, number) {
var d = this; var d = this;
var k = { 'y': 'FullYear', 'q': 'Month', 'm': 'Month', 'w': 'Date', 'd': 'Date', 'h': 'Hours', 'n': 'Minutes', 's': 'Seconds', 'ms': 'MilliSeconds' }; var k = {
var n = { 'q': 3, 'w': 7 }; 'y': 'FullYear',
'q': 'Month',
'm': 'Month',
'w': 'Date',
'd': 'Date',
'h': 'Hours',
'n': 'Minutes',
's': 'Seconds',
'ms': 'MilliSeconds'
};
var n = {'q': 3, 'w': 7};
eval('d.set' + k[interval] + '(d.get' + k[interval] + '()+' + ((n[interval] || 1) * number) + ')'); eval('d.set' + k[interval] + '(d.get' + k[interval] + '()+' + ((n[interval] || 1) * number) + ')');
return d; return d;
}; };
...@@ -915,7 +927,9 @@ ...@@ -915,7 +927,9 @@
} }
// Sort object keys // Sort object keys
data = _.chain(data).pairs().sortBy(function (x) { return x[0]; }).value(); data = _.chain(data).pairs().sortBy(function (x) {
return x[0];
}).value();
// Build new object // Build new object
data = _.object.apply(_, _.zip.apply(_, data)); data = _.object.apply(_, _.zip.apply(_, data));
...@@ -947,7 +961,9 @@ ...@@ -947,7 +961,9 @@
var chineseStr = ''; var chineseStr = '';
//分离金额后用的数组，预定义 //分离金额后用的数组，预定义
var parts; var parts;
if (money == '') { return ''; } if (money == '') {
return '';
}
money = parseFloat(money); money = parseFloat(money);
if (money >= maxNum) { if (money >= maxNum) {
//超出最大处理数字 //超出最大处理数字
...@@ -1034,7 +1050,9 @@ ...@@ -1034,7 +1050,9 @@
var chineseStr = ''; var chineseStr = '';
//分离金额后用的数组，预定义 //分离金额后用的数组，预定义
var parts; var parts;
if (money == '') { return ''; } if (money == '') {
return '';
}
money = parseFloat(money); money = parseFloat(money);
if (money >= maxNum) { if (money >= maxNum) {
//超出最大处理数字 //超出最大处理数字
...@@ -1128,9 +1146,10 @@ ...@@ -1128,9 +1146,10 @@
}, {}); }, {});
} }
}); });
}; }
;
PWC.warning = function(title, text, callback){ PWC.warning = function (title, text, callback) {
swal({ swal({
title: title, title: title,
text: text, text: text,
...@@ -1144,7 +1163,7 @@ ...@@ -1144,7 +1163,7 @@
}, },
callback); callback);
}; };
PWC.alert = function(title, text, callback){ PWC.alert = function (title, text, callback) {
swal({ swal({
title: title, title: title,
text: text, text: text,
...@@ -1160,7 +1179,7 @@ ...@@ -1160,7 +1179,7 @@
}; };
/------------------------------------------------kevin insert -----------------------------------/ /------------------------------------------------kevin insert -----------------------------------/
PWC.downloadCallBack = function(data,status, headers, fileName){ PWC.downloadCallBack = function (data, status, headers, fileName) {
var octetStreamMime = 'application/octet-stream'; var octetStreamMime = 'application/octet-stream';
var contentType = headers('content-type') || octetStreamMime; var contentType = headers('content-type') || octetStreamMime;
if (window.navigator.msSaveBlob) { if (window.navigator.msSaveBlob) {
...@@ -1183,7 +1202,38 @@ ...@@ -1183,7 +1202,38 @@
a.click(); a.click();
} }
} }
} };
/**
* @param scope angular 作用域
* @param translate 翻译器
*这里指定 dataSource 为 companyList
*/
PWC.orgManySelect = function (scope, translate, exp) {
var dataSource = "companyList";
var bindValue = "formParam.orgIds";
scope.selectOrgOptions = {
displayExpr: 'name',
valueExpr: 'id',
width: function() {
return window.innerWidth / 4.5;
},
bindingOptions: {
value: bindValue,
dataSource: dataSource
},
height: '35px',
placeholder: translate.instant('PleaseSelected'),
showClearButton: true,
searchEnabled: true,
noDataText: translate.instant('RevenueNoOrgData'),
showSelectionControls: true,
visible : true,
deferRendering : false
};
if(exp)
_.extend(scope.selectOrgOptions, exp);
};
/*-----------------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------------*/
})(window) })(window)
\ No newline at end of file
atms-web/src/main/webapp/app/dataImport/data-extraction/extract-invoice-data/extract-invoice-data.ctrl.js
View file @ d51f078a
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
$scope.selectedPeriod = null; $scope.selectedPeriod = null;
$scope.showTotalSecondRow = false; $scope.showTotalSecondRow = false;
$scope.maxTitleLength = constant.maxButtonTitleLength; $scope.maxTitleLength = constant.maxButtonTitleLength;
$scope.companyList = []; $scope.companyList = [];
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
$scope.checkedCompanyCodeList = []; $scope.checkedCompanyCodeList = [];
...@@ -52,8 +51,6 @@ ...@@ -52,8 +51,6 @@
$scope.importExcelFile = null; $scope.importExcelFile = null;
$scope.UploadPeriodTime = null; $scope.UploadPeriodTime = null;
//写日志 //写日志
var logDto = { var logDto = {
ID: '', ID: '',
...@@ -288,6 +285,9 @@ ...@@ -288,6 +285,9 @@
ele1.datepicker("setDate", $scope.selectedDate); ele1.datepicker("setDate", $scope.selectedDate);
}; };
//-------------------------------------kevin insert begin -------------------------------------------
var initCompanyList = function () { var initCompanyList = function () {
orgService.getOrgListByUserId().success(function (data) { orgService.getOrgListByUserId().success(function (data) {
if (data) { if (data) {
...@@ -295,7 +295,36 @@ ...@@ -295,7 +295,36 @@
} }
}); });
}; };
var exp = {
showDropDownButton : true,
bindingOptions : {
value : 'checkedCompanyCodeList',
dataSource : 'companyList'
}
}
PWC.orgManySelect($scope, $translate, exp);
$scope.selectDataType = {
displayExpr: 'type',
valueExpr: 'code',
width: function() {
return window.innerWidth / 4.5;
},
bindingOptions: {
value: 'checkedFileCodeList',
dataSource: 'fileTypeList'
},
height: '30px',
placeholder: $translate.instant('PleaseSelected'),
showClearButton: true,
searchEnabled: true,
noDataText: $translate.instant('RevenueNoOrgData'),
showSelectionControls: true,
visible : true,
deferRendering : false
};
//-------------------------------------kevin insert end -------------------------------------------
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
......
atms-web/src/main/webapp/app/dataImport/data-extraction/extract-invoice-data/extract-invoice-data.html
View file @ d51f078a
...@@ -8,10 +8,8 @@ ...@@ -8,10 +8,8 @@
</div> </div>
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm"> <form class="form-inline" id="navigationForm" name="navigationForm"style="margin-top: 10px;">
<div class="form-group" ng-style="setButtonWrapStyle()"> <!--<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="import-wrapper">
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 220px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 220px;">
...@@ -33,15 +31,23 @@ ...@@ -33,15 +31,23 @@
</div> </div>
</li> </li>
</ul> </ul>
</div>-->
<div class="form-group" style=" margin-top: 5px;">
<label class="control-label" translate="SelectedOrganization" style="position: relative; top: -9px;">:</label>
<div dx-tag-box="selectOrgOptions" style="display: inline-block; width: 300px!important;"></div>
</div> </div>
<span class="text-bold" translate="InvoiceQJ"></span>: <div class="form-group">
<div class="period-picker" style="margin-left:10px"> <label class="control-label" translate="InvoiceQJ"></label>:
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:80px;" <div class="period-picker" style="margin-left:10px; display: inline-block">
<input type="text" id="periodDatepicker" class="datepicker imp-subheader form-control"
readonly="readonly" ng-model="UploadPeriodTime"/> readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div> </div>
<span class="text-bold" translate="SelectedDataType"></span>: </div>
<div class="dropdown" style="margin-left:10px"> <div class="form-group">
<label class="text-bold" translate="SelectedDataType" style=" position: relative; top: -5px;">:</label>
<!-- <div class="dropdown" style="margin-left:10px; display: inline-block">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu2" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu2"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 180px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 180px;">
{{checkedFileTypeList ? ((checkedFileTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}} {{checkedFileTypeList ? ((checkedFileTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
...@@ -62,14 +68,16 @@ ...@@ -62,14 +68,16 @@
</div> </div>
</li> </li>
</ul> </ul>
</div>-->
<div dx-tag-box="selectDataType" style="display: inline-block; position: relative; top: 5px;"></div>
</div> </div>
<div class="form-group">
<button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" <button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;" class="btn btn-vat-primary form-control"
translate="ImportBtn" translate="ImportBtn"
ng-click="callInvoiceApi()"></button> ng-click="callInvoiceApi()"></button>
</div> </div>
</div>
</form> </form>
<div class="dt-init-wrapper"> <div class="dt-init-wrapper">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment