车间手机端统计修改

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

@@ -4150,6 +4150,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     retMap.put("creatorName",i.get(0).get("creatorName"));
                     retMap.put("creatorId",i.get(0).get("creator_id"));
                     retMap.put("cost", cost);
+                    retMap.put("detailData", i);
                     return retMap;
                 })));
                 List<String> creatorId = list.stream().map(m -> String.valueOf(m.get("creator_id"))).distinct().collect(Collectors.toList());
@@ -4167,6 +4168,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                             nameItem.put("creatorName",u.getName());
                             nameItem.put("creatorId",u.getId());
                             nameItem.put("cost", 0);
+                            nameItem.put("detailData", new ArrayList<>());
                             theData.add(nameItem);
                         }
                     }

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

@@ -21,9 +21,19 @@
             <van-collapse  v-model="activeNames">
               <van-collapse-item v-for="(item,index) in groupList" :key="index" :title="item.createDate+' 工时:'+item.working_time+'分钟 工价:'+item.cost+'元'" :name="index">
                  <van-cell v-for="(item2,index2) in item.subDataList" :key="index2" @click="goDetail(item2)">
-                  <span>{{item2.creatorName}}:</span>
-                  工时:<span :style="{color:item2.working_time==0?'red':''}">{{item2.working_time}}</span>分钟
-                  工价:<span :style="{color:item2.cost==0?'red':''}">{{item2.cost}}</span>元
+                  <div v-if="checkStatus==1">
+                    <span >{{item2.creatorName}}:</span>
+                    工时:<span :style="{color:item2.working_time==0?'red':''}">{{item2.working_time}}</span>分钟
+                    工价:<span :style="{color:item2.cost==0?'red':''}">{{item2.cost}}</span>元
+                  </div>
+                  <div v-for="(item3, index3) in item2.detailData" :key="index3">
+                    <span style="color:#20a0ff;">{{ item3.productName }}</span>
+                    <span style="margin-left:5px;">{{ item3.procedureName }}</span>
+                    <span style="margin-left:5px;">{{ item3.cost }}元</span>
+                    <span style="margin-left:5px;">{{ item3.working_time }}分钟</span>
+                    <span style="margin-left:5px;"><span style="color:rgb(185, 160, 16);">{{ item3.finish_num?item3.finish_num:0 }}</span> 件</span>
+                  </div>
+
                  </van-cell>
               </van-collapse-item>
             </van-collapse>

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

@@ -2336,8 +2336,9 @@
                     var that = this;
                     var param = {taskId:domainItem.taskId};
                     if (this.isSubstitude) {
-                        if (this.workForm.userId != null && this.workForm.userId.length>0)
-                        param.userId = this.workForm.userId[0];
+                        if (this.workForm.userId != null && this.workForm.userId.length>0) {
+                            param.userId = this.workForm.userId[0];
+                        }
                     }
                     this.http.post('/task/getMyTaskService',param, res => {
                             if (res.code == "ok") {