瀏覽代碼

调整工时成功统计部门详情部门和人员的切换显示

Lijy 10 月之前
父節點
當前提交
2c3a0f0903
共有 1 個文件被更改,包括 28 次插入9 次删除
  1. 28 9
      fhKeeper/formulahousekeeper/timesheet/src/views/project/cost.vue

+ 28 - 9
fhKeeper/formulahousekeeper/timesheet/src/views/project/cost.vue

@@ -70,6 +70,10 @@
                         <el-radio-button label="1">项目名称</el-radio-button>
                         <el-radio-button label="2">项目编号</el-radio-button>
                     </el-radio-group>
+                    <el-radio-group v-model="departmentadio" size="small" @change="departmentPersonnelSwitch" v-if="radio == '部门' && this.parentDeptId">
+                        <el-radio-button label="1">部门</el-radio-button>
+                        <el-radio-button label="2">人员</el-radio-button>
+                    </el-radio-group>
                 </div>
                 <el-pagination
                 @size-change="echartsSizeChange"
@@ -249,10 +253,21 @@
                 radioLoading: false,
                 proJuctId:'',
                 possWidth: 300,
-                possradio: '1'
+                possradio: '1',
+                departmentadio: '1'
             };
         },
         methods: {
+            // 部门详情的部门和人员切换显示
+            departmentPersonnelSwitch() {
+                const typeIndex = this.departmentadio
+                console.log('点击切换', typeIndex, this.parentDeptId)
+                if(typeIndex == '1') {
+                    this.jieliu()
+                } else {
+                    this.getUserCostList(this.parentDeptId)
+                }
+            },
             echartsCurrentChange(val){
                 this.page = val
                 if(this.radio == this.$t('ren-yuan')){
@@ -521,22 +536,22 @@
                 }
             },
             //获取人员成本统计列表
-            getUserCostList() {
-                // console.log(this.port.project.userCost, '获取人员成本统计列表')
-                // console.log(this.user.timeType.fixMonthcost)
-                // console.log(Boolean(this.dateRange))
+            getUserCostList(departmentId) {
                 let startDateNum = ''
                 let endDateNum = ''
                 if(this.dateRange) {
                     startDateNum = this.user.timeType.fixMonthcost==0?this.dateRange[0]:this.dateRange
                     endDateNum = this.user.timeType.fixMonthcost==0?this.dateRange[1]:this.dateRange
                 } 
-                // return 
-                this.http.post(this.port.project.userCost, {
-                    // startDate:this.user.timeType.fixMonthcost==0?this.dateRange[0]:this.dateRange, 
-                    // endDate: this.user.timeType.fixMonthcost==0?this.dateRange[1]:this.dateRange
+                let params = {
                     startDate: startDateNum,
                     endDate: endDateNum
+                }
+                if(departmentId) {
+                    params.departmentId = departmentId
+                }
+                this.http.post(this.port.project.userCost, {
+                    ...params
                 },
                 res => {
                     this.radioLoading = false
@@ -911,6 +926,7 @@
                 } else if (this.radio==this.$t('lable.department')) {
                     url = this.port.project.depCost;
                     param.parentDeptId = this.parentDeptId;
+                    this.departmentadio = '1'
                 } else if (this.radio==this.$t('ren-yuan')) {
                     this.getUserCostList();
                     return;
@@ -1323,6 +1339,9 @@
                                             }
                                             // _this.jieliu();
                                         } else {
+                                            if(this.departmentadio == '2') {
+                                                return
+                                            }
                                             if (_this.dateRange != null) {
                                                 _this.$router.push("/costDep/" + _this.params[0].data.id + "/" + _this.params[0].name
                                                     +"?startDate="+_this.dateRange[0]+"&endDate="+_this.dateRange[1]);