diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue index cffebf5e..04a4e9b6 100644 --- a/back/src/views/modules/abilityStatistics/index.vue +++ b/back/src/views/modules/abilityStatistics/index.vue @@ -27,7 +27,7 @@ 日期: + end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"> @@ -43,7 +43,8 @@ - 部门名称: + 上架部门: + 申请部门: - + @@ -155,7 +156,7 @@ - + @@ -357,7 +358,7 @@ export default { console.log('获取部门=========>', res) this.departmentSelects = [] res.data.data.map(val => { - this.departmentSelects.push({ label: val.name, value: val.name }) + this.departmentSelects.push({ label: val.name, value: val.id }) }) }) // 当前设定的日期时间 @@ -462,6 +463,7 @@ export default { this.$http .get('/census/center/selectDeptDetailTypeCountList/', { params: { + type: this.abilityType, page: page || 1, limit: 5, approveStatus: this.status, @@ -527,6 +529,7 @@ export default { this.$http .get('/census/center/selectApplyDeptDetailTypeCountList', { params: { + type: this.abilityType, page: page || 1, limit: this.pageSize, approveStatus: this.status, @@ -702,6 +705,7 @@ export default { limit: 5, // page: page || 1, approveStatus: '', + type: '', deptId: '', params: '', startDate: '' @@ -881,8 +885,8 @@ export default { // 点击查询按钮查询数据 getDataList () { if (this.value1 && this.value1.length > 0) { - this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd HH:mm:ss') - this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd HH:mm:ss') + this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd') + this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd') } else { this.startDate = '' this.endDate = ''