diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js index f258e13f..3e29aef0 100644 --- a/src/api/sunVillage_info/fixedAssets.js +++ b/src/api/sunVillage_info/fixedAssets.js @@ -437,3 +437,72 @@ export function publicPoll(id) { method: 'get' }) } + +// 获取会计科目列表 +export const subjectData = (query) => { + return request({ + url: '/finance/subject/listAll', + method: 'get', + params: query + }) +} + +//普通明细账接口 +export function listNormalDetails(query) { + return request({ + url: '/finance/balance/listNormalDetails', + method: 'get', + params: query + }) +} +//查询凭证信息明细 +export const voucherDetail = (data) => { + return request({ + url: '/finance/voucher/detail', + method: 'get', + params: data + }) +} + +//统计填报列表数据 +export const statisticsList = (data) => { + return request({ + url: '/entity/statistics/list', + method: 'get', + params: data + }) +} + +// 删除统计填报列表数据 +export function delStatisticsRemove(id) { + return request({ + url: '/entity/statistics/remove/' + id, + method: 'get' + }) +} + +//统计填报 - 模板 +export const entityStatisticsTemplate = (data) => { + return request({ + url: '/entity/statistics/entityStatisticsTemplate', + method: 'get', + params: data + }) +} + +//统计填报 -保存模板 +export const entityStatisticsSave = (data) => { + return request({ + url: '/entity/statistics/save', + method: 'post', + data: data + }) +} + +//统计填报 - 编辑 +export const entityStatisticsDetail = (id) => { + return request({ + url: '/entity/statistics/detail/'+id, + method: 'get' + }) +} \ No newline at end of file diff --git a/src/assets/images/sunVillage_info/fixedAssets_icon_4.png b/src/assets/images/sunVillage_info/fixedAssets_icon_4.png new file mode 100644 index 00000000..5d3431ad Binary files /dev/null and b/src/assets/images/sunVillage_info/fixedAssets_icon_4.png differ diff --git a/src/assets/images/sunVillage_info/fixedAssets_icon_5.png b/src/assets/images/sunVillage_info/fixedAssets_icon_5.png new file mode 100644 index 00000000..ba05fa57 Binary files /dev/null and b/src/assets/images/sunVillage_info/fixedAssets_icon_5.png differ diff --git a/src/assets/images/sunVillage_info/index_block_09.png b/src/assets/images/sunVillage_info/index_block_09.png new file mode 100644 index 00000000..37de49f9 Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_09.png differ diff --git a/src/assets/images/sunVillage_info/index_block_10.png b/src/assets/images/sunVillage_info/index_block_10.png new file mode 100644 index 00000000..b425fa08 Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_10.png differ diff --git a/src/assets/images/sunVillage_info/list_icon_11.png b/src/assets/images/sunVillage_info/list_icon_11.png new file mode 100644 index 00000000..e89ceb08 Binary files /dev/null and b/src/assets/images/sunVillage_info/list_icon_11.png differ diff --git a/src/assets/images/sunVillage_info/list_icon_12.png b/src/assets/images/sunVillage_info/list_icon_12.png new file mode 100644 index 00000000..83b28d7b Binary files /dev/null and b/src/assets/images/sunVillage_info/list_icon_12.png differ diff --git a/src/assets/images/sunVillage_info/list_icon_13.png b/src/assets/images/sunVillage_info/list_icon_13.png new file mode 100644 index 00000000..234cb914 Binary files /dev/null and b/src/assets/images/sunVillage_info/list_icon_13.png differ diff --git a/src/assets/images/sunVillage_info/vocher_bg.png b/src/assets/images/sunVillage_info/vocher_bg.png new file mode 100644 index 00000000..4c82946e Binary files /dev/null and b/src/assets/images/sunVillage_info/vocher_bg.png differ diff --git a/src/router/index.js b/src/router/index.js index 9bc39a11..e464f873 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2431,6 +2431,36 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/yinnong/bankAgriculture/bankOfDeposit/bankOfDepositModify'], resolve) }, + { + + path: '/yinnong/listBalanceRanking', + name: 'yinnongListBalanceRanking', + meta: { + title: '科目余额表', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/listBalanceRanking'], resolve) + }, + { + + path: '/yinnong/detailedLedger', + name: 'yinnongDetailedLedger', + meta: { + title: '明细账', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/detailedLedger'], resolve) + }, + { + + path: '/yinnong/detailedVoucher', + name: 'yinnongDetailedVoucher', + meta: { + title: '记账凭证', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/voucher'], resolve) + }, { path: '/lawEnforcement', name: 'lawEnforcement', @@ -3422,6 +3452,42 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/list_register_detail'], resolve) }, + { // 统计填报 + path: '/sunVillage_info/statistical_report', + name: 'sunVillageInfoStatisticalReport', + meta: { + title: '统计填报', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/statistical_report'], resolve) + }, + { // 统计填报--编辑 + path: '/sunVillage_info/statistical_report_edit', + name: 'sunVillageInfoStatisticalReportEdit', + meta: { + title: '统计填报', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/statistical_report_edit'], resolve) + }, + { //明细账 + path: '/sunVillage_info/detailed_ledger', + name: 'sunVillageInfoDetailedLedger', + meta: { + title: '明细账', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/detailed_ledger'], resolve) + }, + { //查看记账凭证 + path: '/sunVillage_info/voucher', + name: 'sunVillageInfoVoucher', + meta: { + title: '记账凭证', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/voucher'], resolve) + }, { ////阳光村务(新)-- 合同信息 path: '/sunVillage_info/user', name: 'sunVillageInfoUser', diff --git a/src/store/getters.js b/src/store/getters.js index 31855449..fcc6c3b6 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -6,7 +6,7 @@ const getters = { roles: state => state.user.roles, permissions: state => state.user.permissions, bookName: state => state.user.bookName, - + deptName: state => state.user.deptName, nickName: state => state.user.nickName, baseRoutingUrl: state => state.user.baseRoutingUrl, businessLevel: state => state.user.businessLevel, diff --git a/src/store/modules/user.js b/src/store/modules/user.js index f6c5c36b..c5c912ba 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -12,7 +12,7 @@ const user = { roles: [], permissions: [], bookName: '', - + deptName:'', nickName: '', baseRoutingUrl: '', businessLevel: '', diff --git a/src/utils/request.js b/src/utils/request.js index af3daf43..89f08671 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -64,7 +64,7 @@ service.interceptors.response.use(res => { if (code === 401) { Dialog.confirm({ title: '系统提示', - message: '登录状态已过期,您可以继续留在该页面,或者重新登录', + message: '登录状态已过期,请重新登录', confirmButtonText: '重新登录', cancelButtonText: '取消' }) diff --git a/src/views/sunVillage_info/detailed_ledger.vue b/src/views/sunVillage_info/detailed_ledger.vue new file mode 100644 index 00000000..fc3082d1 --- /dev/null +++ b/src/views/sunVillage_info/detailed_ledger.vue @@ -0,0 +1,622 @@ + + + \ No newline at end of file diff --git a/src/views/sunVillage_info/index.vue b/src/views/sunVillage_info/index.vue index 74739b04..4cc13f47 100644 --- a/src/views/sunVillage_info/index.vue +++ b/src/views/sunVillage_info/index.vue @@ -56,6 +56,7 @@ 财务公开榜 零工公开榜 零工登记 + 统计填报 重大事项 发布投票 @@ -142,7 +143,8 @@

