Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

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

@@ -4306,11 +4306,15 @@ export default {
         })
         this.groupConsumptionLoading = false
         let nameList = data.map(item => (item.groupName || ''))
-        let realHourList = data.map(item => (item.realHour || 0))
-        let actualPlan = data.map(item => (item.planHour || 0))
-        let actualSupplement = data.map(item => (item.afterSetPlanHour || 0))
-        let summary = data.map(item => (item.planHour || 0) + (item.afterSetPlanHour || 0))
+        let realHourList = data.map(item => returnNum((item.realHour || 0)))
+        let actualPlan = data.map(item => returnNum((item.planHour || 0)))
+        let actualSupplement = data.map(item => returnNum((item.afterSetPlanHour || 0)))
+        let summary = data.map(item => returnNum((item.planHour || 0)) + returnNum((item.realHour || 0)))
         this.groupConsumptionOption = getGroupConsumption(nameList, actualPlan, actualSupplement, summary, realHourList)
+
+        function returnNum(num) {
+          return num > 0 ? num : 0
+        }
       }, 500)
     }
   },

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/transferWorkingHours.vue

@@ -115,7 +115,7 @@
                         <el-form-item>
                             <el-button type="primary" :size="'small'" :loading="confirmTransformLoading"
                                 @click="confirmTransform()"
-                                :disabled="!(transform.projectId && transform.taskGroupingId && transform.stageId)">{{
+                                :disabled="!(transform.projectId && transform.taskGroupingId)">{{
                                     $t('queRenZhuanYi') }}</el-button>
                         </el-form-item>
                     </el-form>