diff --git a/src/assets/images/sunVillage_info/list_icon_10.png b/src/assets/images/sunVillage_info/list_icon_10.png
new file mode 100644
index 00000000..bd40554f
Binary files /dev/null and b/src/assets/images/sunVillage_info/list_icon_10.png differ
diff --git a/src/permission.js b/src/permission.js
index c6d96f2b..52a1618c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -120,6 +120,7 @@ const whiteList = [
'/sunVillage_info/list_tourists_detail', //详情页
'/sunVillage_info/list_issues_detail', //详情页
'/sunVillage_info/list_finance_detail', //详情页
+ '/sunVillage_info/list_finance_ranking', //详情页
]
router.beforeEach((to, from, next) => {
diff --git a/src/router/index.js b/src/router/index.js
index 428a3c40..23305844 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3008,6 +3008,15 @@ export const constantRoutes = [
},
component: (resolve) => require(['@/views/sunVillage_info/list_finance_detail'], resolve)
},
+ { ////阳光村务(新)-- 合同信息
+ path: '/sunVillage_info/list_finance_ranking',
+ name: 'sunVillageInfoListFinanceRanking',
+ meta: {
+ title: '收支情况公布榜',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/sunVillage_info/list_finance_ranking'], resolve)
+ },
{ ////阳光村务(新)-- 合同信息
path: '/sunVillage_info/list_tourists_add',
name: 'sunVillageInfoListTouristsAdd',
diff --git a/src/views/sunVillage_info/list_finance.vue b/src/views/sunVillage_info/list_finance.vue
index 52bfd5fd..a01fa3e7 100644
--- a/src/views/sunVillage_info/list_finance.vue
+++ b/src/views/sunVillage_info/list_finance.vue
@@ -45,6 +45,9 @@
+
+
+
@@ -177,6 +180,9 @@
goDetail(id){
this.$router.push({path:'/sunVillage_info/list_finance_detail',query: {id:id,type:'finance'}})
},
+ goRanking(id,time){
+ this.$router.push({path:'/sunVillage_info/list_finance_ranking',query: {id:id,time:time}})
+ },
goEdit(id){
this.$router.push({path:'/sunVillage_info/list_finance_edit',query: {id:id,type:'finance'}})
},
@@ -387,6 +393,7 @@
}
&.view{
background: #3494ff;
+ margin-left: 28px;
.icon {
width: 29px;
height: 21px;
@@ -395,6 +402,16 @@
display: block;
}
}
+ &.list{
+ background: #79cf13;
+ .icon {
+ width: 29px;
+ height: 21px;
+ background: url('../../assets/images/sunVillage_info/list_icon_10.png') no-repeat;
+ background-size: 100% 100%;
+ display: block;
+ }
+ }
}
}
}
diff --git a/src/views/sunVillage_info/list_finance_detail.vue b/src/views/sunVillage_info/list_finance_detail.vue
index bf2abe2a..f590be7a 100644
--- a/src/views/sunVillage_info/list_finance_detail.vue
+++ b/src/views/sunVillage_info/list_finance_detail.vue
@@ -116,7 +116,6 @@
getDetail(id){
financePublicDetail(this.queryParams).then((res) => {
res.data.openFile = res.data.openFile.split(',')
- res.data.openPic = res.data.openPic.split(',')
res.data.openFile.map(rr=>{
let name = rr.substr(27,rr.length);
let type = '';
@@ -127,10 +126,16 @@
}
this.openFileList.push({name:name,type:type})
})
-
- res.data.openPic.map((rrr,i)=>{
- this.openPic.push({url:this.$store.getters.baseRoutingUrl+rrr})
- })
+ if (res.data.openPic!=''){
+ this.openPic = res.data.openPic.split(',')
+ this.openPic2 = res.data.openPic.split(',')
+ this.openPic.map((rrr,i)=>{
+ this.openPic[i] = {url:'/api'+rrr}
+ })
+ }
+ // res.data.openPic.map((rrr,i)=>{
+ // this.openPic.push({url:this.$store.getters.baseRoutingUrl+rrr})
+ // })
this.form = res.data;
})
diff --git a/src/views/sunVillage_info/list_finance_edit.vue b/src/views/sunVillage_info/list_finance_edit.vue
index 2837b4f1..5ad36c55 100644
--- a/src/views/sunVillage_info/list_finance_edit.vue
+++ b/src/views/sunVillage_info/list_finance_edit.vue
@@ -157,7 +157,7 @@
this.openPic = res.data.openPic.split(',')
this.openPic2 = res.data.openPic.split(',')
this.openPic.map((rrr,i)=>{
- this.openPic[i] = {url:this.$store.getters.baseRoutingUrl+rrr}
+ this.openPic[i] = {url:'/api'+rrr}
})
}
that.form = res.data;
diff --git a/src/views/sunVillage_info/list_finance_ranking.vue b/src/views/sunVillage_info/list_finance_ranking.vue
new file mode 100644
index 00000000..d04f969d
--- /dev/null
+++ b/src/views/sunVillage_info/list_finance_ranking.vue
@@ -0,0 +1,441 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/sunVillage_info/list_issues_detail.vue b/src/views/sunVillage_info/list_issues_detail.vue
index 3d3a3d9a..bf6c73fd 100644
--- a/src/views/sunVillage_info/list_issues_detail.vue
+++ b/src/views/sunVillage_info/list_issues_detail.vue
@@ -135,7 +135,7 @@
})
res.data.openPic.map((rrr,i)=>{
- this.openPic.push({url:this.$store.getters.baseRoutingUrl+rrr})
+ this.openPic.push({url:'/api'+rrr})
})
this.form = res.data;
diff --git a/src/views/sunVillage_info/list_issues_edit.vue b/src/views/sunVillage_info/list_issues_edit.vue
index 963ff058..3274dacc 100644
--- a/src/views/sunVillage_info/list_issues_edit.vue
+++ b/src/views/sunVillage_info/list_issues_edit.vue
@@ -163,7 +163,7 @@
this.openPic = res.data.openPic.split(',')
this.openPic2 = res.data.openPic.split(',')
this.openPic.map((rrr,i)=>{
- this.openPic[i] = {url:this.$store.getters.baseRoutingUrl+rrr}
+ this.openPic[i] = {url:'/api'+rrr}
})
}
that.form = res.data;
diff --git a/src/views/sunVillage_info/list_tourists_detail.vue b/src/views/sunVillage_info/list_tourists_detail.vue
index 03e9fe39..0177edb9 100644
--- a/src/views/sunVillage_info/list_tourists_detail.vue
+++ b/src/views/sunVillage_info/list_tourists_detail.vue
@@ -129,7 +129,7 @@
})
res.data.openPic.map((rrr,i)=>{
- this.openPic.push({url:this.$store.getters.baseRoutingUrl+rrr})
+ this.openPic.push({url:'/api'+rrr})
})
this.form = res.data;
diff --git a/src/views/sunVillage_info/list_tourists_edit.vue b/src/views/sunVillage_info/list_tourists_edit.vue
index 7facdb76..66b66457 100644
--- a/src/views/sunVillage_info/list_tourists_edit.vue
+++ b/src/views/sunVillage_info/list_tourists_edit.vue
@@ -157,7 +157,7 @@
this.openPic = res.data.openPic.split(',')
this.openPic2 = res.data.openPic.split(',')
this.openPic.map((rrr,i)=>{
- this.openPic[i] = {url:this.$store.getters.baseRoutingUrl+rrr}
+ this.openPic[i] = {url:'/api'+rrr}
})
}
that.form = res.data;
diff --git a/src/views/yinnong/bankAgriculture/bankOfDeposit/bankOfDepositAdd.vue b/src/views/yinnong/bankAgriculture/bankOfDeposit/bankOfDepositAdd.vue
index 4597e88d..4487b13c 100644
--- a/src/views/yinnong/bankAgriculture/bankOfDeposit/bankOfDepositAdd.vue
+++ b/src/views/yinnong/bankAgriculture/bankOfDeposit/bankOfDepositAdd.vue
@@ -39,6 +39,7 @@
+