调整项目阶段的判断

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

@@ -18,7 +18,7 @@
         <el-col :span="24"  style="margin-top:10px;padding-bottom: 0px;text-align:center;">
             <el-radio-group v-model="radio" @change="getList">
                 <el-radio-button label="人员"></el-radio-button>
-                <el-radio-button label="子项目"></el-radio-button>
+                <el-radio-button label="子项目" v-if="user.timeType.mainProjectState != '1'"></el-radio-button>
                 <el-radio-button label="阶段" v-if="user.company.packageProject != 0"></el-radio-button>
             </el-radio-group>
         </el-col>

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

@@ -41,7 +41,10 @@
                         <el-table-column label="基线成本" align="center">
                             <el-table-column v-for="item in costFields" :prop="contractAmount" :label="item.baseName" :key="item.id" align="right">
                                 <template slot-scope="scope">
-                                ￥{{scope.row.costList.filter(c=>c.baseId == item.baseId)[0].baseAmount | numberToCurrency}}
+                                    <span v-if="scope.row.costList.filter(c=>c.baseId == item.baseId)[0]">
+                                        ￥{{scope.row.costList.filter(c=>c.baseId == item.baseId)[0].baseAmount | numberToCurrency}}
+                                    </span>
+                                <!-- ￥{{scope.row.costList.filter(c=>c.baseId == item.baseId)[0].baseAmount | numberToCurrency}} -->
                                 </template>
                             </el-table-column>
 <!-- 

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

@@ -3171,6 +3171,8 @@ a {
             if(this.user.company.packageProvider == 1){
                 this.getSupplierList()
                 // this.getPhase()
+            }
+            if(this.user.company.packageProject == 1) {
                 this.obtainPhase()
             }
             // this.getSupplierList()