diff --git a/src/utils/request.js b/src/utils/request.js index 8b32bdf..d55d71b 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -29,7 +29,7 @@ service.interceptors.request.use( text: "正在加载中..." }) } - if (store.getters.token) { + if (getToken()) { // let each request carry token // ['X-Token'] is a custom headers key // please modify it according to the actual situation diff --git a/src/views/budget/budgetList.vue b/src/views/budget/budgetList.vue index 3e2397b..74010e0 100644 --- a/src/views/budget/budgetList.vue +++ b/src/views/budget/budgetList.vue @@ -27,6 +27,28 @@ > + 资金隶属情况 + + + + + + + + 预算类型 { if (this.isTree) this.treeData = res.list; else { diff --git a/src/views/statisticalReport/budgetProgress.vue b/src/views/statisticalReport/budgetProgress.vue index 61f8b0b..09d5e4d 100644 --- a/src/views/statisticalReport/budgetProgress.vue +++ b/src/views/statisticalReport/budgetProgress.vue @@ -26,6 +26,27 @@ /> + 资金隶属情况 + + + + + + + 科室 @@ -75,13 +96,36 @@ export default { data() { return { + dimensions: [ + { + value: "年初部门预算", + id: "1" + }, + { + value: "年中追加部门预算", + id: "2" + }, + { + value: "上年结转资金", + id: "3" + }, + { + value: "基本户资金", + id: "4" + }, + { + value: "其他", + id: "5" + } + ], types: [], //预算类型 departments: [], select: { pageIndex: 1, year: '', type: '', - department: '' + department: '', + dimension: [] }, rateTotal: '0%', moneyTotal: 0, @@ -407,7 +451,8 @@ year: this.select.year, type: this.select.type, plan_department_id: this.select.department, - top_pid: 1 + top_pid: 1, + dimension: this.select.dimension.toString() }) for (var m of res.list.data) { m.pid_info_name = m.pid_info?.name diff --git a/src/views/system/department.vue b/src/views/system/department.vue index b33d4cf..75b1a44 100644 --- a/src/views/system/department.vue +++ b/src/views/system/department.vue @@ -127,7 +127,10 @@ }, methods: { querySearch(queryString, cb) { - listuser().then(response => { + listuser({ + page: 1, + page_size: 999 + }).then(response => { var data = response.data; for (var m of data) { m.value = m.name;