Skip to content

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

1、fixbug

parent e713cd9f
Show whitespace changes
Inline Side-by-side
Showing with 128 additions and 101 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-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java
View file @ 80e37989
......@@ -309,7 +309,7 @@ public class DataImportService extends BaseService {
continue;
}
// 所选期间与导入文件期间不相等 且非 所选期间12期导入文件为13期
boolean isThirteenPeriod = period / 1000 != 13 && tmsPeriod != 12;
boolean isThirteenPeriod = period % 100 == 13 && tmsPeriod % 100 == 12;
if (!tmsPeriod.equals(period) && isThirteenPeriod) {
dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.ExistDataPeriodsError);
......@@ -317,8 +317,8 @@ public class DataImportService extends BaseService {
continue;
}
String currencyCode = sheet.getRow(5).getCell(0).getStringCellValue().replace(" ", "").substring(3);
String dataDateStr = sheet.getRow(0).getCell(4).getStringCellValue().substring(3).replace(" ", "");
String currencyCode = getCellStringValue(sheet.getRow(5).getCell(0)).replace(" ", "").substring(3);
String dataDateStr = getCellStringValue(sheet.getRow(0).getCell(4)).substring(3).replace(" ", "");
SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyyHH:mm:ss");
Date dataDate = sdf.parse(dataDateStr);
......@@ -342,11 +342,11 @@ public class DataImportService extends BaseService {
if (null == cell1) {
continue;
}
pl.setItemName(cell1.getStringCellValue());
pl.setItemName(getCellStringValue(cell1));
Cell cell2 = row.getCell(1);
if (cell2.getCellTypeEnum().equals(CellType.STRING)) {
String value1 = cell2.getStringCellValue().replace(",", "");
String value1 = getCellStringValue(cell2).replace(",", "");
pl.setPeriodAmt(new BigDecimal(value1));
} else {
pl.setPeriodAmt(new BigDecimal(cell2.getNumericCellValue()));
......@@ -354,7 +354,7 @@ public class DataImportService extends BaseService {
Cell cell3 = row.getCell(2);
if (cell3.getCellTypeEnum().equals(CellType.STRING)) {
String value2 = cell3.getStringCellValue().replace(",", "");
String value2 = getCellStringValue(cell3).replace(",", "");
pl.setYtdAmt(new BigDecimal(value2));
} else {
pl.setYtdAmt(new BigDecimal(cell3.getNumericCellValue()));
......@@ -434,7 +434,7 @@ public class DataImportService extends BaseService {
Sheet sheet = workbook.getSheetAt(i);
if (isSheetEmpty(sheet)) continue;
List<BalanceSheet> bls = Lists.newArrayList();
String companyName = sheet.getRow(5).getCell(1).getStringCellValue();
String companyName = getCellStringValue(sheet.getRow(5).getCell(1));
OrganizationExample example = new OrganizationExample();
example.createCriteria().andNameEqualTo(companyName);
List<Organization> organizations = organizationMapper.selectByExample(example);
......@@ -482,15 +482,15 @@ public class DataImportService extends BaseService {
continue;
}
// 所选期间与导入文件期间不相等 且非 所选期间12期导入文件为13期
boolean isThirteenPeriod = period / 1000 != 13 && tmsPeriod != 12;
boolean isThirteenPeriod = period % 100 == 13 && tmsPeriod % 100 == 12;
if (!tmsPeriod.equals(period) && isThirteenPeriod) {
dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.ExistDataPeriodsError);
dataImportLogs.add(dataImportLog);
continue;
}
String currencyCode = sheet.getRow(5).getCell(0).getStringCellValue().replace(" ", "").substring(3);
String dataDateStr = sheet.getRow(0).getCell(4).getStringCellValue().substring(3).replace(" ", "");
String currencyCode = getCellStringValue(sheet.getRow(5).getCell(0)).replace(" ", "").substring(3);
String dataDateStr = getCellStringValue(sheet.getRow(0).getCell(4)).substring(3).replace(" ", "");
SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyyHH:mm:ss");
Date dataDate = sdf.parse(dataDateStr);
for (int j = 11; j < sheet.getLastRowNum(); j++) {
......@@ -512,11 +512,11 @@ public class DataImportService extends BaseService {
if (null == cell1) {
continue;
}
bl.setItemName(cell1.getStringCellValue());
bl.setItemName(getCellStringValue(cell1));
Cell cell2 = row.getCell(1);
if (cell2.getCellTypeEnum().equals(CellType.STRING)) {
String value1 = cell2.getStringCellValue().replace(",", "");
String value1 = getCellStringValue(cell2).replace(",", "");
bl.setEndBal(new BigDecimal(value1));
} else {
bl.setEndBal(new BigDecimal(cell2.getNumericCellValue()));
......@@ -524,7 +524,7 @@ public class DataImportService extends BaseService {
Cell cell3 = row.getCell(2);
if (cell3.getCellTypeEnum().equals(CellType.STRING)) {
String value2 = cell3.getStringCellValue().replace(",", "");
String value2 = getCellStringValue(cell3).replace(",", "");
bl.setBegBal(new BigDecimal(value2));
} else {
bl.setBegBal(new BigDecimal(cell3.getNumericCellValue()));
......@@ -581,7 +581,7 @@ public class DataImportService extends BaseService {
Sheet sheet = workbook.getSheetAt(i);
if (isSheetEmpty(sheet)) continue;
List<CashFlow> cfs = Lists.newArrayList();
String companyName = sheet.getRow(4).getCell(1).getStringCellValue();
String companyName = getCellStringValue(sheet.getRow(4).getCell(1));
OrganizationExample example = new OrganizationExample();
example.createCriteria().andNameEqualTo(companyName);
List<Organization> organizations = organizationMapper.selectByExample(example);
......@@ -597,7 +597,7 @@ public class DataImportService extends BaseService {
}
String periodStr = getCellStringValue(sheet.getRow(4).getCell(8));
String fileType = getCellStringValue(sheet.getRow(0).getCell(0));
Date dataDate = DateUtils.strToDate2(sheet.getRow(4).getCell(10).getStringCellValue());
Date dataDate = DateUtils.strToDate2(getCellStringValue(sheet.getRow(4).getCell(10)));
Integer period = DateUtils.strToPeriod(periodStr);
Integer tmsPeriod = DateUtils.strToPeriod(periodDate);
......@@ -630,7 +630,7 @@ public class DataImportService extends BaseService {
continue;
}
// 所选期间与导入文件期间不相等 且非 所选期间12期导入文件为13期
boolean isThirteenPeriod = period / 1000 != 13 && tmsPeriod != 12;
boolean isThirteenPeriod = period % 100 == 13 && tmsPeriod % 100 == 12;
if (!tmsPeriod.equals(period) && isThirteenPeriod) {
dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.ExistDataPeriodsError);
......@@ -651,17 +651,17 @@ public class DataImportService extends BaseService {
Row row = sheet.getRow(j);
Cell cell1 = row.getCell(0);
if (null == cell1 || StringUtils.isEmpty(cell1.getStringCellValue())) {
if (null == cell1 || StringUtils.isEmpty(getCellStringValue(cell1))) {
continue;
}
cf.setItemName(cell1.getStringCellValue());
cf.setItemName(getCellStringValue(cell1));
Cell cell2 = row.getCell(1);
cf.setItemName2(cell2.getStringCellValue());
cf.setItemName2(getCellStringValue(cell2));
Cell cell3 = row.getCell(2);
if (cell3.getCellTypeEnum().equals(CellType.STRING)) {
String value1 = cell3.getStringCellValue().replace(",", "");
String value1 = getCellStringValue(cell3).replace(",", "");
cf.setPeriodAmt(new BigDecimal(value1));
} else {
cf.setPeriodAmt(new BigDecimal(cell3.getNumericCellValue()));
......@@ -669,7 +669,7 @@ public class DataImportService extends BaseService {
Cell cell4 = row.getCell(3);
if (cell3.getCellTypeEnum().equals(CellType.STRING)) {
String value2 = cell4.getStringCellValue().replace(",", "");
String value2 = getCellStringValue(cell4).replace(",", "");
cf.setYtdAmt(new BigDecimal(value2));
} else {
cf.setYtdAmt(new BigDecimal(cell4.getNumericCellValue()));
......@@ -689,6 +689,7 @@ public class DataImportService extends BaseService {
}
}
cashFlowManualMapper.insertBatch(cfs);
cashFlowFinalMapper.insertBatch(cfs);
dataImportLog.setRecordSize(cfs.size());
dataImportLog.setImportResult(true);
dataImportLogs.add(dataImportLog);
......@@ -779,7 +780,7 @@ public class DataImportService extends BaseService {
continue;
}
// 所选期间与导入文件期间不相等 且非 所选期间12期导入文件为13期
boolean isThirteenPeriod = period / 1000 != 13 && tmsPeriod != 12;
boolean isThirteenPeriod = period % 100 == 13 && tmsPeriod % 100 == 12;
if (!tmsPeriod.equals(period) && isThirteenPeriod) {
dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.ExistDataPeriodsError);
......@@ -799,10 +800,10 @@ public class DataImportService extends BaseService {
iData.setCountType(j);
Cell cell1 = sheet.getRow(1).getCell(j);
if (null == cell1 || StringUtils.isEmpty(cell1.getStringCellValue())) {
if (null == cell1 || StringUtils.isEmpty(getCellStringValue(cell1))) {
continue;
}
iData.setCompanyName(cell1.getStringCellValue());
iData.setCompanyName(getCellStringValue(cell1));
Cell cell2 = sheet.getRow(2).getCell(j);
iData.setSpecialInvoiceAmount1(getCellLongDecimalValue(cell2));
......@@ -1016,8 +1017,8 @@ public class DataImportService extends BaseService {
RedLetterInfoTableExample redLetterInfoTableExample = new RedLetterInfoTableExample();
redLetterInfoTableExample.createCriteria().andSubjectNumEqualTo(companyCode).andFillInDateEqualTo(rlits.get(0).getFillInDate());
redLetterInfoTableMapper.deleteByExample(redLetterInfoTableExample);
redLetterInfoTableMapper.insertBatch(rlits);
}
redLetterInfoTableMapper.insertBatch(rlits);
// 1、记录数据导入记录与数据处理校验记录
dataImportLogs.add(dataImportLog);
}
......@@ -1119,8 +1120,8 @@ public class DataImportService extends BaseService {
AdjustmentTableExample adjustmentTableExample = new AdjustmentTableExample();
adjustmentTableExample.createCriteria().andSegment1EqualTo(companyCode).andPeriodEqualTo(ats.get(0).getPeriod());
adjustmentTableMapper.deleteByExample(adjustmentTableExample);
adjustmentTableMapper.insertBatch(ats);
}
adjustmentTableMapper.insertBatch(ats);
// 1、记录数据导入记录与数据处理校验记录
dataImportLogs.add(dataImportLog);
}
......@@ -1225,8 +1226,8 @@ public class DataImportService extends BaseService {
CoupaPurchasingReportExample coupaPurchasingReportExample = new CoupaPurchasingReportExample();
coupaPurchasingReportExample.createCriteria().andCompanyCodeEqualTo(companyCode).andPeriodEqualTo(cprs.get(0).getPeriod());
coupaPurchasingReportMapper.deleteByExample(coupaPurchasingReportExample);
coupaPurchasingReportMapper.insertBatch(cprs);
}
coupaPurchasingReportMapper.insertBatch(cprs);
// 1、记录数据导入记录与数据处理校验记录
dataImportLogs.add(dataImportLog);
}
......@@ -1251,7 +1252,7 @@ public class DataImportService extends BaseService {
Sheet sheet = workbook.getSheetAt(i);
if (isSheetEmpty(sheet)) continue;
List<CertifiedInvoicesList> cils = Lists.newArrayList();
String tayPayerIdNum = sheet.getRow(1).getCell(1).getStringCellValue();
String tayPayerIdNum = getCellStringValue(sheet.getRow(1).getCell(1));
OrganizationExample example = new OrganizationExample();
example.createCriteria().andTaxPayerNumberEqualTo(tayPayerIdNum);
List<Organization> organizations = organizationMapper.selectByExample(example);
......@@ -1299,14 +1300,14 @@ public class DataImportService extends BaseService {
String companyName = organizations.get(0).getName();
dataImportLog.setCompanyName(companyName);
// 所选期间与导入文件期间不相等 且非 所选期间12期导入文件为13期
boolean isThirteenPeriod = period / 1000 != 13 && tmsPeriod != 12;
boolean isThirteenPeriod = period % 100 == 13 && tmsPeriod % 100 == 12;
if (!tmsPeriod.equals(period) && isThirteenPeriod) {
dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.ExistDataPeriodsError);
dataImportLogs.add(dataImportLog);
continue;
}
String unit = sheet.getRow(1).getCell(11).getStringCellValue().replace(" ", "").substring(3);
String unit = getCellStringValue(sheet.getRow(1).getCell(11)).replace(" ", "").substring(3);
for (int j = 3; j < sheet.getLastRowNum(); j++) {
Long plId = idService.nextId();
CertifiedInvoicesList cil = new CertifiedInvoicesList();
......@@ -1497,8 +1498,8 @@ public class DataImportService extends BaseService {
InvoiceRecordExample invoiceRecordExample = new InvoiceRecordExample();
invoiceRecordExample.createCriteria().andBillingBodyEqualTo(billingBody).andPeriodEqualTo(irs.get(0).getPeriod());
invoiceRecordMapper.deleteByExample(invoiceRecordExample);
invoiceRecordMapper.insertBatch(irs);
}
invoiceRecordMapper.insertBatch(irs);
// 1、记录数据导入记录与数据处理校验记录
dataImportLogs.add(dataImportLog);
}
......@@ -1663,10 +1664,10 @@ public class DataImportService extends BaseService {
return "";
}
if (cell.getCellTypeEnum().equals(CellType.STRING)) {
return cell.getStringCellValue();
return cell.getStringCellValue().trim();
} else if(cell.getCellTypeEnum().equals(CellType.NUMERIC)) {
// 取整
return String.valueOf((int)cell.getNumericCellValue());
return String.valueOf((int)cell.getNumericCellValue()).trim();
}
logger.warn("获取单元格数据类型未匹配");
return null;
......@@ -1701,7 +1702,7 @@ public class DataImportService extends BaseService {
return null;
}
if (cell.getCellTypeEnum().equals(CellType.STRING)) {
return Integer.valueOf(cell.getStringCellValue());
return Integer.valueOf(cell.getStringCellValue().trim());
} else if(cell.getCellTypeEnum().equals(CellType.NUMERIC)) {
return (int)cell.getNumericCellValue();
}
......@@ -1714,7 +1715,7 @@ public class DataImportService extends BaseService {
return null;
}
if (cell.getCellTypeEnum().equals(CellType.STRING)) {
return new BigDecimal(cell.getStringCellValue());
return new BigDecimal(cell.getStringCellValue().trim());
} else if(cell.getCellTypeEnum().equals(CellType.NUMERIC)) {
return new BigDecimal(cell.getNumericCellValue());
}
......@@ -1727,7 +1728,7 @@ public class DataImportService extends BaseService {
return null;
}
if (cell.getCellTypeEnum().equals(CellType.STRING)) {
return Long.valueOf(cell.getStringCellValue());
return Long.valueOf(cell.getStringCellValue().trim());
} else if(cell.getCellTypeEnum().equals(CellType.NUMERIC)) {
return new Double(cell.getNumericCellValue()).longValue();
}
......@@ -1893,7 +1894,7 @@ public class DataImportService extends BaseService {
private boolean isSheetEmpty(Sheet sheet) {
if (sheet.getLastRowNum() > 0 &&
(null == sheet.getRow(0).getCell(0) || "Version".equals(sheet.getRow(0).getCell(0).getStringCellValue())) &&
(null == sheet.getRow(0).getCell(0) || "Version".equals(getCellStringValue(sheet.getRow(0).getCell(0)))) &&
null == sheet.getRow(0).getCell(2)) {
return true;
}
......@@ -1957,7 +1958,7 @@ public class DataImportService extends BaseService {
}
@Override
public Object call(){
public Integer call(){
String response = null;
String ledgerId = org.getEnterpriseAccountCode();
String code = org.getCode();
......@@ -1976,6 +1977,19 @@ public class DataImportService extends BaseService {
log.setPeriodStatus("EBS抽取");
log.setOperator(authUserHelper.getCurrentAuditor().get());
try {
if (StringUtils.isEmpty(org.getEnterpriseAccountCode())) {
log.setId(idService.nextId());
log.setImportResult(false);
log.setErrorMsg(String.format(EnumApiCodeMsg.CALLFAILED.getMsg(), ErrorMessageCN.NoLedgerID));
}else if(StringUtils.isEmpty(org.getCode())) {
log.setId(idService.nextId());
log.setImportResult(false);
log.setErrorMsg(String.format(EnumApiCodeMsg.CALLFAILED.getMsg(), ErrorMessageCN.NoCompanyCode));
}
if (StringUtils.isNotEmpty(log.getErrorMsg())) {
dataImportLogMapper.insertSelective(log);
return 0;
}
switch (type) {
case EbsExtractTypeConstant.TB:
response = HttpUtil.post(ebsCallUrl + "/glMonthlyBal?ledgerId="+ledgerId+"&companyCode="+ code + "&period=" + period,
......@@ -2019,12 +2033,6 @@ public class DataImportService extends BaseService {
break;
}
if (StringUtils.isNotEmpty(response)) {
if(EbsExtractTypeConstant.RATE==type){
EbsCallRateResp resp = JSON.parseObject(response, EbsCallRateResp.class);
log.setId(idService.nextId());
log.setImportResult(true);
log.setErrorMsg(String.format(EnumApiCodeMsg.CALLSUCCESS.getMsg(),resp.getRequestStatus()));
}else{
EbsCallResp resp = JSON.parseObject(response, EbsCallResp.class);
long taskId = Long.valueOf(resp.getTaskId());
if (taskId == -1) {
......@@ -2032,13 +2040,15 @@ public class DataImportService extends BaseService {
log.setImportResult(false);
log.setErrorMsg(String.format(EnumApiCodeMsg.CALLFAILED.getMsg(), resp.getTaskDesc()));
} else {
if(EbsExtractTypeConstant.JE==type){
resp.setCompanyCode(null!=resp.getSegment1()?resp.getSegment1():"");
}
log.setId(taskId);
log.setImportResult(true);
log.setErrorMsg(String.format(EnumApiCodeMsg.CALLSUCCESS.getMsg(), resp.getTaskDesc()));
}
}
dataImportLogMapper.insertSelective(log);
}
} catch (Exception e) {
log.setId(idService.nextId());
log.setImportResult(false);
......@@ -2046,7 +2056,7 @@ public class DataImportService extends BaseService {
dataImportLogMapper.insertSelective(log);
logger.error(String.format(EnumApiCodeMsg.CALLFAILED.getMsg(), e.getMessage()), e);
}
return null;
return 1;
}
}
......
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