Balance Sheet and Profit table

atms-api/src/main/java/pwc/taxtech/atms/controller/DataPreviewController.java

@@ -67,6 +67,12 @@ public class DataPreviewController extends BaseController {
         return dataPreviewSerivceImpl.getCFDataForDisplay(param);
     }
 
+    @PostMapping("getCFManualDataForDisplay")
+    public PageInfo<CashFlowDto> getCFManualDataForDisplay(@RequestBody CashFlowParam param) {
+        logger.debug(String.format("现金流量表查询 Condition:%s", JSON.toJSONString(param)));
+        return dataPreviewSerivceImpl.getCFManualDataForDisplay(param);
+    }
+
     @PostMapping("getBSDataForDisplay")
     public PageInfo<BalanceSheetDto> getBSDataForDisplay(@RequestBody BalanceSheetParam param) {
         logger.debug(String.format("资产负债表PRC查询 Condition:%s", JSON.toJSONString(param)));

atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataPreviewSerivceImpl.java

@@ -48,7 +48,7 @@ public class DataPreviewSerivceImpl extends BaseService {
 
     @Resource
     private ProfitLossStatementPrcManualMapper profitLossStatementPrcManualMapper;
-    
+
     @Resource
     private ProfitLossStatementMapper profitLossStatementMapper;
 
@@ -67,6 +67,9 @@ public class DataPreviewSerivceImpl extends BaseService {
     @Resource
     private CashFlowMapper cashFlowMapper;
 
+    @Resource
+    private CashFlowManualMapper cashFlowManualMapper;
+
     @Resource
     private InvoiceRecordMapper invoiceRecordMapper;
 
@@ -195,6 +198,26 @@ public class DataPreviewSerivceImpl extends BaseService {
         return pageInfo;
     }
 
+    public PageInfo<CashFlowDto> getCFManualDataForDisplay(CashFlowParam param) {
+        CashFlowCondition condition = new CashFlowCondition();
+        beanUtil.copyProperties(param, condition);
+        //Integer totalCount=cashFlowMapper.selectCountByCondition(condition);
+        List<CashFlowDto> cashFlowDtos = Lists.newArrayList();
+        Page page = PageHelper.startPage(param.getPageInfo().getPageIndex(), param.getPageInfo().getPageSize());
+        List<CashFlow> cashFlows = cashFlowManualMapper.selectByCondition(condition);
+        //使用page的getTotal()
+        Long total = page.getTotal();
+        cashFlows.forEach(cf -> {
+            CashFlowDto cashFlowDto = new CashFlowDto();
+            beanUtil.copyProperties(cf, cashFlowDto);
+            cashFlowDtos.add(cashFlowDto);
+        });
+        PageInfo<CashFlowDto> pageInfo = new PageInfo<>(cashFlowDtos);
+        pageInfo.setTotal(total);
+        pageInfo.setPageNum(param.getPageInfo().getPageIndex());
+        return pageInfo;
+    }
+
     public PageInfo<AdjustmentTableDto> getAdjustmentTbDataForDisplay(AdjustmentTableParam param) {
 
         AdjustmentTableCondition condition = beanUtil.copyProperties(param, new AdjustmentTableCondition());

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/CashFlowManualExtendsMapper.xml

@@ -5,7 +5,7 @@
   <sql id="QueryCondition">
     1 = 1
     <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(cfCondition.orgId)">
-      AND entity_code= #{cfCondition.orgId,jdbcType=VARCHAR}
+      AND organization_id= #{cfCondition.orgId,jdbcType=VARCHAR}
     </if>
     <if test="cfCondition.periodStart!=null">
       AND tms_period &gt;= #{cfCondition.periodStart,jdbcType=INTEGER}

atms-web/src/main/webapp/Scripts/module-part1.js

@@ -952,7 +952,22 @@ var vatModule = angular.module('app.vat', ['ui.grid', 'ui.grid.selection', 'ui.g
 				deepStateRedirect: true,
 				sticky: true
 			});
-
+			$stateProvider.state({
+				name: 'vat.previewData.cashFlowManual',
+				url: '/cashFlowManual',
+				views: {
+					'@vat.previewData': {
+						controller: ['$scope', '$stateParams', 'appTranslation',
+							function ($scope, $stateParams, appTranslation) {
+								appTranslation.load([appTranslation.vat]);
+							}],
+						template: '<vat-preview-cash-flow-manual></vat-preview-cash-flow-manual>'
+					}
+				},
+				resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.vat),
+				deepStateRedirect: true,
+				sticky: true
+			});
 			$stateProvider.state({
 				name: 'vat.previewData.offBalanceSheetPrcManual',
 				url: '/offBalanceSheetPrcManual',

atms-web/src/main/webapp/app-resources/i18n/en-us/vat.json

@@ -1830,6 +1830,7 @@
   "ImportType": "Import Type",
   "cashFlow": "Cash Flow",
   "CashFlowDDTitle": "Cash Flow",
+  "CashFlowManual": "Cash Flow Manual",
   "invoiceData": "Invoice Data",
   "InvoiceDataTitle": "Invoice Data",
   "IDTotalAmount": "Total",

atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json

@@ -1853,6 +1853,7 @@
     "TrialBalanceDDTitle": "科目余额表",
     "cashFlow":"现金流量表",
     "CashFlowDDTitle":"现金流量表",
+    "CashFlowManual": "现金流量表人工导入",
 
 
     "TBAccountCode": "科目编号",

atms-web/src/main/webapp/app/common/utils/constant.js

@@ -46,9 +46,9 @@ constant.priority = {
 }
 
 constant.importTypeList = [
-    {value:0,name:"默认导入"},
-    {value:1,name:"覆盖导入"},
-    {value:2,name:"追加导入"}
+    {value: 0, name: "默认导入"},
+    {value: 1, name: "覆盖导入"},
+    {value: 2, name: "追加导入"}
 ]
 
 constant.customer = {
@@ -502,13 +502,15 @@ constant.vatPermission = {
         profitLossPrcManual: {
             queryCode: '02.002.021'
         },
+        cashFlowManual: {
+            queryCode: '02.002.022'
+        },
         offBalanceSheetPrcManual: {
             queryCode: '02.002.022'
         },
         profitTable: {
             queryCode: '02.002.023'
         }
-
     },
     dataManage: {
         dataManageCode: '02.003',
@@ -1665,7 +1667,7 @@ constant.anlDownLoadFileNameList = [
 ];
 
 constant.countryCNList = ['安哥拉', '阿富汗', '阿尔巴尼亚', '阿尔及利亚', '安道尔共和国', '安圭拉岛', '安提瓜和巴布达', '阿根廷', '亚美尼亚', '阿森松', '澳大利亚', '奥地利', '阿塞拜疆', '巴哈马', '巴林', '孟加拉国', '巴巴多斯', '白俄罗斯', '比利时', '伯利兹', '贝宁', '百慕大群岛', '玻利维亚', '博茨瓦纳', '巴西', '文莱', '保加利亚', '布基纳法索', '缅甸', '布隆迪', '喀麦隆', '加拿大', '开曼群岛', '中非共和国', '乍得', '智利', '中国', '哥伦比亚', '刚果', '库克群岛', '哥斯达黎加', '古巴', '塞浦路斯', '捷克', '丹麦', '吉布提', '多米尼加共和国', '厄瓜多尔', '埃及', '萨尔瓦多', '爱沙尼亚', '埃塞俄比亚', '斐济', '芬兰', '法国', '法属圭亚那', '法属玻利尼西亚', '加蓬', '冈比亚', '格鲁吉亚', '德国', '加纳', '直布罗陀', '希腊', '格林纳达', '关岛', '危地马拉', '几内亚', '圭亚那', '海地', '洪都拉斯', '香港', '匈牙利', '冰岛', '印度', '印度尼西亚', '伊朗', '伊拉克', '爱尔兰', '以色列', '意大利', '科特迪瓦', '牙买加', '日本', '约旦', '柬埔寨', '哈萨克斯坦', '肯尼亚', '韩国', '科威特', '吉尔吉斯坦', '老挝', '拉脱维亚', '黎巴嫩', '莱索托', '利比里亚', '利比亚', '列支敦士登', '立陶宛', '卢森堡', '澳门', '马达加斯加', '马拉维', '马来西亚', '马尔代夫', '马里', '马耳他', '马里亚那群岛', '马提尼克', '毛里求斯', '墨西哥', '摩尔多瓦', '摩纳哥', '蒙古', '蒙特塞拉特岛', '摩洛哥', '莫桑比克', '纳米比亚', '瑙鲁', '尼泊尔', '荷属安的列斯', '荷兰', '新西兰', '尼加拉瓜', '尼日尔', '尼日利亚', '朝鲜', '挪威', '阿曼', '巴基斯坦', '巴拿马', '巴布亚新几内亚', '巴拉圭', '秘鲁', '菲律宾', '波兰', '葡萄牙', '波多黎各', '卡塔尔', '留尼旺', '罗马尼亚', '俄罗斯', '圣卢西亚', '圣文森特岛', '东萨摩亚(美)', '西萨摩亚', '圣马力诺', '圣多美和普林西比', '沙特阿拉伯', '塞内加尔', '塞舌尔', '塞拉利昂', '新加坡', '斯洛伐克', '斯洛文尼亚', '所罗门群岛', '索马里', '南非', '西班牙', '斯里兰卡', '圣文森特', '苏丹', '苏里南', '斯威士兰', '瑞典', '瑞士', '叙利亚', '台湾省', '塔吉克斯坦', '坦桑尼亚', '泰国', '多哥', '汤加', '特立尼达和多巴哥', '突尼斯', '土耳其', '土库曼斯坦', '乌干达', '乌克兰', '阿拉伯联合酋长国', '英国', '美国', '乌拉圭', '乌兹别克斯坦', '委内瑞拉', '越南', '也门', '南斯拉夫', '津巴布韦', '扎伊尔', '赞比亚'];
-constant.countryCNNAMEList = [ { 'name' : '安哥拉'}, { 'name' : '阿富汗'}, { 'name' : '阿尔巴尼亚'}, { 'name' : '阿尔及利亚'}, { 'name' : '安道尔共和国'}, { 'name' : '安圭拉岛'}, { 'name' : '安提瓜和巴布达'}, { 'name' : '阿根廷'}, { 'name' : '亚美尼亚'}, { 'name' : '阿森松'}, { 'name' : '澳大利亚'}, { 'name' : '奥地利'}, { 'name' : '阿塞拜疆'}, { 'name' : '巴哈马'}, { 'name' : '巴林'}, { 'name' : '孟加拉国'}, { 'name' : '巴巴多斯'}, { 'name' : '白俄罗斯'}, { 'name' : '比利时'}, { 'name' : '伯利兹'}, { 'name' : '贝宁'}, { 'name' : '百慕大群岛'}, { 'name' : '玻利维亚'}, { 'name' : '博茨瓦纳'}, { 'name' : '巴西'}, { 'name' : '文莱'}, { 'name' : '保加利亚'}, { 'name' : '布基纳法索'}, { 'name' : '缅甸'}, { 'name' : '布隆迪'}, { 'name' : '喀麦隆'}, { 'name' : '加拿大'}, { 'name' : '开曼群岛'}, { 'name' : '中非共和国'}, { 'name' : '乍得'}, { 'name' : '智利'}, { 'name' : '中国'}, { 'name' : '哥伦比亚'}, { 'name' : '刚果'}, { 'name' : '库克群岛'}, { 'name' : '哥斯达黎加'}, { 'name' : '古巴'}, { 'name' : '塞浦路斯'}, { 'name' : '捷克'}, { 'name' : '丹麦'}, { 'name' : '吉布提'}, { 'name' : '多米尼加共和国'}, { 'name' : '厄瓜多尔'}, { 'name' : '埃及'}, { 'name' : '萨尔瓦多'}, { 'name' : '爱沙尼亚'}, { 'name' : '埃塞俄比亚'}, { 'name' : '斐济'}, { 'name' : '芬兰'}, { 'name' : '法国'}, { 'name' : '法属圭亚那'}, { 'name' : '法属玻利尼西亚'}, { 'name' : '加蓬'}, { 'name' : '冈比亚'}, { 'name' : '格鲁吉亚'}, { 'name' : '德国'}, { 'name' : '加纳'}, { 'name' : '直布罗陀'}, { 'name' : '希腊'}, { 'name' : '格林纳达'}, { 'name' : '关岛'}, { 'name' : '危地马拉'}, { 'name' : '几内亚'}, { 'name' : '圭亚那'}, { 'name' : '海地'}, { 'name' : '洪都拉斯'}, { 'name' : '香港'}, { 'name' : '匈牙利'}, { 'name' : '冰岛'}, { 'name' : '印度'}, { 'name' : '印度尼西亚'}, { 'name' : '伊朗'}, { 'name' : '伊拉克'}, { 'name' : '爱尔兰'}, { 'name' : '以色列'}, { 'name' : '意大利'}, { 'name' : '科特迪瓦'}, { 'name' : '牙买加'}, { 'name' : '日本'}, { 'name' : '约旦'}, { 'name' : '柬埔寨'}, { 'name' : '哈萨克斯坦'}, { 'name' : '肯尼亚'}, { 'name' : '韩国'}, { 'name' : '科威特'}, { 'name' : '吉尔吉斯坦'}, { 'name' : '老挝'}, { 'name' : '拉脱维亚'}, { 'name' : '黎巴嫩'}, { 'name' : '莱索托'}, { 'name' : '利比里亚'}, { 'name' : '利比亚'}, { 'name' : '列支敦士登'}, { 'name' : '立陶宛'}, { 'name' : '卢森堡'}, { 'name' : '澳门'}, { 'name' : '马达加斯加'}, { 'name' : '马拉维'}, { 'name' : '马来西亚'}, { 'name' : '马尔代夫'}, { 'name' : '马里'}, { 'name' : '马耳他'}, { 'name' : '马里亚那群岛'}, { 'name' : '马提尼克'}, { 'name' : '毛里求斯'}, { 'name' : '墨西哥'}, { 'name' : '摩尔多瓦'}, { 'name' : '摩纳哥'}, { 'name' : '蒙古'}, { 'name' : '蒙特塞拉特岛'}, { 'name' : '摩洛哥'}, { 'name' : '莫桑比克'}, { 'name' : '纳米比亚'}, { 'name' : '瑙鲁'}, { 'name' : '尼泊尔'}, { 'name' : '荷属安的列斯'}, { 'name' : '荷兰'}, { 'name' : '新西兰'}, { 'name' : '尼加拉瓜'}, { 'name' : '尼日尔'}, { 'name' : '尼日利亚'}, { 'name' : '朝鲜'}, { 'name' : '挪威'}, { 'name' : '阿曼'}, { 'name' : '巴基斯坦'}, { 'name' : '巴拿马'}, { 'name' : '巴布亚新几内亚'}, { 'name' : '巴拉圭'}, { 'name' : '秘鲁'}, { 'name' : '菲律宾'}, { 'name' : '波兰'}, { 'name' : '葡萄牙'}, { 'name' : '波多黎各'}, { 'name' : '卡塔尔'}, { 'name' : '留尼旺'}, { 'name' : '罗马尼亚'}, { 'name' : '俄罗斯'}, { 'name' : '圣卢西亚'}, { 'name' : '圣文森特岛'}, { 'name' : '东萨摩亚(美)'}, { 'name' : '西萨摩亚'}, { 'name' : '圣马力诺'}, { 'name' : '圣多美和普林西比'}, { 'name' : '沙特阿拉伯'}, { 'name' : '塞内加尔'}, { 'name' : '塞舌尔'}, { 'name' : '塞拉利昂'}, { 'name' : '新加坡'}, { 'name' : '斯洛伐克'}, { 'name' : '斯洛文尼亚'}, { 'name' : '所罗门群岛'}, { 'name' : '索马里'}, { 'name' : '南非'}, { 'name' : '西班牙'}, { 'name' : '斯里兰卡'}, { 'name' : '圣文森特'}, { 'name' : '苏丹'}, { 'name' : '苏里南'}, { 'name' : '斯威士兰'}, { 'name' : '瑞典'}, { 'name' : '瑞士'}, { 'name' : '叙利亚'}, { 'name' : '台湾省'}, { 'name' : '塔吉克斯坦'}, { 'name' : '坦桑尼亚'}, { 'name' : '泰国'}, { 'name' : '多哥'}, { 'name' : '汤加'}, { 'name' : '特立尼达和多巴哥'}, { 'name' : '突尼斯'}, { 'name' : '土耳其'}, { 'name' : '土库曼斯坦'}, { 'name' : '乌干达'}, { 'name' : '乌克兰'}, { 'name' : '阿拉伯联合酋长国'}, { 'name' : '英国'}, { 'name' : '美国'}, { 'name' : '乌拉圭'}, { 'name' : '乌兹别克斯坦'}, { 'name' : '委内瑞拉'}, { 'name' : '越南'}, { 'name' : '也门'}, { 'name' : '南斯拉夫'}, { 'name' : '津巴布韦'}, { 'name' : '扎伊尔'}, { 'name' : '赞比亚'}];
+constant.countryCNNAMEList = [{'name': '安哥拉'}, {'name': '阿富汗'}, {'name': '阿尔巴尼亚'}, {'name': '阿尔及利亚'}, {'name': '安道尔共和国'}, {'name': '安圭拉岛'}, {'name': '安提瓜和巴布达'}, {'name': '阿根廷'}, {'name': '亚美尼亚'}, {'name': '阿森松'}, {'name': '澳大利亚'}, {'name': '奥地利'}, {'name': '阿塞拜疆'}, {'name': '巴哈马'}, {'name': '巴林'}, {'name': '孟加拉国'}, {'name': '巴巴多斯'}, {'name': '白俄罗斯'}, {'name': '比利时'}, {'name': '伯利兹'}, {'name': '贝宁'}, {'name': '百慕大群岛'}, {'name': '玻利维亚'}, {'name': '博茨瓦纳'}, {'name': '巴西'}, {'name': '文莱'}, {'name': '保加利亚'}, {'name': '布基纳法索'}, {'name': '缅甸'}, {'name': '布隆迪'}, {'name': '喀麦隆'}, {'name': '加拿大'}, {'name': '开曼群岛'}, {'name': '中非共和国'}, {'name': '乍得'}, {'name': '智利'}, {'name': '中国'}, {'name': '哥伦比亚'}, {'name': '刚果'}, {'name': '库克群岛'}, {'name': '哥斯达黎加'}, {'name': '古巴'}, {'name': '塞浦路斯'}, {'name': '捷克'}, {'name': '丹麦'}, {'name': '吉布提'}, {'name': '多米尼加共和国'}, {'name': '厄瓜多尔'}, {'name': '埃及'}, {'name': '萨尔瓦多'}, {'name': '爱沙尼亚'}, {'name': '埃塞俄比亚'}, {'name': '斐济'}, {'name': '芬兰'}, {'name': '法国'}, {'name': '法属圭亚那'}, {'name': '法属玻利尼西亚'}, {'name': '加蓬'}, {'name': '冈比亚'}, {'name': '格鲁吉亚'}, {'name': '德国'}, {'name': '加纳'}, {'name': '直布罗陀'}, {'name': '希腊'}, {'name': '格林纳达'}, {'name': '关岛'}, {'name': '危地马拉'}, {'name': '几内亚'}, {'name': '圭亚那'}, {'name': '海地'}, {'name': '洪都拉斯'}, {'name': '香港'}, {'name': '匈牙利'}, {'name': '冰岛'}, {'name': '印度'}, {'name': '印度尼西亚'}, {'name': '伊朗'}, {'name': '伊拉克'}, {'name': '爱尔兰'}, {'name': '以色列'}, {'name': '意大利'}, {'name': '科特迪瓦'}, {'name': '牙买加'}, {'name': '日本'}, {'name': '约旦'}, {'name': '柬埔寨'}, {'name': '哈萨克斯坦'}, {'name': '肯尼亚'}, {'name': '韩国'}, {'name': '科威特'}, {'name': '吉尔吉斯坦'}, {'name': '老挝'}, {'name': '拉脱维亚'}, {'name': '黎巴嫩'}, {'name': '莱索托'}, {'name': '利比里亚'}, {'name': '利比亚'}, {'name': '列支敦士登'}, {'name': '立陶宛'}, {'name': '卢森堡'}, {'name': '澳门'}, {'name': '马达加斯加'}, {'name': '马拉维'}, {'name': '马来西亚'}, {'name': '马尔代夫'}, {'name': '马里'}, {'name': '马耳他'}, {'name': '马里亚那群岛'}, {'name': '马提尼克'}, {'name': '毛里求斯'}, {'name': '墨西哥'}, {'name': '摩尔多瓦'}, {'name': '摩纳哥'}, {'name': '蒙古'}, {'name': '蒙特塞拉特岛'}, {'name': '摩洛哥'}, {'name': '莫桑比克'}, {'name': '纳米比亚'}, {'name': '瑙鲁'}, {'name': '尼泊尔'}, {'name': '荷属安的列斯'}, {'name': '荷兰'}, {'name': '新西兰'}, {'name': '尼加拉瓜'}, {'name': '尼日尔'}, {'name': '尼日利亚'}, {'name': '朝鲜'}, {'name': '挪威'}, {'name': '阿曼'}, {'name': '巴基斯坦'}, {'name': '巴拿马'}, {'name': '巴布亚新几内亚'}, {'name': '巴拉圭'}, {'name': '秘鲁'}, {'name': '菲律宾'}, {'name': '波兰'}, {'name': '葡萄牙'}, {'name': '波多黎各'}, {'name': '卡塔尔'}, {'name': '留尼旺'}, {'name': '罗马尼亚'}, {'name': '俄罗斯'}, {'name': '圣卢西亚'}, {'name': '圣文森特岛'}, {'name': '东萨摩亚(美)'}, {'name': '西萨摩亚'}, {'name': '圣马力诺'}, {'name': '圣多美和普林西比'}, {'name': '沙特阿拉伯'}, {'name': '塞内加尔'}, {'name': '塞舌尔'}, {'name': '塞拉利昂'}, {'name': '新加坡'}, {'name': '斯洛伐克'}, {'name': '斯洛文尼亚'}, {'name': '所罗门群岛'}, {'name': '索马里'}, {'name': '南非'}, {'name': '西班牙'}, {'name': '斯里兰卡'}, {'name': '圣文森特'}, {'name': '苏丹'}, {'name': '苏里南'}, {'name': '斯威士兰'}, {'name': '瑞典'}, {'name': '瑞士'}, {'name': '叙利亚'}, {'name': '台湾省'}, {'name': '塔吉克斯坦'}, {'name': '坦桑尼亚'}, {'name': '泰国'}, {'name': '多哥'}, {'name': '汤加'}, {'name': '特立尼达和多巴哥'}, {'name': '突尼斯'}, {'name': '土耳其'}, {'name': '土库曼斯坦'}, {'name': '乌干达'}, {'name': '乌克兰'}, {'name': '阿拉伯联合酋长国'}, {'name': '英国'}, {'name': '美国'}, {'name': '乌拉圭'}, {'name': '乌兹别克斯坦'}, {'name': '委内瑞拉'}, {'name': '越南'}, {'name': '也门'}, {'name': '南斯拉夫'}, {'name': '津巴布韦'}, {'name': '扎伊尔'}, {'name': '赞比亚'}];
 constant.countryENList = ['Angola', 'Afghanistan', 'Albania', 'Algeria', 'Andorra', 'Anguilla', 'Antigua and Barbuda', 'Argentina', 'Armenia', 'Ascension', 'Australia', 'Austria', 'Azerbaijan', 'Bahamas', 'Bahrain', 'Bangladesh', 'Barbados', 'Belarus', 'Belgium', 'Belize', 'Benin', 'Bermuda Is', 'Bolivia', 'Botswana', 'Brazil', 'Brunei', 'Bulgaria', 'Burkina Faso', 'Burma', 'Burundi', 'Cameroon', 'Canada', 'Cayman Is', 'Central African Republic', 'Chad', 'Chile', 'China', 'Colombia', 'Congo', 'Cook Is', 'Costa Rica', 'Cuba', 'Cyprus', 'Czech Republic', 'Denmark', 'Djibouti', 'Dominica Rep', 'Ecuador', 'Egypt', 'EI Salvador', 'Estonia', 'Ethiopia', 'Fiji', 'Finland', 'France', 'French Guiana', 'French Polynesia', 'Gabon', 'Gambia', 'Georgia', 'Germany', 'Ghana', 'Gibraltar', 'Greece', 'Grenada', 'Guam', 'Guatemala', 'Guinea', 'Guyana', 'Haiti', 'Honduras', 'Hongkong', 'Hungary', 'Iceland', 'India', 'Indonesia', 'Iran', 'Iraq', 'Ireland', 'Israel', 'Italy', 'Ivory Coast', 'Jamaica', 'Japan', 'Jordan', 'Kampuchea (Cambodia )', 'Kazakstan', 'Kenya', 'Korea', 'Kuwait', 'Kyrgyzstan', 'Laos', 'Latvia', 'Lebanon', 'Lesotho', 'Liberia', 'Libya', 'Liechtenstein', 'Lithuania', 'Luxembourg', 'Macao', 'Madagascar', 'Malawi', 'Malaysia', 'Maldives', 'Mali', 'Malta', 'Mariana Is', 'Martinique', 'Mauritius', 'Mexico', 'Moldova', 'Monaco', 'Mongolia', 'Montserrat Is', 'Morocco', 'Mozambique', 'Namibia', 'Nauru', 'Nepal', 'Netheriands Antilles', 'Netherlands', 'New Zealand', 'Nicaragua', 'Niger', 'Nigeria', 'North Korea', 'Norway', 'Oman', 'Pakistan', 'Panama', 'Papua New Cuinea', 'Paraguay', 'Peru', 'Philippines', 'Poland', 'Portugal', 'Puerto Rico', 'Qatar', 'Reunion', 'Romania', 'Russia', 'Saint Lueia', 'Saint Vincent', 'Samoa Eastern', 'Samoa Western', 'San Marino', 'Sao Tome and Principe', 'Saudi Arabia', 'Senegal', 'Seychelles', 'Sierra Leone', 'Singapore', 'Slovakia', 'Slovenia', 'Solomon Is', 'Somali', 'South Africa', 'Spain', 'SriLanka', 'St.Lucia', 'St.Vincent', 'Sudan', 'Suriname', 'Swaziland', 'Sweden', 'Switzerland', 'Syria', 'Taiwan', 'Tajikstan', 'Tanzania', 'Thailand', 'Togo', 'Tonga', 'Trinidad and Tobago', 'Tunisia', 'Turkey', 'Turkmenistan', 'Uganda', 'Ukraine', 'United Arab Emirates', 'United Kiongdom', 'United States of America', 'Uruguay', 'Uzbekistan', 'Venezuela', 'Vietnam', 'Yemen', 'Yugoslavia', 'Zimbabwe', 'Zaire', 'Zambia'];
 
 

atms-web/src/main/webapp/app/common/vatservices/vatPreviewService.js

@@ -189,6 +189,9 @@
         getCFDataForDisplay: function (queryParams) {
             return $http.post('/dataPreview/getCFDataForDisplay', queryParams, apiConfig.createVat());
         },
+        getCFManualDataForDisplay: function (queryParams) {
+            return $http.post('/dataPreview/getCFManualDataForDisplay', queryParams, apiConfig.createVat());
+        },
         //服务器导出
         initExportCFData: function (queryParm, fileName) {
             var thisConfig = apiConfig.create();

atms-web/src/main/webapp/app/framework/app-overview/app-overview.ctrl.js

@@ -883,6 +883,7 @@
                     constant.vatPermission.dataPreview.invoiceData.queryCode,
                     constant.vatPermission.dataPreview.profitTable.queryCode,
                     constant.vatPermission.dataPreview.balanceSheet.queryCode,
+                    constant.vatPermission.dataPreview.cashFlowManual.queryCode,
 
 
                     constant.vatPermission.dataManage.caculateDataCode,
@@ -933,7 +934,9 @@
                             $state.go('vat.previewData.vatPreviewProfitTable');
                         } else if (data[constant.vatPermission.dataPreview.balanceSheet.queryCode]) {
                             $state.go('vat.previewData.vatPreviewTheBalanceSheet');
-                        } else if (data[constant.vatPermission.dataManage.caculateDataCode]) {
+                        } else if (data[constant.vatPermission.dataPreview.cashFlowManual.queryCode]) {
+                            $state.go('vat.previewData.cashFlowManual');
+                        }else if (data[constant.vatPermission.dataManage.caculateDataCode]) {
                             $state.go('vat.reductionData.caculateData');
                         } else if (data[constant.vatPermission.dataManage.revenueDetailCode]) {
                             $state.go('vat.reductionData.revenueDetail');

atms-web/src/main/webapp/app/vat/import/vat-import-layout/vat-import-layout.ctrl.js

@@ -13,82 +13,101 @@
             $scope.notMappedCount = d;
         });
 
-    $log.debug("$location && $location.absUrl(): " + $location && $location.absUrl());
-    //using .replace(';', '<br/>') to text-wrap at exact position as designed in menu 
-    if ($location && $location.absUrl().indexOf('previewData') > -1) {
-        $scope.nodeDicKey = constant.DictionaryDictKey.DataImport;
-        $scope.linkShort = enums.linkShort.PreviewData;
-        $scope.menus = [
-             {
-                name: 'trialBalance', permission: constant.vatPermission.dataPreview.trialBalance.queryCode,
-                text: $translate.instant('trialBalance'), icon: 'fa fa-file-text-o', show: true
-            },
-            {
-                name: 'profitLoss', permission: constant.vatPermission.dataPreview.profitLoss.queryCode,
-                text: $translate.instant('profitLossPRC'), icon: 'fa fa-file-text-o', show: true
-            },
-            {
-                name: 'offBalanceSheet', permission: constant.vatPermission.dataPreview.offBalanceSheet.queryCode,
-                text: $translate.instant('offBalanceSheetPRC'), icon: 'fa fa-file-text-o', show: true
-            },
-            {
-                name: 'journal', permission: constant.vatPermission.dataPreview.journal.queryCode,
-                text: $translate.instant('journal'), icon: 'fa fa-file-text-o', show: true
-            },
-            {
-                name: 'adjustmentTab', permission: constant.vatPermission.dataPreview.adjustmentTab.queryCode,
-                text: $translate.instant('adjustmentTable'), icon: 'fa fa-file-text-o', show: true
-            },
-            {
-                name: 'cashFlow', permission: constant.vatPermission.dataPreview.cashFlow.queryCode,
-                text: $translate.instant('cashFlow'), icon: 'fa fa-file-text-o', show: true
-            },
-            {
-                name: 'profitLossPrcManual', permission: constant.vatPermission.dataPreview.profitLossPrcManual.queryCode,
-                text: $translate.instant('profitLossPRCManual'), icon: 'fa fa-file-text-o', show: true
-            },
-            {
-                name: 'offBalanceSheetPrcManual', permission: constant.vatPermission.dataPreview.offBalanceSheetPrcManual.queryCode,
-                text: $translate.instant('offBalanceSheetPRCManual'), icon: 'fa fa-file-text-o', show: true
-            },
-             {
-                name: 'invoiceRecord', permission: constant.vatPermission.dataPreview.invoiceRecord.queryCode,
-                text: $translate.instant('invoiceRecord'), icon: 'fa fa-file-text-o', show: true
-            },
-             {
-                name: 'certifiedInvoicesList', permission: constant.vatPermission.dataPreview.certifiedInvoicesList.queryCode,
-                text: $translate.instant('certifiedInvoicesList'), icon: 'fa fa-file-text-o', show: true
-            },
-             {
-                name: 'redLetterInfoTab', permission: constant.vatPermission.dataPreview.redLetterInformationTable.queryCode,
-                text: $translate.instant('redLetterInformationTable'), icon: 'fa fa-file-text-o', show: true
-            },
-             {
-                name: 'coupaPurchasingReport', permission: constant.vatPermission.dataPreview.coupaPurchasingReport.queryCode,
-                text: $translate.instant('coupaPurchasingReport'), icon: 'fa fa-file-text-o', show: true
-            },
-             {
-                name: 'invoiceData', permission: constant.vatPermission.dataPreview.invoiceData.queryCode,
-                text: $translate.instant('invoiceData'), icon: 'fa fa-file-text-o', show: true
-            },
-            //TODO 增加TAB
-            {
-                name: 'vatPreviewProfitTable', permission: constant.vatPermission.dataPreview.profitTable.queryCode,
-                text: $translate.instant('ProfitTable'), icon: 'fa fa-file-text-o', show: true
-            },
-            {
-                name: 'vatPreviewTheBalanceSheet', permission: constant.vatPermission.dataPreview.balanceSheet.queryCode,
-                text: $translate.instant('offBalanceSheet'), icon: 'fa fa-file-text-o', show: true
-            },
-             {
-                name: 'quarterlyOwnersEquityChangeTab', permission: constant.vatPermission.dataPreview.quarterlyOwnersEquityChangeTable.queryCode,
-                text: $translate.instant('quarterlyOwnersEquityChangeTable'), icon: 'fa fa-file-text-o', show: false
-            },
-            {
-                name: 'balanceSheet', permission: constant.vatPermission.dataPreview.balanceSheet.queryCode,
-                text: $translate.instant('balanceSheet'), icon: 'fa fa-bank', show: false
-            },
-
+        $log.debug("$location && $location.absUrl(): " + $location && $location.absUrl());
+        //using .replace(';', '<br/>') to text-wrap at exact position as designed in menu
+        if ($location && $location.absUrl().indexOf('previewData') > -1) {
+            $scope.nodeDicKey = constant.DictionaryDictKey.DataImport;
+            $scope.linkShort = enums.linkShort.PreviewData;
+            $scope.menus = [
+                {
+                    name: 'trialBalance', permission: constant.vatPermission.dataPreview.trialBalance.queryCode,
+                    text: $translate.instant('trialBalance'), icon: 'fa fa-file-text-o', show: true
+                },
+                {
+                    name: 'profitLoss', permission: constant.vatPermission.dataPreview.profitLoss.queryCode,
+                    text: $translate.instant('profitLossPRC'), icon: 'fa fa-file-text-o', show: true
+                },
+                {
+                    name: 'offBalanceSheet', permission: constant.vatPermission.dataPreview.offBalanceSheet.queryCode,
+                    text: $translate.instant('offBalanceSheetPRC'), icon: 'fa fa-file-text-o', show: true
+                },
+                {
+                    name: 'journal', permission: constant.vatPermission.dataPreview.journal.queryCode,
+                    text: $translate.instant('journal'), icon: 'fa fa-file-text-o', show: true
+                },
+                {
+                    name: 'adjustmentTab', permission: constant.vatPermission.dataPreview.adjustmentTab.queryCode,
+                    text: $translate.instant('adjustmentTable'), icon: 'fa fa-file-text-o', show: true
+                },
+                {
+                    name: 'cashFlow', permission: constant.vatPermission.dataPreview.cashFlow.queryCode,
+                    text: $translate.instant('cashFlow'), icon: 'fa fa-file-text-o', show: true
+                },
+                {
+                    name: 'profitLossPrcManual', permission: constant.vatPermission.dataPreview.profitLossPrcManual.queryCode,
+                    text: $translate.instant('profitLossPRCManual'), icon: 'fa fa-file-text-o', show: true
+                },
+                {
+                    name: 'offBalanceSheetPrcManual', permission: constant.vatPermission.dataPreview.offBalanceSheetPrcManual.queryCode,
+                    text: $translate.instant('offBalanceSheetPRCManual'), icon: 'fa fa-file-text-o', show: true
+                },
+                {
+                    name: 'invoiceRecord', permission: constant.vatPermission.dataPreview.invoiceRecord.queryCode,
+                    text: $translate.instant('invoiceRecord'), icon: 'fa fa-file-text-o', show: true
+                },
+                {
+                    name: 'certifiedInvoicesList',
+                    permission: constant.vatPermission.dataPreview.certifiedInvoicesList.queryCode,
+                    text: $translate.instant('certifiedInvoicesList'),
+                    icon: 'fa fa-file-text-o',
+                    show: true
+                },
+                {
+                    name: 'redLetterInfoTab',
+                    permission: constant.vatPermission.dataPreview.redLetterInformationTable.queryCode,
+                    text: $translate.instant('redLetterInformationTable'),
+                    icon: 'fa fa-file-text-o',
+                    show: true
+                },
+                {
+                    name: 'coupaPurchasingReport',
+                    permission: constant.vatPermission.dataPreview.coupaPurchasingReport.queryCode,
+                    text: $translate.instant('coupaPurchasingReport'),
+                    icon: 'fa fa-file-text-o',
+                    show: true
+                },
+                {
+                    name: 'invoiceData', permission: constant.vatPermission.dataPreview.invoiceData.queryCode,
+                    text: $translate.instant('invoiceData'), icon: 'fa fa-file-text-o', show: true
+                },
+                //TODO 增加TAB
+                {
+                    name: 'vatPreviewProfitTable', permission: constant.vatPermission.dataPreview.profitTable.queryCode,
+                    text: $translate.instant('ProfitTable'), icon: 'fa fa-file-text-o', show: true
+                },
+                {
+                    name: 'vatPreviewTheBalanceSheet', permission: constant.vatPermission.dataPreview.balanceSheet.queryCode,
+                    text: $translate.instant('offBalanceSheet'), icon: 'fa fa-file-text-o', show: true
+                },
+                {
+                    name: 'cashFlowManual', permission: constant.vatPermission.dataPreview.cashFlowManual.queryCode,
+                    text: $translate.instant('CashFlowManual'), icon: 'fa fa-file-text-o', show: true
+                },
+                {
+                    name: 'adjustmentTab', permission: constant.vatPermission.dataPreview.adjustmentTab.queryCode,
+                    text: $translate.instant('adjustmentTable'), icon: 'fa fa-file-text-o', show: false
+                },
+                {
+                    name: 'quarterlyOwnersEquityChangeTab',
+                    permission: constant.vatPermission.dataPreview.quarterlyOwnersEquityChangeTable.queryCode,
+                    text: $translate.instant('quarterlyOwnersEquityChangeTable'),
+                    icon: 'fa fa-file-text-o',
+                    show: false
+                },
+                {
+                    name: 'balanceSheet', permission: constant.vatPermission.dataPreview.balanceSheet.queryCode,
+                    text: $translate.instant('balanceSheet'), icon: 'fa fa-bank', show: false
+                },
 //                {
 //                    name: 'accountVoucher', permission: constant.vatPermission.dataPreview.accountVoucher.queryCode,
 //                    text: $translate.instant('accountVoucher'), icon: 'fa fa-columns', show: true

atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet-prc-manual/vat-preview-off-balance-sheet-prc-manual.ctrl.js

@@ -211,7 +211,7 @@
         //在popover打开时执行事件
         var showPopover = function () {
             $timeout(function () {
-                initDatePickers1();
+                initDatePicker1();
             }, 500);
         };
 
@@ -256,7 +256,7 @@
         (function initialize() {
             $log.debug('VatPreviewInputInvoiceController.ctor()...');
             initPeriods();
-            initDatePicker1();
+            showPopover();
             $scope.gridOptions = {
                 rowHeight: constant.UIGrid.rowHeight,
                 selectionRowHeaderWidth: constant.UIGrid.rowHeight,

atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet-prc-manual/vat-preview-off-balance-sheet-prc-manual.html

@@ -10,7 +10,7 @@
         </button>-->
         <span translate="offBalanceSheetPRCManual" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
         <input type="text" id="periodDatepicker" class="datepicker imp-subheader form-control periodInput"
-                                   readonly="readonly" ng-model="UploadPeriodTime" style="position:relative;top:-30px;left:230px;width: 120px;"/>
+                                   style="position:relative;top:-30px;left:230px;width: 120px;"/>
         <span ng-click="downloadBS()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
     </div>
 

atms-web/src/main/webapp/app/vat/vat-layout/vat-layout.ctrl.js

@@ -147,7 +147,8 @@
                 constant.vatPermission.dataPreview.redLetterInformationTable.queryCode,
                 constant.vatPermission.dataPreview.coupaPurchasingReport.queryCode,
                 constant.vatPermission.dataPreview.invoiceData.queryCode,
-
+                constant.vatPermission.dataPreview.profitTable.queryCode,
+                constant.vatPermission.dataPreview.cashFlowManual.queryCode,
 
                 // constant.vatPermission.dataManage.accountMappingCode,
                 // constant.vatPermission.dataManage.goodsMappingCode,
@@ -444,8 +445,39 @@
                                 permission: constant.vatPermission.dataPreview.invoiceData.queryCode,
                                 url: '#/vat/previewData/invoiceData'
                             });
-                        }
+                        } else if (data[constant.vatPermission.dataPreview.profitTable.queryCode]) {
+
+                            $scope.menus.push({
+                                name: 'previewData',
+                                state: 'previewData',
+                                num: 2,
+                                permission: constant.vatPermission.dataPreview.dataPreviewCode,
+                                url: '#/vat/importData'
+                            });
+                            subMenus.push({
+                                name: 'previewData.vatPreviewProfitTable',
+                                state: 'previewData.vatPreviewProfitTable',
+                                num: 2,
+                                permission: constant.vatPermission.dataPreview.invoiceData.queryCode,
+                                url: '#/vat/previewData/invoiceData'
+                            });
+                        } else if (data[constant.vatPermission.dataPreview.cashFlowManual.queryCode]) {
 
+                            $scope.menus.push({
+                                name: 'previewData',
+                                state: 'previewData',
+                                num: 2,
+                                permission: constant.vatPermission.dataPreview.dataPreviewCode,
+                                url: '#/vat/importData'
+                            });
+                            subMenus.push({
+                                name: 'previewData.cashFlowManual',
+                                state: 'previewData.cashFlowManual',
+                                num: 2,
+                                permission: constant.vatPermission.dataPreview.cashFlowManual.queryCode,
+                                url: '#/vat/previewData/cashFlowManual'
+                            });
+                        }
 
                         // TODO 待删除1
                         // TODO Delete