Skip to content

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

Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql 

# Conflicts:
#	atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
parents 9cd44d6f dac479fd
Hide whitespace changes
Inline Side-by-side
Showing with 742 additions and 187 deletions
atms-api/pom.xml
View file @ dc88ffd1
...@@ -240,12 +240,6 @@ ...@@ -240,12 +240,6 @@
<artifactId>commons-net</artifactId> <artifactId>commons-net</artifactId>
<version>3.6</version> <version>3.6</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.reflections/reflections -->
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>0.9.10</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
......
atms-web/src/main/webapp/Gruntfile.js
View file @ dc88ffd1
...@@ -339,12 +339,12 @@ grunt.initConfig({ ...@@ -339,12 +339,12 @@ grunt.initConfig({
dest: '<%= pkg.bundleTemp %>/taxDocumentManage.js' dest: '<%= pkg.bundleTemp %>/taxDocumentManage.js'
}, },
appJs: { appJs: {
src: ["Scripts/app.js", src: ["app/app.js",
"Scripts/app.config.js", "app/app.config.js",
"Scripts/module-part1.js", "app/module-part1.js",
"Scripts/module-part2.js", "app/module-part2.js",
"Scripts/module-part3.js", "app/module-part3.js",
"Scripts/module-part4.js" "app/module-part4.js"
], ],
dest: '<%= pkg.bundleTemp %>/app.js' dest: '<%= pkg.bundleTemp %>/app.js'
}, },
...@@ -368,7 +368,11 @@ grunt.initConfig({ ...@@ -368,7 +368,11 @@ grunt.initConfig({
files: { files: {
'<%= pkg.bundleDest %>/less/vat.less': "app/vat/**/*.less" '<%= pkg.bundleDest %>/less/vat.less': "app/vat/**/*.less"
} }
} },
citCss: {
src: "app/cit/**/*.css",
dest: '<%= pkg.bundleDest %>/cit.css'
},
}, },
less: { less: {
...@@ -511,7 +515,8 @@ grunt.registerTask('dev', '开发环境', function () { ...@@ -511,7 +515,8 @@ grunt.registerTask('dev', '开发环境', function () {
grunt.task.run(['concat:adminHomePageJs', 'concat:adminHomePageLess','concat:basicDataJs', grunt.task.run(['concat:adminHomePageJs', 'concat:adminHomePageLess','concat:basicDataJs',
'concat:basicDataLess', 'concat:systemConfigurationJs','concat:systemConfigurationLess', 'concat:basicDataLess', 'concat:systemConfigurationJs','concat:systemConfigurationLess',
'concat:basicDataCss', 'concat:infrastructureJs','concat:infrastructureLess', 'concat:basicDataCss', 'concat:infrastructureJs','concat:infrastructureLess',
'concat:commonCss', 'concat:commonLess','concat:adminApp','concat:noPermissionPageJs','concat:noPermissionPageLess','concat:citJs','concat:citLess', 'concat:commonCss', 'concat:commonLess','concat:adminApp','concat:noPermissionPageJs','concat:noPermissionPageLess',
'concat:citJs','concat:citCss','concat:citLess',
'concat:commonJs', 'concat:frameworkJs','concat:frameworkLess', 'concat:commonJs', 'concat:frameworkJs','concat:frameworkLess',
'concat:taxDocumentManageLess', 'concat:taxDocumentManageJs','concat:appJs', 'concat:taxDocumentManageLess', 'concat:taxDocumentManageJs','concat:appJs',
'concat:vatJs', 'concat:vatCss','concat:vatLess', 'concat:vatJs', 'concat:vatCss','concat:vatLess',
......
atms-web/src/main/webapp/WEB-INF/templates/index.html
View file @ dc88ffd1
...@@ -103,7 +103,6 @@ ...@@ -103,7 +103,6 @@
<script type="text/javascript" src="bundles/common.js"></script> <script type="text/javascript" src="bundles/common.js"></script>
<script type="text/javascript" src="bundles/framework.js"></script> <script type="text/javascript" src="bundles/framework.js"></script>
<script type="text/javascript" src="bundles/taxDocumentManage.js"></script> <script type="text/javascript" src="bundles/taxDocumentManage.js"></script>
<script type="text/javascript" src="bundles/cit.js"></script>
<script type="text/javascript" src="bundles/cldr.js"></script> <script type="text/javascript" src="bundles/cldr.js"></script>
<script type="text/javascript" src="bundles/globalize.js"></script> <script type="text/javascript" src="bundles/globalize.js"></script>
......
atms-web/src/main/webapp/app-resources/i18n/en-us/app.json
View file @ dc88ffd1
...@@ -285,7 +285,11 @@ ...@@ -285,7 +285,11 @@
"cellCommentReplyEmptyMsg": "Please input content", "cellCommentReplyEmptyMsg": "Please input content",
"chartsetting": "Chart settings", "chartsetting": "Chart settings",
"dashboard": "Data summary", "dashboard": "Data summary",
"dateFormat4YearMonth": " yyyy 年 mm 月", "dateFormat4Year": " yyyy ",
"dateFormat4YearMonth": " yyyy-mm ",
"dateFormat4YearMonthDay": "yyyy-mm-dd",
"dateFormat4YearMonthDayCh": "yyyy-mm-dd",
"dateFormat4YearMonthForDX": "yyyy-MM",
"fileupload": "File upload", "fileupload": "File upload",
"log": "Log", "log": "Log",
"logoff": "Log off", "logoff": "Log off",
......
atms-web/src/main/webapp/app-resources/i18n/en-us/cit.json
View file @ dc88ffd1
{} {
\ No newline at end of file "@HowToUse": "在提交前，使用PWC.sortJson()对json内容进行排序",
"1stQuarterlyCITFilingReturn": "1st Quarterly CIT Filing Return",
"2ndQuarterlyCITFilingReturn": "2nd Quarterly CIT Filing Return",
"3rdQuarterlyCITFilingReturn": "3rd Quarterly CIT Filing Return",
"4thQuarterlyCITFilingReturn": "4th Quarterly CIT Filing Return",
"AllTask": "All",
"AnnualCITFilingReturn": "Annual CIT Filing Return",
"AnnualCITFilingWorkingPaper": "Annual CIT Filing Working Paper",
"AuditFeedback": "Tax audit feedback",
"AuditImplementation": "Tax audit implementation",
"AuditNotice": "Tax audit notice",
"AuditReport": "Audit report",
"AuditSolution": "Tax audit solution",
"BNDKJTXE": "Amortization in current year:",
"BS": "Balance sheet",
"BankGroup": "Certificate of bank and group",
"Cancellation": "Establishment, liquidation and cancellation of branches",
"CompleteTask": "Completed",
"CreateTask": "Create Task",
"CreditRecord": "Tax credit record",
"DFFSETotal": "Total Credit Amt:",
"DFJETotal": "Total Credit Amt:",
"DataProcessDataName_AnnualSettlement": "Annual CIT Filing Return",
"DataProcessDataName_CITFirstQuarterly": "1st Quarter",
"DataProcessDataName_CITForthQuarterly": "4th Quarter",
"DataProcessDataName_CITQuarterly": "Quarterly CIT Filing Return",
"DataProcessDataName_CITSecondQuarterly": "2nd Quarter",
"DataProcessDataName_CITThirdQuarterly": "3rd Quarter",
"DataProcessDataName_UpdateReportConfig": "Update Report Configuration",
"DataProcessDataName_FinanceReport": "Financial Report",
"DataProcessDataName_GenerateReport": "Generate Report",
"DataProcessDataName_ModelAnalysis": "Model Analytics",
"DataProcessDataName_UpdateTB": "Update Trial Balance",
"DataProcessDataName_YearWorkPaper": "Annual CIT Filing Working Paper",
"DataProcessData_Generate": "Generate",
"DataProcessData_PreGenerate": "Generate",
"DataProcessData_Update": "Update",
"DepreciationCurrentYearTotal": "Total Depreciation",
"DepreciationPerTaxCurrentYearTotal": "Total Tax Depreciation",
"DividendReturn": "Dividend return",
"DueDate": "Due Date",
"FinancialReport": "Financial Report",
"InprogressTask": "In Progress",
"JFFSETotal": "Total Debit Amt:",
"JFJETotal": "Total Debit Amt:",
"NeedToUpdate": "Need to update",
"NotBeginTask": "Not Started",
"OtherRecordFiling": "Other record filing",
"OutDateTask": "Overdue",
"OutOfDateTask": "Overdue",
"PL": "Profit and Loss statement",
"PZCITCount": "Total Records:",
"Planning": "Tax planning",
"PleaseSelectAtLeastOneItem": "Please select at least one item!",
"ProfitAndLossStatement": "Profit and Loss statement",
"QCYETotal": "Total Begin Balance:",
"QMYETotal": "Total End Balance:",
"QNDKJZJE": "Depreciation last year:",
"QuarterlyCITFilingReturn": "Quarterly CIT Filing Return",
"RecordFiling": "Record filing of tax deduction on asset loss",
"SpecialTasks": "Special tax tasks",
"TBDataNum": "Total Records:",
"TaskDescription": "Description",
"TaskEntity": "Entity",
"TaskName": "Task Name",
"TaxInspection": "Tax inspection",
"TaxStatistics": "Investigation and statistics from tax bureau",
"TaxTaskManage": "Tax Task Management",
"TaxTaskType": "Task Type",
"ThisWeek": "This Week",
"Today": "Today",
"WaitCompleteTask": "In Progress",
"dateFormat4YearMonthDay": "yyyy-mm-dd",
"noData": "No Data",
"toUpdate": "To be updated",
"~MustBeEndOneApp": "I Must be the End One, please!"
}
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/en-us/vat.json
View file @ dc88ffd1
...@@ -1549,6 +1549,7 @@ ...@@ -1549,6 +1549,7 @@
"completed": "Completed", "completed": "Completed",
"customInvoice": "Customs verification", "customInvoice": "Customs verification",
"dataMapping": "Data mapping", "dataMapping": "Data mapping",
"dateFormat4Year": " yyyy",
"dateFormat4YearMonth": " yyyy - mm", "dateFormat4YearMonth": " yyyy - mm",
"dateFormat4YearMonthDay": "yyyy-mm-dd", "dateFormat4YearMonthDay": "yyyy-mm-dd",
"deleteChart": "确定删除图表", "deleteChart": "确定删除图表",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json
View file @ dc88ffd1
{ {
"1stQuarterlyCITFilingReturn": "一季度预缴表",
"2ndQuarterlyCITFilingReturn": "二季度预缴表",
"3rdQuarterlyCITFilingReturn": "三季度预缴表",
"4thQuarterlyCITFilingReturn": "四季度预缴表",
"ACEOLEDBUnInstallError": "导入失败。请确认是否安装了Microsoft Office驱动 AccessDatabaseEngine.exe", "ACEOLEDBUnInstallError": "导入失败。请确认是否安装了Microsoft Office驱动 AccessDatabaseEngine.exe",
"AccountCode": "科目代码", "AccountCode": "科目代码",
"AccountCodeNullMag": "科目代码为空。", "AccountCodeNullMag": "科目代码为空。",
...@@ -10,12 +14,97 @@ ...@@ -10,12 +14,97 @@
"AccountMapSuccess": "科目对应成功！", "AccountMapSuccess": "科目对应成功！",
"AccountMappingMenuUnSelect": "请选择操作", "AccountMappingMenuUnSelect": "请选择操作",
"AccountMappingSubmit": "提交", "AccountMappingSubmit": "提交",
"UpdateOrgExtraSubmit": "提交",
"AccountMappingSubmitComplete": "科目对应提交完成", "AccountMappingSubmitComplete": "科目对应提交完成",
"AccountMappingTitle": "科目重分类", "AccountMappingTitle": "科目对应",
"AccountMappingUndo": "撤销", "AccountMappingUndo": "撤销",
"AccountName": "科目名称", "AccountName": "科目名称",
"AccountPeriod": "会计期间", "AccountPeriod": "会计期间",
"Save": "保存",
"Undo": "撤销",
"AssetListImport": "资产导入",
"AssetList": "资产清单",
"FixedAssets": "固定资产",
"LongTermPrepaid": "长期待摊",
"InvisibleAssets": "无形资产",
"AssetClassification": "资产分类",
"FixAssetClassification": "固定资产分类",
"LongTermPrepaidClassification": "长期待摊分类",
"InvisibleAssetsClassification": "无形资产分类",
"AssetNumber": "资产编号",
"AssetGroupName": "资产类别",
"AssetGroupNameValidation": "请输入资产类别",
"AssetDescription": "资产描述",
"BuyDate": "购入日期",
"DepreciationDate": "开始折旧日期",
"DepreciationPeriod": "折旧期限",
"AcquisitionValue": "原值",
"TotalAccountAcquisitionValue": "资产原值：",
"TotalAccountYearDepreciationAmount": "本年会计折旧额：",
"TotalTaxCurrentYearDepreciationAmount": "本年税法折旧额：",
"TotalYearDifferenceAmount": "差异额：",
"AdjustmentValue": "原值调整值",
"DisposedDate": "报废日期",
"ResidualRate": "残值率",
"TaxMonthDepreciationAmount": "每月折旧额(税务)",
"TaxToCurrentYearDepreciationAmount": "截止本年累计折旧额(税务)",
"ReportExportConfirm": "报表数据还未保存，操作结果可能和实际不一致，确定要执行这个操作吗？",
"LeaveReport": "报表数据还未保存，确定要离开页面吗？离开会导致数据丢失。",
"TaxCurrentYearDepreciationAmount": "本年折旧额(税务)",
"TaxYearDepreciationPeriod": "本年折旧期间",
"PerMonthDepreciationAmount": "每月折旧额",
"YearDepreciationAmount": "本年折旧额",
"YearAdjustmentAmount": "本年折旧调整值",
"YearEndValue": "年终剩余价值",
"AssetStatus": "状态",
"AccountData": "财务数据",
"TaxData": "税务数据",
"AccountTotalepreciationAmount": "累计折旧额",
"SetAssetGroup": "资产分类",
"AssetStatus": "状态",
"AssetStatus": "状态",
"LevelOneGroup": "一级分类",
"LevelTwoGroup": "二级分类",
"LevelOneGroupValidation": "请选择一级分类",
"LevelTwoGroupValidation": "请选择二级分类",
"DepreciationPeriodValidation": "请输入折旧期限",
"AssetNameValidation": "资产类别不能重复",
"SaveSuccess": "保存成功",
"AssetDiffData": "数据差异明细",
"LastYear": "去年",
"AssetDifferent": "差异",
"TotalDifferenceAmount": "累计差异",
"YearDifferenceAmount": "当年差异",
"IsRetain": "是否保留",
"LastAcquisitionValue": "去年原值",
"CurrentYear": "今年",
"CurrentAcquisitionValue": "今年原值",
"TaxGroupType": "税法分类",
"TaxToLastYearDepreciationPeriod": "截止去年累计折旧期间",
"TaxToCurrentYearDepreciationPeriod": "截止本年累计折旧期间",
"BuyDateType": "日期错误",
"AssetNumberType": "资产编号错误",
"AssetGroupNameType": "资产类别错误",
"AcquisitionValueType": "原值错误",
"DataTypeError": "数据类型错误",
"DepreciationDateErrorMsg": "的开始折旧日期有误",
"DataTypeErrorMsg": "的数据类型有误",
"BuyDateErrorMsg": "的购入日期有误",
"BuyDateNullMsg": "的购入日期为空",
"AssetNumberNullMsg": "的资产编号为空",
"AssetGroupNameNullMsg": "的资产类别为空",
"AcquisitionValueNullMsg": "的原值为空",
"PleaseSetAssetGroupInfo": "请设置资产类别信息",
"ViewAssetList": "查看明细",
"NoProjet": "项目未创建",
"AssetListDataSource": "资产清单数据源",
"UpdateAssetReportFail": "更新报表数据失败,请联系管理员...",
"NumberDataTypeError": "-类型错误",
"DateTypeError": "-格式错误",
"DataTypeNull": "不能为空",
"NumberDataTypeValidate": "数字类型错误",
"DateTypeValidate": "时间格式错误",
"DataTypeNullValidate": "必填字段验证",
"AccountReMapVoucherDetailTitle": "凭证信息", "AccountReMapVoucherDetailTitle": "凭证信息",
"AccountReMappingCredit": "重对应贷方金额", "AccountReMappingCredit": "重对应贷方金额",
"AccountReMappingCustomerCode": "客户代码", "AccountReMappingCustomerCode": "客户代码",
...@@ -140,6 +229,7 @@ ...@@ -140,6 +229,7 @@
"AllBusinessUnit": "所有事业部", "AllBusinessUnit": "所有事业部",
"AllMappingStatus": "所有对应状态", "AllMappingStatus": "所有对应状态",
"AllOrganization": "所有机构", "AllOrganization": "所有机构",
"AllTask": "全部",
"AllTax": "所有税种", "AllTax": "所有税种",
"AllTheItems": "全选", "AllTheItems": "全选",
"AllTheItemsCancel": "取消全选", "AllTheItemsCancel": "取消全选",
...@@ -151,16 +241,26 @@ ...@@ -151,16 +241,26 @@
"AmountNumberCheckErrorType": "金额数据类型错误", "AmountNumberCheckErrorType": "金额数据类型错误",
"AmountQueryError": "金额范围不正确，请重新输入！", "AmountQueryError": "金额范围不正确，请重新输入！",
"AmountTips": "输入重分类金额", "AmountTips": "输入重分类金额",
"AmountTotal": "金额合计: ",
"AmountWarningSearch": "前金额不能大于后金额", "AmountWarningSearch": "前金额不能大于后金额",
"AnnualCITFilingReturn": "纳税申报表",
"AnnualCITFilingWorkingPaper": "工作底稿",
"ApproveLevelDescTitle": "({level}级)", "ApproveLevelDescTitle": "({level}级)",
"ApproveProcess": "审批流程", "ApproveProcess": "审批流程",
"ApproveReportStatusCheck": "只有已提交或者上级审核已通过后才可以进行审核", "ApproveReportStatusCheck": "只有已提交或者上级审核已通过后才可以进行审核",
"AuantityNumberCheckErrorMsg": "的数量数据类型错误！", "AuantityNumberCheckErrorMsg": "的数量数据类型错误！",
"AuantityNumberCheckErrorType": "数量数据类型错误", "AuantityNumberCheckErrorType": "数量数据类型错误",
"AuditFeedback": "税务检查告知",
"AuditImplementation": "税务检查实施",
"AuditNotice": "税务检查通知",
"AuditReport": "审计报告",
"AuditSolution": "税务检查处理",
"AutoCalcCreditAmount": "自动计算贷方发生额", "AutoCalcCreditAmount": "自动计算贷方发生额",
"AutoCalcDebitAmount": "自动计算借方发生额", "AutoCalcDebitAmount": "自动计算借方发生额",
"AutoGoodsMapping": "自动匹配", "AutoGoodsMapping": "自动匹配",
"AutoMapping": "自动对应", "AutoMapping": "自动对应",
"AllowKeyInByDefault": "所有单元格支持手工修改",
"BNDKJTXE": "本年度会计摊销额:",
"BackEndDuplicateInputInvoiceErrorMsg": "{rows}在数据库中重复;", "BackEndDuplicateInputInvoiceErrorMsg": "{rows}在数据库中重复;",
"BackEndDuplicateInputInvoiceErrorType": "发票信息在数据库中重复", "BackEndDuplicateInputInvoiceErrorType": "发票信息在数据库中重复",
"BackEndInputInvoiceAlreadyPassedErrorMsg": "{rows}为错误发票;", "BackEndInputInvoiceAlreadyPassedErrorMsg": "{rows}为错误发票;",
...@@ -172,6 +272,7 @@ ...@@ -172,6 +272,7 @@
"BalDiff": "差额", "BalDiff": "差额",
"BalanceId": "BalanceId", "BalanceId": "BalanceId",
"BankAccount": "银行账号", "BankAccount": "银行账号",
"BankGroup": "银行及集团证照",
"BasicDataCheck": "基础数据验证", "BasicDataCheck": "基础数据验证",
"Before": "以前", "Before": "以前",
"BegBal": "期初余额", "BegBal": "期初余额",
...@@ -184,9 +285,11 @@ ...@@ -184,9 +285,11 @@
"BegDebitBal": "借方期初", "BegDebitBal": "借方期初",
"BegDebitBalMsg": "借方期初类型错误。", "BegDebitBalMsg": "借方期初类型错误。",
"BegDebitBalType": "借方期初类型错误", "BegDebitBalType": "借方期初类型错误",
"Bi": "records",
"BillIncome": "开票收入", "BillIncome": "开票收入",
"BtnDelete": "删除", "BtnDelete": "删除",
"ButtonBrowser": "浏览...", "ButtonBrowser": "浏览...",
"Browse": "浏览...",
"ButtonCancel": "取消", "ButtonCancel": "取消",
"BuyerName": "购方企业名称", "BuyerName": "购方企业名称",
"BuyerTaxNumber": "购方税号", "BuyerTaxNumber": "购方税号",
...@@ -194,6 +297,7 @@ ...@@ -194,6 +297,7 @@
"CallbackError": "错误信息: {errorMsg}", "CallbackError": "错误信息: {errorMsg}",
"CancelGoodsMapping": "取消匹配", "CancelGoodsMapping": "取消匹配",
"CancelMapping": "取消对应", "CancelMapping": "取消对应",
"Cancellation": "分行设立于清算注销",
"CellColumn": "单元格", "CellColumn": "单元格",
"CellInfo": "单元格信息", "CellInfo": "单元格信息",
"CellInfoFail": "获取单元格信息失败", "CellInfoFail": "获取单元格信息失败",
...@@ -229,7 +333,7 @@ ...@@ -229,7 +333,7 @@
"ClearTrialBalance": "清空试算平衡表", "ClearTrialBalance": "清空试算平衡表",
"CloseButton": "关闭", "CloseButton": "关闭",
"CodeVersion": "商品编码版本号", "CodeVersion": "商品编码版本号",
"ColumnsMapErrorMsg": "必选字段：{columns}；未对应！", "ColumnsMapErrorMsg": "必选字段：{columns}未对应！",
"ColumnsMapErrorType": "必选字段检查", "ColumnsMapErrorType": "必选字段检查",
"ComCreditBal": "原始贷方发生额", "ComCreditBal": "原始贷方发生额",
"ComDebitBal": "原始借方发生额", "ComDebitBal": "原始借方发生额",
...@@ -238,8 +342,9 @@ ...@@ -238,8 +342,9 @@
"ComEndDebitBal": "原始期末借方余额", "ComEndDebitBal": "原始期末借方余额",
"ComfirmIgnoreUnsavedChanges": "该页有改动未保存，离开该页会丢失改动，是否继续？", "ComfirmIgnoreUnsavedChanges": "该页有改动未保存，离开该页会丢失改动，是否继续？",
"ComfirmToReMap": "该企业科目已对应了标准科目,确定要重新对应并覆盖已有对应关系吗？", "ComfirmToReMap": "该企业科目已对应了标准科目,确定要重新对应并覆盖已有对应关系吗？",
"CompleteDeclarationStatusCheck": "只有项目状态为已生成之后并且不等于已拒绝时才可以完成申报", "CompleteDeclarationStatusCheck": "只有项目状态为已生成之后并且不等于已驳回时才可以完成申报",
"Conclusion": "总计:", "CompleteTask": "已完成",
"Conclusion": "总计",
"Condition1": "借方期初，贷方期初必须同时选择。", "Condition1": "借方期初，贷方期初必须同时选择。",
"Condition2": "期初余额 或者 （借方期初，贷方期初）必选。", "Condition2": "期初余额 或者 （借方期初，贷方期初）必选。",
"Condition3": "（借方发生额，贷方发生额）或者（借方期末，贷方期末）或者 期末余额 必选。", "Condition3": "（借方发生额，贷方发生额）或者（借方期末，贷方期末）或者 期末余额 必选。",
...@@ -253,14 +358,13 @@ ...@@ -253,14 +358,13 @@
"ConfirmCleartTbTitle": "是否删除试算平衡导入的相关数据？", "ConfirmCleartTbTitle": "是否删除试算平衡导入的相关数据？",
"ConfirmCredit": "确认数（贷方）", "ConfirmCredit": "确认数（贷方）",
"ConfirmDebit": "确认数（借方）", "ConfirmDebit": "确认数（借方）",
"ConfirmNo": "否",
"ConfirmSelectErpImportFile": "未选择导入文件，不能导入", "ConfirmSelectErpImportFile": "未选择导入文件，不能导入",
"ConfirmSelectErpImportFileTitle": "请选择导入文件", "ConfirmSelectErpImportFileTitle": "请选择导入文件",
"ConfirmTbDataToDelete": "已通过试算平衡表方式导入过数据，必须清理后才可以进行财务数据导入。是否确认删除？", "ConfirmTbDataToDelete": "已通过试算平衡表方式导入过数据，必须清理后才可以进行财务数据导入。是否确认删除？",
"ConfirmToContinue": "确定继续吗？", "ConfirmToContinue": "确定继续吗？",
"ConfirmToMapForDiffAcctProp": "对应的企业科目于标准科目不是同一科目类型，确定要对应吗？", "ConfirmToMapForDiffAcctProp": "对应的企业科目于标准科目不是同一科目类型，确定要对应吗？",
"ConfirmToMapForDiffDirection": "对应的企业科目于标准科目不是同一借贷方向，确定要对应吗？", "ConfirmToMapForDiffDirection": "对应的企业科目于标准科目不是同一借贷方向，确定要对应吗？",
"ConfirmYes": "是", "ConsumDocumentListRoot": "税费相关",
"ContactAdmin": "请联系管理员", "ContactAdmin": "请联系管理员",
"ConverImportBtn": "覆盖导入", "ConverImportBtn": "覆盖导入",
"CoverImportInputInvoice": "覆盖导入进项发票汇总", "CoverImportInputInvoice": "覆盖导入进项发票汇总",
...@@ -268,6 +372,7 @@ ...@@ -268,6 +372,7 @@
"CoverImportJournalEntry": "覆盖导入序时帐", "CoverImportJournalEntry": "覆盖导入序时帐",
"CoverImportOutputInvoice": "覆盖导入销项发票", "CoverImportOutputInvoice": "覆盖导入销项发票",
"CoverImportTrialBalance": "覆盖导入试算平衡表", "CoverImportTrialBalance": "覆盖导入试算平衡表",
"CreateTask": "新建税务事项",
"CreditAmount": "贷方发生", "CreditAmount": "贷方发生",
"CreditAmountConfirmCol": "最终确认数（贷方）", "CreditAmountConfirmCol": "最终确认数（贷方）",
"CreditBal": "贷方发生额", "CreditBal": "贷方发生额",
...@@ -280,6 +385,7 @@ ...@@ -280,6 +385,7 @@
"CreditParseErrorType": "贷方金额非法", "CreditParseErrorType": "贷方金额非法",
"CreditReclassificationCol": "贷方重分类", "CreditReclassificationCol": "贷方重分类",
"CreditReclassificationCountCol": "贷方重分类数", "CreditReclassificationCountCol": "贷方重分类数",
"CreditRecord": "税收优惠备案",
"CreditRelevantAmtCol": "贷方发生（包含审计调整）", "CreditRelevantAmtCol": "贷方发生（包含审计调整）",
"CreditTips": "请输入重分类贷方金额", "CreditTips": "请输入重分类贷方金额",
"Creditor": "贷方", "Creditor": "贷方",
...@@ -307,6 +413,10 @@ ...@@ -307,6 +413,10 @@
"CustomsPayNumEorror": " 第{rowIndex}行海关缴款书号为空,请确认", "CustomsPayNumEorror": " 第{rowIndex}行海关缴款书号为空,请确认",
"CustomsPayNumExisted": "第{rowIndex}行，海关缴款书号: {rows} 已经存在", "CustomsPayNumExisted": "第{rowIndex}行，海关缴款书号: {rows} 已经存在",
"CustomsPayNumExistedInSheet": "Sheet中第{rowIndex}行有重复的海关缴款书号: {rows} ", "CustomsPayNumExistedInSheet": "Sheet中第{rowIndex}行有重复的海关缴款书号: {rows} ",
"DFFSETotal": "贷方发生额合计:",
"DFJETotal": "贷方金额合计:",
"DFQCTotal": "贷方期初合计:",
"DFQMTotal": "贷方期末合计:",
"DataCheckType": "类型", "DataCheckType": "类型",
"DataCorrectnessCheck": "数据正确性验证", "DataCorrectnessCheck": "数据正确性验证",
"DataFilter": "数据筛选", "DataFilter": "数据筛选",
...@@ -317,6 +427,7 @@ ...@@ -317,6 +427,7 @@
"DataProcessDataName_CITQuarterly": "- 所得税季度预缴表", "DataProcessDataName_CITQuarterly": "- 所得税季度预缴表",
"DataProcessDataName_CITSecondQuarterly": "· 第二季度预缴表", "DataProcessDataName_CITSecondQuarterly": "· 第二季度预缴表",
"DataProcessDataName_CITThirdQuarterly": "· 第三季度预缴表", "DataProcessDataName_CITThirdQuarterly": "· 第三季度预缴表",
"DataProcessDataName_UpdateReportConfig": "报表配置更新",
"DataProcessDataName_FinanceReport": "- 财务报表", "DataProcessDataName_FinanceReport": "- 财务报表",
"DataProcessDataName_GenerateReport": "生成报表", "DataProcessDataName_GenerateReport": "生成报表",
"DataProcessDataName_ModelAnalysis": "模型分析", "DataProcessDataName_ModelAnalysis": "模型分析",
...@@ -346,25 +457,27 @@ ...@@ -346,25 +457,27 @@
"DebitRelevantAmtCol": "借方发生（包含审计调整）", "DebitRelevantAmtCol": "借方发生（包含审计调整）",
"DebitTips": "请输入重分类借方金额", "DebitTips": "请输入重分类借方金额",
"Debitor": "借方", "Debitor": "借方",
"DeclarationComplete": "完成申报",
"DeleteDuplicateData": "删除重复数据", "DeleteDuplicateData": "删除重复数据",
"DeleteEmptyWarning": "请选中数据后再删除", "DeleteEmptyWarning": "请选中数据后再删除",
"DeleteFailed": "删除失败", "DeleteFailed": "删除失败",
"DeleteFailure": "删除失败", "DeleteFailure": "删除失败",
"DeleteFiles": "删除文件", "DeleteFiles": "删除文件",
"DeleteSuccess": "删除成功", "DeleteSuccess": "删除成功",
"DeleteTbDataTip": "确定清除数据？清除后数据不可恢复", "DeleteTbDataTip": "确定清除当月数据？清除后数据不可恢复",
"DeleteTips": "请选择需要删除的数据", "DeleteTips": "请选择需要删除的数据",
"ClickEnsureTip": "点击确定,提交变更!", "DepreciationCurrentYearTotal": "本年会计折旧额合计",
"DepreciationPerTaxCurrentYearTotal": "本年税法折旧额合计",
"DirectionDifferent": "借贷方向不一致", "DirectionDifferent": "借贷方向不一致",
"Display": "显示", "Display": "显示",
"DisplayCurrentPeriod": "仅显示当月", "DisplayCurrentPeriod": "仅显示当月",
"DividendReturn": "股利返还",
"DocumentNum": "单据号", "DocumentNum": "单据号",
"DownLoadCsvTemplate": "下载CSV模板", "DownLoadCsvTemplate": "下载CSV模板",
"DownLoadExcelTemplate": "下载Excel模板", "DownLoadExcelTemplate": "下载Excel模板",
"DownloadFiles": "下载文件", "DownloadFiles": "下载文件",
"DownloadOutputTemplate": "模板下载", "DownloadOutputTemplate": "模板下载",
"DownloadTemplateFail": "模板下载失败，请联系管理员.", "DownloadTemplateFail": "模板下载失败，请联系管理员.",
"DueDate": "截止日期",
"DuplicateCheckErrorMsg": "{rows}在导入文件中重复;", "DuplicateCheckErrorMsg": "{rows}在导入文件中重复;",
"DuplicateCheckErrorType": "导入文件发票信息重复", "DuplicateCheckErrorType": "导入文件发票信息重复",
"DuplicateDataCheck": "重复数据", "DuplicateDataCheck": "重复数据",
...@@ -387,8 +500,6 @@ ...@@ -387,8 +500,6 @@
"EndDebitBalType": "借方期末类型错误", "EndDebitBalType": "借方期末类型错误",
"EntempriseAccount": "会计科目", "EntempriseAccount": "会计科目",
"EnterpriseCodeDirection": "企业科目借贷方向", "EnterpriseCodeDirection": "企业科目借贷方向",
"EnterpriseSubjectCodeCol": "企业科目代码",
"EnterpriseSubjectNameCol": "企业科目名称",
"Enum_Accounting": "已记账", "Enum_Accounting": "已记账",
"Enum_Billed": "已开票", "Enum_Billed": "已开票",
"Enum_DisplayIncoice": "页面显示发票信息", "Enum_DisplayIncoice": "页面显示发票信息",
...@@ -417,6 +528,7 @@ ...@@ -417,6 +528,7 @@
"EvidenceTab": "证据", "EvidenceTab": "证据",
"ExportBtn": "导出", "ExportBtn": "导出",
"ExportExcel": "导出Excel", "ExportExcel": "导出Excel",
"FLCITCount": "分录总数:",
"FailureTitle": "失败!", "FailureTitle": "失败!",
"FileName": "文件名：", "FileName": "文件名：",
"Filter": "筛选:", "Filter": "筛选:",
...@@ -445,8 +557,10 @@ ...@@ -445,8 +557,10 @@
"Icon": " ", "Icon": " ",
"ImagePic": "验证结果", "ImagePic": "验证结果",
"ImportBtn": "导入", "ImportBtn": "导入",
"ImportDocumentList": "导入",
"ImportErpDataFail": "数据导入失败： ", "ImportErpDataFail": "数据导入失败： ",
"ImportErpDataSuccess": "数据导入成功,开始整理数据", "ImportErpDataSuccess": "数据导入成功,开始整理数据",
"ImportAssetErrorMsg": "出现{NumberOfError}处警告，请点击明细查看详细信息",
"ImportErrorMsg": "出现{NumberOfError}处错误，请修正后点击刷新按钮重新校验", "ImportErrorMsg": "出现{NumberOfError}处错误，请修正后点击刷新按钮重新校验",
"ImportErrorPopUpErrorCountCol": "错误数量", "ImportErrorPopUpErrorCountCol": "错误数量",
"ImportErrorPopUpErrorDescCol": "错误描述", "ImportErrorPopUpErrorDescCol": "错误描述",
...@@ -483,6 +597,7 @@ ...@@ -483,6 +597,7 @@
"IncomeInvoiceDetail": "进项发票明细", "IncomeInvoiceDetail": "进项发票明细",
"IncomeInvoiceTitle": "进项发票", "IncomeInvoiceTitle": "进项发票",
"IncomeInvoiceTotal": "进项发票汇总", "IncomeInvoiceTotal": "进项发票汇总",
"InprogressTask": "进行中",
"InputInvoiceClearTips": "本月所有的进项汇总表与进项明细表的信息将会清空?", "InputInvoiceClearTips": "本月所有的进项汇总表与进项明细表的信息将会清空?",
"InputInvoiceCoverImportTips": " 若覆盖汇总表，进项明细表信息将会被清空?", "InputInvoiceCoverImportTips": " 若覆盖汇总表，进项明细表信息将会被清空?",
"InputInvoiceItemClearTips": "本月所有进项明细表的信息将会清空?", "InputInvoiceItemClearTips": "本月所有进项明细表的信息将会清空?",
...@@ -539,19 +654,24 @@ ...@@ -539,19 +654,24 @@
"IsConfirmReCalcuate": "系统已到达{status}状态，是否确认重新计算?", "IsConfirmReCalcuate": "系统已到达{status}状态，是否确认重新计算?",
"IsConfirmSaveReport": "系统已到达{status}状态，是否确认保存报表?", "IsConfirmSaveReport": "系统已到达{status}状态，是否确认保存报表?",
"IsConfirmToApproveReport": "是否确认通过审核?", "IsConfirmToApproveReport": "是否确认通过审核?",
"IsConfirmToApproveReportTitle": "是否确定审核通过?", "IsConfirmToApproveReportTitle": "是否确认通过审核?",
"IsConfirmToCompleteDeclaration": "是否确认完成申报?", "IsConfirmToCompleteDeclaration": "是否确认完成申报?",
"IsConfirmToReImport": "系统已到达{status}状态，是否确认重新导入?", "IsConfirmToReImport": "系统已到达{status}状态，是否确认重新导入?",
"IsConfirmToReMap": "系统已到达{status}状态，是否确认重新对应?", "IsConfirmToReMap": "系统已到达{status}状态，是否确认重新对应?",
"IsConfirmToRejectReport": "是否确认拒绝审核?", "IsConfirmToRejectReport": "是否确认驳回审核?",
"IsConfirmToRejectReportTitle": "是否确定拒绝审核?", "IsConfirmToRejectReportTitle": "是否确认驳回审核?",
"IsConfirmToSubmitReportTitle": "是否确定提交报表审核?", "IsConfirmToSubmitReportTitle": "是否确认提交报表审核?",
"IsConfirmToWithdrawSubmitReportTitle": "是否确定撤销提交报表审核?", "IsConfirmToWithdrawSubmitReportTitle": "是否确认撤销提交报表审核?",
"IsConfirmUndoMap": "系统已到达{status}状态，是否确认撤销对应?", "IsConfirmUndoMap": "系统已到达{status}状态，是否确认撤销对应?",
"IsConfirmVoucherReClassify": "系统已到达{status}状态，是否确认保存凭证重分类?", "IsConfirmVoucherReClassify": "系统已到达{status}状态，是否确认保存凭证重分类?",
"IsDelete": "是否确定删除？", "IsDelete": "是否确定删除？",
"IsInputNecessary": "是否必填",
"ItemIDParseErrorMsg": "{rows}存在非法分录号值！", "ItemIDParseErrorMsg": "{rows}存在非法分录号值！",
"ItemIDParseErrorType": "分录号值非法", "ItemIDParseErrorType": "分录号值非法",
"JFFSETotal": "借方发生额合计:",
"JFJETotal": "借方金额合计:",
"JFQCTotal": "借方期初合计:",
"JFQMTotal": "借方期末合计:",
"JournalDFJE": "贷方金额", "JournalDFJE": "贷方金额",
"JournalEntryAccountCodeTooLongErrorMsg": "科目代码不能超过50个字符！", "JournalEntryAccountCodeTooLongErrorMsg": "科目代码不能超过50个字符！",
"JournalEntryAccountCodeTooLongErrorType": "科目代码过长", "JournalEntryAccountCodeTooLongErrorType": "科目代码过长",
...@@ -571,7 +691,7 @@ ...@@ -571,7 +691,7 @@
"JournalEntryGroupEmptyErrorType": "凭证类型空错误", "JournalEntryGroupEmptyErrorType": "凭证类型空错误",
"JournalEntryGroupTooLongErrorMsg": "凭证类型不能超过50个字符！", "JournalEntryGroupTooLongErrorMsg": "凭证类型不能超过50个字符！",
"JournalEntryGroupTooLongErrorType": "凭证类型过长", "JournalEntryGroupTooLongErrorType": "凭证类型过长",
"JournalEntryImportErrorERPDataImportedAlready": "财务数据已经导入，不能导入序时账！", "JournalEntryImportErrorERPDataImportedAlready": "财务数据已经导入，不能导入序时账,请先导入试算平衡表！",
"JournalEntryImportErrorNotImportTBData": "试算平衡表还未导入，不能导入序时账！", "JournalEntryImportErrorNotImportTBData": "试算平衡表还未导入，不能导入序时账！",
"JournalEntryItemIDEmptyErrorMsg": "凭证分录号不能为空！", "JournalEntryItemIDEmptyErrorMsg": "凭证分录号不能为空！",
"JournalEntryItemIDEmptyErrorType": "凭证分录号空错误", "JournalEntryItemIDEmptyErrorType": "凭证分录号空错误",
...@@ -624,7 +744,7 @@ ...@@ -624,7 +744,7 @@
"MoreThan": "及以上", "MoreThan": "及以上",
"MotorVehicle": "机动车发票", "MotorVehicle": "机动车发票",
"MyTrialBalanceTitle": "试算平衡表", "MyTrialBalanceTitle": "试算平衡表",
"No": "否", "NeedToUpdate": "需更新",
"NoAccountCode": "没有选择科目代码。", "NoAccountCode": "没有选择科目代码。",
"NoCurrentPeriodData": "没有符合当前月份的数据.", "NoCurrentPeriodData": "没有符合当前月份的数据.",
"NoCustomsAuditResult": "必选字段: 稽核结果 没有勾选，请确认", "NoCustomsAuditResult": "必选字段: 稽核结果 没有勾选，请确认",
...@@ -641,6 +761,7 @@ ...@@ -641,6 +761,7 @@
"NotAllowDataProcess": "没有提交科目对应，不能进行数据处理", "NotAllowDataProcess": "没有提交科目对应，不能进行数据处理",
"NotAllowSubmitAccountMap": "没有导入数据，不能提交科目对应", "NotAllowSubmitAccountMap": "没有导入数据，不能提交科目对应",
"NotBegin": "未开始", "NotBegin": "未开始",
"NotBeginTask": "未开始",
"NotInputTheQueryConditions": "未输入查询条件!", "NotInputTheQueryConditions": "未输入查询条件!",
"NullValue": "空", "NullValue": "空",
"Num": "编号", "Num": "编号",
...@@ -661,8 +782,11 @@ ...@@ -661,8 +782,11 @@
"OrderyByStatus": "按项目状态", "OrderyByStatus": "按项目状态",
"OrderyByYear": "按项目时间", "OrderyByYear": "按项目时间",
"OrganizationsHasDirtyData": "模型数据有更新，是否重新计算模型数据？", "OrganizationsHasDirtyData": "模型数据有更新，是否重新计算模型数据？",
"OtherRecordFiling": "其他备案事项",
"OutDateTask": "过期",
"OutOfAmount": "每次最多只能上传5个文件", "OutOfAmount": "每次最多只能上传5个文件",
"OutOfAmountType": "文件数量错误", "OutOfAmountType": "文件数量错误",
"OutOfDateTask": "已过期",
"OutOfSize": "{rows}文件大小不能超过10M", "OutOfSize": "{rows}文件大小不能超过10M",
"OutOfSizeType": "文件大小错误", "OutOfSizeType": "文件大小错误",
"Output100LengthMsg": "的长度超过100", "Output100LengthMsg": "的长度超过100",
...@@ -681,7 +805,9 @@ ...@@ -681,7 +805,9 @@
"OverLengthErrorMsg": "{rows}存在字段长度超过最大长度限制！", "OverLengthErrorMsg": "{rows}存在字段长度超过最大长度限制！",
"OverLengthFieldErrorType": "字段长度检查", "OverLengthFieldErrorType": "字段长度检查",
"PIndustry": "行业", "PIndustry": "行业",
"PZCITCount": "凭证总数:",
"PagingFirstPage": "首页", "PagingFirstPage": "首页",
"TotalDebit": "借方金额",
"PagingLastPage": "最后一页", "PagingLastPage": "最后一页",
"PagingNextPage": "下一页", "PagingNextPage": "下一页",
"PagingPreviousPage": "上一页", "PagingPreviousPage": "上一页",
...@@ -695,8 +821,8 @@ ...@@ -695,8 +821,8 @@
"PeriodParseErrorMsg": "{rows}存在非法期间值！", "PeriodParseErrorMsg": "{rows}存在非法期间值！",
"PeriodParseErrorType": "期间值非法", "PeriodParseErrorType": "期间值非法",
"PhoneNum": "地址电话", "PhoneNum": "地址电话",
"PleaseContactAdministrator": "发生异常，请联系管理员！", "Planning": "税收筹划",
"PleaseSelect": "请选择...", "PleaseSelectAtLeastOneItem": "请选择至少一项!",
"PleaseSelectColumn": "请选择列名", "PleaseSelectColumn": "请选择列名",
"PleaseSelectFileFirst": "请先选择文件！", "PleaseSelectFileFirst": "请先选择文件！",
"PleaseSelectPeriod": "请选择一个期间", "PleaseSelectPeriod": "请选择一个期间",
...@@ -704,47 +830,45 @@ ...@@ -704,47 +830,45 @@
"ProductName": "商品名称", "ProductName": "商品名称",
"ProductStandar": "规格", "ProductStandar": "规格",
"ProejctStatusCompleted": "已完成", "ProejctStatusCompleted": "已完成",
"ProfitAndLossStatement": "利润表",
"Project": "行", "Project": "行",
"ProjectCompanyCol": "机构",
"ProjectNameCol": "项目名称", "ProjectNameCol": "项目名称",
"ProjectServiceCol": "服务", "ProjectServiceCol": "服务",
"ProjectStatus": "项目状态", "ProjectStatus": "项目状态",
"ProjectStatusAcccountMapSubmitted": "已对应", "ProjectStatusAcccountMapSubmitted": "已对应",
"ProjectStatusGenerated": "已生成", "ProjectStatusGenerated": "已生成",
"ProjectStatusImported": "已导入", "ProjectStatusImported": "已导入",
"ProjectStatusReportApproved": "已审核",
"ProjectStatusReportRejected": "已拒绝",
"ProjectStatusReportSubmitted": "提交审核",
"ProjectStatusStarted": "开始", "ProjectStatusStarted": "开始",
"ProjectStatusTitle": "项目状态：", "ProjectStatusTitle": "项目状态：",
"ProjectStatusUnStarted": "未开始", "ProjectStatusUnStarted": "未开始",
"ProjectYearCol": "年份", "ProjectYearCol": "年份",
"PropertyDocumentListRoot": "资料清单",
"QCYETotal": "期初余额合计:",
"QMYETotal": "期末余额合计:",
"QNDKJZJE": "去年度会计折旧额:",
"Quantity": "数量", "Quantity": "数量",
"QuantityOverLengthMsg": "超出范围(1-9999)", "QuantityOverLengthMsg": "超出范围(1-9999)",
"QuarterlyCITFilingReturn": "季度预缴表",
"Reason": "原因", "Reason": "原因",
"ReclassificationItem": "重分类明细", "ReclassificationItem": "重分类明细",
"ReclassificationName": "重分类名称", "ReclassificationName": "重分类名称",
"ReclassificationNameCol": "重分类名称", "ReclassificationNameCol": "重分类名称",
"ReclassificationNameTips": "自定义重分类名称", "ReclassificationNameTips": "自定义重分类名称",
"RecordFiling": "资产损失所得税税前扣除备案",
"Refresh": "刷新", "Refresh": "刷新",
"RefreshInputInvoiceItemValidationData": "刷新进项发票明细校验结果", "RefreshInputInvoiceItemValidationData": "刷新进项发票明细校验结果",
"RefreshInputInvoiceValidationData": "刷新进项发票汇总校验结果", "RefreshInputInvoiceValidationData": "刷新进项发票汇总校验结果",
"RefreshSuccess": "刷新成功！", "RefreshSuccess": "刷新成功！",
"RefreshTbFail": "刷新数据失败，请重新加载页面", "RefreshTbFail": "刷新数据失败，请重新加载页面",
"RefreshValidationData": "刷新校验结果", "RefreshValidationData": "刷新校验结果",
"RejectReportStatusCheck": "只有已审核状态时才可以拒绝审核", "RejectReportStatusCheck": "只有提交审核后才可以驳回审核",
"RelatedAttach": "关联附件", "RelatedAttach": "关联附件",
"RelatedAttachmentCol": "关联附件", "RelatedAttachmentCol": "关联附件",
"RelatedVoucherCol": "关联凭证", "RelatedVoucherCol": "关联凭证",
"Remarks": "日志", "Remarks": "日志",
"ReportApprove": "通过申请",
"ReportDataSource": "报表数据源", "ReportDataSource": "报表数据源",
"ReportName": "报表名字", "ReportName": "报表名字",
"ReportReject": "驳回申请",
"ReportSubmitToApprove": "提交审核",
"ReportWithdrawToApprove": "撤销审核",
"RequiredColumnNotSelect": "请选择必选字段: {errorMsg} 再导入数据", "RequiredColumnNotSelect": "请选择必选字段: {errorMsg} 再导入数据",
"Reset": "重置",
"RowIndex": "第{rowIndex}行", "RowIndex": "第{rowIndex}行",
"STANDARDProject": "标准科目", "STANDARDProject": "标准科目",
"SealerTaxNumber": "销售方税号", "SealerTaxNumber": "销售方税号",
...@@ -764,12 +888,13 @@ ...@@ -764,12 +888,13 @@
"SelectOneAccountToVoucherReclassificate": "请选择一个企业科目进行凭证重分类！", "SelectOneAccountToVoucherReclassificate": "请选择一个企业科目进行凭证重分类！",
"SelectPeriodDelete": "请先选择一个期间后再删除", "SelectPeriodDelete": "请先选择一个期间后再删除",
"SelectStdAccount": "选择标准科目", "SelectStdAccount": "选择标准科目",
"SequenceNo": "序号", "SellerTaxNumber": "销售方税号",
"SetProjectStatusError": "设置项目状态出错", "SetProjectStatusError": "设置项目状态出错",
"ShowDetail": "显示明细", "ShowDetail": "显示明细",
"ShowInPeriod": "分期显示", "ShowInPeriod": "分期显示",
"SourceOrFormula": "填报说明", "SourceOrFormula": "填报说明",
"Special": "专用发票", "Special": "专用发票",
"SpecialTasks": "特殊税务事项",
"StandardAccountAcctPropAsset": "资产", "StandardAccountAcctPropAsset": "资产",
"StandardAccountAcctPropCommon": "共同", "StandardAccountAcctPropCommon": "共同",
"StandardAccountAcctPropCost": "成本", "StandardAccountAcctPropCost": "成本",
...@@ -785,7 +910,6 @@ ...@@ -785,7 +910,6 @@
"StartRowNum": "起始行：", "StartRowNum": "起始行：",
"StartRowNumberCheckMsg": "起始行不能大于当前导入数据总数！", "StartRowNumberCheckMsg": "起始行不能大于当前导入数据总数！",
"StartingDate": "开始日期", "StartingDate": "开始日期",
"EndDate": "结束日期",
"StdAccountMappingResult": "标准科目对应结果", "StdAccountMappingResult": "标准科目对应结果",
"StdCodeDirection": "标准科目借贷方向", "StdCodeDirection": "标准科目借贷方向",
"StdGoodsName": "标准货物名称", "StdGoodsName": "标准货物名称",
...@@ -796,35 +920,49 @@ ...@@ -796,35 +920,49 @@
"SubjectDirectionCol": "借贷方向", "SubjectDirectionCol": "借贷方向",
"SubjectNameCol": "科目名称", "SubjectNameCol": "科目名称",
"SubjectTypeCol": "科目类型", "SubjectTypeCol": "科目类型",
"SubmitReportStatusCheck": "只有已生成或者已拒绝状态时才可以提交报表审核", "SubmitReportStatusCheck": "只有已生成或者已驳回状态时才可以提交报表审核",
"SubsidiaryAccounts": "查看明细账", "SubsidiaryAccounts": "查看明细账",
"Subtotal": "合计", "Subtotal": "合计",
"SuccessTitle": "成功!", "SuccessTitle": "成功!",
"SwitchToCITProject": "现在显示企业科目的数据", "SwitchToCITProject": "现在显示企业科目的数据",
"SwitchToSTANDARDProject": "以标准科目方式查看总账，请先进行数据整理", "SwitchToSTANDARDProject": "以标准科目方式查看总账，请先进行数据整理",
"SelectReportTemplate": "选择报表",
"TBDataNum": "试算平衡表总数:",
"TableName": "表名", "TableName": "表名",
"TaxAmount": "税额", "TaskDescription": "事项描述",
"TaskEntity": "使用机构",
"TaskName": "事项名称",
"TaxAmountCheckErrorMsg": "请确认{rows}的正确的金额，税率与税额的值;", "TaxAmountCheckErrorMsg": "请确认{rows}的正确的金额，税率与税额的值;",
"TaxAmountNumberCheckErrorMsg": "的税额有误", "TaxAmountNumberCheckErrorMsg": "的税额有误",
"TaxAmountNumberCheckErrorType": "税额数据类型错误", "TaxAmountNumberCheckErrorType": "税额数据类型错误",
"TaxAmountQueryError": "税额范围不正确，请重新输入！", "TaxAmountQueryError": "税额范围不正确，请重新输入！",
"TaxClassCode": "税收分类编码", "TaxClassCode": "税收分类编码",
"TaxInspection": "税务自查",
"TaxRate": "税率", "TaxRate": "税率",
"TaxRateCheckErrorMsg": "的税率数据类型错误！", "TaxRateCheckErrorMsg": "的税率数据错误！",
"TaxRateCheckErrorType": "税率数据类型错误", "TaxRateCheckErrorType": "税率数据错误",
"TaxRateNumberCheckErrorMsg": "的税率有误", "TaxRateNumberCheckErrorMsg": "的税率有误",
"TaxRateNumberCheckErrorType": "税率数据类型错误", "TaxRateNumberCheckErrorType": "税率数据类型错误",
"TaxReportColumn": "列", "TaxReportColumn": "列",
"TaxReturn": "纳税申报表", "TaxStatistics": "税务局各类调查统计表",
"TaxTaskManage": "税务事项",
"TaxTaskType": "事项分类",
"TaxTotal": "税额合计: ",
"TemplateDownload": "模板下载",
"ThisMonth": "本月",
"ThisWeek": "本周",
"Tips": "提示", "Tips": "提示",
"Today": "今天",
"TotalAmount": "金额合计:", "TotalAmount": "金额合计:",
"TotalCreditAmount": "贷方合计金额:", "TotalCreditAmount": "贷方合计金额:",
"TotalDebitAmount": "借方合计金额:", "TotalDebitAmount": "借方合计金额:",
"TotalLoanAmountColon": "贷款总金额：",
"TotalNo": "总数：", "TotalNo": "总数：",
"TotalTaxAmount": "税额合计:", "TotalTaxAmount": "税额合计:",
"TrialBalanceDataSource": "试算平衡表数据源", "TrialBalanceDataSource": "试算平衡表数据源",
"TrialBalanceTitle": "总帐", "TrialBalanceTitle": "总帐",
"UnbilledInvoiceTitle": "未开票销售", "UnbilledInvoiceTitle": "未开票销售",
"TemplateFile": "报表底稿",
"Unit": "单位", "Unit": "单位",
"UnitPrice": "单价", "UnitPrice": "单价",
"UnitPriceNumberCheckErrorMsg": "的单价数据类型错误！", "UnitPriceNumberCheckErrorMsg": "的单价数据类型错误！",
...@@ -841,6 +979,7 @@ ...@@ -841,6 +979,7 @@
"ValidationDetails": "验证详细内容", "ValidationDetails": "验证详细内容",
"ValidationTips": "提示", "ValidationTips": "提示",
"ViewDetails": "查看明细", "ViewDetails": "查看明细",
"ViewRelatedDocument": "查看相关文档",
"VoucherAccountCode": "会计科目", "VoucherAccountCode": "会计科目",
"VoucherCode": "凭证编号", "VoucherCode": "凭证编号",
"VoucherCreditAmount": "贷方金额", "VoucherCreditAmount": "贷方金额",
...@@ -854,11 +993,12 @@ ...@@ -854,11 +993,12 @@
"VoucherReclassificationTitle": "凭证重分类", "VoucherReclassificationTitle": "凭证重分类",
"VoucherSummary": "凭证摘要", "VoucherSummary": "凭证摘要",
"Voucher_Export_result": "会计凭证查询结果", "Voucher_Export_result": "会计凭证查询结果",
"WaitCompleteTask": "待完成",
"WarningTitle": "警告!", "WarningTitle": "警告!",
"WithdrawReportStatusCheck": "请先提交报表审核，只有已提交状态时才可以撤销报表审核", "WithdrawReportStatusCheck": "请先提交报表审核，只有已提交状态时才可以撤销报表审核",
"WorkSheet": "工作表：", "WorkSheet": "工作表：",
"YearSelection": "年度", "YearSelection": "年度",
"Yes": "是", "Yuan": "元",
"accountMapping": "科目对应", "accountMapping": "科目对应",
"accountVoucher": "会计凭证", "accountVoucher": "会计凭证",
"addMeansures": "添加指标", "addMeansures": "添加指标",
...@@ -900,10 +1040,13 @@ ...@@ -900,10 +1040,13 @@
"dateFormat4Year": " yyyy 年", "dateFormat4Year": " yyyy 年",
"dateFormat4YearMonth": " yyyy 年 mm 月", "dateFormat4YearMonth": " yyyy 年 mm 月",
"dateFormat4YearMonthDay": "yyyy-mm-dd", "dateFormat4YearMonthDay": "yyyy-mm-dd",
"dateFormat4YearMonthDayCh": "yyyy年mm月dd日",
"deleteChart": "确定删除图表", "deleteChart": "确定删除图表",
"deleteChartTitle": "删除图表", "deleteChartTitle": "删除图表",
"dimension": "分析维度", "dimension": "分析维度",
"dimensionOrMeasuresError": "维度或者指标不能为空", "dimensionOrMeasuresError": "维度或者指标不能为空",
"documentList": "企业资料清单",
"documentListTip": "清单列表",
"empty": "空", "empty": "空",
"erpData": "财务数据", "erpData": "财务数据",
"error": "发生错误", "error": "发生错误",
...@@ -915,6 +1058,7 @@ ...@@ -915,6 +1058,7 @@
"invoiceMapping": "发票对应", "invoiceMapping": "发票对应",
"invoiceMappingDesc": "发票对应关系", "invoiceMappingDesc": "发票对应关系",
"invoiceNumber": "发票号码", "invoiceNumber": "发票号码",
"isRequired": "为必填",
"itemID": "分录号", "itemID": "分录号",
"journalEntry": "序时账", "journalEntry": "序时账",
"linechart": "折线图", "linechart": "折线图",
...@@ -949,5 +1093,12 @@ ...@@ -949,5 +1093,12 @@
"vatCaculateDataDesc": "数据处理", "vatCaculateDataDesc": "数据处理",
"vid": "凭证号", "vid": "凭证号",
"voucherMapping": "凭证对应", "voucherMapping": "凭证对应",
"voucherMappingDesc": "凭证对应关系" "voucherMappingDesc": "凭证对应关系",
} "~MustBeEndOneApp": "I Must be the End One, please!",
\ No newline at end of file "DataSourceFilter": "数据源筛选",
"PleaseSelectDatabase": "请选择数据库",
"PleaseEnterTheFiledWordings": "请输入取值字段",
"PleaseEnterTheFilteredCondition": "请输入筛选条件",
"PleaseSelectTheField": "请选择字段",
"PleaseFillinAllDataField": "请输入数据源筛选条件"
}
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
View file @ dc88ffd1
...@@ -1818,6 +1818,8 @@ ...@@ -1818,6 +1818,8 @@
"showData": "显示数据", "showData": "显示数据",
"showGrid": "显示表格", "showGrid": "显示表格",
"startCaculateData": "开始处理", "startCaculateData": "开始处理",
"ReportExportConfirm": "报表数据还未保存，操作结果可能和实际不一致，确定要执行这个操作吗？",
"LeaveReport": "报表数据还未保存，确定要离开页面吗？离开会导致数据丢失。",
"stepchart": "阶梯图", "stepchart": "阶梯图",
"switchValue": "显示数值", "switchValue": "显示数值",
"taxDashboard": "税务指标仪表盘", "taxDashboard": "税务指标仪表盘",
...@@ -1978,4 +1980,18 @@ ...@@ -1978,4 +1980,18 @@
"DirectMethodCashFlowStatementTitle": "直接法现金流量表", "DirectMethodCashFlowStatementTitle": "直接法现金流量表",
"~MustBeEndOneApp": "我必须是最后一个！" "~MustBeEndOneApp": "我必须是最后一个！"
"~MustBeEndOneApp": "我必须是最后一个！",
"DataSourceFilter": "数据源筛选",
"PleaseSelectDatabase": "请选择数据库",
"PleaseEnterTheFiledWordings": "请输入取值字段",
"PleaseEnterTheFilteredCondition": "请输入筛选条件",
"Filter": "筛选",
"PleaseSelectTheField": "请选择字段",
"originator":"Originator",
"associatedSchedule":"Associated Schedule",
"associatedCell":"Associated Cell",
"currentReviewNotesDetails":"Current Review Notes Details",
"ImportFixedAssets":"导入固定资产",
"FixedAssetsMapping":"FA对应关系",
"PleaseFillinAllDataField": "请输入数据源筛选条件"
} }
\ No newline at end of file
atms-web/src/main/webapp/app/adminApp.js
View file @ dc88ffd1
...@@ -91,7 +91,7 @@ var app = angular.module('adminApp', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.t ...@@ -91,7 +91,7 @@ var app = angular.module('adminApp', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.t
.config(['$logProvider', '$translateProvider', '$translatePartialLoaderProvider', 'region', '$compileProvider', .config(['$logProvider', '$translateProvider', '$translatePartialLoaderProvider', 'region', '$compileProvider',
function ($logProvider, $translateProvider, $translatePartialLoaderProvider, region, $compileProvider) { function ($logProvider, $translateProvider, $translatePartialLoaderProvider, region, $compileProvider) {
'use strict'; 'use strict';
region = 'zh-CN';
// to disable various debug runtime information in the compiler to DOM elements. // to disable various debug runtime information in the compiler to DOM elements.
$compileProvider.debugInfoEnabled(false); $compileProvider.debugInfoEnabled(false);
// enable output $log.debug by default // enable output $log.debug by default
......
atms-web/src/main/webapp/app/app.js
View file @ dc88ffd1
...@@ -119,6 +119,7 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls', ...@@ -119,6 +119,7 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls',
urlTemplate: '/app-resources/i18n/{lang}/{part}.json' urlTemplate: '/app-resources/i18n/{lang}/{part}.json'
}); });
region = window.localStorage.langTemp || region;
$translateProvider $translateProvider
.preferredLanguage(region) .preferredLanguage(region)
.fallbackLanguage(region); .fallbackLanguage(region);
...@@ -302,9 +303,9 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls', ...@@ -302,9 +303,9 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls',
return translation; return translation;
} }
]) ])
.controller('AppController', ['$scope', '$log', '$location', '$translate', '$translatePartialLoader', .controller('AppController', ['$rootScope','$scope', '$log', '$location', '$translate', '$translatePartialLoader',
'$window', 'appRoute', 'application', 'appTranslation', '$timeout', '$uibModal', 'loginContext', '$ExceptionlessClient', 'signalRSvc', '$window', 'appRoute', 'application', 'appTranslation', '$timeout', '$uibModal', 'loginContext', '$ExceptionlessClient', 'signalRSvc',
'exceptionlessServerURL', function ($scope, $log, $location, $translate, $translatePartialLoader, $window, appRoute, 'exceptionlessServerURL', function ($rootScope,$scope, $log, $location, $translate, $translatePartialLoader, $window, appRoute,
application, appTranslation, $timeout, $uibModal, loginContext, $ExceptionlessClient, signalRSvc, exceptionlessServerURL) { application, appTranslation, $timeout, $uibModal, loginContext, $ExceptionlessClient, signalRSvc, exceptionlessServerURL) {
'use strict'; 'use strict';
$log.debug('AppController.ctor()...'); $log.debug('AppController.ctor()...');
...@@ -332,6 +333,28 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls', ...@@ -332,6 +333,28 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls',
$log.debug('$stateChangeSuccess: '); $log.debug('$stateChangeSuccess: ');
}); });
var langs = {};
try {
var obj= JSON.parse(window.localStorage.lang);
if(typeof obj == 'object' && obj ){
langs = obj;
}
} catch(e) {}
var region = langs[loginContext.userName] || 'en-us';
var flag = window.localStorage.langTemp;
$rootScope.changeLanguage = function(lang){
$translate.use(lang);
appTranslation.loadAll();
$rootScope.currentLanguage = lang;
$rootScope.currentLanguageDesc = $rootScope.currentLanguage == 'en-us' ? 'Switch to Chinese':'切换至英文';
langs[loginContext.userName] = lang;
window.localStorage.lang = JSON.stringify(langs);
window.localStorage.langTemp = lang;
if(flag !== window.localStorage.langTemp){
window.location.reload();
}
};
$rootScope.changeLanguage(region);
// publish unbeforeunload event to child scopes // publish unbeforeunload event to child scopes
$scope.onbeforeunload = function () { $scope.onbeforeunload = function () {
......
atms-web/src/main/webapp/app/cit/import/cit-import-layout/cit-import-layout.ctrl.js
View file @ dc88ffd1
...@@ -148,10 +148,10 @@ function ($scope, $q, $log, $translate, $location, loginContext, enums, vatSessi ...@@ -148,10 +148,10 @@ function ($scope, $q, $log, $translate, $location, loginContext, enums, vatSessi
$scope.importIcon = 'fa fa-adjust'; $scope.importIcon = 'fa fa-adjust';
$scope.serviceTypeId = enums.serviceType.CIT; $scope.serviceTypeId = enums.serviceType.CIT;
getMenuList(); getMenuList();
getImportTables().then(function (tableInfoList) { // getImportTables().then(function (tableInfoList) {
vatCommonService.isLayoutMenuShow(vatSessionService.project.dbName, citSessionService.month, // vatCommonService.isLayoutMenuShow(vatSessionService.project.dbName, citSessionService.month,
$scope.nodeDicKey, $scope.linkShort, $scope.menus, tableInfoList); // $scope.nodeDicKey, $scope.linkShort, $scope.menus, tableInfoList);
}); // });
})(); })();
} }
]); ]);
\ No newline at end of file
atms-web/src/main/webapp/app/cit/import/cit-import-layout/cit-import-layout.html
View file @ dc88ffd1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="vat-import-menu"> <div class="vat-import-menu">
<div class="vat-import-menu"> <div class="vat-import-menu">
<perfect-scrollbar class="scroller" wheel-propagation="true" wheel-speed="1" min-scrollbar-length="20"> <perfect-scrollbar class="scroller" wheel-propagation="true" wheel-speed="1" min-scrollbar-length="20">
<div class="li" ng-repeat="menu in ::menus" atms-permission permission-control-type="ngIf" permission-code="{{::menu.permission}}" ng-show="menu.show"> <div class="li" ng-repeat="menu in ::menus" atms-permission permission-control-type="ngIf" permission-code="{{::menu.permission}}" ng-show="true">
<a ui-sref-active="active" ui-sref=".{{::menu.name}}"> <a ui-sref-active="active" ui-sref=".{{::menu.name}}">
<i ng-show="menu.name==='balanceSheet' && errorCount !== 0" class="fa fa-circle" style="/* display: block; *//* padding-bottom: 10px; */color: rgb(255, 140, 60);/* float: left; *//* padding-right: 10px; */margin-left: 40px;font-size: 10px;" aria-hidden="true"></i> <i ng-show="menu.name==='balanceSheet' && errorCount !== 0" class="fa fa-circle" style="/* display: block; *//* padding-bottom: 10px; */color: rgb(255, 140, 60);/* float: left; *//* padding-right: 10px; */margin-left: 40px;font-size: 10px;" aria-hidden="true"></i>
<i class="{{::menu.icon}}" style="display: block;padding-bottom: 10px;" aria-hidden="true"></i> <i class="{{::menu.icon}}" style="display: block;padding-bottom: 10px;" aria-hidden="true"></i>
......
atms-web/src/main/webapp/app/common/controls/ack-pagination/ack-pagination.html
View file @ dc88ffd1
<div class="ack-page"> <div class="ack-page">
<div class="ack-footer"> <div class="ack-footer">
<div class="page-size"> <div class="page-size">
<span>共有<span class="total-number">{{pagingOptions.totalItems}}</span>条记录</span> <!--共有-->
<span class="padding-span" ng-show="!hideSelector">每页显示</span> <span>{{'TotalPage'| translate}}<span class="total-number">{{pageOptions.totalItems}}</span>{{'RecordCount' | translate}}</span>
<select class="padding-span page-box" ng-model="pagingOptions.pageSizeString" ng-change="pagingService.pageSizeSelectionChanged()" ng-show="!hideSelector"> <!--每页显示-->
<option ng-repeat="option in pagingOptions.pagingSelection" value="{{option.id}}">{{option.value}}</option> <span class="padding-span" ng-show="!hideSelector">{{'RowForPage'| translate}}</span>
</select>
<span class="padding-span" ng-show="!hideSelector">条记录</span>
<span class="padding-span" ng-show="!hideSelector">跳至 <span class="padding-span"><input class="page-box " type="number" ng-change="pagingService.pageIndexChanging()" ng-model="pagingOptions.pageIndex" /></span>&nbsp;页</span>
<span class="padding-span" ng-show="!hideSelector">当前页 <span class="normal-number">{{pagingOptions.pageIndex}}</span>/<span class="normal-number">{{pagingOptions.totalPages}}</span></span> <select class="padding-span page-box" ng-model="pageOptions.pageSizeString" ng-change="pagingService.pageSizeSelectionChanged()" ng-show="!hideSelector">
<option ng-repeat="option in pageOptions.pagingSelection" value="{{option.id}}">{{option.value}}</option>
</select>
<!--条记录-->
<span class="padding-span" ng-show="!hideSelector">{{'RecordCount' | translate}}</span>
<!--跳至-->
<span class="padding-span" ng-show="!hideSelector">{{'JumpTo' | translate}} <span class="padding-span"><input class="page-box " type="number" ng-change="pagingService.pageIndexChanging()" ng-model="pageOptions.pageIndex" /></span>&nbsp;{{'Page' | translate}}</span>
<!--当前页-->
<span class="padding-span" ng-show="!hideSelector">{{'CurrentPage' | translate}} <span class="normal-number">{{pageOptions.pageIndex}}</span>/<span class="normal-number">{{pageOptions.totalPages}}</span></span>
</div> </div>
<ul uib-pagination total-items="pagingOptions.totalItems" items-per-page="pagingOptions.pageSize" ng-model="pagingOptions.pageIndex" num-pages="pagingOptions.totalPages" max-size="pagingOptions.maxSize" class="pagination-sm" <ul uib-pagination total-items="pageOptions.totalItems" items-per-page="pageOptions.pageSize" ng-model="pageOptions.pageIndex" num-pages="pageOptions.totalPages" max-size="pageOptions.maxSize" class="pagination-sm"
boundary-link-numbers="true" ng-change="pagingService.pageIndexChanging()" rotate="true" boundary-links="true" first-text="{{pagingOptions.firstPage}}" previous-text="{{pagingOptions.previousPage}}" last-text="{{pagingOptions.lastPage}}" next-text="{{pagingOptions.nextPage}}"></ul> boundary-link-numbers="true" ng-change="pagingService.pageIndexChanging()" rotate="true" boundary-links="true" first-text="{{pageOptions.firstPage}}" previous-text="{{pageOptions.previousPage}}" last-text="{{pageOptions.lastPage}}" next-text="{{pageOptions.nextPage}}"></ul>
</div> </div>
</div> </div>
atms-web/src/main/webapp/app/common/utils/constant.js
View file @ dc88ffd1
...@@ -569,10 +569,107 @@ constant.vatPermission = { ...@@ -569,10 +569,107 @@ constant.vatPermission = {
queryCode: '02.007.008.001', queryCode: '02.007.008.001',
editCode: '02.007.008.002', editCode: '02.007.008.002',
} }
} }
};
// cit权限code
constant.citPermission = {
dataImport: {
dataImportCode: '03.001',
balanceSheet: {
queryCode: '03.001.001',
importCode: '03.001.002'
},
journalEntry: {
queryCode: '03.001.003',
importCode: '03.001.004'
},
erpImport: {
queryCode: '03.001.005',
importCode: '03.001.006'
},
auditAdjust: {
queryCode: '03.001.007',
importCode: '03.001.008'
},
documentList: {
queryCode: '03.001.009',
importCode: '03.001.010'
},
assetList: {
queryCode: '03.001.011',
importCode: '03.001.012'
},
},
dataPreview: {
dataPreviewCode: '03.002',
balanceSheet: {
queryCode: '03.002.001'
},
accountVoucher: {
queryCode: '03.002.002'
},
},
dataManage: {
dataManageCode: '03.003',
accountMappingCode: '03.003.001',
accountMapping: {
queryCode: '03.003.001.001',
importCode: '03.003.001.002'
},
caculateDataCode: '03.003.002',
},
reportView: {
reportViewCode: '03.004',
bsplCode: '03.004.001',
bspl: {
bsCode: '03.004.001.001',
plCode: '03.004.001.002'
},
quarterlyFilingReturnTypeCode: '03.004.002',
quarterlyFilingReturnType: {
queryCode: '03.004.002.001',
editCode: '03.004.002.002',
submitCode: '03.004.002.003',
reviewCode: '03.004.002.004',
},
workingPaperTypeCode: '03.004.003',
workingPaperType: {
queryCode: '03.004.003.001',
editCode: '03.004.003.002',
submitCode: '03.004.003.003',
reviewCode: '03.004.003.004',
},
taxReturnCode: '03.004.004',
taxReturn: {
queryCode: '03.004.004.001',
editCode: '03.004.004.002',
submitCode: '03.004.004.003',
reviewCode: '03.004.004.004',
approveCode: '03.004.004.005',
taxVoucherCode: '03.004.004.006',
},
otherReportCode: '03.004.005',
otherReport: {
queryCode: '03.004.005.001',
editCode: '03.004.005.002',
submitCode: '03.004.005.003',
reviewCode: '03.004.005.004',
},
},
dataAnalysis: {
dataAnalysisCode: '03.005',
modelAnalysisCode: '03.005.001',
modelAnalysis: {
queryCode: '03.005.001.001',
filterCode: '03.005.001.005'
},
dashboard: {
dashboardCode: '03.005.002',
querySummaryDashboardCode: '03.005.002.001',
singleOrgIndexDashboardCode: '03.005.002.002',
}
},
}; };
// 权限代码 // 权限代码
...@@ -711,6 +808,28 @@ constant.adminPermission = { ...@@ -711,6 +808,28 @@ constant.adminPermission = {
} }
}; };
constant.citMenuList = [
constant.citPermission.dataImport.balanceSheet.queryCode,
constant.citPermission.dataImport.journalEntry.queryCode,
constant.citPermission.dataImport.erpImport.queryCode,
constant.citPermission.dataImport.auditAdjust.queryCode,
constant.citPermission.dataImport.documentList.queryCode,
constant.citPermission.dataImport.assetList.queryCode,
constant.citPermission.dataPreview.balanceSheet.queryCode,
constant.citPermission.dataPreview.accountVoucher.queryCode,
constant.citPermission.dataManage.accountMappingCode,
constant.citPermission.dataManage.caculateDataCode,
constant.citPermission.reportView.bsplCode,
constant.citPermission.reportView.quarterlyFilingReturnTypeCode,
constant.citPermission.reportView.workingPaperTypeCode,
constant.citPermission.reportView.taxReturnCode,
constant.citPermission.reportView.otherReportCode,
constant.citPermission.dataAnalysis.modelAnalysisCode,
constant.citPermission.dataAnalysis.dashboard.dashboardCode,
];
constant.basicDataUrl = { constant.basicDataUrl = {
orangizationStructureManage: '#/masterData/orangizationStructureManage', orangizationStructureManage: '#/masterData/orangizationStructureManage',
businessUnit: '#/masterData/businessUnit', businessUnit: '#/masterData/businessUnit',
......
atms-web/src/main/webapp/app/common/utils/enums.js
View file @ dc88ffd1
...@@ -577,6 +577,11 @@ commonModule.factory('enums', ['$translate', function ($translate) { ...@@ -577,6 +577,11 @@ commonModule.factory('enums', ['$translate', function ($translate) {
}, },
/*************************************cit enum start**************************************/ /*************************************cit enum start**************************************/
wholeYearPeriod: {
import: -1, // 导入模块中代表全年的期间
report: 0, // 报表模块中代表全年的期间
model: 13 // 模型模块中代表全年的期间
},
erpCheckTypeId: { erpCheckTypeId: {
Tb_NoAcctCode: 30,//Tb验证 科目不在科目表中 Tb_NoAcctCode: 30,//Tb验证 科目不在科目表中
...@@ -599,6 +604,24 @@ commonModule.factory('enums', ['$translate', function ($translate) { ...@@ -599,6 +604,24 @@ commonModule.factory('enums', ['$translate', function ($translate) {
Error: 4 //错误 Error: 4 //错误
}, },
//对应PwC.Tax.Tech.Atms.Globals.Utils:EnumValidationType
EnumValidationType:
{
TrialBalance: 0,
InputVoice: 1,
OutputVoice: 2,
ErpDuplicate: 3, //重复数据
ErpBasicCheck: 4,//基础数据校验
ErpCorrect: 5,//数据正确性
JournalEntry: 6,
InputVoiceItem: 7,
CustomInvoice: 8,
AccountMapping: 9,
InvoiceMapping: 10,
VoucherMapping: 11,
AssetDiffData: 12
},
//对应PwC.Tax.Tech.Atms.Globals.Utils:ErpCheckType //对应PwC.Tax.Tech.Atms.Globals.Utils:ErpCheckType
ErpCheckTypeEnum: ErpCheckTypeEnum:
{ {
......
atms-web/src/main/webapp/app/common/vatservices/dataProcessService.js 0 → 100644
View file @ dc88ffd1
// web service proxy for voucher
webservices.factory('dataProcessService', ['$log', 'vatReportService', function ($log, vatReportService) {
'use strict';
function Job(serviceType, tplId, month, status) {
this.serviceType = serviceType;
this.tplId = tplId;
this.month = month;
this.status = status;
}
var jobsArr = [];
//执行更新项目状态的任务
function status_job() {
var job = jobsArr.shift();
if (job) {
//更新每个状态值
vatReportService.updateProcInfo(job.serviceType, job.tplId, job.month, job.status).then(function (resData) {
setTimeout(status_job, 100);
$log.log("status_job request: " + job.tplId + ", " + job.status);
});
} else {
setTimeout(status_job, 1000);
}
}
//页面容错机制
//1. 后台查询当前项目有没有正在 处理中的报表， 间隔连续两次没查询到，证明没有处理中的，更新页面状态
var timeInterval = 15 * 1000;
var noProcItemCount = 0;
var _serviceType, _projectId, _month, _status,_cb;
function heartBeat() {
vatReportService.heartBeat(_projectId, _month).then(function (resData) {
//if ($scope.isStartProcData) {//如果是当前处理页面
$log.info("heartBeat......" + noProcItemCount);
if (resData && resData.data.result) {
//没有处理中加一次
noProcItemCount++;
//超过两次，就更新状态
if (noProcItemCount > 3) {
//1. 更新项目状态，当前项目状态更改为 处理已完成
//vatReportService.updateProcInfo($scope.serviceType, vatSessionService.project.id, vatSessionService.month, getStatus('completed')).then(function (resData) {
vatReportService.updateProcInfo(_serviceType, _projectId, _month, _status).then(function (resData) {
//更新页面状态
_cb();
timeInterval = 60 * 1000;//60s
});
//注意后台要考虑的问题， 为了防止 signalR 的断线情况，将报表完成状态放到后台更新，前台通知更新显示而已
}
} else {
//表示有处理中
noProcItemCount = 0;
}
if (noProcItemCount == 0) {
timeInterval = 60 * 1000 * 3;//正在处理中，降低频率
} else {
timeInterval = 15 * 1000;
}
setTimeout(heartBeat, timeInterval);
//}
});
}
return {
startJob: function () {
setTimeout(status_job, 100);
},
addJob: function (serviceType, tplId, month, status) {
jobsArr.push(new Job(serviceType, tplId, month, status));
},
startHeartBeat: function (serviceType, projectId, month, status,cb) {
_serviceType = serviceType;
_projectId = projectId;
_month = month;
_status = status;
_cb = cb;
setTimeout(heartBeat, timeInterval);
}
};
}]);
\ No newline at end of file
atms-web/src/main/webapp/app/common/vatservices/vatImportService.js
View file @ dc88ffd1
...@@ -349,6 +349,53 @@ ...@@ -349,6 +349,53 @@
/************************************************CustomsInvoice*********************************************************/ /************************************************CustomsInvoice*********************************************************/
/***************************************批量数据导入服务 start**************************************************************/
getAllTables: function (serviceType) {
return $http.get('/DataImport/getAllTables/' + serviceType, apiConfig.createVat());
},
getTableInfoList: function (serviceType, orgID) {
return $http.get('/DataImport/getTableInfoList/' + serviceType + '/' + orgID, apiConfig.createVat());
},
getMappedList: function (tableInfoId, orgID) {
return $http.get('/DataImport/getMappedList/' + tableInfoId + '/' + orgID, apiConfig.createVat());
},
getTableMenuList: function () {
return $http.get('/DataImport/getTableMenuList', apiConfig.createVat());
},
getTempFileContent: function (tempFileName, selectedSheetIndex, topRowNumber) {
return $http.get('/DataImport/TempFileContent/' + tempFileName + '/' + selectedSheetIndex + '/' + topRowNumber, apiConfig.createVat());
},
importData: function (importDto) {
return $http.post('/DataImport/importData', importDto, apiConfig.createVat());
},
GetDataFromExcelByChunk: function (ChunkDto) {
return $http.post('/DataImport/getDataFromExcelByChunk', ChunkDto, apiConfig.createVat());
},
GetDataFromExcelByChunkByBack: function (ChunkDto) {
return $http.post('/DataImport/getDataFromExcelByChunkByBack', ChunkDto, apiConfig.createVat());
},
getImportedData: function (queryDto) {
return $http.post('/DataImport/getImportedData', queryDto, apiConfig.createVat());
},
getFilterImportedData: function (queryDto) {
return $http.post('/DataImport/getFilterImportedData', queryDto, apiConfig.createVat());
},
getSelectedFilterImportedData: function (queryDto) {
return $http.post('/DataImport/getSelectedFilterImportedData', queryDto, apiConfig.createVat());
},
getPeriodList: function (tableInfoId) {
return $http.get('/DataImport/getPeriodList/' + tableInfoId, apiConfig.createVat());
},
deleteDataByPeriod: function (period, tableInfoId) {
return $http.get('/DataImport/deleteDataByPeriod/' + period + '/' + tableInfoId, apiConfig.createVat());
}
/***************************************批量数据导入服务 end**************************************************************/
}; };
}]); }]);
\ No newline at end of file
atms-web/src/main/webapp/app/framework/app-approve/app-approve.ctrl.js
View file @ dc88ffd1
...@@ -214,9 +214,9 @@ ...@@ -214,9 +214,9 @@
$scope.dateFormat = $translate.instant('dateFormat4Year'); $scope.dateFormat = $translate.instant('dateFormat4Year');
} }
if ($scope.serviceTypeId === enums.serviceType.VAT) { if ($scope.serviceTypeId === enums.serviceType.VAT) {
$scope.systemTitle = $translate.instant('增值税申报'); $scope.systemTitle = $translate.instant('MenuVAT');
$scope.viewMode = 1; $scope.viewMode = 1;
$scope.dateFormat = $translate.instant(' yyyy 年 mm 月'); $scope.dateFormat = $translate.instant('dateFormat4YearMonth');
} }
......
atms-web/src/main/webapp/app/framework/app-nav/app-nav.html
View file @ dc88ffd1
...@@ -48,10 +48,13 @@ ...@@ -48,10 +48,13 @@
<span style="margin-left: 02px; font-size: 15px;cursor:pointer;">{{loginUserName | limitString:10}}</span> <span style="margin-left: 02px; font-size: 15px;cursor:pointer;">{{loginUserName | limitString:10}}</span>
<i class="fa fa-sort-down"></i> <i class="fa fa-sort-down"></i>
</div> </div>
<div class="user-menu"> <div class="user-menu" style="width:150px;">
<a ng-click="showChangePassword()" id="userManageMenu"> <a ng-click="showChangePassword()" id="userManageMenu">
<p>{{'ChangePassword' | translate}}</p> <p>{{'ChangePassword' | translate}}</p>
</a> </a>
<a href="" ng-click="$root.changeLanguage($root.currentLanguage == 'en-us' ? 'zh-CN' : 'en-us')" id="userManageMenu">
<p>{{$root.currentLanguageDesc}}</p>
</a>
</div> </div>
</div> </div>
<!--铃铛通知--> <!--铃铛通知-->
......
atms-web/src/main/webapp/app/framework/app-overview/app-overview.ctrl.js
View file @ dc88ffd1
...@@ -1047,9 +1047,9 @@ ...@@ -1047,9 +1047,9 @@
$scope.dateFormat = $translate.instant('dateFormat4Year'); $scope.dateFormat = $translate.instant('dateFormat4Year');
} }
if ($scope.serviceTypeId === enums.serviceType.VAT) { if ($scope.serviceTypeId === enums.serviceType.VAT) {
$scope.systemTitle = $translate.instant('增值税申报'); $scope.systemTitle = $translate.instant('MenuVAT');
$scope.viewMode = 1; $scope.viewMode = 1;
$scope.dateFormat = $translate.instant(' yyyy 年 mm 月'); $scope.dateFormat = $translate.instant('dateFormat4YearMonth');
} }
if ($scope.serviceTypeId === enums.serviceType.AssetsManage) { if ($scope.serviceTypeId === enums.serviceType.AssetsManage) {
$scope.systemTitle = $translate.instant('AssetTitle'); $scope.systemTitle = $translate.instant('AssetTitle');
......
atms-web/src/main/webapp/app/vat/vat-layout/vat-layout.ctrl.js
View file @ dc88ffd1
...@@ -156,106 +156,106 @@ function ($scope, $rootScope, $q, $log, $timeout, $state, $translate, projectSer ...@@ -156,106 +156,106 @@ function ($scope, $rootScope, $q, $log, $timeout, $state, $translate, projectSer
$scope.$root.checkUserOrganizationPermissionList(menuList).success(function (data) { $scope.$root.checkUserOrganizationPermissionList(menuList).success(function (data) {
if (data) { if (data) {
// if (data[constant.vatPermission.dataImport.balanceSheet.queryCode]) { if (data[constant.vatPermission.dataImport.balanceSheet.queryCode]) {
// $scope.menus.push({ $scope.menus.push({
// name: 'importData', state: 'importData', num: 1, name: 'importData', state: 'importData', num: 1,
// permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData' permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
// }); });
// subMenus.push({ subMenus.push({
// name: 'importData.balanceSheet', state: 'importData.balanceSheet', num: 1, name: 'importData.balanceSheet', state: 'importData.balanceSheet', num: 1,
// permission: constant.vatPermission.dataImport.balanceSheet.queryCode, url: '#/vat/importData/balanceSheet' permission: constant.vatPermission.dataImport.balanceSheet.queryCode, url: '#/vat/importData/balanceSheet'
// }); });
// } }
// else if (data[constant.vatPermission.dataImport.journalEntry.queryCode]) { else if (data[constant.vatPermission.dataImport.journalEntry.queryCode]) {
// $scope.menus.push({ $scope.menus.push({
// name: 'importData', state: 'importData', num: 1, name: 'importData', state: 'importData', num: 1,
// permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData' permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
// }); });
// subMenus.push({ subMenus.push({
// name: 'importData.journalEntry', state: 'importData.journalEntry', num: 1, name: 'importData.journalEntry', state: 'importData.journalEntry', num: 1,
// permission: constant.vatPermission.dataImport.journalEntry.queryCode, url: '#/vat/importData/journalEntry' permission: constant.vatPermission.dataImport.journalEntry.queryCode, url: '#/vat/importData/journalEntry'
// }); });
// } }
// else if (data[constant.vatPermission.dataImport.erpImport.queryCode]) { else if (data[constant.vatPermission.dataImport.erpImport.queryCode]) {
// $scope.menus.push({ $scope.menus.push({
// name: 'importData', state: 'importData', num: 1, name: 'importData', state: 'importData', num: 1,
// permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData' permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
// }); });
// subMenus.push({ subMenus.push({
// name: 'importData.erpData', state: 'importData.erpData', num: 1, name: 'importData.erpData', state: 'importData.erpData', num: 1,
// permission: constant.vatPermission.dataImport.erpImport.queryCode, url: '#/vat/importData/erpData' permission: constant.vatPermission.dataImport.erpImport.queryCode, url: '#/vat/importData/erpData'
// }); });
// } }
// else if (data[constant.vatPermission.dataImport.outputInvoice.queryCode]) { else if (data[constant.vatPermission.dataImport.outputInvoice.queryCode]) {
// $scope.menus.push({ $scope.menus.push({
// name: 'importData', state: 'importData', num: 1, name: 'importData', state: 'importData', num: 1,
// permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData' permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
// }); });
// subMenus.push({ subMenus.push({
// name: 'importData.outputInvoice', state: 'importData.outputInvoice', num: 1, name: 'importData.outputInvoice', state: 'importData.outputInvoice', num: 1,
// permission: constant.vatPermission.dataImport.outputInvoice.queryCode, url: '#/vat/importData/outputInvoice' permission: constant.vatPermission.dataImport.outputInvoice.queryCode, url: '#/vat/importData/outputInvoice'
// }); });
// } }
// else if (data[constant.vatPermission.dataImport.inputInvoice.queryCode]) { else if (data[constant.vatPermission.dataImport.inputInvoice.queryCode]) {
// $scope.menus.push({ $scope.menus.push({
// name: 'importData', state: 'importData', num: 1, name: 'importData', state: 'importData', num: 1,
// permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData' permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
// }); });
// subMenus.push({ subMenus.push({
// name: 'importData.inputInvoice', state: 'importData.inputInvoice', num: 1, name: 'importData.inputInvoice', state: 'importData.inputInvoice', num: 1,
// permission: constant.vatPermission.dataImport.inputInvoice.queryCode, url: '#/vat/importData/inputInvoice' permission: constant.vatPermission.dataImport.inputInvoice.queryCode, url: '#/vat/importData/inputInvoice'
// }); });
// } }
// else if (data[constant.vatPermission.dataImport.customInvoice.queryCode]) { else if (data[constant.vatPermission.dataImport.customInvoice.queryCode]) {
// $scope.menus.push({ $scope.menus.push({
// name: 'importData', state: 'importData', num: 1, name: 'importData', state: 'importData', num: 1,
// permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData' permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
// }); });
// subMenus.push({ subMenus.push({
// name: 'importData.customInvoice', state: 'importData.customInvoice', num: 1, name: 'importData.customInvoice', state: 'importData.customInvoice', num: 1,
// permission: constant.vatPermission.dataImport.customInvoice.queryCode, url: '#/vat/importData/customInvoice' permission: constant.vatPermission.dataImport.customInvoice.queryCode, url: '#/vat/importData/customInvoice'
// }); });
// } }
// else if (data[constant.vatPermission.dataImport.voucherMapping.queryCode]) { else if (data[constant.vatPermission.dataImport.voucherMapping.queryCode]) {
// $scope.menus.push({ $scope.menus.push({
// name: 'importData', state: 'importData', num: 1, name: 'importData', state: 'importData', num: 1,
// permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData' permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
// }); });
// subMenus.push({ subMenus.push({
// name: 'importData.voucherMapping', state: 'importData.voucherMapping', num: 1, name: 'importData.voucherMapping', state: 'importData.voucherMapping', num: 1,
// permission: constant.vatPermission.dataImport.voucherMapping.queryCode, url: '#/vat/importData/voucherMapping' permission: constant.vatPermission.dataImport.voucherMapping.queryCode, url: '#/vat/importData/voucherMapping'
// }); });
// } }
// else if (data[constant.vatPermission.dataImport.invoiceMapping.queryCode]) { else if (data[constant.vatPermission.dataImport.invoiceMapping.queryCode]) {
// $scope.menus.push({ $scope.menus.push({
// name: 'importData', state: 'importData', num: 1, name: 'importData', state: 'importData', num: 1,
// permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData' permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
// }); });
// subMenus.push({ subMenus.push({
// name: 'importData.invoiceMapping', state: 'importData.invoiceMapping', num: 1, name: 'importData.invoiceMapping', state: 'importData.invoiceMapping', num: 1,
// permission: constant.vatPermission.dataImport.invoiceMapping.queryCode, url: '#/vat/importData/invoiceMapping' permission: constant.vatPermission.dataImport.invoiceMapping.queryCode, url: '#/vat/importData/invoiceMapping'
// }); });
// } }
// else if (data[constant.vatPermission.dataImport.auditAdjust.queryCode]) { else if (data[constant.vatPermission.dataImport.auditAdjust.queryCode]) {
// $scope.menus.push({ $scope.menus.push({
// name: 'importData', state: 'importData', num: 1, name: 'importData', state: 'importData', num: 1,
// permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData' permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
// }); });
// subMenus.push({ subMenus.push({
// name: 'importData.auditAdjust', state: 'importData.auditAdjust', num: 1, name: 'importData.auditAdjust', state: 'importData.auditAdjust', num: 1,
// permission: constant.vatPermission.dataImport.auditAdjust.queryCode, url: '#/vat/importData/auditAdjust' permission: constant.vatPermission.dataImport.auditAdjust.queryCode, url: '#/vat/importData/auditAdjust'
// }); });
// } }
//else { else {
// $scope.menus.push({ $scope.menus.push({
// name: 'importData', state: 'importData', num: 1, name: 'importData', state: 'importData', num: 1,
// permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData' permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
// }); });
// subMenus.push({ subMenus.push({
// name: 'importData.productItem', state: 'importData.productItem', num: 1, name: 'importData.productItem', state: 'importData.productItem', num: 1,
// permission: '02', url: '#/vat/importData/productItem' permission: '02', url: '#/vat/importData/productItem'
// }); });
//} }
if (data[constant.vatPermission.dataPreview.balanceSheet.queryCode]) { if (data[constant.vatPermission.dataPreview.balanceSheet.queryCode]) {
$scope.menus.push({ $scope.menus.push({
......
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