调整工时成本统计

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -4,8 +4,8 @@ var path = require('path')
 // var ip = '192.168.2.36'
 
  
-// var ip = '47.100.37.243' 
-var ip = '192.168.2.159'
+var ip = '47.100.37.243' 
+// var ip = '192.168.2.159'
 
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
 

fhKeeper/formulahousekeeper/timesheet/src/views/project/cost.vue

@@ -52,6 +52,7 @@
                         <el-option v-for="item in hasReportUserList"  :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
+
                 <el-form-item prop="projectId" :label="user.timeType.fixMonthcost==0?'日期范围':'选择月份'">
                     <el-date-picker v-show="user.timeType.fixMonthcost==0"
                         v-model="exportParam.dateRange" :editable="false" 
@@ -167,8 +168,10 @@
                 },
             
             showExportDialog() {
+                console.log(12345)
                 this.exportDialog = true;
                 this.exportParam.dateRange = this.dateRange;
+                console.log(this.hasReportUserList)
                 if (this.radio == '人员') {
                     // this.exportParam.userIds = [];
                 }
@@ -254,6 +257,7 @@
             //获取人员成本统计列表
             getUserCostList() {
                 this.listLoading = true;
+                console.log(this.port.project.userCost, '获取人员成本统计列表')
                 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
@@ -722,7 +726,7 @@
             window.addEventListener("resize", function() {
                 _this.myChart.resize();
             });
-            this.getDepartment();
+            // this.getDepartment();
             this.getMyProjectList();
             this.getUsers()
             this.jutishez()