diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js index d4fb8064..6b774a62 100644 --- a/src/api/sunVillage_info/fixedAssets.js +++ b/src/api/sunVillage_info/fixedAssets.js @@ -104,13 +104,44 @@ export function updateInfo(data) { } // 财务公开列表 export function financePublicList(query) { - console.log(query) return request({ url: '/villageAffairs/public/financePublicList', method: 'get', params: query }) } +// 零工公开列表 +export function tempWorkerPublicList(query) { + return request({ + url: '/villageAffairs/public/tempWorkerPublicList', + method: 'get', + params: query + }) +} +// 重大事项公开列表 +export function majorEventPublicList(query) { + return request({ + url: '/villageAffairs/public/majorEventPublicList', + method: 'get', + params: query + }) +} +// 财务公开详情 +export function financePublicDetail(query) { + return request({ + url: '/villageAffairs/public/financePublicDetail', + method: 'get', + params: query + }) +} +// 零工公开详情 +export function tempWorkerPublicDetail(query) { + return request({ + url: '/villageAffairs/public/tempWorkerPublicDetail', + method: 'get', + params: query + }) +} //获取区、镇、村地区 export function treeselectByUser(query) { diff --git a/src/router/index.js b/src/router/index.js index f3c9568e..546412e7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2952,6 +2952,24 @@ export const constantRoutes = [ hidden: true, }, component: (resolve) => require(['@/views/sunVillage_info/list_finance'], resolve) + }, + { ////阳光村务(新)-- 合同信息 + path: '/sunVillage_info/list_issues', + name: 'sunVillageInfoListIssues', + meta: { + title: '重大事项', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_issues'], resolve) + }, + { ////阳光村务(新)-- 合同信息 + path: '/sunVillage_info/list_finance_add', + name: 'sunVillageInfoListFinanceAdd', + meta: { + title: '新增重大事项', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_finance_add'], resolve) } ]; diff --git a/src/views/sunVillage_info/details.vue b/src/views/sunVillage_info/details.vue index 2c459e15..da0cce0d 100644 --- a/src/views/sunVillage_info/details.vue +++ b/src/views/sunVillage_info/details.vue @@ -1,97 +1,163 @@ - \ No newline at end of file + diff --git a/src/views/sunVillage_info/index.vue b/src/views/sunVillage_info/index.vue index b20b9407..a2b8a225 100644 --- a/src/views/sunVillage_info/index.vue +++ b/src/views/sunVillage_info/index.vue @@ -36,8 +36,8 @@
diff --git a/src/views/sunVillage_info/list_finance.vue b/src/views/sunVillage_info/list_finance.vue index 0e103ce1..59833ad4 100644 --- a/src/views/sunVillage_info/list_finance.vue +++ b/src/views/sunVillage_info/list_finance.vue @@ -7,10 +7,10 @@
-
{{queryParams.year == '' ? '全部': queryParams.year}}{{queryParams.year == '' ? '': '年'}}
+
{{queryParams.year == '' ? '全部': queryParams.year}}{{queryParams.year == '' ? '': '年'}}
共{{listLength}}条公告
-
+
全部
2022
2021
@@ -25,7 +25,7 @@ @load="getList" > -
+
@@ -74,6 +74,7 @@ loading: false, finished: false, show: false, + showTab: false, fileList:[], listLength:'0', searchInput:'', @@ -127,6 +128,9 @@ this.applicationList = []; this.getList(); }, + tabShow(){ + this.showTab = !this.showTab; + }, /** 删除按钮操作 */ handleDelete(row,index) { let assetStatus = row.assetStatus ? row.assetStatus : data[0].assetStatus; @@ -164,7 +168,10 @@ }); }, goAdd(){ - this.$router.push('/sunVillage_info/fixedAssetsAdd') + this.$router.push('/sunVillage_info/list_finance_add') + }, + goDetail(id){ + this.$router.push({path:'/sunVillage_info/details',query: {id:id,type:'finance'}}) }, }, } @@ -248,7 +255,7 @@ .record_list{ display: flex; flex-flow: wrap; - margin-top: 12px; + margin-top: 12PX; .flex_block{ font-size: 30px; color: #878787; diff --git a/src/views/sunVillage_info/list_finance_add.vue b/src/views/sunVillage_info/list_finance_add.vue new file mode 100644 index 00000000..2c459e15 --- /dev/null +++ b/src/views/sunVillage_info/list_finance_add.vue @@ -0,0 +1,97 @@ + + \ No newline at end of file diff --git a/src/views/sunVillage_info/list_issues.vue b/src/views/sunVillage_info/list_issues.vue new file mode 100644 index 00000000..38f64b76 --- /dev/null +++ b/src/views/sunVillage_info/list_issues.vue @@ -0,0 +1,392 @@ + + + + + diff --git a/src/views/sunVillage_info/list_tourists.vue b/src/views/sunVillage_info/list_tourists.vue index 7874b3cd..8a7704b1 100644 --- a/src/views/sunVillage_info/list_tourists.vue +++ b/src/views/sunVillage_info/list_tourists.vue @@ -1,290 +1,392 @@ + \ No newline at end of file + } +