|
@@ -54,6 +54,8 @@ year.value = checkyear
|
|
})
|
|
})
|
|
|
|
|
|
const tableData = ref([])
|
|
const tableData = ref([])
|
|
|
|
+const budgetList = ref(['0', '0', '0', '0', '0', '0', '0', '0', '0'])
|
|
|
|
+const costList = ref([])
|
|
//获取部门统计
|
|
//获取部门统计
|
|
const budgetAndPracticalByDept = async () => {
|
|
const budgetAndPracticalByDept = async () => {
|
|
const { error, code, data } = await mainApi.budgetAndPracticalByDept(
|
|
const { error, code, data } = await mainApi.budgetAndPracticalByDept(
|
|
@@ -61,15 +63,71 @@ const budgetAndPracticalByDept = async () => {
|
|
)
|
|
)
|
|
//判断状态
|
|
//判断状态
|
|
if (!error && code === 200) {
|
|
if (!error && code === 200) {
|
|
- tableData.value = getArrValue(data)
|
|
|
|
|
|
+ let res = getArrValue(data)
|
|
|
|
+ tableData.value = getTableData(res)
|
|
|
|
+ // tableData.value = getArrValue(data)
|
|
|
|
+
|
|
|
|
|
|
} else {
|
|
} else {
|
|
tableData.value = []
|
|
tableData.value = []
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+const getTableData = (res)=>{
|
|
|
|
+ let tablearr = []
|
|
|
|
+ res.forEach((ele)=>{
|
|
|
|
+ // tablearr.push(getBlist(ele.budgetList))
|
|
|
|
+ let Blist = getBlist(ele.budgetList)
|
|
|
|
+ let Plist = getPlist(ele.costList)
|
|
|
|
+ let allList = Object.assign(Blist, Plist)
|
|
|
|
+ tablearr.push(allList)
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ })
|
|
|
|
+ // return tablearr
|
|
|
|
+ res.forEach((item, index)=>{
|
|
|
|
+ tablearr.forEach((ele1, index1)=>{
|
|
|
|
+ if (index1 === index) {
|
|
|
|
+ ele1.time = item.time
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ })
|
|
|
|
+ })
|
|
|
|
+ return tablearr
|
|
|
|
+
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+ const getBlist = (arr)=>{
|
|
|
|
+ let a = {}
|
|
|
|
+ arr.forEach((ele)=>{
|
|
|
|
+ for (let i = 0;i < arr.length;i++) {
|
|
|
|
+ let b = 'budget' + i//每个属性的属性名,不一样
|
|
|
|
+ a[b] = ele
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ return a
|
|
|
|
+ }
|
|
|
|
+ const getPlist = (arr)=>{
|
|
|
|
+ let a = {}
|
|
|
|
+ arr.forEach((ele)=>{
|
|
|
|
+ for (let i = 0;i < arr.length;i++) {
|
|
|
|
+ let b = 'practical' + i//每个属性的属性名,不一样
|
|
|
|
+ a[b] = ele
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ return a
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
const department = ref([])
|
|
const department = ref([])
|
|
//获取所属部门列表
|
|
//获取所属部门列表
|
|
const getDepartmentDict = async ()=>{
|
|
const getDepartmentDict = async ()=>{
|
|
|
|
+ department.value = []
|
|
const { error, code, data } = await getdepartmentList({ deptType:2 })
|
|
const { error, code, data } = await getdepartmentList({ deptType:2 })
|
|
if (!error && code === 200) {
|
|
if (!error && code === 200) {
|
|
department.value = getArrValue(data)
|
|
department.value = getArrValue(data)
|