调整

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -2,17 +2,17 @@ var path = require('path')
 
 //  var ip = '127.0.0.1'
 // var ip = '47.100.37.243'
-// var ip = '192.168.2.7'
+var ip = '192.168.2.7'
 
-var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
-for (var i in ifaces) {
-    for (var j in ifaces[i]) {
-        var val = ifaces[i][j]
-        if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
-            ip = val.address
-        }
-    }
-}
+// var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
+// for (var i in ifaces) {
+//     for (var j in ifaces[i]) {
+//         var val = ifaces[i][j]
+//         if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
+//             ip = val.address
+//         }
+//     }
+// }
 
 module.exports = {
   build: {

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -402,6 +402,8 @@
                     <span>￥{{scope.row.baseCurcost | numberToCurrency}}</span>
                   </template>
                 </el-table-column>
+                <el-table-column  prop="projectName" label="当前剩余预算" min-width="200"></el-table-column>
+                <el-table-column  prop="projectName" label="总剩余预算" min-width="200"></el-table-column>
                 <el-table-column prop="feeMan" label="已发生工时成本" min-width="160" align="right">
                   <template slot-scope="scope">
                     <span :class="scope.row.baseCurcost * 0.9 < scope.row.feeMan ? 'warntext' : ''">￥{{scope.row.feeMan | numberToCurrency}}</span>

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

@@ -339,9 +339,20 @@
             getUserCostList() {
                 this.listLoading = true;
                 console.log(this.port.project.userCost, '获取人员成本统计列表')
+                console.log(this.user.timeType.fixMonthcost)
+                console.log(Boolean(this.dateRange))
+                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
+                    // startDate:this.user.timeType.fixMonthcost==0?this.dateRange[0]:this.dateRange, 
+                    // endDate: this.user.timeType.fixMonthcost==0?this.dateRange[1]:this.dateRange
+                    startDate: startDateNum,
+                    endDate: endDateNum
                 },
                 res => {
                     this.listLoading = false;

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

@@ -28,6 +28,13 @@
                         <el-option label="已撤销" value=3 ></el-option>
                     </el-select>
                 </el-form-item>
+                <!-- 主项目筛选 -->
+                <el-form-item v-if="user.timeType.mainProjectState == '1'">
+                    <span style="margin-left:5px;margin-right:5px;color:#606266;">主项目</span>
+                    <el-select v-model="projectMainId" style="width:110px;"  placeholder="请选择" clearable @change="searchClfList" size="small">
+                        <el-option v-for="item in mainProjectList" :key="item.id" :label="item.name" :value="item.id" ></el-option>
+                    </el-select>
+                </el-form-item>
                 <!-- 分类筛选 -->
                 <el-form-item >
                     <span style="margin-left:5px;margin-right:5px;color:#606266;">分类</span>
@@ -35,6 +42,7 @@
                         <el-option v-for="item in baseClfList" :key="item.id" :label="item.name" :value="item.id" ></el-option>
                     </el-select>
                 </el-form-item>
+                
                 <!-- 分类条目 -->
                 <!-- <el-form-item style="float:right;"  v-if="permissions.projectClassification">
                     <el-link type="primary" :underline="false" @click="showClfDialog = true">分类管理</el-link>
@@ -874,7 +882,8 @@ a {
                 addGroupPersonPdialog: false,
                 showColumnWidth: '300',
                 deleteVif: null,
-                isAddGroupPerson: true
+                isAddGroupPerson: true,
+                projectMainId: ''
                 
             };
         },
@@ -2206,7 +2215,8 @@ a {
                     keyword:this.keyword,
                     searchField: this.searchField,
                     status: this.status,
-                    category: this.statusClf
+                    category: this.statusClf,
+                    projectMainId: this.projectMainId
                     // 
                 },
                 res => {

fhKeeper/formulahousekeeper/timesheet/src/views/quanx/quanx.vue

@@ -2,7 +2,7 @@
   <div>
       <!-- 表头 -->
       <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
-          <el-form :inline="true" style="width: 81%">
+          <el-form :inline="true" style="width: 87%">
               <el-form-item label="角色权限">
               </el-form-item>
               <el-form-item >

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -308,11 +308,11 @@
         </div>
 
         <!-- 是否开启主项目管理 -->
-        <div class="yanjiu">
+        <!-- <div class="yanjiu">
             <p style="margin-left:10px;color:#666;">是否开启主项目管理</p>
             <el-switch style="margin-left: 41px" v-model="timeType.mainProjectState" active-color="#13ce66" inactive-color="#ff4949"> </el-switch>
             <span v-if="timeType.mainProjectState == 1" style="margin-left:10px;color:#999;">待定</span>
-        </div>
+        </div> -->
 
         <div style="width:80px;margin:0 auto;padding:20px;">
             <el-button  type="primary" @click="submitInsert" :loading="addLoading">保存</el-button>