1

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

@@ -37,6 +37,7 @@ import java.sql.Wrapper;
 import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.LocalDate;
+import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -827,6 +828,14 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
     @Override
     public HttpRespMsg changePeople(ProdProcedureTeam prodProcedureTeam, String newPeopleId) {
         HttpRespMsg msg=new HttpRespMsg();
+        String time="16:00:00";
+        DateTimeFormatter df=DateTimeFormatter.ofPattern("HH:mm:ss");
+        LocalTime localTime=LocalTime.now();
+        LocalTime timeParse = LocalTime.parse(time, df);
+        if(localTime.isAfter(timeParse)){
+            msg.setError("下午4点之后禁止此操作");
+            return msg;
+        }
         List<ProdProcedureTeam> list=new ArrayList<>();
         ProdProcedureTeam p=new ProdProcedureTeam();
         BeanUtils.copyProperties(prodProcedureTeam,p);
@@ -845,6 +854,14 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
     @Override
     public HttpRespMsg teamAllocation(PlanProcedureTotal planProcedureTotal,String teamIds,Integer planType) throws Exception {
         HttpRespMsg msg=new HttpRespMsg();
+        String time="16:00:00";
+        DateTimeFormatter df=DateTimeFormatter.ofPattern("HH:mm:ss");
+        LocalTime localTime=LocalTime.now();
+        LocalTime timeParse = LocalTime.parse(time, df);
+        if(localTime.isAfter(timeParse)){
+            msg.setError("下午4点之后禁止此操作");
+            return msg;
+        }
         Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
         BigDecimal totalWages=new BigDecimal((planProcedureTotal.getTotalWages()==null||StringUtils.isEmpty(planProcedureTotal.getTotalWages()))?0:planProcedureTotal.getTotalWages());
         BigDecimal totalWorkingHours=new BigDecimal((planProcedureTotal.getTotalWorkingHours()==null||StringUtils.isEmpty(planProcedureTotal.getTotalWorkingHours())?0:planProcedureTotal.getTotalWorkingHours()));

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/planView/component/planComponent.vue

@@ -143,16 +143,15 @@ export default {
     .planComponent_Item {
       .planComponent_ItemTop {
         div {
-          width: 100%;
+          // width: 100%;
+          width: 325px;
           display: flex;
+          flex-wrap: wrap;
           align-items: center;
           justify-content: space-between;
           font-size: 16px;
           color: #333;
           margin-bottom: 8px;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
 
           span {
             color: #1989fa;

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/planView/todayPlan/distribution.vue

@@ -43,23 +43,19 @@
               <span style="color: #1989fa;" v-if="item.prodProcedureTeamList" @click="workShowHide(index)">{{ item.flg ? paiArr[0] : paiArr[1] }}</span>
             </div>
           </div>
-          <div>
-              <collapse>
-                <div v-if="item.flg">
-                    <div>
-                      <div class="distribution_box" v-for="second_item,index in item.prodProcedureTeamList " :key="index">
-                        <div class="distribution_ItemBom">
-                          <div class="PlanItem">
+          <div style="width: 100%">
+              <collapse style="width: 100%">
+                <div v-if="item.flg" style="width: 100%">
+                    <div style="width: 100%;border-top: 0.02667rem solid #E6E6E6;margin-top: 10px">
+                      <div class="disZhuyuan" v-for="second_item,index in item.prodProcedureTeamList " :key="index">
                             <span>{{ second_item.user.name }}</span>
                             <span>{{ second_item.status==0?"待接收":second_item.status==1?"进行中":second_item.status==2?"已完工":second_item.status==3?"已中止":"已换人"}}</span>
                             <span class="" v-if="second_item.status==3" @click="distributionProp(item,index,'change', second_item)"  style="color: #1989fa;">换人</span>
                             <span class="" v-if="second_item.status==0" @click="deletePeople(second_item.id)"  style="color: #1989fa;">删除</span>
-                          </div>
-                        </div>
                       </div>
                       <div class="PlanItem">
-                            <span class="" v-if="beDeptList" @click="distributionProp(item,index,'add')"  style="color: #1989fa;">新增</span>
-                          </div>
+                        <span class="" v-if="beDeptList" @click="distributionProp(item,index,'add')"  style="color: #1989fa;">新增</span>
+                      </div>
                     </div>
                 </div>
               </collapse>
@@ -378,6 +374,17 @@ export default {
         height: 1.2rem;
         border-top: 1px solid #ebebeb;
     }
+
+    .disZhuyuan {
+      padding-left: 30px;
+      font-size: 14px;
+      width: 100%;
+      display: flex;
+      padding-right: 100px;
+      justify-content: space-between;
+      margin-top: 10px;
+      
+    }
   .distribution {
     width: 100%;
     height: 100%;