diff --git a/src/api/count.js b/src/api/count.js
index 669d725b..13e925a3 100644
--- a/src/api/count.js
+++ b/src/api/count.js
@@ -5,6 +5,9 @@ export function collectAndPay(query) {
if (query.type !== '' && query.type !== null && query.type !== undefined) {
params.append('type', query.type) // 你要传给后台的参数值 key/value
}
+ if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) {
+ params.append('repositoryId ', query.repositoryId) // 你要传给后台的参数值 key/value
+ }
if (query.beginTime !== '' && query.beginTime !== null && query.beginTime !== undefined) {
params.append('beginTime', query.beginTime) // 你要传给后台的参数值 key/value
}
diff --git a/src/views/Financecount/collectAndPay.vue b/src/views/Financecount/collectAndPay.vue
index 09f650f8..cb592a96 100644
--- a/src/views/Financecount/collectAndPay.vue
+++ b/src/views/Financecount/collectAndPay.vue
@@ -2,11 +2,9 @@
@@ -248,7 +246,7 @@ export default {
getemplist: {
pageNum: 1,
pageSize: 10,
- type: '1'
+ repositoryId: this.$store.getters.repositoryId
},
// 传给组件的数据
personalForm: {},
@@ -260,7 +258,7 @@ export default {
},
mounted() {
- this.getlist()
+ // this.getlist()
this.changeName()
},
beforeCreate() {
@@ -306,7 +304,7 @@ export default {
this.first = '日期分组'
this.second = true
}
- this.getlist()
+ // this.getlist()
},
checkPermission,
// 不让勾选
@@ -385,13 +383,13 @@ export default {
this.getemplist.beginTime = ''
this.getemplist.endTime = ''
} else {
- this.getemplist.beginTime = this.date[0]
- this.getemplist.endTime = this.date[1]
+ this.getemplist.beginTime = this.date[0] + ' 00:00:00'
+ this.getemplist.endTime = this.date[1] + ' 23:59:59'
}
collectAndPay(this.getemplist).then(res => {
if (res.data.ret === 200) {
- this.list = res.data.data.content.list
- this.total = res.data.data.content.totalCount
+ this.list = res.data.data.content
+ // this.total = res.data.data.content.totalCount
// this.restFilter()
} else {
// this.restFilter()