修改报工无产品bug

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -120,7 +120,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         Plan plan = planMapper.selectById(report.getPlanId());
         if (plan.getPlanType() == 0) {
             //普通计划检查产品是否存在
-            Product product = productMapper.selectById(report.getProductId());
+            Product product = productMapper.selectById(plan.getProductId());
             if (product == null) {
                 httpRespMsg.setError("产品不存在,无法报工");
                 return httpRespMsg;

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/workView/workView.vue

@@ -14,7 +14,7 @@
             <div>
               <van-row >
                 <van-col span="20">{{ prod.plan_type == 0?item.procedure_name : prod.task_change_notice_num}}</van-col>
-                <van-col span="4"><span style="color:goldenrod;font-size:16px;">{{ item.work_time }}</span> h</van-col>
+                <van-col span="4"><span style="color:goldenrod;font-size:16px;">{{ item.work_time }}</span> <span style="font-size:12px;">分钟</span></van-col>
               </van-row>
               <div style="margin-top:10px;text-align: center;">
                 <van-row gutter="20" >

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

@@ -939,7 +939,7 @@ export default {
         }
       }
       return num
-    }selectCal
+    }
   },
   watch: {},
   created() {