diff --git a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java
index 05fa10d..b316cf4 100644
--- a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java
+++ b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java
@@ -109,7 +109,7 @@ public interface ErrorCodeConstants {
     ErrorCode TASK_DISPATCH_TASK_NO_PERMISSION_FOR_OPERATE = new ErrorCode(1_009_005, "任务不满足操作条件");
     ErrorCode TASK_DISPATCH_TASK_IS_OVER = new ErrorCode(1_009_007, "报工数量已完成");
     ErrorCode TASK_DISPATCH_TASK_REPORT_AMOUNT_EXCESS = new ErrorCode(1_009_006, "无法超额报工");
-    ErrorCode TASK_REPORT_OTHER_PERSON_NO_SUBMIT = new ErrorCode(1_009_008, "其他人员尚未报工，无法结束生产");
+    ErrorCode TASK_REPORT_OTHER_PERSON_NO_SUBMIT = new ErrorCode(1_009_020, "其他人员尚未报工，无法结束生产");
     /*************质量管理***********/
     ErrorCode UNQUALIFIED_NOTIFICATION_NOT_EXISTS = new ErrorCode(1_010_001, "品质异常通知单审核不存在");
     ErrorCode QUALITY_FEEDBACK_NOT_EXISTS = new ErrorCode(1_010_002, "客户反馈质量不存在");
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesign/ProcessDesignProgressDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesignprogress/ProcessDesignProgressDO.java
similarity index 93%
rename from mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesign/ProcessDesignProgressDO.java
rename to mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesignprogress/ProcessDesignProgressDO.java
index 95f0ef8..8fc5938 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesign/ProcessDesignProgressDO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesignprogress/ProcessDesignProgressDO.java
@@ -1,10 +1,9 @@
 package com.chanko.yunxi.mes.module.heli.dal.dataobject.processdesignprogress;
 
 import lombok.*;
-import java.util.*;
+
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
+
 import com.baomidou.mybatisplus.annotation.*;
 import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO;
 
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDetailDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDetailDO.java
index cdda922..f18339a 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDetailDO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDetailDO.java
@@ -138,6 +138,8 @@ public class TaskDispatchDetailDO extends BaseDO {
     private String procdureName;
     @TableField(exist = false)
     private String type;
+    @TableField(exist = false)
+    private String ownerName;
     /**
      * 预计工时
      */
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java
index 46f9e18..6e6baaa 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java
@@ -18,6 +18,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatch
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatchdetailowner.TaskDispatchDetailOwnerDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskreport.TaskReportDO;
+import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -58,6 +59,12 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
         }
         return dateRange;
     }
