Skip to content

T
traffic-front
Commit 80e37989 authored by gary's avatar gary
Browse files
Options

1、fixbug

parent e713cd9f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 55 deletions
atms-api/src/main/java/pwc/taxtech/atms/common/message/ErrorMessageCN.java
View file @ 80e37989
......@@ -13,5 +13,7 @@ public class ErrorMessageCN {
public static final String BusinssUnitRepeat = "事业部重复!";
public static final String BusinssUnitUpdateFailed = "未对事业部名称或状态进行修改!";
public static final String OrgStructureFailed = "未对事业部名称或状态进行修改!";
public static final String NoLedgerID = "该机构未同步主数据账套ID!";
public static final String NoCompanyCode = "该机构缺少机构代码字段!";
}
atms-api/src/main/java/pwc/taxtech/atms/dto/ebsdto/EbsCallResp.java
View file @ 80e37989
......@@ -17,6 +17,8 @@ public class EbsCallResp {
private String companyCode;
private String segment1;
private String period;
private String prcFlag;
......@@ -99,5 +101,11 @@ public class EbsCallResp {
return taskDesc;
}
public String getSegment1() {
return segment1;
}
public void setSegment1(String segment1) {
this.segment1 = segment1;
}
}
atms-api/src/main/java/pwc/taxtech/atms/service/impl/AnalysisServiceImpl.java
View file @ 80e37989
......@@ -494,7 +494,7 @@ public class AnalysisServiceImpl extends BaseService {
}catch (ServiceException se){
throw se;
}catch (Exception e){
String errMsg = "分析模块-导入国际税业务数据异常";
String errMsg = "分析模块-导入国际税务数据异常";
logger.error(errMsg,e);
throw new ServiceException(errMsg);
}
......@@ -543,7 +543,7 @@ public class AnalysisServiceImpl extends BaseService {
}catch (ServiceException se){
throw se;
}catch (Exception e){
String errMsg = "分析模块-导入国际税业务数据异常";
String errMsg = "分析模块-导入国际业务数据异常";
logger.error(errMsg,e);
throw new ServiceException(errMsg);
}
......
atms-dao/src/main/java/pwc/taxtech/atms/dpo/UserDto.java
View file @ 80e37989
......@@ -29,7 +29,15 @@ public class UserDto {
}
public void setId(String id) {
id = id;
this.id = id;
}
public String getID() {
return id;
}
public void setID(String id) {
this.id = id;
}
public String getUserName() {
......
atms-web/src/main/webapp/app/admin/infrastructure/userManage/user-manage.ctrl.js
View file @ 80e37989
......@@ -56,7 +56,7 @@
resetErrorStatus();
userService.getSingleUser(userId).success(function (userData) {
$scope.editUserModel.IsAdmin = userData.isAdmin;
$scope.editUserModel.ID = userData.id;
$scope.editUserModel.id = userData.ID;
$scope.editUserModel.UserName = userData.userName;
$scope.editUserModel.Status = userData.status;
$scope.editUserModel.OrganizationID = userData.organizationID;
......@@ -125,7 +125,6 @@
function (isConfirm) {
if (isConfirm) {
// 选中
debugger;
userService.enableOrDisableUser(user.id, 0).success(function (or) {
if (or) {
if (or.result === true) {
......
atms-web/src/main/webapp/app/analysis/data-import/domestic-data-import/domestic-data-import.html
View file @ 80e37989
......@@ -33,23 +33,23 @@
readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
<button type="button" atms-permission permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
<button type="button"
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:10px">
{{fileName ? ((fileName)|limitString:maxTitleLength):'SelectFile' | translate}}
</button>
<button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="ExportBtn"
ng-click="doExport()"></button>
<button type="button" atms-permission permission-control-type="ngIf"
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="ImportBtn"
ng-click="doUpload()"></button>
<button type="button" atms-permission permission-control-type="ngIf"
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="TemplateBtn"
ng-click="downloadTemplate()"></button>
......
atms-web/src/main/webapp/app/analysis/data-import/international-data-import/international-data-import.html
View file @ 80e37989
......@@ -29,7 +29,7 @@
</div>
<span class="text-bold" translate="Period"></span>:
<div class="period-picker" style="margin-left:10px">
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;"
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:80px;"
readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
......@@ -51,11 +51,11 @@
<span class="text-bold" translate="Company"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu4"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 320px;">
{{selectCompany ? ((selectCompany)|translate):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
<ul class="dropdown-menu" style="width: 250px;max-height: 300px;overflow-y: auto;" aria-labelledby="dropdownMenu4">
<ul class="dropdown-menu" style="width: 320px;max-height: 300px;overflow-y: auto;" aria-labelledby="dropdownMenu4">
<li ng-repeat="i in companyList" ng-click="selectCompanyEvent(i)">
<div class="checkbox-custom checkbox-default">
<span style="margin-left:15px; float: left;">{{i.name}}</span>
......@@ -70,20 +70,20 @@
{{fileName ? ((fileName)|limitString:5):'SelectFile' | translate}}
</button>
<button type="button" atms-permission permission-control-type="ngIf"
class="btn btn-vat-primary" style="float:right;margin-left: 15px;margin-top: 8px;"
translate="ExportBtn"
ng-click="doExport()"></button>
<button type="button"
class="btn btn-vat-primary" style=""
translate="TemplateBtn"
ng-click="downloadTemplate()"></button>
<button type="button" atms-permission permission-control-type="ngIf"
class="btn btn-vat-primary" style="float:right;margin-top: 8px;"
<button type="button"
class="btn btn-vat-primary" style=""
translate="ImportBtn"
ng-click="doUpload()"></button>
<button type="button" atms-permission permission-control-type="ngIf"
class="btn btn-vat-primary" style="float:right;margin-top: 8px;"
translate="TemplateBtn"
ng-click="downloadTemplate()"></button>
<button type="button"
class="btn btn-vat-primary" style="margin-top: 8px;margin-right:0px;"
translate="ExportBtn"
ng-click="doExport()"></button>
</div>
</div>
</form>
......
atms-web/src/main/webapp/app/analysis/data-import/international-data-import/international-data-import.less
View file @ 80e37989
......@@ -118,7 +118,7 @@
}
.period-picker {
width: 150px;
width: 110px;
border: 1px solid #c7c5c0;
display: inline-block;
line-height: 20px;
......
atms-web/src/main/webapp/app/common/controls/edit-equity-change-modal/edit-equity-change-modal.ctrl.js
View file @ 80e37989
......@@ -98,6 +98,7 @@ controller('editEquityChangeModalController', ['$scope', '$log', '$translate', '
{
dataField: "certificateType",
caption: $translate.instant('CertificateType'),
width: "140px",
lookup: {
dataSource: constant.CertificateTypeList,
displayExpr: "type",
......
atms-web/src/main/webapp/app/common/controls/edit-equity-modal/edit-equity-modal.ctrl.js
View file @ 80e37989
......@@ -86,6 +86,7 @@ controller('editEquityModalController', ['$scope', '$log', '$translate', 'uiGrid
{
dataField: "certificateType",
caption: $translate.instant('CertificateType'),
width: "140px",
lookup: {
dataSource: constant.CertificateTypeList,
displayExpr: "type",
......
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js
View file @ 80e37989
......@@ -98,7 +98,6 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
// 保存机构
$scope.saveOrg = function () {
debugger;
if($scope.isInternational){
saveInternationalOrg();
}else{
......
atms-web/src/main/webapp/app/common/controls/edit-user-modal/edit-user-modal.ctrl.js
View file @ 80e37989
......@@ -24,7 +24,7 @@ controller('editUserModalController', ['$scope', '$log', '$translate', 'uiGridCo
resetErrorStatus();
userService.getSingleUser(userId).success(function(userData) {
$scope.editUserModel = {};
$scope.editUserModel.ID = userData.id;
$scope.editUserModel.id = userData.ID;
$scope.editUserModel.UserName = userData.userName;
$scope.editUserModel.Status = userData.status;
$scope.editUserModel.OrganizationID = userData.organizationID;
......
atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.html
View file @ 80e37989
......@@ -14,11 +14,11 @@
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
<ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1">
<ul class="dropdown-menu" style="width: 380px;" aria-labelledby="dropdownMenu1">
<li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
<span style="margin-left:5px;float: left;">全选</span></li>
......
atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.html
View file @ 80e37989
......@@ -14,11 +14,11 @@
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
<ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1">
<ul class="dropdown-menu" style="width: 380px;" aria-labelledby="dropdownMenu1">
<li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
<span style="margin-left:5px;float: left;">全选</span></li>
......
atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.html
View file @ 80e37989
......@@ -14,11 +14,11 @@
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
<ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1">
<ul class="dropdown-menu" style="width: 380px;" aria-labelledby="dropdownMenu1">
<li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
<span style="margin-left:5px;float: left;">全选</span></li>
......
atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.html
View file @ 80e37989
......@@ -14,11 +14,11 @@
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
<ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1">
<ul class="dropdown-menu" style="width: 380px;" aria-labelledby="dropdownMenu1">
<li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
<span style="margin-left:5px;float: left;">全选</span></li>
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-bs-prc-adjust/import-cit-bs-prc-adjust.html
View file @ 80e37989
......@@ -11,11 +11,11 @@
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
<ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1">
<ul class="dropdown-menu" style="width: 380px;" aria-labelledby="dropdownMenu1">
<li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
<span style="margin-left:5px;float: left;">全选</span></li>
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-journal-adjust/import-cit-journal-adjust.html
View file @ 80e37989
......@@ -11,11 +11,11 @@
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
<ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1">
<ul class="dropdown-menu" style="width: 380px;" aria-labelledby="dropdownMenu1">
<li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
<span style="margin-left:5px;float: left;">全选</span></li>
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-profit-prc-adjust/import-cit-profit-prc-adjust.html
View file @ 80e37989
......@@ -11,11 +11,11 @@
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
<ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1">
<ul class="dropdown-menu" style="width: 380px;" aria-labelledby="dropdownMenu1">
<li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
<span style="margin-left:5px;float: left;">全选</span></li>
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-salary-advance/import-cit-salary-advance.html
View file @ 80e37989
......@@ -11,11 +11,11 @@
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
<ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1">
<ul class="dropdown-menu" style="width: 380px;" aria-labelledby="dropdownMenu1">
<li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
<span style="margin-left:5px;float: left;">全选</span></li>
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.html
View file @ 80e37989
......@@ -11,11 +11,11 @@
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
<ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1">
<ul class="dropdown-menu" style="width: 380px;" aria-labelledby="dropdownMenu1">
<li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
<span style="margin-left:5px;float: left;">全选</span></li>
......
atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.html
View file @ 80e37989
......@@ -14,11 +14,11 @@
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
<ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1">
<ul class="dropdown-menu" style="width: 380px;" aria-labelledby="dropdownMenu1">
<li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
<span style="margin-left:5px;float: left;">全选</span></li>
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.html
View file @ 80e37989
......@@ -14,11 +14,11 @@
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
<ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1">
<ul class="dropdown-menu" style="width: 380px;" aria-labelledby="dropdownMenu1">
<li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
<span style="margin-left:5px;float: left;">全选</span></li>
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.html
View file @ 80e37989
......@@ -14,11 +14,11 @@
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
<ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1">
<ul class="dropdown-menu" style="width: 380px;" aria-labelledby="dropdownMenu1">
<li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
<span style="margin-left:5px;float: left;">全选</span></li>
......
atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.html
View file @ 80e37989
......@@ -14,11 +14,11 @@
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
<ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1">
<ul class="dropdown-menu" style="width: 380px;" aria-labelledby="dropdownMenu1">
<li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
<span style="margin-left:5px;float: left;">全选</span></li>
......
atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.html
View file @ 80e37989
......@@ -14,11 +14,11 @@
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
<ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1">
<ul class="dropdown-menu" style="width: 380px;" aria-labelledby="dropdownMenu1">
<li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
<span style="margin-left:5px;float: left;">全选</span></li>
......@@ -46,7 +46,7 @@
<button type="button"
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">
{{'SelectFile' | translate}}
{{'SelectFile' | etranslate}}
</button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
......
atms-web/src/main/webapp/app/framework/app-data-import/app-data-import.js
View file @ 80e37989
......@@ -11,7 +11,6 @@
},
controller: 'appDataImportController',
link: function (scope, element, attr) {
debugger;
$('.nav-element-left a').removeClass('active');
$('.main-contents')[0].style.width = "260px";
$('.main-contents')[0].style.float = "left";
......
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