diff --git a/src/views/sunVillage_info/list_finance.vue b/src/views/sunVillage_info/list_finance.vue index 5a38c3e7..14355d1f 100644 --- a/src/views/sunVillage_info/list_finance.vue +++ b/src/views/sunVillage_info/list_finance.vue @@ -40,7 +40,7 @@
-
+
@@ -174,8 +174,8 @@ goDetail(id){ this.$router.push({path:'/sunVillage_info/list_finance_detail',query: {id:id,type:'finance',showBtn:this.showBtn}}) }, - goRanking(id,time){ - this.$router.push({path:'/sunVillage_info/list_finance_ranking',query: {id:id,time:time}}) + goRanking(id,time,openName){ + this.$router.push({path:'/sunVillage_info/list_finance_ranking',query: {id:id,time:time,openName:openName}}) }, goEdit(id){ this.$router.push({path:'/sunVillage_info/list_finance_edit',query: {id:id,type:'finance'}}) diff --git a/src/views/sunVillage_info/list_finance_add.vue b/src/views/sunVillage_info/list_finance_add.vue index a90504f1..7bd6edfb 100644 --- a/src/views/sunVillage_info/list_finance_add.vue +++ b/src/views/sunVillage_info/list_finance_add.vue @@ -132,7 +132,7 @@ this.type = this.$route.query.type; this.queryParams.bookId = Cookies.get('bookId'); this.queryParams.deptId = Cookies.get('deptId'); - this.form.openName = this.format(new Date(),'yyyy')+ '年' + (this.format(new Date(),'MM')) + '月财务公开'; + this.form.openName = this.format(new Date(),'yyyy')+ '年' + (this.format(new Date(),'MM')-1) + '月财务公开'; }, methods: { onSubmit(){ diff --git a/src/views/sunVillage_info/list_finance_ranking.vue b/src/views/sunVillage_info/list_finance_ranking.vue index 5b3f30aa..5bdf0f78 100644 --- a/src/views/sunVillage_info/list_finance_ranking.vue +++ b/src/views/sunVillage_info/list_finance_ranking.vue @@ -18,7 +18,8 @@ -

{{deptName}}{{yearMonth[0]}}年{{yearMonth[1]}}月份

+ +

{{openName}}

@@ -95,7 +96,8 @@ projectIndex:'', showBtn:true, yearMonth:[], - deptName:'' + deptName:'', + openName:'', }; }, created() { @@ -103,6 +105,7 @@ this.queryParams.deptId = Cookies.get('deptId'); this.deptName = Cookies.get('deptName'); this.queryParams.yearMonth = this.$route.query.time; + this.openName = this.$route.query.openName; this.yearMonth = this.$route.query.time.split('-') this.getList() }, diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue index d1ea5e8a..e90fa9a3 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue @@ -64,14 +64,16 @@
-
-
+
+
+

查看更多

+

收起列表

上传附件(收据)

@@ -198,6 +200,10 @@ pass: "true", comment: "同意", templateList:[], + + listLength:1, + showbtn:true, + }; }, created() { @@ -212,6 +218,19 @@ this.getTemplateList(); }, methods: { + openItem(){ + + this.listLength = this.listLength+5; + + if (this.listLength > this.chargeItme.length){ + + this.listLength = this.chargeItme.length; + + this.showbtn = false; + + } + + }, getTemplateList(){ let templateQueryParams = { // 分页 @@ -366,6 +385,17 @@ .app-container { padding: 2% 0; } + .main_more{ + width: 96%; + margin: 0 auto; + margin-top: 10px; + border-radius: 6px; + box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16); + overflow: hidden; + background-color: #FFF; + text-align: center; + padding: 10PX 0; + } .main_title{ font-size: 0.4rem; color: #1D6FE9;