Skip to content

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

fixbug

parent 4d7c9711
Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 16 deletions
atms-web/src/main/webapp/app-resources/i18n/en-us/app.json
View file @ f94490dd
...@@ -134,6 +134,7 @@ ...@@ -134,6 +134,7 @@
"MenuTaxOperationManagement": "Tax Operation", "MenuTaxOperationManagement": "Tax Operation",
"MenuTaxPolicyManagement": "Tax Policy", "MenuTaxPolicyManagement": "Tax Policy",
"MenuVAT": "VAT", "MenuVAT": "VAT",
"MenuListApproval": "List approval",
"MobileManufacturingIndustry": "Mobile manufacturing", "MobileManufacturingIndustry": "Mobile manufacturing",
"ModelException": "Model exception", "ModelException": "Model exception",
"Month01": "Jan", "Month01": "Jan",
......
atms-web/src/main/webapp/app-resources/i18n/en-us/vat.json
View file @ f94490dd
...@@ -1617,14 +1617,165 @@ ...@@ -1617,14 +1617,165 @@
"voucherMapping": "Voucher re-categorisation", "voucherMapping": "Voucher re-categorisation",
"voucherMappingDesc": "Voucher Mapping", "voucherMappingDesc": "Voucher Mapping",
"offlineBilling": "线下开票", "offlineBilling": "线下开票",
"invoiceRecord": "已开增值税发票记录",
"InvoiceRecordTitle": "已开增值税发票记录",
"certifiedInvoicesList": "已认证发票清单", "vatInvoiceRecord": "Vat invoice record",
"redLetterInformationTable": "红字信息表", "ApplicationSector": "Application sector",
"coupaPurchasingReport": "Coupa采购报告",
"adjustmentTable": "调整表", "invoiceRecord": "Invoice record",
"incomeStatement": "利润表", "InvoiceRecordTitle": "Invoice record",
"quarterlyOwnersEquityChangeTable": "季度所有者权益变动表", "VatInvoiceRecordNoCol":"SeqNo",
"directMethodCashFlowStatement": "直接法现金流量表", "BillingBody":"Billing body",
"CustomerCompanyName":"Customer company name",
"BillingContent":"Billing content",
"InvoiceAmount":"Invoice amount",
"Applicant":"Applicant",
"OAApplicationNum":"OA Application number",
"ContractNo":"Contract No",
"ContractAmount":"Contract amount",
"Department":"Department",
"ApplicationDate":"Application date",
"BillingMonth":"Billing month",
"InvoiceRemarks":"Invoice remarks",
"InvoicePaperNum":"Invoice paper number",
"CustomerCompanyTaxNum":"Customer company tax number",
"CustomerSourceSystem":"Customer source system",
"certifiedInvoicesList": "Certified invoices list",
"CertifiedInvoicesListTitle": "Certified invoices list",
"TaxpayerIdNum": "Taxpayer Id",
"CertificationMonth": "Certification month",
"UnitYuan": "Unit : Yuan",
"InvoiceNoCol": "Seq No",
"InvoiceNum": "Invoice number",
"BillingDate": "Billing date",
"SalesTaxNum": "Sales tax number",
"SalesTaxName": "Sales tax name",
"VerificationMethod": "Verification method",
"ConfirmDate": "Confirm date",
"redLetterInformationTable": "Red letter information table",
"RedLetterInformationTableTitle": "Red letter information table",
"SubjectNum": "Subject number",
"SubjectName": "Subject name",
"RedLetterInvoiceInfoTableNum": "Red letter information table num",
"FillInDate": "Fill in date",
"RedLetterInfoSalesTaxNum": "Sales tax number",
"SalespersonName": "Salesperson Name",
"RedLetterInfoTotalAmount": "Total amount",
"RedLetterInfoTotalTaxAmount": "Total tax amount",
"ApplicantsManager": "Applicants manager",
"RedLetterInfoInvoiceNum": "Invoice number",
"ApplicationSelectionDescription": "Application selection description",
"coupaPurchasingReport": "Coupa purchasing report",
"CoupaPurchasingReportTitle": "Coupa purchasing report",
"CoupaInvoiceNum": "Invoice number",
"CoupaLineNum": "Line number",
"HeadUpStatus": "HeadUp status",
"CoupaInvoiceDate": "Invoice date",
"InvoiceReceiptDate": "Invoice receipt date",
"PayExpiration": "Pay expiration",
"PurchaseOrderNum": "Purchase order number",
"PurchaseOrderLineNum": "Purchase order line num",
"CoupaDescription": "description",
"SupplierNumber": "Supplier number",
"Supplier": "Supplier",
"Currency": "Currency",
"Bill": "Bill",
"Paid": "Paid",
"Cancel": "Cancel",
"Prepayments": "Prepayments",
"ReviewReason": "Review reason",
"Commodity": "Commodity",
"CommodityCode": "Commodity code",
"Founder": "Founder",
"CreationDate": "Creation date",
"CurrentApprover": "Current approver",
"CoupaBillingDate": "Billing date",
"LastUpdatedDate": "Last updated date",
"LastUpdatedPerson": "Last updated person",
"CoupaTotalTaxAmount": "Total tax amount",
"TotalTaxAmountHeader": "Total tax amount header",
"BillingNote": "Billing note",
"adjustmentTable": "Adjustment table",
"AdjustmentTableTitle": "Adjustment table",
"MainBody": "Main body",
"Subject": "Subject",
"AuxiliarySubject": "Auxiliary subject",
"ProfitCenter": "Profit center",
"Product": "Product",
"ProjectName": "Project name",
"BetweenCompanies": "inter company",
"Alternate 1": "Alternate 1",
"Alternate 2": "Alternate 2",
"MainBodyDescription": "Main body description",
"CostCenterDescription": "Cost center description",
"SubjectDescription": "Subject description",
"AuxiliaryAccountDescription": "Auxiliary account description",
"ProfitCenterDescription": "Profit center description",
"ProductManual": "Product manual",
"ProjectInstruction": "Project instruction",
"InterCompanyDescription": "Inter company description",
"Alternate1Description": "Alternate 1 description",
"Alternate2Description": "Alternate 2 description",
"YYYY-MM": "YYYY-MM",
"profitLoss": "Profit&Loss",
"ProfitLossTitle": "Profit&Loss",
"CurrentPeriodAmount": "Current period amount",
"ThisYearAccumulatedAmount": "This year accumulated amount",
"quarterlyOwnersEquityChangeTable": "Quarterly owners equity change Table",
"QuarterlyOwnersEquityChangeTableTitle": "Quarterly owners equity change Table",
"directMethodCashFlowStatement": "Direct method cash flow statement",
"DirectMethodCashFlowStatementTitle": "Direct method cash flow statement",
"offBalanceSheet" : "Balance sheet",
"OffBalanceSheetTitle" : "Balance sheet",
"InitialBalance" : "Initial balance",
"journal" : "Journal entry",
"JournalTitle" : "Journal entry",
"IsContainsAdjustmentRecord": "Is contains adjustment record",
"ApprovalStatus":"Approval status",
"Posting":"Posting",
"AccountingPeriod":"Accounting period",
"DocumentDate":"Document date",
"JournalSource":"Journal source",
"JournalCategory":"Journal category",
"JournalName":"Journal name",
"DocumentNo":"Document No",
"Summary":"Summary",
"AccountDescription":"Account description",
"AuxiliarySubjectDescription":"Auxiliary subject description",
"CurrencyGroup":"Currency group",
"LocalCurrency":"Local currency",
"JournalDebitAmount":"Journal debitAmount",
"JournalCreditAmount":"Journal credit amount",
"LocalCurrencyDebitAmount":"Local currency debit amount",
"LocalCurrencyCreditAmount":"Local currency credit amount",
"CashFlowEntry":"Cash flow entry",
"City":"City",
"TransactionDate":"Transaction date",
"BankAccountNumber":"Bank account number",
"BankSerialNumber":"Bank serial number",
"SupplierCode":"Supplier code",
"TransactionOrderNumber":"Transaction order number",
"SupplierName":"Supplier name",
"ReceiveCode":"Receive code",
"PreparedBy":"Prepared by",
"Reviewer":"Reviewer",
"CostCenterDepartmentDescription1":"Cost center department description 1",
"CostCenterDepartmentDescription2":"Cost center department description 2",
"CostCenterDepartmentDescription3":"Cost center department description 3",
"CostCenterDepartmentDescription4":"Cost center department description 4",
"CostCenterDepartmentDescription5":"Cost center department description 5",
"CostCenterDepartmentDescription6":"Cost center department description 6",
"GroupCertificateNumber":"Group certificate number",
"~MustBeEndOneApp": "I Must be the End One, please!" "~MustBeEndOneApp": "I Must be the End One, please!"
} }
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json
View file @ f94490dd
...@@ -421,6 +421,7 @@ ...@@ -421,6 +421,7 @@
"MenuTaxOperationManagement": "税务运营管理平台", "MenuTaxOperationManagement": "税务运营管理平台",
"MenuTaxPolicyManagement": "税务政策管理平台", "MenuTaxPolicyManagement": "税务政策管理平台",
"MenuVAT": "增值税申报", "MenuVAT": "增值税申报",
"MenuListApproval": "报表审批",
"Mid": "中", "Mid": "中",
"MobileManufacturingIndustry": "汽车制造业", "MobileManufacturingIndustry": "汽车制造业",
"ModelAlert": "模型异常", "ModelAlert": "模型异常",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
View file @ f94490dd
...@@ -2038,7 +2038,6 @@ ...@@ -2038,7 +2038,6 @@
"PleaseSelectDatabase": "请选择数据库", "PleaseSelectDatabase": "请选择数据库",
"PleaseEnterTheFiledWordings": "请输入取值字段", "PleaseEnterTheFiledWordings": "请输入取值字段",
"PleaseEnterTheFilteredCondition": "请输入筛选条件", "PleaseEnterTheFilteredCondition": "请输入筛选条件",
"Filter": "筛选",
"PleaseSelectTheField": "请选择字段", "PleaseSelectTheField": "请选择字段",
"originator":"Originator", "originator":"Originator",
"associatedSchedule":"Associated Schedule", "associatedSchedule":"Associated Schedule",
......
atms-web/src/main/webapp/app/framework/app-nav/app-nav.ctrl.js
View file @ f94490dd
...@@ -126,12 +126,13 @@ frameworkModule.controller('AppNavController', ['$rootScope', '$scope', '$log', ...@@ -126,12 +126,13 @@ frameworkModule.controller('AppNavController', ['$rootScope', '$scope', '$log',
var initState = function(){ var initState = function(){
$($('.nav-container .nav-element-left a')[0]).addClass('active'); $($('.nav-container .nav-element-left a')[0]).addClass('active');
$rootScope.$on('$stateChangeStart', function (event, toState, toParams, fromState, fromParams) { /*$rootScope.$on('$stateChangeStart', function (event, toState, toParams, fromState, fromParams) {
debugger;
$log.debug("$stateChangeStart: toState="+toState.name); $log.debug("$stateChangeStart: toState="+toState.name);
$('.nav-container .nav-element-left a').removeClass('active'); $('.nav-container .nav-element-left a').removeClass('active');
$($('.nav-container .nav-element-left a')[getMenuIndex(toState.name)]).addClass('active'); $($('.nav-container .nav-element-left a')[getMenuIndex(toState.name)]).addClass('active');
}); });*/
}; };
var getMenuIndex = function(name){ var getMenuIndex = function(name){
......
atms-web/src/main/webapp/app/framework/app-nav/app-nav.html
View file @ f94490dd
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
</div> </div>
<div class="nav-element-left"> <div class="nav-element-left">
<a ui-sref="listApproval"> <a ui-sref="listApproval">
<span class="nav-icon-color">{{'报表审批' | translate}}</span> <span class="nav-icon-color">{{'MenuListApproval' | translate}}</span>
</a> </a>
</div> </div>
<div class="nav-element-left btn-sm-hide"> <div class="nav-element-left">
<a ui-sref="overviewCit"> <a ui-sref="overviewCit">
<span class="nav-icon-color">{{'MenuCIT' | translate}}</span> <span class="nav-icon-color">{{'MenuCIT' | translate}}</span>
</a> </a>
......
atms-web/src/main/webapp/app/module-part1.js
View file @ f94490dd
...@@ -182,7 +182,7 @@ var frameworkModule = angular.module('app.framework', ['app.webservices', 'app.c ...@@ -182,7 +182,7 @@ var frameworkModule = angular.module('app.framework', ['app.webservices', 'app.c
function ($scope, $stateParams, appTranslation) { function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.vat,appTranslation.appPart]); appTranslation.load([appTranslation.vat,appTranslation.appPart]);
}], }],
template: '<app-overview servicetypeid="2"></app-overview>', template: '<app-overview servicetypeid="2"></app-overview>'
} }
}, },
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.vat), resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.vat),
...@@ -190,6 +190,22 @@ var frameworkModule = angular.module('app.framework', ['app.webservices', 'app.c ...@@ -190,6 +190,22 @@ var frameworkModule = angular.module('app.framework', ['app.webservices', 'app.c
sticky: true sticky: true
}); });
$stateProvider.state({
name: 'listApproval',
url: '/overview/listApproval',
views: {
'@': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.vat,appTranslation.appPart]);
}],
template: '<app-approve servicetypeid="2"></app-overview>'
}
},
deepStateRedirect: true,
sticky: true
});
// $stateProvider.state({ // $stateProvider.state({
// name: 'overviewAssetsManage', // name: 'overviewAssetsManage',
// url: '/overview/assetsManage', // url: '/overview/assetsManage',
...@@ -215,7 +231,7 @@ var frameworkModule = angular.module('app.framework', ['app.webservices', 'app.c ...@@ -215,7 +231,7 @@ var frameworkModule = angular.module('app.framework', ['app.webservices', 'app.c
function ($scope, $stateParams, appTranslation) { function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.appPart]); appTranslation.load([appTranslation.appPart]);
}], }],
template: '<app-overview servicetypeid="6"></app-overview>', template: '<app-overview servicetypeid="6"></app-overview>'
} }
}, },
deepStateRedirect: true, deepStateRedirect: true,
......
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