Skip to content

T
traffic-front
Commit 773b16bb authored by kevin's avatar kevin
Browse files
Options

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

# Conflicts:
#	atms-web/src/main/webapp/app/vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js
parent 4e1f53ea
Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 150 deletions
atms-web/src/main/webapp/Scripts/module-part2.js
View file @ 773b16bb
......@@ -29,10 +29,10 @@ var invoiceModule = angular.module('app.invoice', ['ui.grid', 'ui.grid.selection
views: {
'@': {
controller: ['$scope', '$stateParams', 'appTranslation', '$state',
function ($scope, $stateParams, appTranslation, $state) {
appTranslation.load([appTranslation.vat]);
$scope.state = $state;
}],
function ($scope, $stateParams, appTranslation, $state) {
appTranslation.load([appTranslation.vat]);
$scope.state = $state;
}],
template: '<invoice-manage-infrastructure state="state"></invoice-manage-infrastructure>'
}
},
......@@ -126,33 +126,33 @@ var invoiceModule = angular.module('app.invoice', ['ui.grid', 'ui.grid.selection
//开票管理
$stateProvider.state('invoiceManagement.billingManage',
{
url: "/billingManage",
sticky: true,
dsr: true,
views: {
'billingManage-view@invoiceManagement': {
template: '<iframe id="dfiframe" src="/app/df/code/pages/PreViewFapiao.html" scrolling="auto" height="100%" style="border:none" width="100%"></iframe>'
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.vat)
});
{
url: "/billingManage",
sticky: true,
dsr: true,
views: {
'billingManage-view@invoiceManagement': {
template: '<iframe id="dfiframe" src="/app/df/code/pages/PreViewFapiao.html" scrolling="auto" height="100%" style="border:none" width="100%"></iframe>'
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.vat)
});
//发票查询
$stateProvider.state('invoiceManagement.invoiceQuery',
{
url: "/invoiceQuery",
sticky: true,
dsr: true,
views: {
'invoiceQuery-view@invoiceManagement': {
template: '<iframe id="dfiframe" src="/app/df/code/pages/FapiaoInqury.html" scrolling="auto" height="100%" style="border:none" width="100%"></iframe>'
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.vat)
});
{
url: "/invoiceQuery",
sticky: true,
dsr: true,
views: {
'invoiceQuery-view@invoiceManagement': {
template: '<iframe id="dfiframe" src="/app/df/code/pages/FapiaoInqury.html" scrolling="auto" height="100%" style="border:none" width="100%"></iframe>'
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.vat)
});
//发票管理待退票管理
......@@ -189,10 +189,10 @@ var invoiceModule = angular.module('app.invoice', ['ui.grid', 'ui.grid.selection
views: {
'@': {
controller: ['$scope', '$stateParams', 'appTranslation', '$state',
function ($scope, $stateParams, appTranslation, $state) {
appTranslation.load([appTranslation.vat]);
$scope.state = $state;
}],
function ($scope, $stateParams, appTranslation, $state) {
appTranslation.load([appTranslation.vat]);
$scope.state = $state;
}],
template: '<output-invoice-infrastructure state="state"></output-invoice-infrastructure>'
}
},
......@@ -436,9 +436,9 @@ var citModule = angular.module('app.cit', ['ui.grid', 'ui.grid.selection', 'ui.g
views: {
'@cit': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-import-layout></cit-import-layout>',
}
},
......@@ -454,9 +454,9 @@ var citModule = angular.module('app.cit', ['ui.grid', 'ui.grid.selection', 'ui.g
views: {
'@cit.importData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-import-trial-balance></cit-import-trial-balance>',
}
},
......@@ -471,9 +471,9 @@ var citModule = angular.module('app.cit', ['ui.grid', 'ui.grid.selection', 'ui.g
views: {
'@cit.importData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-import-asset-list></cit-import-asset-list>'
}
},
......@@ -489,9 +489,9 @@ var citModule = angular.module('app.cit', ['ui.grid', 'ui.grid.selection', 'ui.g
views: {
'@cit.importData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-old-import-asset-list></cit-old-import-asset-list>'
}
},
......@@ -507,16 +507,16 @@ var citModule = angular.module('app.cit', ['ui.grid', 'ui.grid.selection', 'ui.g
views: {
'@cit.importData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
$scope.docId = $stateParams.docId;
$scope.docTemplateId = $stateParams.docTemplateId;
$scope.docName = $stateParams.docName;
$scope.treeTypeCode = $stateParams.treeTypeCode;
$scope.selectedReportCode = $stateParams.selectedReportCode;
$scope.hasDocument = $stateParams.hasDocument;
$scope.docNum = $stateParams.docNum;
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
$scope.docId = $stateParams.docId;
$scope.docTemplateId = $stateParams.docTemplateId;
$scope.docName = $stateParams.docName;
$scope.treeTypeCode = $stateParams.treeTypeCode;
$scope.selectedReportCode = $stateParams.selectedReportCode;
$scope.hasDocument = $stateParams.hasDocument;
$scope.docNum = $stateParams.docNum;
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-import-document-list doc-id="docId" doc-template-id="docTemplateId" doc-name="docName" \
tree-type-code="treeTypeCode" selected-report-code="selectedReportCode" has-document="hasDocument" doc-num="docNum"> \
</cit-import-document-list>',
......@@ -533,16 +533,16 @@ var citModule = angular.module('app.cit', ['ui.grid', 'ui.grid.selection', 'ui.g
views: {
'@cit.importData.documentList': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
$scope.reportId = $stateParams.id;
$scope.templateId = $stateParams.templateid;
$scope.templateName = $stateParams.name;
$scope.templateCode = $stateParams.templatecode;
$scope.initRow = $stateParams.initrow;
$scope.initCol = $stateParams.initcol;
$scope.parentId = $stateParams.parentId;
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
$scope.reportId = $stateParams.id;
$scope.templateId = $stateParams.templateid;
$scope.templateName = $stateParams.name;
$scope.templateCode = $stateParams.templatecode;
$scope.initRow = $stateParams.initrow;
$scope.initCol = $stateParams.initcol;
$scope.parentId = $stateParams.parentId;
appTranslation.load([appTranslation.cit]);
}],
template: '<vat-report-view report-id="reportId" template-id="templateId" template-name="templateName" template-code="templateCode" \
init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="true" parent-id="parentId"></vat-report-view>',
}
......@@ -558,9 +558,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
views: {
'@cit.importData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-import-journal-entry></cit-import-journal-entry>',
}
},
......@@ -575,9 +575,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
views: {
'@cit.importData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-import-erp></cit-import-erp>',
}
},
......@@ -592,9 +592,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
views: {
'@cit.importData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-import-output-invoice></cit-import-output-invoice>',
}
},
......@@ -609,9 +609,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
views: {
'@cit.importData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-import-income-invoice></cit-import-income-invoice>',
}
},
......@@ -626,9 +626,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
views: {
'@cit.importData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-import-custom-invoice></cit-import-custom-invoice>',
}
},
......@@ -643,9 +643,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
views: {
'@cit.importData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-voucher-mapping></cit-voucher-mapping>',
}
},
......@@ -660,9 +660,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
views: {
'@cit.importData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-invoice-mapping></cit-invoice-mapping>',
}
},
......@@ -677,9 +677,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
views: {
'@cit.importData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-audit-adjust></cit-audit-adjust>',
}
},
......@@ -713,9 +713,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
views: {
'@cit': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-import-layout></cit-import-layout>',
}
},
......@@ -730,9 +730,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
views: {
'@cit.previewData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-preview-balance-sheet></cit-preview-balance-sheet>',
}
},
......@@ -847,7 +847,7 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
appTranslation.load([appTranslation.cit]);
}
],
template: '<cit-preview-account-voucher></cit-preview-account-voucher>'
template: '<cit-preview-salary-advance-list></cit-preview-salary-advance-list>'
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.cit),
......@@ -880,9 +880,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
views: {
'@cit.previewData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-preview-output-invoice></cit-preview-output-invoice>',
}
},
......@@ -897,9 +897,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
views: {
'@cit.previewData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-preview-input-invoice></cit-preview-input-invoice>',
}
},
......@@ -914,9 +914,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
views: {
'@cit.previewData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-preview-custom-invoice-sheet></cit-preview-custom-invoice-sheet>',
}
},
......@@ -931,9 +931,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
views: {
'@cit': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-import-layout></cit-import-layout>',
}
},
......@@ -948,9 +948,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
views: {
'@cit.reductionData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-account-mapping></cit-account-mapping>',
}
},
......@@ -965,9 +965,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
views: {
'@cit.reductionData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-goods-mapping></cit-goods-mapping>',
}
},
......@@ -982,9 +982,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
views: {
'@cit.reductionData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-caculate-data></cit-caculate-data>',
}
},
......@@ -999,9 +999,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
views: {
'@cit.reductionData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<p>inputInvoice</p>',
}
},
......@@ -1016,9 +1016,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
views: {
'@cit.reductionData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-unbilled-invoice></cit-unbilled-invoice>',
}
},
......@@ -1034,9 +1034,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
views: {
'@cit': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-report-layout></cit-report-layout>',
}
},
......@@ -1051,16 +1051,16 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
views: {
'@cit.generateReport': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
$scope.reportId = $stateParams.id;
$scope.templateId = $stateParams.templateid;
$scope.templateName = $stateParams.name;
$scope.templateCode = $stateParams.templatecode;
$scope.initRow = $stateParams.initrow;
$scope.initCol = $stateParams.initcol;
$scope.parentViewId = $stateParams.parentviewid;
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
$scope.reportId = $stateParams.id;
$scope.templateId = $stateParams.templateid;
$scope.templateName = $stateParams.name;
$scope.templateCode = $stateParams.templatecode;
$scope.initRow = $stateParams.initrow;
$scope.initCol = $stateParams.initcol;
$scope.parentViewId = $stateParams.parentviewid;
appTranslation.load([appTranslation.cit]);
}],
template: '<vat-report-view report-id="reportId" template-id="templateId" template-name="templateName" template-code="templateCode" \
init-row="initRow" init-col="initCol" service-type="\'6\'" show-col="false" is-read-only="true" parent-view-id="parentViewId"></vat-report-view>',
}
......@@ -1077,11 +1077,11 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" show-col="false" is-r
views: {
'@cit.generateReport': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
$scope.demoFrameOptions = {};
$scope.demoFrameApi = {};
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
$scope.demoFrameOptions = {};
$scope.demoFrameApi = {};
appTranslation.load([appTranslation.cit]);
}],
template: '<demo-frame is-show="true" demo-frame-options="demoFrameOptions" demo-review-notes-api="demoFrameApi"></demo-frame>',
}
},
......@@ -1096,9 +1096,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" show-col="false" is-r
views: {
'@cit': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.vat, appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.vat, appTranslation.cit]);
}],
template: '<cit-analysis-menu></cit-analysis-menu>',
}
......@@ -1114,9 +1114,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" show-col="false" is-r
views: {
'@cit.analyzeLayout': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.vat, appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.vat, appTranslation.cit]);
}],
template: '<cit-model-analysis></cit-model-analysis>',
}
},
......@@ -1131,9 +1131,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" show-col="false" is-r
views: {
'@cit.analyzeLayout': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-organization-dashboard></cit-organization-dashboard>',
}
......@@ -1166,9 +1166,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" show-col="false" is-r
views: {
'@cit': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-model-analysis></cit-model-analysis>',
}
},
......
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