Skip to content

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

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

parents dc7fd7a0 718af310
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1042 additions and 106 deletions
atms-api/src/main/java/pwc/taxtech/atms/service/impl/AssetListServiceImpl.java
View file @ b9667ec5
......@@ -288,10 +288,10 @@ public class AssetListServiceImpl extends BaseService {
return null;
}
citAsset.setAssetNumber(value.toString());
citAsset.setSerialNumber(String.valueOf(CitCommonUtil.getValue(rowData.getCell(2))));
citAsset.setSerialNumber(CitCommonUtil.getValue(rowData.getCell(2)).toString());
//获取资产描述
citAsset.setAssetDescription(String.valueOf(CitCommonUtil.getValue(rowData.getCell(5))));
citAsset.setAssetDescription(CitCommonUtil.getValue(rowData.getCell(5)).toString());
//获取资产类别
value = CitCommonUtil.getValue(rowData.getCell(7));
if (value == null) {
......@@ -303,7 +303,9 @@ public class AssetListServiceImpl extends BaseService {
//获取购入日期
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
value = CitCommonUtil.getValue(rowData.getCell(15));
citAsset.setBuyDate(value==null?null:sdf.parse(value.toString()));
if(!"".equals(value)){
citAsset.setBuyDate(sdf.parse(value.toString()));
}
//获取开始折旧日期,DD没有提供，我们要根据购入日期和税法分类做预处理自己转化
// citAsset.setDepreciationDate(sdf.parse(CitCommonUtil.getValue(rowData.getCell(15)).toString()));
......@@ -324,8 +326,10 @@ public class AssetListServiceImpl extends BaseService {
// citAsset.setAdjustmentValue(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(32)).toString()));
//获取报废日期
value = CitCommonUtil.getValue(rowData.getCell(37));
citAsset.setDisposedDate(value==null?null:sdf.parse(value.toString()));
citAsset.setScrapType(String.valueOf(CitCommonUtil.getValue(rowData.getCell(38))));
if(!"".equals(value)){
citAsset.setDisposedDate(sdf.parse(value.toString()));
}
citAsset.setScrapType(CitCommonUtil.getValue(rowData.getCell(38)).toString());
//获取残值额，原为残值率现为残值额，接下来计算需要用到，所以赋给一个对象
BigDecimal residualRate = new BigDecimal(CitCommonUtil.getValue(rowData.getCell(20)).toString());
citAsset.setResidualRate(residualRate);
......
atms-orangeheap/.gitignore 0 → 100644
View file @ b9667ec5
.DS_Store
node_modules
/dist
# local env files
.env.local
.env.*.local
# Log files
npm-debug.log*
yarn-debug.log*
yarn-error.log*
# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw*
atms-orangeheap/README.md 0 → 100644
View file @ b9667ec5
<<<<<<< HEAD
# didi2
## Project setup
```
yarn install
```
### Compiles and hot-reloads for development
```
yarn run serve
```
### Compiles and minifies for production
```
yarn run build
```
### Run your tests
```
yarn run test
```
### Lints and fixes files
```
yarn run lint
```
### Customize configuration
See [Configuration Reference](https://cli.vuejs.org/config/).
=======
# ProjectK
#### Description
{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}
#### Software Architecture
Software architecture description
#### Installation
1. xxxx
2. xxxx
3. xxxx
#### Instructions
1. xxxx
2. xxxx
3. xxxx
#### Contribution
1. Fork the repository
2. Create Feat_xxx branch
3. Commit your code
4. Create Pull Request
#### Gitee Feature
1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
4. The most valuable open source project [GVP](https://gitee.com/gvp)
5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
>>>>>>> e40bf8c2d8938c71eee9c06c9efc53631bdc03fd
atms-orangeheap/babel.config.js 0 → 100644
View file @ b9667ec5
module.exports = {
presets: [
'@vue/app'
]
}
atms-orangeheap/orangeheap/css/app.cf16809e.css 0 → 100644
View file @ b9667ec5
.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}
\ No newline at end of file
atms-orangeheap/orangeheap/css/chunk-vendors.1d7fe95e.css 0 → 100644
View file @ b9667ec5
This source diff could not be displayed because it is too large. You can view the blob instead.
atms-orangeheap/orangeheap/index.html 0 → 100644
View file @ b9667ec5
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons"><link href=js/about.173a42f4.js rel=prefetch><link href=css/app.cf16809e.css rel=preload as=style><link href=css/chunk-vendors.1d7fe95e.css rel=preload as=style><link href=js/app.e06965e0.js rel=preload as=script><link href=js/chunk-vendors.cc3f6466.js rel=preload as=script><link href=css/chunk-vendors.1d7fe95e.css rel=stylesheet><link href=css/app.cf16809e.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.cc3f6466.js></script><script src=js/app.e06965e0.js></script></body></html>
\ No newline at end of file
atms-orangeheap/orangeheap/js/about.173a42f4.js 0 → 100644
View file @ b9667ec5
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["about"],{f820:function(t,e,n){"use strict";n.r(e);var a=function(){var t=this,e=t.$createElement;t._self._c;return t._m(0)},s=[function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"about"},[n("h1",[t._v("This is an about page")])])}],u=n("2877"),c={},i=Object(u["a"])(c,a,s,!1,null,null,null);e["default"]=i.exports}}]);
//# sourceMappingURL=about.173a42f4.js.map
\ No newline at end of file
atms-orangeheap/orangeheap/js/about.173a42f4.js.map 0 → 100644
View file @ b9667ec5
{"version":3,"sources":["webpack:///./src/views/About.vue?cd20","webpack:///./src/views/About.vue"],"names":["render","_vm","this","_h","$createElement","_self","_c","_m","staticRenderFns","staticClass","_v","script","component","Object","componentNormalizer","__webpack_exports__"],"mappings":"8GAAA,IAAAA,EAAA,WAA0B,IAAAC,EAAAC,KAAaC,EAAAF,EAAAG,eAA0BH,EAAAI,MAAAC,GAAwB,OAAAL,EAAAM,GAAA,IACzFC,EAAA,YAAoC,IAAAP,EAAAC,KAAaC,EAAAF,EAAAG,eAA0BE,EAAAL,EAAAI,MAAAC,IAAAH,EAAwB,OAAAG,EAAA,OAAiBG,YAAA,SAAoB,CAAAH,EAAA,MAAAL,EAAAS,GAAA,2CCAxIC,EAAA,GAKAC,EAAgBC,OAAAC,EAAA,KAAAD,CAChBF,EACEX,EACAQ,GACF,EACA,KACA,KACA,MAIeO,EAAA,WAAAH","file":"js/about.173a42f4.js","sourcesContent":["var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _vm._m(0)}\nvar staticRenderFns = [function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:\"about\"},[_c('h1',[_vm._v(\"This is an about page\")])])}]\n\nexport { render, staticRenderFns }","import { render, staticRenderFns } from \"./About.vue?vue&type=template&id=1ae8a7be&\"\nvar script = {}\n\n\n/* normalize component */\nimport normalizer from \"!../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n null,\n null\n \n)\n\nexport default component.exports"],"sourceRoot":""}
\ No newline at end of file
atms-orangeheap/orangeheap/js/app.e06965e0.js.map 0 → 100644
View file @ b9667ec5
This diff is collapsed.
atms-orangeheap/orangeheap/js/chunk-vendors.cc3f6466.js 0 → 100644
View file @ b9667ec5
This source diff could not be displayed because it is too large. You can view the blob instead.
atms-orangeheap/orangeheap/js/chunk-vendors.cc3f6466.js.map 0 → 100644
View file @ b9667ec5
This diff is collapsed.
atms-orangeheap/orangeweb/css/app.cf16809e.css 0 → 100644
View file @ b9667ec5
.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}
\ No newline at end of file
atms-orangeheap/orangeweb/css/chunk-vendors.1d7fe95e.css 0 → 100644
View file @ b9667ec5
This source diff could not be displayed because it is too large. You can view the blob instead.
atms-orangeheap/orangeweb/index.html 0 → 100644
View file @ b9667ec5
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons"><link href=js/about.173a42f4.js rel=prefetch><link href=css/app.cf16809e.css rel=preload as=style><link href=css/chunk-vendors.1d7fe95e.css rel=preload as=style><link href=js/app.007ff91c.js rel=preload as=script><link href=js/chunk-vendors.cc3f6466.js rel=preload as=script><link href=css/chunk-vendors.1d7fe95e.css rel=stylesheet><link href=css/app.cf16809e.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.cc3f6466.js></script><script src=js/app.007ff91c.js></script></body></html>
\ No newline at end of file
atms-orangeheap/orangeweb/js/about.173a42f4.js 0 → 100644
View file @ b9667ec5
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["about"],{f820:function(t,e,n){"use strict";n.r(e);var a=function(){var t=this,e=t.$createElement;t._self._c;return t._m(0)},s=[function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"about"},[n("h1",[t._v("This is an about page")])])}],u=n("2877"),c={},i=Object(u["a"])(c,a,s,!1,null,null,null);e["default"]=i.exports}}]);
//# sourceMappingURL=about.173a42f4.js.map
\ No newline at end of file
atms-orangeheap/orangeweb/js/about.173a42f4.js.map 0 → 100644
View file @ b9667ec5
{"version":3,"sources":["webpack:///./src/views/About.vue?cd20","webpack:///./src/views/About.vue"],"names":["render","_vm","this","_h","$createElement","_self","_c","_m","staticRenderFns","staticClass","_v","script","component","Object","componentNormalizer","__webpack_exports__"],"mappings":"8GAAA,IAAAA,EAAA,WAA0B,IAAAC,EAAAC,KAAaC,EAAAF,EAAAG,eAA0BH,EAAAI,MAAAC,GAAwB,OAAAL,EAAAM,GAAA,IACzFC,EAAA,YAAoC,IAAAP,EAAAC,KAAaC,EAAAF,EAAAG,eAA0BE,EAAAL,EAAAI,MAAAC,IAAAH,EAAwB,OAAAG,EAAA,OAAiBG,YAAA,SAAoB,CAAAH,EAAA,MAAAL,EAAAS,GAAA,2CCAxIC,EAAA,GAKAC,EAAgBC,OAAAC,EAAA,KAAAD,CAChBF,EACEX,EACAQ,GACF,EACA,KACA,KACA,MAIeO,EAAA,WAAAH","file":"js/about.173a42f4.js","sourcesContent":["var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _vm._m(0)}\nvar staticRenderFns = [function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:\"about\"},[_c('h1',[_vm._v(\"This is an about page\")])])}]\n\nexport { render, staticRenderFns }","import { render, staticRenderFns } from \"./About.vue?vue&type=template&id=1ae8a7be&\"\nvar script = {}\n\n\n/* normalize component */\nimport normalizer from \"!../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n null,\n null\n \n)\n\nexport default component.exports"],"sourceRoot":""}
\ No newline at end of file
atms-orangeheap/orangeweb/js/app.007ff91c.js 0 → 100644
View file @ b9667ec5
This source diff could not be displayed because it is too large. You can view the blob instead.
atms-orangeheap/orangeweb/js/app.007ff91c.js.map 0 → 100644
View file @ b9667ec5
This diff is collapsed.
atms-orangeheap/orangeweb/js/chunk-vendors.cc3f6466.js 0 → 100644
View file @ b9667ec5
This source diff could not be displayed because it is too large. You can view the blob instead.
atms-orangeheap/orangeweb/js/chunk-vendors.cc3f6466.js.map 0 → 100644
View file @ b9667ec5
This diff is collapsed.
atms-orangeheap/package-lock.json 0 → 100644
View file @ b9667ec5
This diff is collapsed.
atms-orangeheap/package.json 0 → 100644
View file @ b9667ec5
{
"name": "didi2",
"version": "0.1.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
"lint": "vue-cli-service lint"
},
"dependencies": {
"axios": "^0.18.0",
"compression-webpack-plugin": "^2.0.0",
"vue": "^2.6.6",
"vue-router": "^3.0.1",
"vuetify": "^1.5.5",
"vuex": "^3.0.1"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.5.0",
"@vue/cli-plugin-eslint": "^3.5.0",
"@vue/cli-service": "^3.5.0",
"babel-eslint": "^10.0.1",
"eslint": "^5.8.0",
"eslint-plugin-vue": "^5.0.0",
"stylus": "^0.54.5",
"stylus-loader": "^3.0.1",
"vue-cli-plugin-vuetify": "^0.5.0",
"vue-template-compiler": "^2.5.21",
"vuetify-loader": "^1.0.5"
}
}
atms-orangeheap/postcss.config.js 0 → 100644
View file @ b9667ec5
module.exports = {
plugins: {
autoprefixer: {}
}
}
atms-orangeheap/public/index.html 0 → 100644
View file @ b9667ec5
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>didi2</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Material+Icons">
</head>
<body>
<noscript>
<strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript>
<div id="app"></div>
<!-- built files will be auto injected -->
</body>
</html>
atms-orangeheap/src/App.vue 0 → 100644
View file @ b9667ec5
<template>
<v-app>
<v-content>
<ChartApp/>
</v-content>
</v-app>
</template>
<script>
import ChartApp from './views/ChartApp'
export default {
name: 'App',
components: {
ChartApp
},
data() {
return {
//
}
}
}
</script>
atms-orangeheap/src/assets/iconfont/globalcss.css 0 → 100644
View file @ b9667ec5
.icon {
width: 1em;
height: 1em;
vertical-align: -0.15em;
fill: currentColor;
overflow: hidden;
}
\ No newline at end of file
atms-orangeheap/src/assets/iconfont/iconfont.js 0 → 100644
View file @ b9667ec5
This diff is collapsed.
atms-orangeheap/src/assets/logo.svg 0 → 100644
View file @ b9667ec5
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 87.5 100"><defs><style>.cls-1{fill:#1697f6;}.cls-2{fill:#7bc6ff;}.cls-3{fill:#1867c0;}.cls-4{fill:#aeddff;}</style></defs><title>Artboard 46</title><polyline class="cls-1" points="43.75 0 23.31 0 43.75 48.32"/><polygon class="cls-2" points="43.75 62.5 43.75 100 0 14.58 22.92 14.58 43.75 62.5"/><polyline class="cls-3" points="43.75 0 64.19 0 43.75 48.32"/><polygon class="cls-4" points="64.58 14.58 87.5 14.58 43.75 100 43.75 62.5 64.58 14.58"/></svg>
atms-orangeheap/src/assets/tableaujs.js 0 → 100644
View file @ b9667ec5
This source diff could not be displayed because it is too large. You can view the blob instead.
atms-orangeheap/src/components/Mine.vue 0 → 100644
View file @ b9667ec5
<template>
<v-content style="margin-top: 20%">
<v-container fluid fill-height>
<v-layout align-center justify-center>
<v-flex>
<div class="v-card-profile">
<v-avatar
slot="offset"
class="mx-auto d-block"
size="130"
>
<img src="https://demos.creative-tim.com/vue-material-dashboard/img/marc.aba54d65.jpg">
</v-avatar>
<v-card-text class="text-xs-center">
<h6 class="category text-gray font-weight-thin mb-9"></h6>
<h4 class="card-title" v-text="userName"></h4>
<!-- <p class="card-description font-weight-light">Don't be scared of the truth because we need to-->
<!-- restart the human foundation in truth And I love you like Kanye loves Kanye I love Rick-->
<!-- Owens’ bed design but the back is...</p>-->
<!-- <v-btn-->
<!-- color="success"-->
<!-- round-->
<!-- class="font-weight-light"-->
<!-- >Follow-->
<!-- </v-btn>-->
</v-card-text>
</div>
</v-flex>
</v-layout>
</v-container>
</v-content>
</template>
<script>
export default {
name: 'Mine',
data: () => ({
userName: "杨铖的号头"
})
//
}
</script>
\ No newline at end of file
atms-orangeheap/src/components/Panel.vue 0 → 100644
View file @ b9667ec5
<template>
<v-container>
<v-navigation-drawer
v-model="drawerRight"
fixed
right
clipped
app
>
<!-- <v-list dense>-->
<!-- <v-list-tile @click.stop="right = !right">-->
<!-- <v-list-tile-action>-->
<!-- <v-icon>exit_to_app</v-icon>-->
<!-- </v-list-tile-action>-->
<!-- <v-list-tile-content>-->
<!-- <v-list-tile-title>Ope Temporary Drawer</v-list-tile-title>-->
<!-- </v-list-tile-content>-->
<!-- </v-list-tile>-->
<v-list subheader>
<v-subheader>列表</v-subheader>
<v-list-tile
v-for="item in items"
:key="item.title"
@click="switchTable(item)"
avatar
>
<v-list-tile-action>
<svg class="icon" aria-hidden="true">
<use :xlink:href="item.iconName"></use>
</svg>
</v-list-tile-action>
<v-list-tile-content>
<v-list-tile-title v-html="item.title"></v-list-tile-title>
</v-list-tile-content>
<v-list-tile-action>
<v-icon v-show="item.active"
color="green"
>check
</v-icon>
</v-list-tile-action>
</v-list-tile>
</v-list>
</v-navigation-drawer>
<v-toolbar
fixed
app
clipped-right
>
<!-- <v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon>-->
<v-toolbar-title>仪表盘</v-toolbar-title>
<v-spacer></v-spacer>
<span class="body-2"
@click.stop="drawerRight = !drawerRight"
>
<svg class="icon" aria-hidden="true" style="vertical-align: middle; margin-right: 5px"><use
:xlink:href="selectedItem.iconName"></use></svg>
<span style="vertical-align: middle; margin-right: 2px" v-text="selectedItem.title"></span>
<v-icon style="vertical-align: middle">menu</v-icon>
</span>
<!-- <v-btn large-->
<!-- left-->
<!-- @click.stop="drawerRight = !drawerRight">-->
<!-- 未返还税金分析-->
<!-- <v-icon>menu</v-icon>-->
<!-- </v-btn>-->
<!-- <v-toolbar-side-icon @click.stop="drawerRight = !drawerRight"></v-toolbar-side-icon>-->
</v-toolbar>
<v-container ma-0 pa-0>
<Tableau :url="chartUrl"
width="100%"
ref="tableau"
:apiUrl="tableauApiUrl"
>
</Tableau>
</v-container>
</v-container>
</template>
<script>
import Tableau from './Tableau'
export default {
data: () => ({
chartUrl: process.env.VUE_APP_TABLEAU_API + 'unreturnedTax',
tableauApiUrl: require('../assets/tableaujs.js'),
// tableauApiUrl: 'https://public.tableau.com/javascripts/api/tableau-2.2.2.min.js',
drawer: null,
drawerRight: null,
right: false,
left: false,
items: [
{
iconName: '#d-iconyihuankuanbufen',
active: false,
title: '未返还税金分析',
avatar: 'https://cdn.vuetifyjs.com/images/lists/1.jpg',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'unreturnedTax',
},
{
iconName: '#d-iconCompare',
active: false,
title: '未返还/返还后税金比较',
avatar: 'https://cdn.vuetifyjs.com/images/lists/2.jpg',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'taxComparison',
},
{
iconName: '#d-iconhuaban',
active: false,
title: '利润/亏损分析',
avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'profitAndLoss',
},
{
iconName: '#d-iconqita1',
active: false,
title: '其他国内数据',
avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'otherDomesticData',
},
{
iconName: '#d-iconarchive-paper',
active: false,
title: '档案归档情况',
avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'docSituation',
},
{
iconName: '#d-iconfeiyong',
active: false,
title: '费用分析',
avatar: 'https://cdn.vuetifyjs.com/images/lists/3.jpg',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'costAnalysis',
},
{
iconName: '#d-iconquanqiu',
active: false,
title: '全球概览',
avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'globalOverview',
},
{
iconName: "#d-iconmexico",
active: false,
title: '墨西哥税务分析',
avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'mexicanTax',
},
{
iconName: '#d-iconaodaliya',
active: false,
title: '澳洲税务分析',
avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'australianTax',
},
{
iconName: '#d-iconbaxi',
active: false,
title: '巴西税务分析',
avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'brazilianTax',
},
{
iconName: '#d-iconqita',
active: false,
title: '其他国家税务分析',
avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'otherCountries',
},
],
selectedItem: null
}),
props: {
source: String
},
components: {
Tableau
},
created() {
this.selectTable(this.items[0])
this.$axios({
method: 'get',
url: 'https://api.coindesk.com/v1/bpi/currentprice.json',
}).then((response) => { //这里使用了ES6的语法
console.log(response) //请求成功返回的数据
}).catch((error) => {
console.log(error) //请求失败返回的数据
})
},
mounted() {
console.log(process.env.VUE_APP_TABLEAU_API)
},
methods: {
selectTable(item) {
if (this.selectedItem != null) {
this.selectedItem.active = false
}
item.active = true
this.selectedItem = item
},
switchTable(item) {
this.selectTable(item)
this.drawerRight = !this.drawerRight
this.chartUrl = this.selectedItem.chartUrl
}
}
}
</script>
<style scoped>
</style>
\ No newline at end of file
atms-orangeheap/src/components/Tableau.vue 0 → 100644
View file @ b9667ec5
<template>
<div id="tableau">
<!-- <button @click="initViz">nice</button>-->
</div>
</template>
<script>
export default {
name: 'Tableau',
props: {
url: '',
options: {},
width: '',
height: '',
filters: {},
apiUrl: {
// default: 'https://public.tableau.com/javascripts/api/tableau-2.2.2.min.js'
default: require('../assets/tableaujs.js')
}
},
data() {
return {
viz: {},
workBook: {}
}
},
watch: {
url() {
if (this.viz) {
this.viz.dispose()
}
this.initViz()
},
height(val) {
this.viz.setFrameSize(parseInt(this.width), parseInt(val))
},
width(val) {
this.viz.setFrameSize(parseInt(val), parseInt(this.height))
},
filters() {
if (this.viz) {
this.viz.dispose()
}
this.initViz()
}
},
computed: {
worksheet() {
return this.workBook.getActiveSheet()
}
},
methods: {
reloadViz() {
if (this.viz) {
this.viz.dispose()
}
this.initViz()
},
initViz() {
this.$axios({
method: 'get',
url: this.url
}).then((response) => { //这里使用了ES6的语法
let tableauUrl = response.data.data //请求成功返回的数据
const containerDiv = document.getElementById("tableau")
// Setting up constructor options
let options = {}
if (!this.options) {
options = {
height: this.height ? this.height : 1000,
width: this.width ? this.width : 1000,
hideTabs: true,
hideToolbar: true,
onFirstInteractive: () => {
this.workBook = this.viz.getWorkbook()
}
}
if (this.filters) {
Object.keys(this.filters).map((el) => {
options[el.toString()] = this.filters[el.toString()]
})
}
} else {
options = this.options
}
this.viz = new window.tableau.Viz(containerDiv, tableauUrl, options)
}).catch((error) => {
console.log(error) //请求失败返回的数据
})
}
},
mounted() {
let recaptchaScript = document.createElement('script')
// recaptchaScript.async = true
recaptchaScript.setAttribute('src', this.apiUrl)
this.tableauScript = document.head.appendChild(recaptchaScript)
// window.addEventListener('load', () => {
// this.initViz()
// })
this.initViz()
},
beforeDestroy() {
// this.viz.dispose()
}
}
</script>
<style scoped>
</style>
\ No newline at end of file
atms-orangeheap/src/main.js 0 → 100644
View file @ b9667ec5
import Vue from 'vue'
import './plugins/vuetify'
import App from './App.vue'
import router from './router'
import store from './store'
// import FlagIcon from 'vue-flag-icon'
// import './assets/iconfont/iconfont.css'
import './assets/iconfont/iconfont.js'
import './assets/iconfont/globalcss.css'
import axios from 'axios'
Vue.config.productionTip = false
Vue.prototype.$axios = axios
// Vue.use(FlagIcon)
new Vue({
router,
store,
render: h => h(App)
}).$mount('#app')
atms-orangeheap/src/plugins/vuetify.js 0 → 100644
View file @ b9667ec5
import Vue from 'vue'
import Vuetify from 'vuetify/lib'
import 'vuetify/src/stylus/app.styl'
Vue.use(Vuetify, {
iconfont: 'md',
})
atms-orangeheap/src/router.js 0 → 100644
View file @ b9667ec5
import Vue from 'vue'
import Router from 'vue-router'
import ChartApp from './views/ChartApp'
import Panel from './components/Panel'
import Mine from './components/Mine'
Vue.use(Router)
export default new Router({
routes: [
{
path: '/',
name: '',
component: ChartApp,
children: [
{path: '/', name: 'panel', component: Panel},
{path: 'mine', name: 'mine', component: Mine}
]
},
{
path: '/about',
name: 'about',
// route level code-splitting
// this generates a separate chunk (about.[hash].js) for this route
// which is lazy-loaded when the route is visited.
component: () => import(/* webpackChunkName: "about" */ './views/About.vue')
}
]
})
atms-orangeheap/src/store.js 0 → 100644
View file @ b9667ec5
import Vue from 'vue'
import Vuex from 'vuex'
Vue.use(Vuex)
export default new Vuex.Store({
state: {
},
mutations: {
},
actions: {
}
})
atms-orangeheap/src/views/About.vue 0 → 100644
View file @ b9667ec5
<template>
<div class="about">
<h1>This is an about page</h1>
</div>
</template>
atms-orangeheap/src/views/ChartApp.vue 0 → 100644
View file @ b9667ec5
<template>
<v-content class="ma-0 pa-0">
<v-container ma-0 pa-0 flat>
<router-view></router-view>
<v-bottom-nav
:active.sync="bottomNav"
:value="true"
absolute
style=" overflow: hidden;
position: fixed;
bottom: 0;
width: 100%;"
>
<v-btn
color="teal"
flat
value="panel"
depressed
:to="{name: 'panel'}"
>
<span>仪表盘</span>
<v-icon>table_chart</v-icon>
</v-btn>
<v-btn
color="teal"
flat
value="mine"
depressed
:to="{name: 'mine'}"
>
<span>我的</span>
<v-icon>account_box</v-icon>
</v-btn>
</v-bottom-nav>
</v-container>
</v-content>
</template>
<script>
export default {
data() {
return {
bottomNav: 'panel'
}
},
components: {}
}
</script>
<style scoped>
</style>
\ No newline at end of file
atms-orangeheap/vue.config.js 0 → 100644
View file @ b9667ec5
module.exports = {
/** 区分打包环境与开发环境
* process.env.NODE_ENV==='production' (打包环境)
* process.env.NODE_ENV==='development' (开发环境)
* baseUrl: process.env.NODE_ENV==='production'?"https://cdn.didabisai.com/front/":'front/',
*/
// 基本路径
publicPath: './',
// 输出文件目录
outputDir: './atms-web/src/main/webapp/orangeweb',
// eslint-loader 是否在保存的时候检查
// lintOnSave: true,
// use the full build with in-browser compiler?
// https://vuejs.org/v2/guide/installation.html#Runtime-Compiler-vs-Runtime-only
//compiler: false,
// webpack配置
// see https://github.com/vuejs/vue-cli/blob/dev/docs/webpack.md
chainWebpack: () => {
},
configureWebpack: () => {
},
//如果想要引入babel-polyfill可以这样写
// configureWebpack: (config) => {
// config.entry = ["babel-polyfill", "./src/main.js"]
// },
// vue-loader 配置项
// https://vue-loader.vuejs.org/en/options.html
//vueLoader: {},
// 生产环境是否生成 sourceMap 文件
// productionSourceMap: true,
// css相关配置
//css: {
// 是否使用css分离插件 ExtractTextPlugin
// extract: true,
// 开启 CSS source maps?
// sourceMap: false,
// css预设器配置项
// loaderOptions: {},
// 启用 CSS modules for all css / pre-processor files.
// modules: false
// },
// use thread-loader for babel & TS in production build
// enabled by default if the machine has more than 1 cores
//parallel: require('os').cpus().length > 1,
// 是否启用dll
// See https://github.com/vuejs/vue-cli/blob/dev/docs/cli-service.md#dll-mode
// dll: false,
// PWA 插件相关配置
// see https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-pwa
// pwa: {},
// webpack-dev-server 相关配置
devServer: {
open: process.platform === 'darwin',
host: '127.0.0.1',
port: 9099,
https: false,
hotOnly: false,
proxy: null, // 设置代理
before: app => {
}
},
// 第三方插件配置
pluginOptions: {
// ...
}
}
\ No newline at end of file
atms-orangeheap/yarn.lock 0 → 100644
View file @ b9667ec5
This diff is collapsed.
atms-web/src/main/java/pwc/taxtech/atms/web/controller/OrangeHeapController.java
View file @ b9667ec5
......@@ -23,8 +23,69 @@ public class OrangeHeapController {
@ResponseBody
@GetMapping("unreturnedTax")
public ApiResultDto getUnreturnedTax() {
return ApiResultDto.success(tableauService.getUnreturnedTax().orElse(StringUtils.EMPTY));
}
//以上是示范代码
//TODO 加入其他图表
@ResponseBody
@GetMapping("taxComparison")
public ApiResultDto getTaxComparison() {
return ApiResultDto.success(tableauService.getTaxComparison().orElse(StringUtils.EMPTY));
}
@ResponseBody
@GetMapping("otherCountries")
public ApiResultDto getOtherCountries() {
return ApiResultDto.success(tableauService.getOtherCountries().orElse(StringUtils.EMPTY));
}
@ResponseBody
@GetMapping("costAnalysis")
public ApiResultDto getCostAnalysis() {
return ApiResultDto.success(tableauService.getCostAnalysis().orElse(StringUtils.EMPTY));
}
@ResponseBody
@GetMapping("profitAndLoss")
public ApiResultDto getProfitAndLoss() {
return ApiResultDto.success(tableauService.getProfitAndLoss().orElse(StringUtils.EMPTY));
}
@ResponseBody
@GetMapping("otherDomesticData")
public ApiResultDto getOtherDomesticData() {
return ApiResultDto.success(tableauService.getOtherDomesticData().orElse(StringUtils.EMPTY));
}
@ResponseBody
@GetMapping("docSituation")
public ApiResultDto getDocSituation() {
return ApiResultDto.success(tableauService.getDocSituation().orElse(StringUtils.EMPTY));
}
@ResponseBody
@GetMapping("globalOverview")
public ApiResultDto getGlobalOverview() {
return ApiResultDto.success(tableauService.getGlobalOverview().orElse(StringUtils.EMPTY));
}
@ResponseBody
@GetMapping("mexicanTax")
public ApiResultDto getMexicanTax() {
return ApiResultDto.success(tableauService.getMexicanTax().orElse(StringUtils.EMPTY));
}
@ResponseBody
@GetMapping("australianTax")
public ApiResultDto getAustralianTax() {
return ApiResultDto.success(tableauService.getAustralianTax().orElse(StringUtils.EMPTY));
}
@ResponseBody
@GetMapping("brazilianTax")
public ApiResultDto getBrazilianTax() {
return ApiResultDto.success(tableauService.getBrazilianTax().orElse(StringUtils.EMPTY));
}
}
atms-web/src/main/java/pwc/taxtech/atms/web/service/OrangeHeapService.java
View file @ b9667ec5
......@@ -47,12 +47,72 @@ public class OrangeHeapService {
}
public Optional<String> getUnreturnedTax() {
// Optional<String> optional = authUserHelper.getCurrentAuditor();
// Optional<String> optional = Optional.of("admin");
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauUnreturnedTax(),
getTicket(s).orElse(StringUtils.EMPTY)));
}
//TODO 加入其他图表
public Optional<String> getTaxComparison() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauTaxComparison(),
getTicket(s).orElse(StringUtils.EMPTY)));
}
public Optional<String> getOtherCountries() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauOtherCountries(),
getTicket(s).orElse(StringUtils.EMPTY)));
}
public Optional<String> getCostAnalysis() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauCostAnalysis(),
getTicket(s).orElse(StringUtils.EMPTY)));
}
public Optional<String> getProfitAndLoss() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauProfitAndLoss(),
getTicket(s).orElse(StringUtils.EMPTY)));
}
public Optional<String> getOtherDomesticData() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauOtherDomesticData(),
getTicket(s).orElse(StringUtils.EMPTY)));
}
public Optional<String> getDocSituation() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauDocSituation(),
getTicket(s).orElse(StringUtils.EMPTY)));
}
public Optional<String> getGlobalOverview() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauGlobalOverview(),
getTicket(s).orElse(StringUtils.EMPTY)));
}
public Optional<String> getMexicanTax() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauMexicanTax(),
getTicket(s).orElse(StringUtils.EMPTY)));
}
public Optional<String> getAustralianTax() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauAustralianTax(),
getTicket(s).orElse(StringUtils.EMPTY)));
}
public Optional<String> getBrazilianTax() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauBrazilianTax(),
getTicket(s).orElse(StringUtils.EMPTY)));
}
}
atms-web/src/main/webapp/app/admin/systemConfiguration/ruleEngineeConfiguration/fixedAssetsRuleEnginee/fixed-assets-rule-enginee.ctrl.js
View file @ b9667ec5
......@@ -54,7 +54,7 @@
//获取固定资产二级分类的数据
var getAllFixedAssetDetailGroup = function(assetGroupType){
debugger;
var pageIndex = 1;
var pageSize = 10;
if(assetGroupType == '1'){
......@@ -68,7 +68,7 @@
pageSize = $scope.intangibleAssetsPagingOptions.pageSize;
}
assetGroupService.getAllFixedAssetDetailGroup(assetGroupType,pageIndex,pageSize).success(function(fixedAssetData){
debugger;
if(assetGroupType == '1'){
$scope.fixedAssetData = fixedAssetData.data['detailGroup'].list;
initFixedAssetPagingControl(fixedAssetData.data['totalItem']);
......@@ -81,42 +81,42 @@
}
}).error(function(){
debugger;
SweetAlert.error("获取类型为"+assetGroupType+"的资产数据出错");
});
};
//获取资产二级分类的数据
var getAllAssetDetailGroup = function(){
debugger;
assetGroupService.getAllAssetDetailGroup().success(function(resultData){
debugger;
$scope.fixedAssetData = resultData.data['1'];//1代表固定资产，获取返回数据map的key
$scope.longTermPendingData = resultData.data['2'];//2代表固定资产，获取返回数据map的key
$scope.intangibleAssetsData = resultData.data['3'];//3代表固定资产，获取返回数据map的key
}).error(function(){
debugger;
SweetAlert.error("获取资产数据出错");
});
};
$scope.pagingService = {
refreshFixedAssetDataGrid: function (assetGroupType) {
debugger;
$log.debug("refreshFixedAssetGrid");
getAllFixedAssetDetailGroup(assetGroupType);
}
};
var initFixedAssetPagingControl = function (totalItemsCount) {
debugger;
$scope.fixedAssetPagingOptions.totalItems = totalItemsCount;
};
var initLongTermPagingControl = function (totalItemsCount) {
debugger;
$scope.longTermPendingPagingOptions.totalItems = totalItemsCount;
};
var initIntangibleAssetsPagingControl = function (totalItemsCount) {
debugger;
$scope.intangibleAssetsPagingOptions.totalItems = totalItemsCount;
};
......@@ -129,7 +129,7 @@
};
//创建--固定资产
$scope.createNewData = function (type) {
debugger;
$scope.isEdit = false;
$scope.assetGroupType = type;
$scope.resetFixedAssetsObject();
......@@ -162,7 +162,7 @@
//给fixedAssetsObject实体赋予属性assetGroupType并赋值
$scope.fixedAssetsObject.assetGroupType = $scope.assetGroupType;
if($scope.isEdit){
debugger;
assetGroupService.updateAssetDetailGroup($scope.fixedAssetsObject).success(function () {
$(editModalSelector).modal('hide');
getAllFixedAssetDetailGroup($scope.assetGroupType);
......@@ -170,9 +170,9 @@
});
}else{
debugger;
assetGroupService.addAssetDetailGroup($scope.fixedAssetsObject).success(function () {
debugger;
if ($scope.fixedAssetsObject.groupYear)
$scope.fixedAssetsObject.groupYear = $scope.fixedAssetsObject.groupYear + "年";
// $scope.fixedAssetData.push($scope.fixedAssetsObject);
......@@ -190,7 +190,7 @@
};
//删除
$scope.delete = function (data) {
debugger;
assetGroupService.deleteAssetDetailGroup(data.id).success(function(){
getAllFixedAssetDetailGroup(data.assetGroupType);
// var index = $scope.fixedAssetData.indexOf(data);
......@@ -203,7 +203,7 @@
};
$scope.editRow = function (data,type) {
debugger;
$scope.assetGroupType = type;
$scope.isEdit = true;
$scope.fixedAssetsObject = angular.copy(data)
......
atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.ctrl.js
View file @ b9667ec5
......@@ -63,7 +63,6 @@
taxGroupType:''
};
$scope.refreshAssetResultListGrid = function () {
$log.debug("refreshAssetResultListGrid");
getAssetResultList($scope.citAssetsListDto.assetType);
};
......@@ -232,25 +231,31 @@
}, withCredentials: true
}).success(function(resp){
$('#busy-indicator-container').hide();
assetListService.getAssetGroupResultData(projectId).success(function (groupResultData) {
$scope.assetGroupResultDataSource = groupResultData.data;
});
// $scope.assetGroupResultDataSource = resp.data;
InitGrid(false);
$scope.saveGroupType = 1;
$scope.isDisabled = true;
//为方便开发暂时先改为false
$scope.isDisabled = false;
$scope.modalInstance = $uibModal.open({
animation: false,
backdrop: 'static',
keyboard: false,
ariaLabelledBy: 'modal-title',
ariaDescribedBy: 'modal-body',
templateUrl: 'set-asset-group-modal.html',
scope: $scope,
windowClass: "set-asset-list-modal"
});
if(resp.code == 1){
assetListService.getAssetGroupResultData(projectId).success(function (groupResultData) {
$scope.assetGroupResultDataSource = groupResultData.data;
});
// $scope.assetGroupResultDataSource = resp.data;
InitGrid(false);
$scope.saveGroupType = 1;
$scope.isDisabled = true;
//为方便开发暂时先改为false
$scope.isDisabled = false;
$scope.modalInstance = $uibModal.open({
animation: false,
backdrop: 'static',
keyboard: false,
ariaLabelledBy: 'modal-title',
ariaDescribedBy: 'modal-body',
templateUrl: 'set-asset-group-modal.html',
scope: $scope,
windowClass: "set-asset-list-modal"
});
}else{
SweetAlert.error("文件导入出现错误，请重试");
}
}).error(function(resp){
SweetAlert.error("文件导入出现错误，请重试");
});
......@@ -258,6 +263,7 @@
//根据分类获取数据
function getAssetResultList(assetType) {
debugger;
$scope.citAssetsListDto.assetType = assetType;
$scope.TotalCount = 0;
$scope.TotalAccountAcquisitionValue = 0;
......@@ -265,7 +271,7 @@
$scope.TotalTaxCurrentYearDepreciationAmount = 0;
$scope.TotalYearDifferenceAmount = 0;
assetListService.getAssetResultListPage($scope.citAssetsListDto).success(function (assetListData) {
debugger;
var data = assetListData.data.list;
if (data) {
var index = 1;
......@@ -279,7 +285,7 @@
// }
// });
$scope.assetsResultData = data;
$scope.TotalCount = data.total;
// $scope.TotalAccountAcquisitionValue = PWC.round($scope.TotalAccountAcquisitionValue, 2);
// $scope.TotalAccountYearDepreciationAmount = PWC.round($scope.TotalAccountYearDepreciationAmount, 2);
// $scope.TotalTaxCurrentYearDepreciationAmount = PWC.round($scope.TotalTaxCurrentYearDepreciationAmount, 2);
......@@ -289,6 +295,7 @@
$scope.TotalTaxCurrentYearDepreciationAmount = PWC.round(data[0].totalTaxCurrentYearDepreciationAmount, 2);
$scope.TotalYearDifferenceAmount = PWC.round(data[0].totalYearDifferenceAmount, 2);
}
$scope.TotalCount = assetListData.data.total;
$scope.pagingOptions.totalItems = assetListData.data.total;
});
}
......@@ -1006,13 +1013,12 @@
//开始
(function initialize() {
//分页的设置
//分页的设置
$scope.pagingOptions = {
pageIndex: 1, //当前页码
totalItems: 0, //总数据
totalItems: 1, //总数据
pageSize: 100, //每页多少条数据
pageSizeString: "100"
};
/**************************************** function start*************************************************/
$scope.displayType = 2;
......@@ -1030,8 +1036,9 @@
initColumns();
initDxGrid();
initAssetResultDxGrid();
getAssetResultList(1);
// getAssetResultList(1);
$scope.refreshAssetResultListGrid();
getGroupList();
getGroupDetailList();
getUserPermission();
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.ctrl.js
View file @ b9667ec5
......@@ -263,7 +263,7 @@
if (resp.result) {
SweetAlert.success($translate.instant('ProcessSuccess'));
}else {
debugger;
if (resp.resultMsg && resp.resultMsg.length > 0) {
SweetAlert.warning(resp.resultMsg);
}else{
......
atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.ctrl.js
View file @ b9667ec5
......@@ -51,7 +51,7 @@
$scope.getDataFromDatabase = function (queryParams){
citReportService.getAssetEamMappings(queryParams).success(function (resp) {
debugger;
if (resp.data) {
// minDate = data.
var index = 1;
......@@ -247,7 +247,7 @@
$scope.startCalculateData = function () {
citReportService.generateAssetEamMapping($scope.queryParams).success(function (data) {
debugger;
loadJournalEntryDataFromDB(1);
// if(status===204){
// SweetAlert.warning("没有数据可以下载");
......
atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.ctrl.js
View file @ b9667ec5
......@@ -62,7 +62,7 @@
$scope.getDataFromDatabase = function (queryParams){
citReportService.getDistributionTables(queryParams).success(function (resp) {
debugger;
if (resp.data) {
// minDate = data.
var index = 1;
......@@ -258,7 +258,7 @@
$scope.startCalculateData = function () {
citReportService.generateDistributionTable($scope.queryParams).success(function (data) {
debugger;
$scope.totalBusinessIncome = data.data.totalBusinessIncome;
$scope.totalEmployeeRemuneration = data.data.totalEmployeeRemuneration;
$scope.totalTotalAssets = data.data.totalTotalAssets;
......
atms-web/src/main/webapp/app/cit/report/cit-report-view/cit-report-view.ctrl.js
View file @ b9667ec5
......@@ -957,7 +957,7 @@
//批量导出EXCEL
$scope.export = function () {
debugger;
var grp = _.find($scope.$parent.$parent.groups, function (g) {
return g.name == 'TaxReturnType';
});
......@@ -992,13 +992,13 @@
var reg = /^([A-Z]+[0-9]+){1}$|^([A-Z]+[0-9]+){1}([\+-]{1}[A-Z]+[0-9]+)+$/g;
var exportReportData = [];
angular.forEach(reportArray, function (currentVal) {
debugger;
var node = _.first(_.where(grp.children, {reportId: currentVal}));
if (!node) {
return;
}
var reportPromiss = citReportService.getReportData(node.reportId).success(function (reportData) {
debugger;
if (reportData && reportData.data && reportData.data.cellData) {
_.each(reportData.data.cellData, function (x) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-bs-prc-adjust/import-cit-bs-prc-adjust.ctrl.js
View file @ b9667ec5
......@@ -103,7 +103,7 @@
//导入事件
var importFile = function (importType) {
debugger;
var impExl = $scope.importExcelFile;
var deferred = $q.defer();
......@@ -215,7 +215,7 @@
};
var loadImportInfoDataGrid = function () {
debugger;
$scope.importPLStatusGridOptions = {
bindingOptions: {
dataSource: 'citImportLogGridSource'
......@@ -300,7 +300,7 @@
};
var getImportLog = function () {
debugger;
citImportDataService.getCitDataImportLog(constant.citImportFileType.BalanceSheetPrcAdjust).success(function (data) {
if (data) {
$scope.citImportLogGridSource = data.data;
......@@ -447,7 +447,7 @@
};
$scope.downloadTemplate = function () {
debugger;
templateService.citDownloadTemplate(constant.citImportFileType.BalanceSheetPrcAdjust).success(function (data, status, headers) {
var octetStreamMime = 'application/octet-stream';
var contentType = headers('content-type') || octetStreamMime;
......@@ -478,7 +478,7 @@
//开始
(function initialize() {
debugger;
$log.debug('ImportTBController.ctor()...');
checkUserOrganizationPermissionList();
$scope.importFile = importFile;
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-draft-account-mapping/import-cit-draft-account-mapping.ctrl.js
View file @ b9667ec5
......@@ -100,7 +100,7 @@
//导入事件
var importFile = function (importType) {
debugger;
var impExl = $scope.importExcelFile;
var deferred = $q.defer();
......@@ -208,7 +208,7 @@
};
var loadImportInfoDataGrid = function () {
debugger;
$scope.importPLStatusGridOptions = {
bindingOptions: {
dataSource: 'citImportLogGridSource'
......@@ -293,7 +293,7 @@
};
var getImportLog = function () {
debugger;
citImportDataService.getCitDataImportLog(constant.citImportFileType.DraftAccountMapping).success(function (data) {
if (data) {
$scope.citImportLogGridSource = data.data;
......@@ -386,7 +386,7 @@
};
$scope.downloadTemplate = function () {
debugger;
templateService.citDownloadTemplate(constant.citImportFileType.DraftAccountMapping).success(function (data, status, headers) {
var octetStreamMime = 'application/octet-stream';
var contentType = headers('content-type') || octetStreamMime;
......@@ -417,7 +417,7 @@
//开始
(function initialize() {
debugger;
$log.debug('ImportTBController.ctor()...');
checkUserOrganizationPermissionList();
$scope.importFile = importFile;
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-eam-assets-disposal/import-cit-eam-assets-disposal.ctrl.js
View file @ b9667ec5
......@@ -100,7 +100,7 @@
//导入事件
var importFile = function (importType) {
debugger;
var impExl = $scope.importExcelFile;
var deferred = $q.defer();
......@@ -207,7 +207,7 @@
};
var loadImportInfoDataGrid = function () {
debugger;
$scope.importPLStatusGridOptions = {
bindingOptions: {
dataSource: 'citImportLogGridSource'
......@@ -292,7 +292,7 @@
};
var getImportLog = function () {
debugger;
citImportDataService.getCitDataImportLog(constant.citImportFileType.EAMAssetsDisposal).success(function (data) {
if (data) {
$scope.citImportLogGridSource = data.data;
......@@ -385,7 +385,7 @@
};
$scope.downloadTemplate = function () {
debugger;
templateService.citDownloadTemplate(constant.citImportFileType.EAMAssetsDisposal).success(function (data, status, headers) {
var octetStreamMime = 'application/octet-stream';
var contentType = headers('content-type') || octetStreamMime;
......@@ -416,7 +416,7 @@
//开始
(function initialize() {
debugger;
$log.debug('ImportTBController.ctor()...');
checkUserOrganizationPermissionList();
$scope.importFile = importFile;
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-journal-adjust/import-cit-journal-adjust.ctrl.js
View file @ b9667ec5
......@@ -105,7 +105,7 @@
//导入事件
var importFile = function (importType) {
debugger;
var impExl = $scope.importExcelFile;
var deferred = $q.defer();
......@@ -173,16 +173,16 @@
withCredentials: true
}).then(function(data) {
var resp = data.data;
debugger;
$('#busy-indicator-container').hide();
deferred.resolve();
if (resp.result) {
debugger;
logDto.UpdateState = $translate.instant('ImportSuccess')+" "+resp.data + $translate.instant('ItemData');
vatOperationLogService.addOperationLog(logDto);
SweetAlert.success($translate.instant('ImportSuccess')+" "+resp.data + $translate.instant('ItemData'));
} else {
debugger;
if (resp.resultMsg && resp.resultMsg.length > 0) {
SweetAlert.warning(resp.resultMsg);
}else{
......@@ -223,7 +223,7 @@
};
var loadImportInfoDataGrid = function () {
debugger;
$scope.importPLStatusGridOptions = {
bindingOptions: {
dataSource: 'citImportLogGridSource'
......@@ -308,7 +308,7 @@ debugger;
};
var getImportLog = function () {
debugger;
var a = constant.citImportFileType.JournalAdjust;
citImportDataService.getCitDataImportLog(constant.citImportFileType.JournalAdjust).success(function (data) {
if (data) {
......@@ -456,7 +456,7 @@ debugger;
};
$scope.downloadTemplate = function () {
debugger;
templateService.citDownloadTemplate(constant.citImportFileType.JournalAdjust).success(function (data, status, headers) {
var octetStreamMime = 'application/octet-stream';
var contentType = headers('content-type') || octetStreamMime;
......@@ -487,7 +487,7 @@ debugger;
//开始
(function initialize() {
debugger;
$log.debug('ImportTBController.ctor()...');
checkUserOrganizationPermissionList();
$scope.importFile = importFile;
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-profit-prc-adjust/import-cit-profit-prc-adjust.ctrl.js
View file @ b9667ec5
......@@ -103,7 +103,7 @@
//导入事件
var importFile = function (importType) {
debugger;
var impExl = $scope.importExcelFile;
var deferred = $q.defer();
......@@ -216,7 +216,7 @@
};
var loadImportInfoDataGrid = function () {
debugger;
$scope.importPLStatusGridOptions = {
bindingOptions: {
dataSource: 'citImportLogGridSource'
......@@ -301,7 +301,7 @@
};
var getImportLog = function () {
debugger;
citImportDataService.getCitDataImportLog(constant.citImportFileType.ProfitPrcAdjust).success(function (data) {
if (data) {
$scope.citImportLogGridSource = data.data;
......@@ -448,7 +448,7 @@
};
$scope.downloadTemplate = function () {
debugger;
templateService.citDownloadTemplate(constant.citImportFileType.ProfitPrcAdjust).success(function (data, status, headers) {
var octetStreamMime = 'application/octet-stream';
var contentType = headers('content-type') || octetStreamMime;
......@@ -479,7 +479,7 @@
//开始
(function initialize() {
debugger;
$log.debug('ImportTBController.ctor()...');
checkUserOrganizationPermissionList();
$scope.importFile = importFile;
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-salary-advance/import-cit-salary-advance.ctrl.js
View file @ b9667ec5
......@@ -104,7 +104,7 @@
//导入事件
var importFile = function (importType) {
debugger;
var impExl = $scope.importExcelFile;
var deferred = $q.defer();
......@@ -177,7 +177,7 @@
vatOperationLogService.addOperationLog(logDto);
SweetAlert.success($translate.instant('ImportSuccess')+" "+resp.data + $translate.instant('ItemData'));
} else {
debugger;
if (resp.resultMsg && resp.resultMsg.length > 0) {
SweetAlert.warning(resp.resultMsg);
}else{
......@@ -218,7 +218,7 @@
};
var loadImportInfoDataGrid = function () {
debugger;
$scope.importPLStatusGridOptions = {
bindingOptions: {
dataSource: 'citImportLogGridSource'
......@@ -303,7 +303,7 @@
};
var getImportLog = function () {
debugger;
citImportDataService.getCitDataImportLog(constant.citImportFileType.SalaryAdvance).success(function (data) {
if (data) {
$scope.citImportLogGridSource = data.data;
......@@ -450,7 +450,7 @@
};
$scope.downloadTemplate = function () {
debugger;
templateService.citDownloadTemplate(constant.citImportFileType.SalaryAdvance).success(function (data, status, headers) {
var octetStreamMime = 'application/octet-stream';
var contentType = headers('content-type') || octetStreamMime;
......@@ -481,7 +481,7 @@
//开始
(function initialize() {
debugger;
$log.debug('ImportTBController.ctor()...');
checkUserOrganizationPermissionList();
$scope.importFile = importFile;
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.ctrl.js
View file @ b9667ec5
......@@ -106,7 +106,7 @@
//导入事件
var importFile = function (importType) {
debugger;
var impExl = $scope.importExcelFile;
var deferred = $q.defer();
......@@ -218,7 +218,7 @@
};
var loadImportInfoDataGrid = function () {
debugger;
$scope.importPLStatusGridOptions = {
bindingOptions: {
dataSource: 'citImportLogGridSource'
......@@ -303,7 +303,7 @@
};
var getImportLog = function () {
debugger;
citImportDataService.getCitDataImportLog(constant.citImportFileType.TrialBalance).success(function (data) {
if (data) {
$scope.citImportLogGridSource = data.data;
......@@ -450,7 +450,7 @@
};
$scope.downloadTemplate = function () {
debugger;
templateService.citDownloadTemplate(constant.citImportFileType.TrialBalance).success(function (data, status, headers) {
var octetStreamMime = 'application/octet-stream';
var contentType = headers('content-type') || octetStreamMime;
......@@ -481,7 +481,7 @@
//开始
(function initialize() {
debugger;
$log.debug('ImportTBController.ctor()...');
checkUserOrganizationPermissionList();
$scope.importFile = importFile;
......
atms-web/src/main/webapp/app/common/webservices/assetDetailGroup.svc.js
View file @ b9667ec5
......@@ -3,23 +3,23 @@ webservices.factory('assetGroupService', ['$http', 'apiConfig', function ($http,
'use strict';
return {
getAllAssetDetailGroup: function () {
debugger;
return $http.get('/asset/getAllAssetDetailGroup', apiConfig.create());
},
getAllFixedAssetDetailGroup: function (assetGroupType,pageIndex,pageSize) {
debugger;
return $http.post('/asset/getFixedAssetDetailGroup',{"assetGroupType":assetGroupType,"pageIndex":pageIndex,"pageSize":pageSize}, apiConfig.create());
},
addAssetDetailGroup:function (assetDetailGroupDto) {
debugger;
return $http.post('/asset/addAssetDetailGroup',assetDetailGroupDto, apiConfig.create());
},
updateAssetDetailGroup:function (assetDetailGroupDto) {
debugger;
return $http.post('/asset/editAssetDetailGroup', assetDetailGroupDto, apiConfig.create());
},
deleteAssetDetailGroup:function (id) {
debugger;
return $http.delete('/asset/deleteAssetDetailGroup?id=' + id, apiConfig.create());
}
......
atms-web/src/main/webapp/app/common/webservices/citReport.svc.js
View file @ b9667ec5
......@@ -215,7 +215,7 @@
生成固定资产及EAM对应的数据
*/
generateAssetEamMapping : function(citAssetsListDto){
debugger;
return $http.post('/citReport/generateAssetEamMapping', citAssetsListDto, apiConfig.create());
},
/**
......@@ -242,7 +242,7 @@
生成所得税分配表的
*/
generateDistributionTable : function(citAssetsListDto){
debugger;
return $http.post('/citReport/generateDistributionTable', citAssetsListDto, apiConfig.create());
},
/**
......
atms-web/src/main/webapp/orangeweb/index.html
View file @ b9667ec5
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons"><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.cf16809e.css rel=preload as=style><link href=css/chunk-vendors.1d7fe95e.css rel=preload as=style><link href=js/app.ce388b93.js rel=preload as=script><link href=js/chunk-vendors.cc3f6466.js rel=preload as=script><link href=css/chunk-vendors.1d7fe95e.css rel=stylesheet><link href=css/app.cf16809e.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.cc3f6466.js></script><script src=js/app.ce388b93.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons"><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.cf16809e.css rel=preload as=style><link href=css/chunk-vendors.1d7fe95e.css rel=preload as=style><link href=js/app.4bce033e.js rel=preload as=script><link href=js/chunk-vendors.cc3f6466.js rel=preload as=script><link href=css/chunk-vendors.1d7fe95e.css rel=stylesheet><link href=css/app.cf16809e.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.cc3f6466.js></script><script src=js/app.4bce033e.js></script></body></html>
\ No newline at end of file
atms-web/src/main/webapp/orangeweb/js/app.4bce033e.js 0 → 100644
View file @ b9667ec5
This source diff could not be displayed because it is too large. You can view the blob instead.
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