提交代码

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/echartsData.js

@@ -147,6 +147,7 @@ export const fixedGrouping = {
       { label: '研发部', filed: '研发部', title: '行政项目占比' },
       { label: '研发部工艺调试', filed: '研发部工艺调试', title: '项目设计占比' }
     ],
+    deptIds: '8754,8768',
     name: '研发工艺',
     tableKey: 1001
   },
@@ -159,6 +160,7 @@ export const fixedGrouping = {
       { label: '研发部', filed: '研发部', title: 'BIM行政工时占比' },
       { label: '研发部BIM设计', filed: '研发部BIM设计', title: 'BIM设计项目占比' }
     ],
+    deptIds: '8757',
     name: '研发BIM',
     tableKey: 1002,
   },
@@ -171,6 +173,7 @@ export const fixedGrouping = {
       { label: '研发部', filed: '研发部', title: '研发行政工时占比' },
       { label: '研发部结构设计', filed: '研发部结构设计', title: '结构设计项目占比' }
     ],
+    deptIds: '8758,8769',
     name: '研发结构',
     tableKey: 1003
   },
@@ -186,6 +189,7 @@ export const fixedGrouping = {
       { label: '研发部电气设计', filed: '研发部电气设计', title: '电气设计项目占比' },
       { label: '研发部电气调试验收', filed: '研发部电气调试验收', title: '电气调试项目占比' }
     ],
+    deptIds: '8756,8770',
     name: '研发电气',
     tableKey: 1004
   },
@@ -203,6 +207,7 @@ export const fixedGrouping = {
       { label: '研发部工艺调试验收', filed: '研发部工艺调试验收', title: '调试项目占比' },
       { label: '研发部售后', filed: '研发部售后', title: '售后项目占比' }
     ],
+    deptIds: '8755',
     name: '研发调试',
     tableKey: 1005
   },
@@ -216,6 +221,7 @@ export const fixedGrouping = {
       { label: '研发部', filed: '研发部', title: '生产部行政工时占比' },
       { label: '生产部车间,生产部电气', filed: '生产部车间,生产部电气', title: '生产项目占比' }
     ],
+    deptIds: '8762,8760,8761,8737,7903',
     name: '生产部',
     tableKey: 1006
   },
@@ -241,6 +247,7 @@ export const fixedGrouping = {
       { label: '工程部现场安装施工', filed: '工程部现场安装施工', title: '施工占比' },
       { label: '生产部,生产部车间,生产部电气', filed: '生产部,生产部车间,生产部电气', title: '配合生产占比' },
     ],
+    deptIds: '7460,8763,8764,8765,8766',
     name: '工程部',
     tableKey: 1007
   },

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/packetConsumption/tables.vue

@@ -162,19 +162,20 @@ export default {
     },
     async getEchartsData(params) {
       const { groupNames, dataTime = [], projectIds } = params
+      const type = this.types
+      const row = fixedGrouping[type]
       this.echartsLoading = true
       let res = await this.postData('/project/groupExpendProcessListForProject', {
         projectIds,
         startDate: dataTime[0] || '',
         endDate: dataTime[1] || '',
-        deptIdStr: '',
+        deptIdStr: row.deptIds,
         groupNames
       })
       this.echartsKey++
       this.echartsLoading = false
       const dataList = res.data.record
       this.echartsTableData = dataList
-      const type = this.types
       const list = fixedGrouping[type].tabPicFileds
       const item = list.find(item => item.filed == groupNames)
       const datas = dataList.map(item => {
@@ -187,13 +188,15 @@ export default {
     },
     async getTableList(params) {
       const { dataTime = [], projectIds } = params
+      const type = this.types
+      const row = fixedGrouping[type]
       this.tableLoading = true
       let groupNames = this.typesDataObj[this.types].tableFileds.map(item => item.label).join(',')
       let { data } = await this.postData('/project/groupExpendProcessListForUser', {
         projectIds,
         startDate: dataTime[0] || '',
         endDate: dataTime[1] || '',
-        deptIdStr: '',
+        deptIdStr: row.deptIds,
         groupNames
       })
       this.tableLoading = false