1

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/entity/ProdProcedureTeam.java

@@ -20,7 +20,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  * </p>
  *
  * @author Seyason
- * @since 2023-08-02
+ * @since 2023-08-30
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -80,14 +80,21 @@ public class ProdProcedureTeam extends Model<ProdProcedureTeam> {
     private Integer planProcedureId;
 
     /**
-     * 员工执行状态：0-待接收，1-进行中，2-已完工，3-已中止(员工自己中止或者管理端中止）
+     * 员工执行状态：0-待接收，1-进行中，2-已完工，3-已中止(员工自己中止或者管理端中止）4-已换人
      */
     @TableField("status")
     private Integer status;
 
+
     @TableField(exist = false)
     private User user;
 
+    /**
+     * 是否为更换人员动作
+     */
+    @TableField("is_change")
+    private Integer isChange;
+
 
     @Override
     protected Serializable pkVal() {

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

@@ -971,6 +971,7 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
         p.setId(null);
         p.setUserId(newPeopleId);
         p.setStatus(0);
+        p.setIsChange(0);
         prodProcedureTeam.setStatus(4);
         list.add(prodProcedureTeam);
         list.add(p);
@@ -1037,6 +1038,9 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                     prodProcedureTeam.setWorkTime(totalWorkingHours.doubleValue());
                     prodProcedureTeam.setJobOfMoney(totalWages);
                 }
+                if(plan.getPlanType()==1){
+                    prodProcedureTeam.setStatus(1);
+                }
                 list.add(prodProcedureTeam);
             }
             List<WxCorpInfo> wxCorpInfoList = wxCorpInfoService.list(new QueryWrapper<WxCorpInfo>().eq("company_id", companyId));

fhKeeper/formulahousekeeper/management-workshop/src/main/resources/mapper/ProdProcedureTeamMapper.xml

@@ -15,11 +15,12 @@
         <result column="update_time" property="updateTime" />
         <result column="plan_procedure_id" property="planProcedureId" />
         <result column="status" property="status" />
+        <result column="is_change" property="isChange" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, company_id, user_id, work_time, job_of_money, progress, checker_id, checker_name, update_time, plan_procedure_id, status
+        id, company_id, user_id, work_time, job_of_money, progress, checker_id, checker_name, update_time, plan_procedure_id, status, is_change
     </sql>
 
     <select id="getReportForWorkList" resultType="java.util.HashMap" >

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

@@ -51,11 +51,11 @@
                             <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>
+                            <span class="" v-if="second_item.status==0&&second_item.isChange==1" @click="deletePeople(second_item.id)"  style="color: #1989fa;">删除</span>
                       </div>
-                      <div class="PlanItem">
+                      <p style="margin-top:20px;">
                         <span class="" v-if="beDeptList" @click="distributionProp(item,index,'add')"  style="color: #1989fa;">新增</span>
-                      </div>
+                      </p>
                     </div>
                 </div>
               </collapse>
@@ -472,6 +472,7 @@ export default {
             width: 50%;
             display: flex;
             padding-top: 12px;
+            
 
             &:first-child {
               width: 100%;