+    default List<TaskDispatchDetailDO> selectListByDeitalOwnerId(Long detailOwnerId){
+        MPJLambdaWrapper<TaskDispatchDetailDO> query = new MPJLambdaWrapper<>();
+        query.selectAll(TaskDispatchDetailDO.class)
+                .select("a.nickname as ownerName").leftJoin(AdminUserDO.class,"a",AdminUserDO::getId,TaskDispatchDetailDO::getOwner).eq(TaskDispatchDetailDO::getDetailOwnerId,detailOwnerId);
+        return selectList(query);
+    }
     /*public static void main(String[] args) {
         // 示例：假设传入的时间戳代表 2024 年 2 月 11 日
         LocalDate exampleDate = LocalDate.of(2025, 2, 13);
@@ -133,7 +140,10 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
     }
     default int updateByOwner(TaskDispatchDetailOwnerDO taskDispatchDetailOwnerDO, Set<String> owner){
         UpdateWrapper<TaskDispatchDetailDO> wrapper = new UpdateWrapper();
-        wrapper.eq("detail_owner_id",taskDispatchDetailOwnerDO.getId()).in("owner",owner);
+        wrapper.eq("detail_owner_id",taskDispatchDetailOwnerDO.getId());
+        if (CollUtil.isNotEmpty(owner)){
+            wrapper.in("owner",owner);
+        }
         if (taskDispatchDetailOwnerDO.getProcedureId() != null) {
             wrapper.set("procedure_id", taskDispatchDetailOwnerDO.getProcedureId());
         }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java
index 29f80e3..82bc2d2 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java
@@ -568,7 +568,10 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
                             .ne(TaskReportDO::getAmount, 0);
                 }});
                 int historyReportAmount = historyReportList.stream().mapToInt(TaskReportDO::getAmount).sum();
-                if (!taskDispatchDO.getDispatchType().equals("ASSEMBLE") && taskDispatchDetailDO.getAmount() <= historyReportAmount){
+//                if (!taskDispatchDO.getDispatchType().equals("ASSEMBLE") && taskDispatchDetailDO.getAmount() <= historyReportAmount){
+//                    throw exception(TASK_DISPATCH_TASK_IS_OVER);
+//                }
+                if ( taskDispatchDetailDO.getAmount() <= historyReportAmount){
                     throw exception(TASK_DISPATCH_TASK_IS_OVER);
                 }
             }
@@ -587,10 +590,16 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
                             .ne(TaskReportDO::getAmount, 0);
                 }});
                 int historyReportAmount = historyReportList.stream().mapToInt(TaskReportDO::getAmount).sum();
-                if (!taskDispatchDO.getDispatchType().equals("ASSEMBLE") && taskDispatchDetailDO.getAmount() <= historyReportAmount){
+//                if (!taskDispatchDO.getDispatchType().equals("ASSEMBLE") && taskDispatchDetailDO.getAmount() <= historyReportAmount){
+//                    throw exception(TASK_DISPATCH_TASK_IS_OVER);
+//                }
+//                if(!taskDispatchDO.getDispatchType().equals("ASSEMBLE") && taskDispatchDetailDO.getAmount() < (historyReportAmount + operateReqVO.getAmount())){
+//                    throw exception(TASK_DISPATCH_TASK_REPORT_AMOUNT_EXCESS);
+//                }
+                if ( taskDispatchDetailDO.getAmount() <= historyReportAmount){
                     throw exception(TASK_DISPATCH_TASK_IS_OVER);
                 }
-                if(!taskDispatchDO.getDispatchType().equals("ASSEMBLE") && taskDispatchDetailDO.getAmount() < (historyReportAmount + operateReqVO.getAmount())){
+                if( taskDispatchDetailDO.getAmount() < (historyReportAmount + operateReqVO.getAmount())){
                     throw exception(TASK_DISPATCH_TASK_REPORT_AMOUNT_EXCESS);
                 }
             }
@@ -643,37 +652,48 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
 
                 taskDispatchDetailDO.setProcedureStatus(TaskDispatchProcedureStatusEnum.COMPLETED.getCode());
                 //装配看看是不是多人，如果是多人，判断一下
+                boolean allReport = true;
+                HashMap<Long,TaskDispatchDetailDO> dispatchDetailDOHashMap = new HashMap<>();
+
+                String msg = "";
                 if (taskDispatchDO.getDispatchType().equals("ASSEMBLE")){
-                    List<TaskDispatchDetailDO> taskDispatchDetailDOS = taskDispatchDetailMapper.selectList(new LambdaQueryWrapperX<TaskDispatchDetailDO>().eq(TaskDispatchDetailDO::getDetailOwnerId, taskDispatchDetailDO.getDetailOwnerId()));
-                    List<Long> dispatchDetailId = new ArrayList<>();
+                    List<TaskDispatchDetailDO> taskDispatchDetailDOS = taskDispatchDetailMapper.selectListByDeitalOwnerId(taskDispatchDetailDO.getDetailOwnerId());
                     for (TaskDispatchDetailDO dispatchDetailDO : taskDispatchDetailDOS) {
                         if (!dispatchDetailDO.getId().equals(taskDispatchDetailDO.getId()) && !(dispatchDetailDO.getProcedureStatus() == TaskDispatchProcedureStatusEnum.COMPLETED.getCode())){
-                            dispatchDetailId.add(dispatchDetailDO.getId());
+                            dispatchDetailDOHashMap.put(dispatchDetailDO.getId(),dispatchDetailDO);
                         }
                     }
-                    boolean allReport = true;
-                    if (CollUtil.isNotEmpty(dispatchDetailId)){
-                        List<HashMap<Long, Long>> hashMaps = taskDispatchDetailMapper.sumAssembleReport(dispatchDetailId);
+                    if (CollUtil.isNotEmpty(dispatchDetailDOHashMap)){
+                        List<HashMap<Long, Long>> hashMaps = taskDispatchDetailMapper.sumAssembleReport(new ArrayList<>(dispatchDetailDOHashMap.keySet()));
                         HashMap<Long,Long> reportMap = new HashMap<>();
                         for (HashMap<Long, Long> hashMap : hashMaps) {
-                            reportMap.putAll(hashMap);
+                            reportMap.put(hashMap.get("detailId"),hashMap.get("amount"));
                         }
-
-                        for (Long l : dispatchDetailId) {
+                        for (Long l : dispatchDetailDOHashMap.keySet()) {
                             if (!reportMap.containsKey(l)){
+                                msg = msg + dispatchDetailDOHashMap.get(l).getOwnerName() + ",";
                                 allReport = false;
-                                break;
                             }
                         }
+                        if (!msg.equals("")){
+                            msg = msg.substring(0,msg.length()-1) + "还没有报工，请确认";
+                        }
+
+
+
                     }
 
                     if (!allReport){
-                        throw exception(TASK_REPORT_OTHER_PERSON_NO_SUBMIT);
+                        throw exception(new ErrorCode(1_009_019,msg));
                     }
                     if (allReport){
                         TaskDispatchDetailOwnerDO taskDispatchDetailOwnerDO = taskDispatchDetailOwnerMapper.selectById(taskDispatchDetailDO.getDetailOwnerId());
                         taskDispatchDetailOwnerDO.setProcedureStatus(TaskDispatchProcedureStatusEnum.COMPLETED.getCode());
                         taskDispatchDetailOwnerMapper.updateById(taskDispatchDetailOwnerDO);
+                        TaskDispatchDetailOwnerDO ownerDO  = new TaskDispatchDetailOwnerDO();
+                        ownerDO.setId(taskDispatchDetailOwnerDO.getId());
+                        ownerDO.setProcedureStatus(TaskDispatchProcedureStatusEnum.COMPLETED.getCode());
+                        taskDispatchDetailMapper.updateByOwner(ownerDO,null);
                     }
                 }
                 //子项目装配是否完成
@@ -700,9 +720,13 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
                     }
                 }
                 if (CollUtil.isNotEmpty(productionList)){
+                    if (CollUtil.isNotEmpty(dispatchDetailDOHashMap)){
+                        productionList =   productionList.stream().filter((e -> !dispatchDetailDOHashMap.keySet().contains(e.getId()))).collect(Collectors.toList());
+                    }
+
                     for (TaskDispatchDetailDO dispatchDetailDO : productionList) {
-                        if (!dispatchDetailDO.getId().equals(taskDispatchDetailDO.getId()) &&
-                                dispatchDetailDO.getProcedureStatus() !=TaskDispatchProcedureStatusEnum.COMPLETED.getCode()){
+                        if (!dispatchDetailDO.getId().equals(taskDispatchDetailDO.getId()) && dispatchDetailDO.getProcedureStatus() !=TaskDispatchProcedureStatusEnum.COMPLETED.getCode()){
+
                             //如果其他的有未完成的
                             isProjectSubAssembleOver = false;
                             break;
@@ -718,9 +742,11 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
                         bdgzsomthingMapper.updateById(bdgzsomthingDO);
                     }
                 }
+
                 if (taskDispatchDO.getDispatchType().equals("PRODUCTION") && isBomDetailProductionOver){
                         pgMasterService.insertPgList(planDO.getId(),planDO.getProjectId(),taskDispatchDO.getBomDetailId());
-                    }else if (taskDispatchDO.getDispatchType().equals("ASSEMBLE") && isProjectSubAssembleOver){
+                    }else if (taskDispatchDO.getDispatchType().equals("ASSEMBLE") && isProjectSubAssembleOver ){
+
                         zjPgMasterService.insertZjList(planDO.getId(),planDO.getProjectId(),taskDispatchDO.getProjectSubId());
                     }
 //          //      TaskDispatchDO taskDispatchDO = taskDispatchMapper.selectById(taskDispatchDetailDO.getDispatchId());
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchDetailMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchDetailMapper.xml
index 212d980..03252c6 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchDetailMapper.xml
+++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchDetailMapper.xml
@@ -103,7 +103,7 @@
         GROUP BY  t.id
     </select>
     <select id="sumAssembleReport" parameterType="java.util.List">
-        select t.dispatch_detail_id,count(t.id) from pro_task_report t where t.dispatch_detail_id in
+        select t.dispatch_detail_id as detailId,count(t.id) as amount  from pro_task_report t where t.dispatch_detail_id in
         <foreach collection="list" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue
index 392d0e3..708bcd9 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue
@@ -314,6 +314,7 @@ v-for="dict in userInit" :key="dict.id"
                           readonly
                           :disabled="detailDisabled || row.beginProduce != 0 "
                           @click.prevent="handleClick(row.owners,$index)"
+													 :title="row.ownerNames"
                         >
                           <template #append
                             ><el-button
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/userselect.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/userselect.vue
index 7f75f75..6f159a5 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/userselect.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/userselect.vue
@@ -121,7 +121,7 @@ const getList = async () => {
   loading.value = true
   // 清除选中状态
   try {
-    postList.value = [];
+   // postList.value = [];
     list.value = []
     var hasSet = new Set;
     const data = await UserApi.getUserPage(queryParams)
@@ -150,8 +150,12 @@ const getList = async () => {
         beforeOwnerList.value.forEach(item =>{
           list.value.forEach(item1 =>{
               if(item == item1.id){
-                  multipleSelection.value.push(item1);
+                  var id = multipleSelection.value. some(item2 => item2.id === item)
+                  if(!id){
+                       multipleSelection.value.push(item1);
+                  }
                   multipleTable.value.toggleRowSelection(item1, true)
+                  
               }
           })
         })
@@ -160,13 +164,29 @@ const getList = async () => {
       }else{
         total.value = 0
       }
-       
-      hasSet.forEach(item =>{
-        postList.value.push({
-          label:item,
-          value:item
-        })
-      })
+
+      if(!arrayEmpty(multipleSelection.value)){
+          let seenIds = new Set();
+          let uniqueItems = multipleSelection.value.filter(item => {
+          // 如果 id 已经出现过，返回 false，否则返回 true
+          if (seenIds.has(item.id)) {
+          return false;
+          } else {
+          seenIds.add(item.id);
+          return true;
+          }
+          });
+          multipleSelection.value = uniqueItems
+      }
+      // if(arrayEmpty(postList.value)){
+      //         hasSet.forEach(item =>{
+      //       postList.value.push({
+      //         label:item,
+      //         value:item
+      //       })
+      //     })
+      // } 
+
     }else{
       list.value = []
       total.value = 0
@@ -300,6 +320,15 @@ const faindex =ref()
 const open = async (owners,index) => {
   multipleSelection.value=[]
   console.log(owners)
+  postList.value = []
+              postList.value.push({
+              label:'4',
+              value:'4'
+            })
+                          postList.value.push({
+              label:'5',
+              value:'5'
+            })
   beforeOwnerList.value = owners;
   faindex.value=index
   dialogVisible.value = true
diff --git a/mes-ui/mini-app/src/pages/assembleReport/assembleReport-detail.vue b/mes-ui/mini-app/src/pages/assembleReport/assembleReport-detail.vue
index 8d39a2d..9b39284 100644
--- a/mes-ui/mini-app/src/pages/assembleReport/assembleReport-detail.vue
+++ b/mes-ui/mini-app/src/pages/assembleReport/assembleReport-detail.vue
@@ -11,28 +11,30 @@ const dictInfo = userStore?.dictInfo || []
 const unitDictData = dictInfo.filter(e => e.dictType == 'heli_material_unit') || []
 const userId = userStore.userInfo.userId
 
-const isShowStart = computed(() => {
-  let flag = true
-  if (historyList.value.length) {
-    const obj = historyList.value[0]
-    if (!obj?.endTime) {
-      flag = false
-    }
-  }
-  return flag
-})
-const isShowEnd = computed(() => {
-  let flag = true
-  if (historyList.value.length) {
-    const obj = historyList.value[0]
-    if (obj?.endTime) {
-      flag = false
-    }
-  } else {
-    flag = false
-  }
-  return flag
-})
+const isShowStart = ref(false)
+const isShowEnd = ref(false)
+// const isShowStart = computed(() => {
+//   let flag = true
+//   if (historyList.value.length) {
+//     const obj = historyList.value[0]
+//     if (!obj?.endTime) {
+//       flag = false
+//     }
+//   }
+//   return flag
+// })
+// const isShowEnd = computed(() => {
+//   let flag = true
+//   if (historyList.value.length) {
+//     const obj = historyList.value[0]
+//     if (obj?.endTime) {
+//       flag = false
+//     }
+//   } else {
+//     flag = false
+//   }
+//   return flag
+// })
 const amount = ref(null)
 const workTime = ref(null)
 // 详情数据
@@ -56,28 +58,42 @@ const getData = async () => {
     e.endTimeStr = e.endTime && formatDate(e.endTime, 'YYYY-MM-DD HH:mm')
  	    // e.endTimeStr =  '2025-01-13 00:00'
   })
- //  if (data.list[0]) {
- //    formObj.value = data.list[0]
- //    const time = formObj.value.endTime - formObj.value.startTime //时间差秒
- 	// console.log(time)
- //    const leave1 = time % (24 * 3600 * 1000) //计算天数后剩余的毫秒数
- //    workTime.value = Math.floor(leave1 / (3600 * 1000))
- //  }
- // if (data.list[0]) {
- //     // 将字符串转换为Date对象
- // 	 formObj.value = data.list[0]
- //     const endTime= new Date(formObj.value.endTimeStr);
- //     const startTime = new Date(formObj.value.startTimeStr);
- 
- //     // 计算两个日期之间的毫秒差
- //     const timeDifferenceInMs = endTime - startTime;
- 
- //     // 将毫秒差转换为小时
- //     const timeDifferenceInHours = timeDifferenceInMs / (3600 * 1000);
- // 	 const roundedTimeDifference = parseFloat(timeDifferenceInHours.toFixed(2));
- // 	 workTime.value = roundedTimeDifference;
- // }
+ if (data.list[0]) {
+   // 将字符串转换为Date对象
+   formObj.value = data.list[0]
+   const endTime= new Date(formObj.value.endTimeStr);
+   const startTime = new Date(formObj.value.startTimeStr);
+   // 计算两个日期之间的毫秒差
+   const timeDifferenceInMs = endTime - startTime;
+
+   // 将毫秒差转换为小时
+   const timeDifferenceInHours = timeDifferenceInMs / (3600 * 1000);
+   const roundedTimeDifference = parseFloat(timeDifferenceInHours.toFixed(2));
+   if ("Y"==detailInfo.value.isOutsourcing){
+
+   }else {
+     workTime.value = roundedTimeDifference;
+   }
+
+ }
   historyList.value = data.list
+  isShowEnd.value = true;
+  isShowStart.value = true
+  if (historyList.value.length) {
+    const obj = historyList.value[0]
+	console.log('s')
+    if (!obj?.amount) {
+      isShowStart.value= false
+    }
+  }
+	  if (historyList.value.length) {
+	    const obj = historyList.value[0]
+	    if (obj?.amount) {
+	      isShowEnd.value = false
+	    }
+	  } else {
+	    isShowEnd.value = false
+	  }
   if(historyList.value!=null&&historyList.value.length>0){
   	  var totalAmount = detailInfo.value.amount;
   	  var beforeAmount = detailInfo.value.totalReportAmount
@@ -88,6 +104,7 @@ const getData = async () => {
  	  }
  
   }
+	
 
   isLoading.value = false
 }
@@ -107,27 +124,28 @@ const getDetailData = async (id) => {
 	data.startTime = formatDate(data.startTime, 'YYYY-MM-DD HH:mm');
 	data.endTime = formatDate(data.endTime, 'YYYY-MM-DD HH:mm'); // 去掉了末尾的空格
 
-	const endTime = new Date(data.endTime);
-	const startTime = new Date(data.startTime);
-	// // 计算两个日期之间的毫秒差
-	const timeDifferenceInMs = endTime - startTime;
-	// // 将毫秒差转换为小时
-	const timeDifferenceInHours = timeDifferenceInMs / (3600 * 1000);
-	const roundedTimeDifference = parseFloat(timeDifferenceInHours.toFixed(2));
-	workTime.value = roundedTimeDifference;
+	// const endTime = new Date(data.endTime);
+	// const startTime = new Date(data.startTime);
+	// // // 计算两个日期之间的毫秒差
+	// const timeDifferenceInMs = endTime - startTime;
+	// // // 将毫秒差转换为小时
+	// const timeDifferenceInHours = timeDifferenceInMs / (3600 * 1000);
+	// const roundedTimeDifference = parseFloat(timeDifferenceInHours.toFixed(2));
+	// workTime.value = roundedTimeDifference;
   // 单位枚举
   const lineObj = unitDictData.find((q) => q.value == data.unit) || {}
   data.unit = lineObj.label
   detailInfo.value = data || {}
   isLoading.value = false
 }
+const popupShow = ref(false)
 onLoad(async (options: any) => {
   await getDetailData(options.id)
   await getData()
   const obj = historyList.value[0]
     // 最新的报工是否完成
   if (obj && obj?.workTime == null && obj.endTime) {
-    popup.value?.open()
+       popupShow.value = true
   }
 })
 
@@ -138,8 +156,12 @@ const handleComplate = async () => {
     id: detailInfo.value?.id,
     active: 'FINISH',
   }
-  const data = await postOperateAPI(params)
-  isLoading.value = false
+  try {
+  const data = await postOperateAPI(params);
+  } catch (error) {
+  } finally {
+  isLoading.value = false;
+  }
   const url = `/pages/productionReport/productionReport-detail?id=${detailInfo.value.id}`
   uni.redirectTo({
     url,
@@ -147,6 +169,7 @@ const handleComplate = async () => {
 }
 // 提交报工
 const handleOk = async (active) => {
+console.log(amount.value)
   const params = {
     id: detailInfo.value?.id,
     active: 'SUBMIT',
@@ -178,10 +201,11 @@ const handleStop = async () => {
     active: 'END',
   }
   const data = await postOperateAPI(params)
-  const url = `/pages/productionReport/productionReport-detail?id=${detailInfo.value.id}`
-  uni.redirectTo({
-    url,
-  })
+  await getData()
+  // const url = `/pages/productionReport/productionReport-detail?id=${detailInfo.value.id}`
+  // uni.redirectTo({
+  //   url,
+  // })
   popup.value?.open()
 }
 </script>
@@ -256,8 +280,8 @@ const handleStop = async () => {
         </view>
       </view>
       <view class="action" v-if="detailInfo.procedureStatus !== 2">
-        <view class="action-item start" v-if="isShowStart" @click="handleStart">开始生产</view>
-        <view class="action-item stop" v-if="isShowEnd" @click="handleStop">结束生产</view>
+		  <view class="action-item start" v-if="isShowStart" @click="handleStart">开始生产</view>
+		    <view class="action-item stop" v-if="isShowEnd" @click="handleStop">结束生产</view>
         <!-- <view class="action-item finish" v-if="isShowFinish" @click="handleComplate">生产完成</view> -->
       </view>
     </template>
@@ -270,20 +294,20 @@ const handleStop = async () => {
       <view class="cont">
         <view class="item">
           <view class="label">开始生产时间：</view>
-          <view class="val">{{ detailInfo.startTime }}</view>
+          <view class="val">{{ formObj.startTimeStr }}</view>
         </view>
         <view class="item">
           <view class="label">结束生产时间：</view>
-          <view class="val">{{ detailInfo.endTime }}</view>
+          <view class="val">{{ formObj.endTimeStr }}</view>
         </view>
         <view class="item">
           <view class="label"><span class="star">*</span>本次报工工时：</view>
-          <uni-easyinput class="val" type="digit" v-model="amount" placeholder="请输入本次报工工时"></uni-easyinput>
+          <uni-easyinput class="val" type="digit" v-model="workTime" placeholder="请输入本次报工工时"></uni-easyinput>
           <view class="unit">时</view>
         </view>
         <view class="item">
           <view class="label"><span class="star">*</span>本次报工数量：</view>
-          <uni-easyinput class="val" type="number" v-model="workTime" placeholder="请输入本次报工数量"></uni-easyinput>
+          <uni-easyinput class="val" type="number" v-model="amount" placeholder="请输入本次报工数量"></uni-easyinput>
           <view class="unit"> {{ detailInfo.unit }}</view>
         </view>
       </view>
diff --git a/mes-ui/mini-app/src/pages/productionReport/productionReport-detail.vue b/mes-ui/mini-app/src/pages/productionReport/productionReport-detail.vue
index bc196c4..0eb4c6f 100644
--- a/mes-ui/mini-app/src/pages/productionReport/productionReport-detail.vue
+++ b/mes-ui/mini-app/src/pages/productionReport/productionReport-detail.vue
@@ -1,618 +1,657 @@
 <script setup lang="ts">
-import { toRaw, ref, computed } from 'vue'
-import { formatDate } from '@/utils/index'
-import { onLoad, onShow } from '@dcloudio/uni-app'
-import { useLoginStore } from '@/stores/modules/login'
-import { getTaskRepotPageAPI, getTaskDetailAPI, postOperateAPI,getListWxAPI } from '@/services/productionReport'
-const popup = ref<UniHelper.UniPopupInstance>()
-const userStore = useLoginStore()
-const dictInfo = userStore?.dictInfo || []
-const unitDictData = dictInfo.filter(e => e.dictType == 'heli_material_unit') || []
-const userId = userStore.userInfo.userId
+	import { toRaw, ref, computed } from 'vue'
+	import { formatDate } from '@/utils/index'
+	import { onLoad, onShow } from '@dcloudio/uni-app'
+	import { useLoginStore } from '@/stores/modules/login'
+	import { getTaskRepotPageAPI, getTaskDetailAPI, postOperateAPI, getListWxAPI } from '@/services/productionReport'
+	const popup = ref<UniHelper.UniPopupInstance>()
+	const userStore = useLoginStore()
+	const dictInfo = userStore?.dictInfo || []
+	const unitDictData = dictInfo.filter(e => e.dictType == 'heli_material_unit') || []
+	const userId = userStore.userInfo.userId
 
-const isShowStart = computed(() => {
-  let flag = true
-  if (historyList.value.length) {
-    const obj = historyList.value[0]
-    if (!obj?.endTime) {
-      flag = false
-    }
-  }
-  // // 派工数量和总报工数量相等了就不展示开始生产
-  // if (detailInfo.value.amount == detailInfo.value.totalReportAmount) {
-  //   flag = false
-  // }
-  return flag
-})
-const isShowEnd = computed(() => {
-  let flag = true
-  if (historyList.value.length) {
-    const obj = historyList.value[0]
-    if (obj?.endTime) {
-      flag = false
-    }
-  } else {
-    flag = false
-  }
-  return flag
-})
-const amount = ref('')
-const workTime = ref('')
-// 详情数据
-const detailInfo = ref({})
-let isLoading = ref(false)
-const historyList = ref([])
-const formObj = ref({})
-// 历史明细
-const getData = async () => {
-  // 发送请求
-  isLoading.value = true
-  const params = {
-    pageNo: 1,
-    integerpageSize: 5,
-    owner: userId,
-    dispatchDetailId: detailInfo.value.id,
-  }
-  const data = await getTaskRepotPageAPI(params)
-  data.list.forEach((e) => {
-    e.startTimeStr = e.startTime && formatDate(e.startTime, 'YYYY-MM-DD HH:mm')
-    e.endTimeStr = e.endTime && formatDate(e.endTime, 'YYYY-MM-DD HH:mm')
-	    // e.endTimeStr =  '2025-01-13 00:00'
-  })
- //  if (data.list[0]) {
- //    formObj.value = data.list[0]
- //    const time = formObj.value.endTime - formObj.value.startTime //时间差秒
-	// console.log(time)
- //    const leave1 = time % (24 * 3600 * 1000) //计算天数后剩余的毫秒数
- //    workTime.value = Math.floor(leave1 / (3600 * 1000))
- //  }
- if (data.list[0]) {
-   // 将字符串转换为Date对象
-   formObj.value = data.list[0]
-   const endTime= new Date(formObj.value.endTimeStr);
-   const startTime = new Date(formObj.value.startTimeStr);
-   // 计算两个日期之间的毫秒差
-   const timeDifferenceInMs = endTime - startTime;
+	const isShowStart = ref(false)
+	const isShowEnd = ref(false)
+	// const isShowStart = computed(() => {
+	//   let flag = true
+	//   if (historyList.value.length) {
+	//     const obj = historyList.value[0]
+	//     if (!obj?.endTime) {
+	//       flag = false
+	//     }
+	//   }
+	//   // // 派工数量和总报工数量相等了就不展示开始生产
+	//   // if (detailInfo.value.amount == detailInfo.value.totalReportAmount) {
+	//   //   flag = false
+	//   // }
+	//   return flag
+	// })
+	// const isShowEnd = computed(() => {
+	//   let flag = true
+	//   if (historyList.value.length) {
+	//     const obj = historyList.value[0]
+	//     if (obj?.endTime) {
+	//       flag = false
+	//     }
+	//   } else {
+	//     flag = false
+	//   }
+	//   return flag
+	// })
+	const amount = ref('')
+	const workTime = ref('')
+	// 详情数据
+	const detailInfo = ref({})
+	let isLoading = ref(false)
+	const historyList = ref([])
+	const formObj = ref({})
+	// 历史明细
+	const getData = async () => {
+		// 发送请求
+		isLoading.value = true
+		const params = {
+			pageNo: 1,
+			integerpageSize: 5,
+			owner: userId,
+			dispatchDetailId: detailInfo.value.id,
+		}
+		const data = await getTaskRepotPageAPI(params)
+		data.list.forEach((e) => {
+			e.startTimeStr = e.startTime && formatDate(e.startTime, 'YYYY-MM-DD HH:mm')
+			e.endTimeStr = e.endTime && formatDate(e.endTime, 'YYYY-MM-DD HH:mm')
+			// e.endTimeStr =  '2025-01-13 00:00'
+		})
+		if (data.list[0]) {
+			// 将字符串转换为Date对象
+			formObj.value = data.list[0]
+			const endTime = new Date(formObj.value.endTimeStr);
+			const startTime = new Date(formObj.value.startTimeStr);
+			// 计算两个日期之间的毫秒差
+			const timeDifferenceInMs = endTime - startTime;
 
-   // 将毫秒差转换为小时
-   const timeDifferenceInHours = timeDifferenceInMs / (3600 * 1000);
-   const roundedTimeDifference = parseFloat(timeDifferenceInHours.toFixed(2));
-   if ("Y"==detailInfo.value.isOutsourcing){
+			// 将毫秒差转换为小时
+			const timeDifferenceInHours = timeDifferenceInMs / (3600 * 1000);
+			const roundedTimeDifference = parseFloat(timeDifferenceInHours.toFixed(2));
+			if ("Y" == detailInfo.value.isOutsourcing) {
 
-   }else {
-     workTime.value = roundedTimeDifference;
-   }
+			} else {
+				workTime.value = roundedTimeDifference;
+			}
 
- }
-  historyList.value = data.list
-  if(historyList.value!=null&&historyList.value.length>0){
-  	  var totalAmount = detailInfo.value.amount;
-  	  var beforeAmount = detailInfo.value.totalReportAmount
-  	  if(totalAmount >= beforeAmount){
-  		  amount.value = totalAmount - beforeAmount
-  	  }else{
- 		  amount.value = 0
- 	  }
+		}
+		historyList.value = data.list
+		isShowEnd.value = true;
+		isShowStart.value = true
+		if (historyList.value.length) {
+			const obj = historyList.value[0]
+			if (!obj?.amount) {
+				isShowStart.value = false
+			}
+		}
+		if (historyList.value.length) {
+			const obj = historyList.value[0]
+			if (obj?.amount) {
+				isShowEnd.value = false
+			}
+		} else {
+			isShowEnd.value = false
+		}
+		console.log(isShowEnd.value);
+		console.log(isShowStart.value)
+		if (historyList.value != null && historyList.value.length > 0) {
+			var totalAmount = detailInfo.value.amount;
+			var beforeAmount = detailInfo.value.totalReportAmount
+			if (totalAmount >= beforeAmount) {
+				amount.value = totalAmount - beforeAmount
+			} else {
+				amount.value = 0
+			}
 
-  }
-  isLoading.value = false
-}
-const isOverBeforeProcedure = ref(true)
-// 详情
-const getDetailData = async (id) => {
-  // 发送请求
-  // isLoading.value = true
-  const params = {
-    id,
-  }
-  const data = await getTaskDetailAPI(params)
-  if(data.beforeProcedureStatus == 0){
-	  //如果上一道工序没结束
-	  isOverBeforeProcedure.value = true;
-  }
-  data.startTime = formatDate(data.startTime, 'YYYY-MM-DD')
-  data.endTime = formatDate(data.endTime, 'YYYY-MM-DD')
-  // 单位枚举
-  const lineObj = unitDictData.find((q) => q.value == data.unit) || {}
-  data.unit = lineObj.label
+		}
+		isLoading.value = false
+	}
+	const isOverBeforeProcedure = ref(true)
+	// 详情
+	const getDetailData = async (id) => {
+		// 发送请求
+		// isLoading.value = true
+		const params = {
+			id,
+		}
+		const data = await getTaskDetailAPI(params)
+		if (data.beforeProcedureStatus == 0) {
+			//如果上一道工序没结束
+			isOverBeforeProcedure.value = true;
+		}
+		data.startTime = formatDate(data.startTime, 'YYYY-MM-DD')
+		data.endTime = formatDate(data.endTime, 'YYYY-MM-DD')
+		// 单位枚举
+		const lineObj = unitDictData.find((q) => q.value == data.unit) || {}
+		data.unit = lineObj.label
 
-  detailInfo.value = data || {}
-  isLoading.value = false
-}
-onLoad(async (options: any) => {
-  await getDetailData(options.id)
-  await getData()
-  const obj = historyList.value[0]
-    // 最新的报工是否完成
-  if (obj && obj?.workTime == null && obj.endTime) {
-    popup.value?.open()
-  }
-})
+		detailInfo.value = data || {}
+		isLoading.value = false
+	}
+	onLoad(async (options : any) => {
+		await getDetailData(options.id)
+		await getData()
+		const obj = historyList.value[0]
+		// 最新的报工是否完成
+		if (obj && obj?.workTime == null && obj.endTime) {
+			popupShow.value = true
+		}
+	})
 
-// 生产完成
-const handleComplate = async () => {
-	isLoading.value = true;
-  const params = {
-    id: detailInfo.value?.id,
-    active: 'FINISH',
-  }
-  const data = await postOperateAPI(params)
-  isLoading.value = false
-  const url = `/pages/productionReport/productionReport-detail?id=${detailInfo.value.id}`
-  uni.redirectTo({
-    url,
-  })
-}
-// 提交报工
-const handleOk = async (active) => {
-  const params = {
-    id: detailInfo.value?.id,
-    active: 'SUBMIT',
-    amount: amount.value,
-    workTime: workTime.value,
-  }
-  const data = await postOperateAPI(params)
-  const url = `/pages/productionReport/productionReport-detail?id=${detailInfo.value.id}`
-  uni.redirectTo({
-    url,
-  })
-}
-// 开始生产
-const handleStart = async () => {
-  const params = {
-    id: detailInfo.value.id,
-    active: 'START',
-	ownerId:userId
-  }
-  productionTitle.value = '生产中';
-  console.log(detailInfo.value)
-  const data = await postOperateAPI(params)
-  const url = `/pages/productionReport/productionReport-detail?id=${detailInfo.value.id}`
-  uni.redirectTo({
-    url,
-  })
-}
-const productionTitle = ref('开始生产')
-// 结束生产
-const handleStop = async () => {
-  const params = {
-    id: detailInfo.value?.id,
-    active: 'END',
-  }
-  console.log(detailInfo.value)
-  const data = await postOperateAPI(params)
-
-  const url = `/pages/productionReport/productionReport-detail?id=${detailInfo.value.id}`
-  uni.redirectTo({
-    url,
-  })
-  popup.value?.open()
-}
+	// 生产完成
+	const handleComplate = async () => {
+		isLoading.value = true;
+		const params = {
+			id: detailInfo.value?.id,
+			active: 'FINISH',
+		}
+		try {
+			const data = await postOperateAPI(params);
+		} catch (error) {
+		} finally {
+			isLoading.value = false;
+		}
+		const url = `/pages/productionReport/productionReport-detail?id=${detailInfo.value.id}`
+		uni.redirectTo({
+			url,
+		})
+	}
+	// 提交报工
+	const handleOk = async (active) => {
+		const params = {
+			id: detailInfo.value?.id,
+			active: 'SUBMIT',
+			amount: amount.value,
+			workTime: workTime.value,
+		}
+		const data = await postOperateAPI(params)
+		const url = `/pages/productionReport/productionReport-detail?id=${detailInfo.value.id}`
+		uni.redirectTo({
+			url,
+		})
+	}
+	// 开始生产
+	const handleStart = async () => {
+		const params = {
+			id: detailInfo.value.id,
+			active: 'START',
+			ownerId: userId
+		}
+		productionTitle.value = '生产中';
+		console.log(detailInfo.value)
+		const data = await postOperateAPI(params)
+		const url = `/pages/productionReport/productionReport-detail?id=${detailInfo.value.id}`
+		uni.redirectTo({
+			url,
+		})
+	}
+	const popupShow = ref(false)
+	const productionTitle = ref('开始生产')
+	// 结束生产
+	const handleStop = async () => {
+		const params = {
+			id: detailInfo.value?.id,
+			active: 'END',
+		}
+		console.log(detailInfo.value)
+		const data = await postOperateAPI(params)
+		await getData()
+		// const url = `/pages/productionReport/productionReport-detail?id=${detailInfo.value.id}`
+		// uni.redirectTo({
+		//   url,
+		// })
+		popup.value?.open()
+	}
 </script>
 <template>
-<view>
-	  <view v-if="isOverBeforeProcedure==true" class="data-detail">
-    <template v-if="!isLoading">
-      <view class="module">
-        <view class="module-info">
-          <view class="product-item product-name">项目：{{ detailInfo.projectCode }} {{ detailInfo.projectName }}</view>
-          <image src="/static/images/productionReport-page.png" class="product-img" mode="scaleToFill"></image>
-          <view :class="[detailInfo.procedureStatus == 2 ? 'had' : 'unhad', 'product-status']">{{
+	<view>
+		<view v-if="isOverBeforeProcedure==true" class="data-detail">
+			<template v-if="!isLoading">
+				<view class="module">
+					<view class="module-info">
+						<view class="product-item product-name">项目：{{ detailInfo.projectCode }}
+							{{ detailInfo.projectName }}</view>
+						<image src="/static/images/productionReport-page.png" class="product-img" mode="scaleToFill">
+						</image>
+						<view :class="[detailInfo.procedureStatus == 2 ? 'had' : 'unhad', 'product-status']">{{
             detailInfo.procedureStatus == 2 ? '已完成' : '未完成' }}</view>
-          <view class="product-item">子项目：{{ detailInfo.projectSubCode || '' }} {{' ' + detailInfo.projectSubName }}
-          </view>
-          <view class="product-row">
-            <view class="row-item">
-              <view class="label">零件名称: {{ detailInfo.materialName }}</view>
-            </view>
-            <view class="row-item">
-              <view class="label">派工工序: {{ detailInfo.procedureName }}</view>
-            </view>
-          </view>
-          <view class="product-row">
-            <view class="row-item">
-              <view class="label">派工数量</view>
-              <view class="val">{{ detailInfo.amount }}</view>
-            </view>
-            <view class="row-item">
-              <view class="label">总报工数量</view>
-              <view class="val high-color">{{ detailInfo.totalReportAmount }}</view>
-            </view>
-          </view>
-          <view class="product-row">
-            <view class="row-item">
-              <view class="label">预计工时</view>
-              <view class="val">{{ detailInfo.workTime }}</view>
-            </view>
-            <view class="row-item">
-              <view class="label">总报工工时</view>
-              <view class="val high-color">{{ detailInfo.totalWorkTime }}</view>
-            </view>
-          </view>
-          <view class="product-item">预计生产日期：{{ detailInfo.startTime }} ～ {{ detailInfo.endTime }}</view>
-          <view class="finish" v-if="isShowStart && detailInfo.procedureStatus !== 2 && detailInfo.totalWorkTime"
-            @click="handleComplate" >
-            <image class="complate-img" src="/static/images/productionReport-detail-complate.png" mode="scaleToFill" />
-            生产完成
-          </view>
-        </view>
-      </view>
-      <view class="module-list">
-        <view class="module-title">历史报工明细</view>
-        <view class="history-list">
-          <view class="no-data" v-if="!historyList.length">
-            无数据...
-          </view>
-          <template v-else>
-            <view class="item" v-for="(item, index) in historyList" :key="item.id">
-              <view class="product-item">生产开始时间：{{ item.startTimeStr }}</view>
-              <view class="product-item">生产结束时间：{{ item.endTimeStr }}</view>
+						<view class="product-item">子项目：{{ detailInfo.projectSubCode || '' }}
+							{{' ' + detailInfo.projectSubName }}
+						</view>
+						<view class="product-row">
+							<view class="row-item">
+								<view class="label">零件名称: {{ detailInfo.materialName }}</view>
+							</view>
+							<view class="row-item">
+								<view class="label">派工工序: {{ detailInfo.procedureName }}</view>
+							</view>
+						</view>
+						<view class="product-row">
+							<view class="row-item">
+								<view class="label">派工数量</view>
+								<view class="val">{{ detailInfo.amount }}</view>
+							</view>
+							<view class="row-item">
+								<view class="label">总报工数量</view>
+								<view class="val high-color">{{ detailInfo.totalReportAmount }}</view>
+							</view>
+						</view>
+						<view class="product-row">
+							<view class="row-item">
+								<view class="label">预计工时</view>
+								<view class="val">{{ detailInfo.workTime }}</view>
+							</view>
+							<view class="row-item">
+								<view class="label">总报工工时</view>
+								<view class="val high-color">{{ detailInfo.totalWorkTime }}</view>
+							</view>
+						</view>
+						<view class="product-item">预计生产日期：{{ detailInfo.startTime }} ～ {{ detailInfo.endTime }}</view>
+						<view class="finish"
+							v-if="isShowStart && detailInfo.procedureStatus !== 2 && detailInfo.totalWorkTime"
+							@click="handleComplate">
+							<image class="complate-img" src="/static/images/productionReport-detail-complate.png"
+								mode="scaleToFill" />
+							生产完成
+						</view>
+					</view>
+				</view>
+				<view class="module-list">
+					<view class="module-title">历史报工明细</view>
+					<view class="history-list">
+						<view class="no-data" v-if="!historyList.length">
+							无数据...
+						</view>
+						<template v-else>
+							<view class="item" v-for="(item, index) in historyList" :key="item.id">
+								<view class="product-item">生产开始时间：{{ item.startTimeStr }}</view>
+								<view class="product-item">生产结束时间：{{ item.endTimeStr }}</view>
 
-              <view class="product-row">
-                <view class="row-item">
-                  <view class="label">报工工时：</view>
-                  <view class="val high-color">{{ item.workTime }}</view>
-                </view>
-                <view class="row-item">
-                  <view class="label">报工数量：</view>
-                  <view class="val high-color">{{ item.amount }}</view>
-                </view>
-              </view>
-              <view class="tip-index">
-                <image src="/static/images/productionReport-detail-index.png" class="icon-status" mode="scaleToFit">
-                </image>
-                <view class="text">{{historyList.length - index}}</view>
-              </view>
+								<view class="product-row">
+									<view class="row-item">
+										<view class="label">报工工时：</view>
+										<view class="val high-color">{{ item.workTime }}</view>
+									</view>
+									<view class="row-item">
+										<view class="label">报工数量：</view>
+										<view class="val high-color">{{ item.amount }}</view>
+									</view>
+								</view>
+								<view class="tip-index">
+									<image src="/static/images/productionReport-detail-index.png" class="icon-status"
+										mode="scaleToFit">
+									</image>
+									<view class="text">{{historyList.length - index}}</view>
+								</view>
 
-            </view>
-          </template>
-        </view>
-      </view>
-      <view class="action" v-if="detailInfo.procedureStatus !== 2">
-        <view class="action-item start" v-if="isShowStart" @click="handleStart">{{productionTitle}}</view>
-        <view class="action-item stop" v-if="isShowEnd" @click="handleStop">结束生产</view>
-      </view>
-    </template>
-    <view class="loading-text" v-else>加载中..</view>
-    <uni-popup class="popup" ref="popup" :mask-click="false" type="bottom" background-color="#fff">
-      <view class="title">
-        <view class="text">填写信息</view>
-        <!-- <view class="close" @click="handleClose">X</view> -->
-      </view>
-      <view class="cont">
-        <view class="item">
-          <view class="label">开始生产时间：</view>
-          <view class="val">{{ formObj.startTimeStr }}</view>
-        </view>
-        <view class="item">
-          <view class="label">结束生产时间：</view>
-          <view class="val">{{ formObj.endTimeStr }}</view>
-        </view>
-        <view class="item">
-          <view class="label"><span class="star">*</span>本次报工工时：</view>
-          <uni-easyinput class="val" type="digit" v-model="workTime" placeholder="请输入本次报工工时"></uni-easyinput>
-          <view class="unit">{{ detailInfo.isOutsourcing=='Y'?"元":"小时" }}</view>
-        </view>
-        <view class="item">
-          <view class="label"><span class="star">*</span>本次报工数量：</view>
-          <uni-easyinput class="val" type="number" v-model="amount" placeholder="请输入本次报工数量"></uni-easyinput>
-          <view class="unit"> {{ detailInfo.unit }}</view>
-        </view>
-      </view>
-      <view class="ok" @click="handleOk">确定</view>
-    </uni-popup>
-  </view>
-  <view v-if="isOverBeforeProcedure==false">
-	  <p>上一道工序尚未完工，请等待上一道工序完工后进行报工！</p>
-  </view>
-</view>
+							</view>
+						</template>
+					</view>
+				</view>
+				<view class="action" v-if="detailInfo.procedureStatus !== 2">
+					<view class="action-item start" v-if="isShowStart" @click="handleStart">开始生产</view>
+					<view class="action-item stop" v-if="isShowEnd" @click="handleStop">结束生产</view>
+				</view>
+			</template>
+			<view class="loading-text" v-else>加载中..</view>
+			<uni-popup class="popup" ref="popup" :mask-click="false" type="bottom" background-color="#fff">
+				<view class="title">
+					<view class="text">填写信息</view>
+					<!-- <view class="close" @click="handleClose">X</view> -->
+				</view>
+				<view class="cont">
+					<view class="item">
+						<view class="label">开始生产时间：</view>
+						<view class="val">{{ formObj.startTimeStr }}</view>
+					</view>
+					<view class="item">
+						<view class="label">结束生产时间：</view>
+						<view class="val">{{ formObj.endTimeStr }}</view>
+					</view>
+					<view class="item">
+						<view class="label"><span class="star">*</span>本次报工工时：</view>
+						<uni-easyinput class="val" type="digit" v-model="workTime"
+							placeholder="请输入本次报工工时"></uni-easyinput>
+						<view class="unit">{{ detailInfo.isOutsourcing=='Y'?"元":"小时" }}</view>
+					</view>
+					<view class="item">
+						<view class="label"><span class="star">*</span>本次报工数量：</view>
+						<uni-easyinput class="val" type="number" v-model="amount"
+							placeholder="请输入本次报工数量"></uni-easyinput>
+						<view class="unit"> {{ detailInfo.unit }}</view>
+					</view>
+				</view>
+				<view class="ok" @click="handleOk">确定</view>
+			</uni-popup>
+		</view>
+		<view v-if="isOverBeforeProcedure==false">
+			<p>上一道工序尚未完工，请等待上一道工序完工后进行报工！</p>
+		</view>
+	</view>
 
 </template>
 <style lang="scss">
-// 订单列表
-.data-detail {
-  border-radius: 10rpx;
-  padding-bottom: 200rpx;
+	// 订单列表
+	.data-detail {
+		border-radius: 10rpx;
+		padding-bottom: 200rpx;
 
-  .module {
-    background: linear-gradient(178deg, #356899 7%, #356899 57%, #F4F6F9 94%);
-    padding: 20rpx;
+		.module {
+			background: linear-gradient(178deg, #356899 7%, #356899 57%, #F4F6F9 94%);
+			padding: 20rpx;
 
-    .module-info {
-      padding: 20rpx 20rpx 80rpx;
-      border-radius: 10rpx;
-      min-height: 100rpx;
-      font-size: 28rpx;
-      border-bottom: 2rpx solid #F2F2F2;
-      background: linear-gradient(215deg, #C7D3E5 8%, rgba(222, 228, 236, 0) 13%), linear-gradient(162deg, #FFFFFF 25%, #E4EFFD 106%);
-      position: relative;
-      border-top-right-radius: 100rpx;
+			.module-info {
+				padding: 20rpx 20rpx 80rpx;
+				border-radius: 10rpx;
+				min-height: 100rpx;
+				font-size: 28rpx;
+				border-bottom: 2rpx solid #F2F2F2;
+				background: linear-gradient(215deg, #C7D3E5 8%, rgba(222, 228, 236, 0) 13%), linear-gradient(162deg, #FFFFFF 25%, #E4EFFD 106%);
+				position: relative;
+				border-top-right-radius: 100rpx;
 
-      .product-img {
-        position: absolute;
-        right: 0rpx;
-        top: 0;
-        width: 100rpx;
-        height: 100rpx;
-      }
+				.product-img {
+					position: absolute;
+					right: 0rpx;
+					top: 0;
+					width: 100rpx;
+					height: 100rpx;
+				}
 
-      .product-status {
+				.product-status {
 
-        width: 140rpx;
-        border-raduis: 10rpx;
-        text-align: center;
-        padding: 8rpx 12rpx;
-        &.had {
-          background: #E8FFEA;
-          color: #00B42A;
-        }
-        &.unhad {
-          background: #FFF7E8;
-          color: #FF7D00;
-        }
-      }
+					width: 140rpx;
+					border-raduis: 10rpx;
+					text-align: center;
+					padding: 8rpx 12rpx;
 
-      .product-item {
-        margin: 20rpx 0;
-        display: flex;
-        align-items: center;
-        color: #737D88
-      }
+					&.had {
+						background: #E8FFEA;
+						color: #00B42A;
+					}
 
-      .product-row {
-        margin: 20rpx 0;
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-        color: #737D88;
+					&.unhad {
+						background: #FFF7E8;
+						color: #FF7D00;
+					}
+				}
 
-        .row-item {
-          flex: 1;
+				.product-item {
+					margin: 20rpx 0;
+					display: flex;
+					align-items: center;
+					color: #737D88
+				}
 
-          .label {
-            margin-bottom: 10rpx;
-          }
+				.product-row {
+					margin: 20rpx 0;
+					display: flex;
+					flex-direction: row;
+					justify-content: space-between;
+					color: #737D88;
 
-          .val {
-            color: #1D2129;
+					.row-item {
+						flex: 1;
 
-            &.high-color {
-              color: #00B42A
-            }
-          }
-        }
+						.label {
+							margin-bottom: 10rpx;
+						}
 
-      }
-      .finish {
-        position: absolute;
-        right: 40rpx;
-        bottom: 30rpx;
-        background: linear-gradient(142deg, #FEB34A 14%, #FE9B12 83%);
-        color: #fff;
-        width: 200rpx;
-        text-align: center;
-        padding: 10rpx;
-        border-radius: 31rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        .complate-img {
-          width: 30rpx;
-          height: 30rpx;
-          margin-right: 10rpx;
-        }
-      }
+						.val {
+							color: #1D2129;
 
-    }
-  }
+							&.high-color {
+								color: #00B42A
+							}
+						}
+					}
 
-  .module-list {
-    padding: 20rpx 20rpx;
-    // box-shadow: 0px 0px 8px 0px rgba(161, 161, 177, 0.12);
+				}
 
-    .module-title {
-      color: #0D0D26;
-      font-size: 36rpx;
-      margin: 20rpx 0;
-      font-weight: 500;
-    }
+				.finish {
+					position: absolute;
+					right: 40rpx;
+					bottom: 30rpx;
+					background: linear-gradient(142deg, #FEB34A 14%, #FE9B12 83%);
+					color: #fff;
+					width: 200rpx;
+					text-align: center;
+					padding: 10rpx;
+					border-radius: 31rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
 
-    .history-list {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      min-height: 200rpx;
-      justify-content: center;
-      padding: 0rpx 10rpx;
+					.complate-img {
+						width: 30rpx;
+						height: 30rpx;
+						margin-right: 10rpx;
+					}
+				}
 
-      .item {
-        margin: 10rpx 0;
-        background: #EAEEF4;
-        font-size: 28rpx;
-        padding: 20rpx;
-        width: 100%;
-        border-radius: 10rpx;
-        color: #737D88;
-        position: relative;
+			}
+		}
 
-        .product-item {
-          margin: 10rpx 0;
-          .hight-color {
-            color: #00B42A;
-          }
-        }
-        .product-row {
-          margin: 20rpx 0;
-          display: flex;
-          flex-direction: row;
-          justify-content: space-between;
-          color: #737D88;
+		.module-list {
+			padding: 20rpx 20rpx;
+			// box-shadow: 0px 0px 8px 0px rgba(161, 161, 177, 0.12);
 
-          .row-item {
-            flex: 1;
-            display: flex;
-            flex-direction: row;
-            .label {
-              margin-bottom: 10rpx;
-              &.high-color {
-                  color: #00B42A
-                }
-            }
+			.module-title {
+				color: #0D0D26;
+				font-size: 36rpx;
+				margin: 20rpx 0;
+				font-weight: 500;
+			}
 
-            .val {
-              color: #1D2129;
+			.history-list {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				min-height: 200rpx;
+				justify-content: center;
+				padding: 0rpx 10rpx;
 
-              &.high-color {
-                color: #00B42A
-              }
-            }
-          }
+				.item {
+					margin: 10rpx 0;
+					background: #EAEEF4;
+					font-size: 28rpx;
+					padding: 20rpx;
+					width: 100%;
+					border-radius: 10rpx;
+					color: #737D88;
+					position: relative;
 
-        }
-        .tip-index {
-          position: absolute;
-          top: 0rpx;
-          right: 0rpx;
-          .icon-status {
-            width: 100rpx;
-            height: 72rpx;
-            z-index: 1;
-          }
-          .text {
-            color: #fff;
-            position: absolute;
-            top: 4rpx;
-            right: 30rpx;
-            z-index: 2;
-          }
-        }
-      }
+					.product-item {
+						margin: 10rpx 0;
 
-      .no-data {
-        font-size: 28rpx;
-        color: #444;
-      }
-    }
+						.hight-color {
+							color: #00B42A;
+						}
+					}
 
-    .table-cont {
-      font-size: 24rpx;
-    }
+					.product-row {
+						margin: 20rpx 0;
+						display: flex;
+						flex-direction: row;
+						justify-content: space-between;
+						color: #737D88;
 
-    .button {
-      color: #356899;
-    }
-  }
+						.row-item {
+							flex: 1;
+							display: flex;
+							flex-direction: row;
 
-  .action {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    position: fixed;
-    bottom: 0rpx;
-    border-radius: 18rpx;
-    padding: 30rpx 30rpx;
-    background: #FFFFFF;
-    margin: 0 auto;
-    width: 100vw;
-    box-shadow: 0px -4px 10px 0px rgba(121, 153, 183, 0.2);
+							.label {
+								margin-bottom: 10rpx;
 
-    .action-item {
-      width: 272rpx;
-      height: 86rpx;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      margin: 0 20rpx;
-      font-size: 40rpx;
-      color: #fff;
-      width: 272rpx;
-      height: 86rpx;
-      border-radius: 24rpx;
+								&.high-color {
+									color: #00B42A
+								}
+							}
 
-      &.start {
-        background: linear-gradient(157deg, #2EACE6 -3%, #356899 90%);
-      }
+							.val {
+								color: #1D2129;
 
-      &.stop {
-        background: linear-gradient(167deg, #FEA97B -2%, #F75E40 87%);
-      }
+								&.high-color {
+									color: #00B42A
+								}
+							}
+						}
 
-      &.finish {
-        background: linear-gradient(142deg, #FEB34A 14%, #FE9B12 83%);
-      }
-    }
-  }
+					}
 
-  .loading-text {
-    text-align: center;
-    font-size: 28rpx;
-    color: #666;
-    padding: 20rpx 0;
-  }
+					.tip-index {
+						position: absolute;
+						top: 0rpx;
+						right: 0rpx;
 
-  .popup {
-    .title {
-      line-height: 1;
-      padding: 40rpx;
-      font-size: 32rpx;
-      font-weight: normal;
-      border-bottom: 1rpx solid #ddd;
-      color: #444;
+						.icon-status {
+							width: 100rpx;
+							height: 72rpx;
+							z-index: 1;
+						}
 
-      .close {
-        position: absolute;
-        right: 24rpx;
-        top: 40rpx;
-        height: 60rpx;
-        width: 60rpx;
-        text-align: center;
-      }
-    }
+						.text {
+							color: #fff;
+							position: absolute;
+							top: 4rpx;
+							right: 30rpx;
+							z-index: 2;
+						}
+					}
+				}
 
-    .cont {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      margin: 40rpx;
-      height: 50vh;
+				.no-data {
+					font-size: 28rpx;
+					color: #444;
+				}
+			}
 
-      .item {
-        display: flex;
-        align-items: center;
-        margin: 20rpx 0;
-        color: #737D88;
-        width: 94%;
+			.table-cont {
+				font-size: 24rpx;
+			}
 
-        .label {
-          font-size: 32rpx;
-          width: 260rpx;
-          .star {
-            color: red
-          }
-        }
+			.button {
+				color: #356899;
+			}
+		}
 
-        .val {
-          flex: 1;
-          font-size: 32rpx;
-        }
-        .unit {
-          width: 100rpx;
-          margin-left: 4rpx;
-          text-align: center;
-        }
-      }
-    }
+		.action {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			position: fixed;
+			bottom: 0rpx;
+			border-radius: 18rpx;
+			padding: 30rpx 30rpx;
+			background: #FFFFFF;
+			margin: 0 auto;
+			width: 100vw;
+			box-shadow: 0px -4px 10px 0px rgba(121, 153, 183, 0.2);
 
-    .ok {
-      font-size: 32rpx;
-      margin: 20rpx auto 80rpx;
-      text-align: center;
-      width: 200rpx;
-      border-radius: 10rpx;
-      padding: 8rpx 0;
-      background-color: #3C8AF7;
-      color: #fff;
-    }
-  }
-}
-</style>
+			.action-item {
+				width: 272rpx;
+				height: 86rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				margin: 0 20rpx;
+				font-size: 40rpx;
+				color: #fff;
+				width: 272rpx;
+				height: 86rpx;
+				border-radius: 24rpx;
+
+				&.start {
+					background: linear-gradient(157deg, #2EACE6 -3%, #356899 90%);
+				}
+
+				&.stop {
+					background: linear-gradient(167deg, #FEA97B -2%, #F75E40 87%);
+				}
+
+				&.finish {
+					background: linear-gradient(142deg, #FEB34A 14%, #FE9B12 83%);
+				}
+			}
+		}
+
+		.loading-text {
+			text-align: center;
+			font-size: 28rpx;
+			color: #666;
+			padding: 20rpx 0;
+		}
+
+		.popup {
+			.title {
+				line-height: 1;
+				padding: 40rpx;
+				font-size: 32rpx;
+				font-weight: normal;
+				border-bottom: 1rpx solid #ddd;
+				color: #444;
+
+				.close {
+					position: absolute;
+					right: 24rpx;
+					top: 40rpx;
+					height: 60rpx;
+					width: 60rpx;
+					text-align: center;
+				}
+			}
+
+			.cont {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				margin: 40rpx;
+				height: 50vh;
+
+				.item {
+					display: flex;
+					align-items: center;
+					margin: 20rpx 0;
+					color: #737D88;
+					width: 94%;
+
+					.label {
+						font-size: 32rpx;
+						width: 260rpx;
+
+						.star {
+							color: red
+						}
+					}
+
+					.val {
+						flex: 1;
+						font-size: 32rpx;
+					}
+
+					.unit {
+						width: 100rpx;
+						margin-left: 4rpx;
+						text-align: center;
+					}
+				}
+			}
+
+			.ok {
+				font-size: 32rpx;
+				margin: 20rpx auto 80rpx;
+				text-align: center;
+				width: 200rpx;
+				border-radius: 10rpx;
+				padding: 8rpx 0;
+				background-color: #3C8AF7;
+				color: #fff;
+			}
+		}
+	}
+</style>
\ No newline at end of file