财务信息

- 科目余额表 + 余额表 + 明细账 固定资产 合同信息 @@ -273,7 +275,6 @@ }) }, selectChange(val){ - console.log(val) val.index == 0 ? this.$router.push({path:"/sunVillage_info/user"}) : val.index == 1 ? this.$router.push({path:"/sunVillage_info/passWord"}) : val.index == 2 ? this.logout() : ''; } }, @@ -404,23 +405,38 @@ &.n_4 { background: url('../../assets/images/sunVillage_info/index_block_04.png') no-repeat center top; background-size: 50%; - margin-bottom: 20PX; + // margin-bottom: 20PX; } &.n_5 { background: url('../../assets/images/sunVillage_info/index_block_05.png') no-repeat center top; background-size: 50%; + margin-bottom: 20PX; } &.n_6 { background: url('../../assets/images/sunVillage_info/index_block_06.png') no-repeat center top; background-size: 50%; + // margin-bottom: 20PX; } &.n_7 { background: url('../../assets/images/sunVillage_info/index_block_07.png') no-repeat center top; background-size: 50%; + // margin-bottom: 20PX; } &.n_8 { background: url('../../assets/images/sunVillage_info/index_block_08.png') no-repeat center top; background-size: 50%; + margin-bottom: 20PX; + } + &.n_9 { + background: url('../../assets/images/sunVillage_info/index_block_09.png') no-repeat center top; + background-size: 50%; + margin-bottom: 20PX; + + } + &.n_10 { + background: url('../../assets/images/sunVillage_info/index_block_10.png') no-repeat center top; + background-size: 50%; + // margin-bottom: 20PX; } } .icon{ @@ -441,6 +457,7 @@ font-size: 22px; color: #3f3d56; text-align: center; + padding-top: 20px; padding-bottom: 25PX; } } diff --git a/src/views/sunVillage_info/statistical_report.vue b/src/views/sunVillage_info/statistical_report.vue new file mode 100644 index 00000000..b10dbae7 --- /dev/null +++ b/src/views/sunVillage_info/statistical_report.vue @@ -0,0 +1,247 @@ + + + + + diff --git a/src/views/sunVillage_info/statistical_report_edit.vue b/src/views/sunVillage_info/statistical_report_edit.vue new file mode 100644 index 00000000..0528892d --- /dev/null +++ b/src/views/sunVillage_info/statistical_report_edit.vue @@ -0,0 +1,821 @@ + + + + + diff --git a/src/views/sunVillage_info/voucher.vue b/src/views/sunVillage_info/voucher.vue new file mode 100644 index 00000000..6473ba1b --- /dev/null +++ b/src/views/sunVillage_info/voucher.vue @@ -0,0 +1,388 @@ + + + \ No newline at end of file diff --git a/src/views/yinnong/detailedLedger.vue b/src/views/yinnong/detailedLedger.vue new file mode 100644 index 00000000..98e8f053 --- /dev/null +++ b/src/views/yinnong/detailedLedger.vue @@ -0,0 +1,622 @@ + + + \ No newline at end of file diff --git a/src/views/yinnong/listBalanceRanking.vue b/src/views/yinnong/listBalanceRanking.vue new file mode 100644 index 00000000..1bc200a7 --- /dev/null +++ b/src/views/yinnong/listBalanceRanking.vue @@ -0,0 +1,632 @@ + + + + + diff --git a/src/views/yinnong/voucher.vue b/src/views/yinnong/voucher.vue new file mode 100644 index 00000000..6473ba1b --- /dev/null +++ b/src/views/yinnong/voucher.vue @@ -0,0 +1,388 @@ + + + \ No newline at end of file diff --git a/src/views/yinnong/workbench.vue b/src/views/yinnong/workbench.vue index 83441578..9e2d171b 100644 --- a/src/views/yinnong/workbench.vue +++ b/src/views/yinnong/workbench.vue @@ -56,7 +56,30 @@ + + + +
+ +
+

科目余额表

+
+ +
+ +
+

科目明细账

+
+ +
+
+ + + + @@ -66,24 +89,24 @@

银行卡转账

- - - - - - + + + + + +

信用卡还款

- - - - - - + + + + + +
@@ -122,6 +145,7 @@ +
@@ -261,6 +285,17 @@ >>> .icon img{ width:50px; } + >>> .icon.all{ + width: 80px; + padding: 0; + display: flex; + align-items: center; + justify-content: center; + } + >>> .icon.all img{ + width: 80px; + /* padding: 0; */ + } >>> .indexCard{ margin:2%;width:96%;padding:20px 0;padding:20px 0;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);background: #fff } diff --git a/static/images/onlineHome/icon_Y11.png b/static/images/onlineHome/icon_Y11.png new file mode 100644 index 00000000..fc2422e2 Binary files /dev/null and b/static/images/onlineHome/icon_Y11.png differ diff --git a/static/images/onlineHome/icon_Y12.png b/static/images/onlineHome/icon_Y12.png new file mode 100644 index 00000000..b425fa08 Binary files /dev/null and b/static/images/onlineHome/icon_Y12.png differ