Skip to content

T
traffic-front
Commit 071425ed authored by sherlock's avatar sherlock
Browse files
Options

bug:app-overview:listView\cardView

parent 9381f831
Show whitespace changes
Inline Side-by-side
Showing with 306 additions and 17 deletions
atms-api/src/main/resources/conf/conf_profile_dev.properties
View file @ 071425ed
...@@ -4,6 +4,12 @@ jdbc_password=taxadmin2018 ...@@ -4,6 +4,12 @@ jdbc_password=taxadmin2018
#jdbc_password=111111 #jdbc_password=111111
jdbc_admin_db=tax_admin jdbc_admin_db=tax_admin
#jdbc_url=jdbc:oracle:thin:@10.158.230.144:11521:XE
#jdbc_user=tax_admin_longi
#jdbc_password=tax_admin_longi
##jdbc_password=111111
#jdbc_admin_db=tax_admin_longi
jdbc2_url=jdbc:oracle:thin:@10.158.230.144:11521:XE jdbc2_url=jdbc:oracle:thin:@10.158.230.144:11521:XE
jdbc2_user=pwc_invoice jdbc2_user=pwc_invoice
jdbc2_password=pwc_invoice jdbc2_password=pwc_invoice
......
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js
View file @ 071425ed
...@@ -155,9 +155,12 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', ' ...@@ -155,9 +155,12 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
} }
//事业部 //事业部
if ($scope.selectBusinessUnit) { if ($scope.selectBusinessUnit) {
editModel.businessUnitID = $scope.selectBusinessUnit.id; editModel.businessUnitID = $scope.selectBusinessUnit.ID;
}
//区域
if ($scope.selectedArea) {
editModel.areaID = $scope.selectedArea.ID;
} }
//账套 //账套
if ($scope.orgAccountList) { if ($scope.orgAccountList) {
......
atms-web/src/main/webapp/app/vat/report/vat-report-layout/vat-report-layout.ctrl.js
View file @ 071425ed
...@@ -41,27 +41,58 @@ ...@@ -41,27 +41,58 @@
} }
if ($scope.hasTaxReturnPermission && $scope.hasQueryTaxReturnPermission) { if ($scope.hasTaxReturnPermission && $scope.hasQueryTaxReturnPermission) {
// var templates = _.chain
// 获取 申报表 Report Template // 获取 申报表 Report Template
var taxRtnGrp = { var taxRtnGrp = {
name: 'TaxReturn', name: 'TaxReturn',
children: _.map(result[1].data.data, function (x) { children: _.chain(result[1].data.data)
//if (x.templateID === $scope.selectedTemplateId) { .sortBy(function(x){
// $state.go('vat.generateReport.reportView', { id: x.id, templateid: x.templateID, name: x.templateName }); return x.templateName;
//} })
.map(function(x){
var nameIndex;
var tempName = x.templateName.substr(x.templateName.length - 4);
if(tempName.search("一") != -1){
nameIndex = 0;
} else if(tempName.search("二") != -1){
nameIndex = 1;
} else if(tempName.search("三") != -1){
nameIndex = 2;
} else if(tempName.search("四") != -1){
nameIndex = 3;
} else if(tempName.search("五") != -1){
nameIndex = 4;
} else {
nameIndex = 10;
}
return {
id:x.id,
templateId:x.templateId,
templateName:x.templateName,
templateCode:x.templateCode,
nameIndex:nameIndex
}
})
.sortBy(function(x){
return x.nameIndex;
})
.map(function (x) {
return { return {
reportId: x.id, reportId: x.id,
id: x.templateId, id: x.templateId,
name: x.templateName, name: x.templateName,
code: x.templateCode code: x.templateCode
}; };
}), }).value(),
orderIndex: grps.length orderIndex: grps.length
}; };
grps.push(taxRtnGrp); grps.push(taxRtnGrp);
} }
$scope.groups = _.chain(grps).sortBy(function (x) { $scope.groups = _.chain(grps).sortBy(function (x) {
return x.orderIndex
return x.orderIndex;
// return x.children.name;
}).map(function (x) { }).map(function (x) {
x.isExpand = true; x.isExpand = true;
return x; return x;
......
atms-web/src/main/webapp/package-lock.json
View file @ 071425ed
...@@ -161,6 +161,23 @@ ...@@ -161,6 +161,23 @@
"supports-color": "2.0.0" "supports-color": "2.0.0"
} }
}, },
"clean-css": {
"version": "4.2.1",
"resolved": "http://registry.npm.taobao.org/clean-css/download/clean-css-4.2.1.tgz",
"integrity": "sha1-LUEe92uFabbQyEBo2r6FsKpeXBc=",
"dev": true,
"requires": {
"source-map": "0.6.1"
},
"dependencies": {
"source-map": {
"version": "0.6.1",
"resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz",
"integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
"dev": true
}
}
},
"co": { "co": {
"version": "4.6.0", "version": "4.6.0",
"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
...@@ -168,10 +185,25 @@ ...@@ -168,10 +185,25 @@
"dev": true, "dev": true,
"optional": true "optional": true
}, },
"coffeescript": { "coffee-script": {
"version": "1.10.0", "version": "1.10.0",
"resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-1.10.0.tgz", "resolved": "http://registry.npm.taobao.org/coffee-script/download/coffee-script-1.10.0.tgz",
"integrity": "sha1-56qDAZF+9iGzXYo580jc3R234z4=" "integrity": "sha1-EpOLz5vhlI+gBvkuDEyegXBRCMA="
},
"color-convert": {
"version": "1.9.3",
"resolved": "http://registry.npm.taobao.org/color-convert/download/color-convert-1.9.3.tgz",
"integrity": "sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg=",
"dev": true,
"requires": {
"color-name": "1.1.3"
}
},
"color-name": {
"version": "1.1.3",
"resolved": "http://registry.npm.taobao.org/color-name/download/color-name-1.1.3.tgz",
"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
"dev": true
}, },
"colors": { "colors": {
"version": "1.1.2", "version": "1.1.2",
...@@ -187,6 +219,12 @@ ...@@ -187,6 +219,12 @@
"delayed-stream": "1.0.0" "delayed-stream": "1.0.0"
} }
}, },
"commander": {
"version": "2.17.1",
"resolved": "http://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz",
"integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78=",
"dev": true
},
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
...@@ -256,6 +294,12 @@ ...@@ -256,6 +294,12 @@
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
"dev": true "dev": true
}, },
"duplexer": {
"version": "0.1.1",
"resolved": "http://registry.npm.taobao.org/duplexer/download/duplexer-0.1.1.tgz",
"integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
"dev": true
},
"ecc-jsbn": { "ecc-jsbn": {
"version": "0.1.1", "version": "0.1.1",
"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
...@@ -317,6 +361,22 @@ ...@@ -317,6 +361,22 @@
"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
"dev": true "dev": true
}, },
"figures": {
"version": "1.7.0",
"resolved": "http://registry.npm.taobao.org/figures/download/figures-1.7.0.tgz",
"integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
"dev": true,
"requires": {
"escape-string-regexp": "1.0.5",
"object-assign": "4.1.1"
}
},
"file-sync-cmp": {
"version": "0.1.1",
"resolved": "http://registry.npm.taobao.org/file-sync-cmp/download/file-sync-cmp-0.1.1.tgz",
"integrity": "sha1-peeo/7+kk7Q7kju9TKiaU7Y7YSs=",
"dev": true
},
"find-up": { "find-up": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
...@@ -420,11 +480,11 @@ ...@@ -420,11 +480,11 @@
"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
}, },
"grunt": { "grunt": {
"version": "1.0.2", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.0.2.tgz", "resolved": "http://registry.npm.taobao.org/grunt/download/grunt-1.0.1.tgz",
"integrity": "sha1-TmpeaVtwRy/VME9fqeNCNoNqc7w=", "integrity": "sha1-6HeHZOlEsY8yuw8QuQeEdcnftWs=",
"requires": { "requires": {
"coffeescript": "1.10.0", "coffee-script": "1.10.0",
"dateformat": "1.0.12", "dateformat": "1.0.12",
"eventemitter2": "0.4.14", "eventemitter2": "0.4.14",
"exit": "0.1.2", "exit": "0.1.2",
...@@ -440,11 +500,11 @@ ...@@ -440,11 +500,11 @@
"nopt": "3.0.6", "nopt": "3.0.6",
"path-is-absolute": "1.0.1", "path-is-absolute": "1.0.1",
"rimraf": "2.2.8" "rimraf": "2.2.8"
}
}, },
"dependencies": {
"grunt-cli": { "grunt-cli": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.2.0.tgz", "resolved": "http://registry.npm.taobao.org/grunt-cli/download/grunt-cli-1.2.0.tgz",
"integrity": "sha1-VisRnrsGndtGSs4oRVAb6Xs1tqg=", "integrity": "sha1-VisRnrsGndtGSs4oRVAb6Xs1tqg=",
"requires": { "requires": {
"findup-sync": "0.3.0", "findup-sync": "0.3.0",
...@@ -452,6 +512,40 @@ ...@@ -452,6 +512,40 @@
"nopt": "3.0.6", "nopt": "3.0.6",
"resolve": "1.1.7" "resolve": "1.1.7"
} }
},
"grunt-contrib-clean": {
"version": "2.0.0",
"resolved": "http://registry.npm.taobao.org/grunt-contrib-clean/download/grunt-contrib-clean-2.0.0.tgz",
"integrity": "sha1-O+fKSA2kt0CqXp2GPi9+iyT4pos=",
"dev": true,
"requires": {
"async": "2.6.1",
"rimraf": "2.6.2"
},
"dependencies": {
"async": {
"version": "2.6.1",
"resolved": "http://registry.npm.taobao.org/async/download/async-2.6.1.tgz",
"integrity": "sha1-skWiPKcZMAROxT+kaqAKPofGphA=",
"dev": true,
"requires": {
"lodash": "4.17.11"
}
},
"lodash": {
"version": "4.17.11",
"resolved": "http://registry.npm.taobao.org/lodash/download/lodash-4.17.11.tgz",
"integrity": "sha1-s56mIp72B+zYniyN8SU2iRysm40=",
"dev": true
},
"rimraf": {
"version": "2.6.2",
"resolved": "http://registry.npm.taobao.org/rimraf/download/rimraf-2.6.2.tgz",
"integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=",
"dev": true,
"requires": {
"glob": "7.0.6"
}
} }
} }
}, },
...@@ -465,6 +559,58 @@ ...@@ -465,6 +559,58 @@
"source-map": "0.5.7" "source-map": "0.5.7"
} }
}, },
"grunt-contrib-copy": {
"version": "1.0.0",
"resolved": "http://registry.npm.taobao.org/grunt-contrib-copy/download/grunt-contrib-copy-1.0.0.tgz",
"integrity": "sha1-cGDGWB6QS4qw0A8HbgqPbj58NXM=",
"dev": true,
"requires": {
"chalk": "1.1.3",
"file-sync-cmp": "0.1.1"
}
},
"grunt-contrib-cssmin": {
"version": "3.0.0",
"resolved": "http://registry.npm.taobao.org/grunt-contrib-cssmin/download/grunt-contrib-cssmin-3.0.0.tgz",
"integrity": "sha1-F2fAoGL0tzU8WtytxS3P9xl9TYk=",
"dev": true,
"requires": {
"chalk": "2.4.1",
"clean-css": "4.2.1",
"maxmin": "2.1.0"
},
"dependencies": {
"ansi-styles": {
"version": "3.2.1",
"resolved": "http://registry.npm.taobao.org/ansi-styles/download/ansi-styles-3.2.1.tgz",
"integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=",
"dev": true,
"requires": {
"color-convert": "1.9.3"
}
},
"chalk": {
"version": "2.4.1",
"resolved": "http://registry.npm.taobao.org/chalk/download/chalk-2.4.1.tgz",
"integrity": "sha1-GMSasWoDe26wFSzIPjRxM4IVtm4=",
"dev": true,
"requires": {
"ansi-styles": "3.2.1",
"escape-string-regexp": "1.0.5",
"supports-color": "5.5.0"
}
},
"supports-color": {
"version": "5.5.0",
"resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz",
"integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
"dev": true,
"requires": {
"has-flag": "3.0.0"
}
}
}
},
"grunt-contrib-less": { "grunt-contrib-less": {
"version": "1.4.1", "version": "1.4.1",
"resolved": "https://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-1.4.1.tgz", "resolved": "https://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-1.4.1.tgz",
...@@ -494,6 +640,49 @@ ...@@ -494,6 +640,49 @@
} }
} }
}, },
"grunt-contrib-uglify": {
"version": "4.0.0",
"resolved": "http://registry.npm.taobao.org/grunt-contrib-uglify/download/grunt-contrib-uglify-4.0.0.tgz",
"integrity": "sha1-UKo2Voy/X5Uys1/os9rPmSEMkJw=",
"dev": true,
"requires": {
"chalk": "2.4.1",
"maxmin": "2.1.0",
"uglify-js": "3.4.9",
"uri-path": "1.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "3.2.1",
"resolved": "http://registry.npm.taobao.org/ansi-styles/download/ansi-styles-3.2.1.tgz",
"integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=",
"dev": true,
"requires": {
"color-convert": "1.9.3"
}
},
"chalk": {
"version": "2.4.1",
"resolved": "http://registry.npm.taobao.org/chalk/download/chalk-2.4.1.tgz",
"integrity": "sha1-GMSasWoDe26wFSzIPjRxM4IVtm4=",
"dev": true,
"requires": {
"ansi-styles": "3.2.1",
"escape-string-regexp": "1.0.5",
"supports-color": "5.5.0"
}
},
"supports-color": {
"version": "5.5.0",
"resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz",
"integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
"dev": true,
"requires": {
"has-flag": "3.0.0"
}
}
}
},
"grunt-known-options": { "grunt-known-options": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.0.tgz", "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.0.tgz",
...@@ -548,6 +737,15 @@ ...@@ -548,6 +737,15 @@
} }
} }
}, },
"gzip-size": {
"version": "3.0.0",
"resolved": "http://registry.npm.taobao.org/gzip-size/download/gzip-size-3.0.0.tgz",
"integrity": "sha1-VGGI6b3DN/Zzdy+BZgRks4nc5SA=",
"dev": true,
"requires": {
"duplexer": "0.1.1"
}
},
"har-schema": { "har-schema": {
"version": "1.0.5", "version": "1.0.5",
"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
...@@ -574,6 +772,12 @@ ...@@ -574,6 +772,12 @@
"ansi-regex": "2.1.1" "ansi-regex": "2.1.1"
} }
}, },
"has-flag": {
"version": "3.0.0",
"resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-3.0.0.tgz",
"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
"dev": true
},
"hawk": { "hawk": {
"version": "3.1.3", "version": "3.1.3",
"resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
...@@ -810,6 +1014,18 @@ ...@@ -810,6 +1014,18 @@
"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=" "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0="
}, },
"maxmin": {
"version": "2.1.0",
"resolved": "http://registry.npm.taobao.org/maxmin/download/maxmin-2.1.0.tgz",
"integrity": "sha1-TTsiCQPZXu5+t6x/qGTnLcCaMWY=",
"dev": true,
"requires": {
"chalk": "1.1.3",
"figures": "1.7.0",
"gzip-size": "3.0.0",
"pretty-bytes": "3.0.1"
}
},
"meow": { "meow": {
"version": "3.7.0", "version": "3.7.0",
"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
...@@ -981,6 +1197,15 @@ ...@@ -981,6 +1197,15 @@
"pinkie": "2.0.4" "pinkie": "2.0.4"
} }
}, },
"pretty-bytes": {
"version": "3.0.1",
"resolved": "http://registry.npm.taobao.org/pretty-bytes/download/pretty-bytes-3.0.1.tgz",
"integrity": "sha1-J9AAjXeAY6C0gRuzXHnxvV1fvM8=",
"dev": true,
"requires": {
"number-is-nan": "1.0.1"
}
},
"promise": { "promise": {
"version": "7.3.1", "version": "7.3.1",
"resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
...@@ -1238,11 +1463,35 @@ ...@@ -1238,11 +1463,35 @@
"dev": true, "dev": true,
"optional": true "optional": true
}, },
"uglify-js": {
"version": "3.4.9",
"resolved": "http://registry.npm.taobao.org/uglify-js/download/uglify-js-3.4.9.tgz",
"integrity": "sha1-rwLxgMEgfXZDLkc+0koo9KeCuuM=",
"dev": true,
"requires": {
"commander": "2.17.1",
"source-map": "0.6.1"
},
"dependencies": {
"source-map": {
"version": "0.6.1",
"resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz",
"integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
"dev": true
}
}
},
"underscore.string": { "underscore.string": {
"version": "3.2.3", "version": "3.2.3",
"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.2.3.tgz", "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.2.3.tgz",
"integrity": "sha1-gGmSYzZl1eX8tNsfs6hi62jp5to=" "integrity": "sha1-gGmSYzZl1eX8tNsfs6hi62jp5to="
}, },
"uri-path": {
"version": "1.0.0",
"resolved": "http://registry.npm.taobao.org/uri-path/download/uri-path-1.0.0.tgz",
"integrity": "sha1-l0fwGDWJM8Md4PzP2C0TjmcmLjI=",
"dev": true
},
"uuid": { "uuid": {
"version": "3.2.1", "version": "3.2.1",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
......
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