diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js index 7876f0cc..f258e13f 100644 --- a/src/api/sunVillage_info/fixedAssets.js +++ b/src/api/sunVillage_info/fixedAssets.js @@ -368,3 +368,72 @@ export function getLoginBook() { method: 'get' }) } + +// 查询投票主题列表 +export function listPoll(deptId , query) { + return request({ + url: `/villageAffairs/public/poll/list/${deptId}`, + method: 'get', + params: query + }) +} + +// 姓名, 账套ID, 身份证, 返回里会有个id字段 +export function checkFarmer(data) { + return request({ + url: '/register/checkFarmer', + method: 'post', + data: data, + }) +} + +// 查询投票主题详细 +export function getPoll(id) { + return request({ + url: `/villageAffairs/public/poll/detail/${id}`, + method: 'get' + }) +} + +// 投票 id为主题ID, option为投票选项ID, 多个用,分隔, userId为认证后的农户ID +export function votePoll(id, data) { + return request({ + url: `/villageAffairs/public/poll/vote/${id}`, + method: 'post', + params: data, + }) +} + +// 新增投票主题 +export function addPoll(data) { + return request({ + url: '/poll/poll/add', + method: 'post', + data: data + }) +} + +// 修改投票主题 +export function updatePoll(data) { + return request({ + url: '/poll/poll/edit', + method: 'post', + data: data + }) +} + +// 删除投票主题 +export function delPoll(id) { + return request({ + url: '/poll/poll/remove/' + id, + method: 'get' + }) +} + +// 发布投票主题 +export function publicPoll(id) { + return request({ + url: '/poll/poll/publicPoll/'+ id, + method: 'get' + }) +} diff --git a/src/assets/images/sunVillage_info/icon_cj.png b/src/assets/images/sunVillage_info/icon_cj.png new file mode 100644 index 00000000..0028ffd7 Binary files /dev/null and b/src/assets/images/sunVillage_info/icon_cj.png differ diff --git a/src/assets/images/sunVillage_info/icon_sm.png b/src/assets/images/sunVillage_info/icon_sm.png new file mode 100644 index 00000000..2ca503ca Binary files /dev/null and b/src/assets/images/sunVillage_info/icon_sm.png differ diff --git a/src/assets/images/sunVillage_info/icon_vote.png b/src/assets/images/sunVillage_info/icon_vote.png new file mode 100644 index 00000000..43ed7170 Binary files /dev/null and b/src/assets/images/sunVillage_info/icon_vote.png differ diff --git a/src/assets/images/sunVillage_info/index_block_01.png b/src/assets/images/sunVillage_info/index_block_01.png new file mode 100644 index 00000000..606c2a8d Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_01.png differ diff --git a/src/assets/images/sunVillage_info/index_block_02.png b/src/assets/images/sunVillage_info/index_block_02.png new file mode 100644 index 00000000..48e49816 Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_02.png differ diff --git a/src/assets/images/sunVillage_info/index_block_03.png b/src/assets/images/sunVillage_info/index_block_03.png new file mode 100644 index 00000000..4d3fa203 Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_03.png differ diff --git a/src/assets/images/sunVillage_info/index_block_04.png b/src/assets/images/sunVillage_info/index_block_04.png new file mode 100644 index 00000000..fc2422e2 Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_04.png differ diff --git a/src/assets/images/sunVillage_info/index_block_05.png b/src/assets/images/sunVillage_info/index_block_05.png new file mode 100644 index 00000000..1fe48ba1 Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_05.png differ diff --git a/src/assets/images/sunVillage_info/index_block_06.png b/src/assets/images/sunVillage_info/index_block_06.png new file mode 100644 index 00000000..6672df3a Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_06.png differ diff --git a/src/assets/images/sunVillage_info/index_block_07.png b/src/assets/images/sunVillage_info/index_block_07.png new file mode 100644 index 00000000..35817bcb Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_07.png differ diff --git a/src/assets/images/sunVillage_info/index_block_08.png b/src/assets/images/sunVillage_info/index_block_08.png new file mode 100644 index 00000000..f2712d1b Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_08.png differ diff --git a/src/assets/images/sunVillage_info/index_block_1_rights.png b/src/assets/images/sunVillage_info/index_block_1_rights.png new file mode 100644 index 00000000..92eb4d2e Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_1_rights.png differ diff --git a/src/assets/images/sunVillage_info/index_block_2_rights.png b/src/assets/images/sunVillage_info/index_block_2_rights.png new file mode 100644 index 00000000..5b27f8bd Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_2_rights.png differ diff --git a/src/assets/images/sunVillage_info/index_block_3_rights.png b/src/assets/images/sunVillage_info/index_block_3_rights.png new file mode 100644 index 00000000..7193ad9a Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_3_rights.png differ diff --git a/src/assets/images/sunVillage_info/index_block_4_rights.png b/src/assets/images/sunVillage_info/index_block_4_rights.png new file mode 100644 index 00000000..f0e2d987 Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_4_rights.png differ diff --git a/src/assets/images/sunVillage_info/index_block_8.png b/src/assets/images/sunVillage_info/index_block_8.png new file mode 100644 index 00000000..446786e3 Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_8.png differ diff --git a/src/assets/images/sunVillage_info/index_btn.png b/src/assets/images/sunVillage_info/index_btn.png new file mode 100644 index 00000000..98c31287 Binary files /dev/null and b/src/assets/images/sunVillage_info/index_btn.png differ diff --git a/src/assets/images/sunVillage_info/index_title2_rights.png b/src/assets/images/sunVillage_info/index_title2_rights.png new file mode 100644 index 00000000..d21dccea Binary files /dev/null and b/src/assets/images/sunVillage_info/index_title2_rights.png differ diff --git a/src/assets/images/sunVillage_info/login_head_code.png b/src/assets/images/sunVillage_info/login_head_code.png new file mode 100644 index 00000000..4e93ab6a Binary files /dev/null and b/src/assets/images/sunVillage_info/login_head_code.png differ diff --git a/src/assets/images/sunVillage_info/login_head_h_rights.png b/src/assets/images/sunVillage_info/login_head_h_rights.png new file mode 100644 index 00000000..fba033d3 Binary files /dev/null and b/src/assets/images/sunVillage_info/login_head_h_rights.png differ diff --git a/src/assets/images/sunVillage_info/login_head_nr_code.png b/src/assets/images/sunVillage_info/login_head_nr_code.png new file mode 100644 index 00000000..7d5f83ba Binary files /dev/null and b/src/assets/images/sunVillage_info/login_head_nr_code.png differ diff --git a/src/assets/images/sunVillage_info/login_icon_2_code.png b/src/assets/images/sunVillage_info/login_icon_2_code.png new file mode 100644 index 00000000..eb06ef0d Binary files /dev/null and b/src/assets/images/sunVillage_info/login_icon_2_code.png differ diff --git a/src/assets/images/sunVillage_info/user_icon.png b/src/assets/images/sunVillage_info/user_icon.png new file mode 100644 index 00000000..f80bad65 Binary files /dev/null and b/src/assets/images/sunVillage_info/user_icon.png differ diff --git a/src/components/form/SubjectTreeChooser.vue b/src/components/form/SubjectTreeChooser.vue index a7655f04..e5d79f94 100644 --- a/src/components/form/SubjectTreeChooser.vue +++ b/src/components/form/SubjectTreeChooser.vue @@ -8,7 +8,7 @@ /> - + diff --git a/src/permission.js b/src/permission.js index 5aeff49c..03fd72cc 100644 --- a/src/permission.js +++ b/src/permission.js @@ -122,6 +122,11 @@ const whiteList = [ '/sunVillage_info/list_finance_detail', //详情页 '/sunVillage_info/list_finance_ranking', //详情页 '/sunVillage_info/list_tourists_ranking', //详情页 + '/sunVillage_info/login_code', //详情页 + '/sunVillage_info/index_code_rights', //详情页 + '/sunVillage_info/list_vote', //详情页 + '/sunVillage_info/list_vote_detail', //详情页 + '/sunVillage_info/list_vote_form', //详情页 ] router.beforeEach((to, from, next) => { diff --git a/src/router/index.js b/src/router/index.js index 837a6c08..edf95bbf 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3151,6 +3151,69 @@ export const constantRoutes = [ hidden: true, }, component: (resolve) => require(['@/views/sunVillage_info/list_balance_ranking'], resolve) + }, + { ////阳光村务(新)-- 合同信息 + path: '/sunVillage_info/list_vote', + name: 'sunVillageInfoListVote', + meta: { + title: '投票', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_vote'], resolve) + }, + { ////阳光村务(新)-- 合同信息 + path: '/sunVillage_info/list_vote_detail', + name: 'sunVillageInfoListVoteDetail', + meta: { + title: '投票', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_vote_detail'], resolve) + }, + { ////阳光村务(新)-- 合同信息 + path: '/sunVillage_info/list_vote_form', + name: 'sunVillageInfoListVoteForm', + meta: { + title: '投票', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_vote_form'], resolve) + }, + { ////阳光村务(新)-- 合同信息 + path: '/sunVillage_info/list_vote_add', + name: 'sunVillageInfoListVoteAdd', + meta: { + title: '新增投票', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_vote_add'], resolve) + }, + { ////阳光村务(新)-- 合同信息 + path: '/sunVillage_info/list_vote_edit', + name: 'sunVillageInfoListVoteEdit', + meta: { + title: '修改投票', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_vote_edit'], resolve) + }, + { ////阳光村务(新)-- 合同信息 + path: '/sunVillage_info/login_code', + name: 'sunVillageInfoLoginCode', + meta: { + title: '村民身份验证', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/login_code'], resolve) + }, + { ////阳光村务(新)-- 合同信息 + path: '/sunVillage_info/index_code_rights', + name: 'sunVillageInfoIndexCodeRights', + meta: { + title: '我的权利', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/index_code_rights'], resolve) } ]; diff --git a/src/views/sunVillage_info/fixedAssetsAdd.vue b/src/views/sunVillage_info/fixedAssetsAdd.vue index afd34fd6..fa12c45d 100644 --- a/src/views/sunVillage_info/fixedAssetsAdd.vue +++ b/src/views/sunVillage_info/fixedAssetsAdd.vue @@ -100,6 +100,8 @@ @@ -277,6 +279,7 @@ name: "certificateList", data() { return { + minDate:new Date(1900,1,1), applicationList:[], applicationListSecond:[], assetStatusOptions:[], @@ -284,7 +287,7 @@ assetType:'151001', operationType:'1', addType:'1', - buildTime:'2020-01-01', + buildTime:this.format(new Date(),'yyyy-MM-dd'), useType:'1', assetStatus:'1', isMin:'Y', @@ -341,7 +344,8 @@ orderByColumn:'createTime', isAsc:'desc', name:'', - } + }, + buildTime:new Date() }; }, created() { diff --git a/src/views/sunVillage_info/index.vue b/src/views/sunVillage_info/index.vue index 4d986a1e..f1a67cac 100644 --- a/src/views/sunVillage_info/index.vue +++ b/src/views/sunVillage_info/index.vue @@ -46,13 +46,16 @@
diff --git a/src/views/sunVillage_info/list_balance_ranking.vue b/src/views/sunVillage_info/list_balance_ranking.vue index 2222d122..1bc200a7 100644 --- a/src/views/sunVillage_info/list_balance_ranking.vue +++ b/src/views/sunVillage_info/list_balance_ranking.vue @@ -53,14 +53,14 @@
-

本期发生

+

期初余额

借方

贷方

-

期初余额

+

本期发生

借方

贷方

@@ -75,10 +75,10 @@ - {{item.bqjffs}} - {{item.bqdffs}} {{item.qcjfye}} {{item.qcdfye}} + {{item.bqjffs}} + {{item.bqdffs}} {{item.qmjffs}} {{item.qmdffs}} diff --git a/src/views/sunVillage_info/list_finance.vue b/src/views/sunVillage_info/list_finance.vue index bc8acbae..8baa66ee 100644 --- a/src/views/sunVillage_info/list_finance.vue +++ b/src/views/sunVillage_info/list_finance.vue @@ -15,6 +15,8 @@
2022
2021
2020
+
2019
+
2018
diff --git a/src/views/sunVillage_info/list_finance_detail.vue b/src/views/sunVillage_info/list_finance_detail.vue index 4e495eed..4506a32c 100644 --- a/src/views/sunVillage_info/list_finance_detail.vue +++ b/src/views/sunVillage_info/list_finance_detail.vue @@ -51,7 +51,7 @@
-

{{item.name}}

+ {{item.name}}
@@ -123,7 +123,7 @@ }else if(name.indexOf('.xls') > -1){ type = 'excel'; } - this.openFileList.push({name:name,type:type}) + this.openFileList.push({name:name,type:type,url:'/api'+rr}) }) } if (res.data.openPic !='' && res.data.openPic != null && res.data.openPic != undefined){ diff --git a/src/views/sunVillage_info/list_issues.vue b/src/views/sunVillage_info/list_issues.vue index 5c4bcbb2..d75d1659 100644 --- a/src/views/sunVillage_info/list_issues.vue +++ b/src/views/sunVillage_info/list_issues.vue @@ -15,6 +15,8 @@
2022
2021
2020
+
2019
+
2018
diff --git a/src/views/sunVillage_info/list_issues_detail.vue b/src/views/sunVillage_info/list_issues_detail.vue index eee2b6b1..8de2a234 100644 --- a/src/views/sunVillage_info/list_issues_detail.vue +++ b/src/views/sunVillage_info/list_issues_detail.vue @@ -51,7 +51,7 @@
-

{{item.name}}

+ {{item.name}}
@@ -131,7 +131,7 @@ }else if(name.indexOf('.xls') > -1){ type = 'excel'; } - this.openFileList.push({name:name,type:type}) + this.openFileList.push({name:name,type:type,url:'/api'+rr}) }) } if (res.data.openPic !='' && res.data.openPic != null && res.data.openPic != undefined){ diff --git a/src/views/sunVillage_info/list_register_add.vue b/src/views/sunVillage_info/list_register_add.vue index 9f36d823..559b0fd6 100644 --- a/src/views/sunVillage_info/list_register_add.vue +++ b/src/views/sunVillage_info/list_register_add.vue @@ -42,7 +42,7 @@ - + diff --git a/src/views/sunVillage_info/list_register_edit.vue b/src/views/sunVillage_info/list_register_edit.vue index ab50840a..b08b22ca 100644 --- a/src/views/sunVillage_info/list_register_edit.vue +++ b/src/views/sunVillage_info/list_register_edit.vue @@ -42,7 +42,7 @@ - + diff --git a/src/views/sunVillage_info/list_tourists.vue b/src/views/sunVillage_info/list_tourists.vue index 98c98925..de029b3b 100644 --- a/src/views/sunVillage_info/list_tourists.vue +++ b/src/views/sunVillage_info/list_tourists.vue @@ -15,6 +15,8 @@
2022
2021
2020
+
2019
+
2018
diff --git a/src/views/sunVillage_info/list_tourists_detail.vue b/src/views/sunVillage_info/list_tourists_detail.vue index e31da9bd..2c302585 100644 --- a/src/views/sunVillage_info/list_tourists_detail.vue +++ b/src/views/sunVillage_info/list_tourists_detail.vue @@ -51,7 +51,7 @@
-

{{item.name}}

+ {{item.name}}
@@ -123,7 +123,7 @@ }else if(name.indexOf('.xls') > -1){ type = 'excel'; } - this.openFileList.push({name:name,type:type}) + this.openFileList.push({name:name,type:type,url:'/api'+rr}) }) } if (res.data.openPic !='' && res.data.openPic != null && res.data.openPic != undefined){ diff --git a/src/views/sunVillage_info/list_vote.vue b/src/views/sunVillage_info/list_vote.vue new file mode 100644 index 00000000..9b3c837e --- /dev/null +++ b/src/views/sunVillage_info/list_vote.vue @@ -0,0 +1,211 @@ + + + + + diff --git a/src/views/sunVillage_info/list_vote_add.vue b/src/views/sunVillage_info/list_vote_add.vue new file mode 100644 index 00000000..f04b52c7 --- /dev/null +++ b/src/views/sunVillage_info/list_vote_add.vue @@ -0,0 +1,294 @@ + + + + + diff --git a/src/views/sunVillage_info/list_vote_detail.vue b/src/views/sunVillage_info/list_vote_detail.vue new file mode 100644 index 00000000..d189786f --- /dev/null +++ b/src/views/sunVillage_info/list_vote_detail.vue @@ -0,0 +1,238 @@ + + + + + diff --git a/src/views/sunVillage_info/list_vote_edit.vue b/src/views/sunVillage_info/list_vote_edit.vue new file mode 100644 index 00000000..be916606 --- /dev/null +++ b/src/views/sunVillage_info/list_vote_edit.vue @@ -0,0 +1,302 @@ + + + + + diff --git a/src/views/sunVillage_info/list_vote_form.vue b/src/views/sunVillage_info/list_vote_form.vue new file mode 100644 index 00000000..6ab912a0 --- /dev/null +++ b/src/views/sunVillage_info/list_vote_form.vue @@ -0,0 +1,269 @@ + + + + + diff --git a/src/views/sunVillage_info/login_code.vue b/src/views/sunVillage_info/login_code.vue new file mode 100644 index 00000000..219a5d37 --- /dev/null +++ b/src/views/sunVillage_info/login_code.vue @@ -0,0 +1,272 @@ + + + + +