Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/PlanController.java

@@ -80,6 +80,7 @@ public class PlanController {
     }
     /*计划下产品工序组员分配*/
     @RequestMapping("/teamAllocation")
+    @Transactional
     public HttpRespMsg teamAllocation(PlanProcedureTotal planProcedureTotal, String teamIds){
         return planService.teamAllocation(planProcedureTotal,teamIds);
     }

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

@@ -1,6 +1,8 @@
 package com.management.platform.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 import lombok.Data;
@@ -13,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2023-07-28
+ * @since 2023-07-29
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -22,6 +24,9 @@ public class PlanProcedureTotal extends Model<PlanProcedureTotal> {
 
     private static final long serialVersionUID=1L;
 
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
     /**
      * 计划id
      */
@@ -49,9 +54,12 @@ public class PlanProcedureTotal extends Model<PlanProcedureTotal> {
     @TableField(exist = false)
     private ProdProcedure prodProcedure;
 
+    @TableField(exist = false)
+    private String teamIds;
+
     @Override
     protected Serializable pkVal() {
-        return null;
+        return this.id;
     }
 
 }

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

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2023-07-28
+ * @since 2023-07-29
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -35,12 +35,6 @@ public class ProdProcedureTeam extends Model<ProdProcedureTeam> {
     @TableField("user_id")
     private String userId;
 
-    @TableField("prod_procedure_id")
-    private Integer prodProcedureId;
-
-    @TableField("plan_id")
-    private Integer planId;
-
     /**
      * 工时
      */
@@ -77,6 +71,9 @@ public class ProdProcedureTeam extends Model<ProdProcedureTeam> {
     @TableField("update_time")
     private LocalDateTime updateTime;
 
+    @TableField("plan_procedure_id")
+    private Integer planProcedureId;
+
 
     @Override
     protected Serializable pkVal() {

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

@@ -31,6 +31,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.*;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.Wrapper;
 import java.text.SimpleDateFormat;
 import java.time.Instant;
@@ -83,6 +84,8 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
     private PlanProcedureTotalService planProcedureTotalService;
     @Resource
     private TaskTypeService taskTypeService;
+    @Resource
+    private ReportMapper reportMapper;
 
     @Value(value = "${upload.path}")
     private String path;
@@ -122,8 +125,8 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
             List<ProdProcedureTeam> prodProcedureTeams = prodProcedureTeamService.list(new QueryWrapper<ProdProcedureTeam>().eq("company_id", companyId).eq("user_id", user.getId()));
             List<Integer> collect=new ArrayList<>();
             if(prodProcedureTeams!=null&&prodProcedureTeams.size()>0){
-                List<Integer> ids = prodProcedureTeams.stream().map(ProdProcedureTeam::getProdProcedureId).collect(Collectors.toList());
-                List<PlanProcedureTotal> list = planProcedureTotalService.list(new QueryWrapper<PlanProcedureTotal>().in("prod_procedure_id", ids));
+                List<Integer> ids = prodProcedureTeams.stream().map(ProdProcedureTeam::getPlanProcedureId).collect(Collectors.toList());
+                List<PlanProcedureTotal> list = planProcedureTotalService.list(new QueryWrapper<PlanProcedureTotal>().in("id", ids));
                 collect = list.stream().map(PlanProcedureTotal::getPlanId).distinct().collect(Collectors.toList());
             }
             collect.add(-1);
@@ -639,23 +642,44 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
         Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
         BigDecimal totalWages=new BigDecimal(planProcedureTotal.getTotalWages());
         BigDecimal totalWorkingHours=new BigDecimal(planProcedureTotal.getTotalWorkingHours());
+        BigDecimal overCountWages = new BigDecimal(0);
+        BigDecimal overWorkingHours = new BigDecimal(0);
         List<ProdProcedureTeam> list=new ArrayList<>();
-        if(StringUtils.isEmpty(teamIds)){
+        if(!StringUtils.isEmpty(teamIds)){
             String[] team = teamIds.split(",");
-            totalWages=totalWages.divide(new BigDecimal(team.length));
-            totalWorkingHours=totalWorkingHours.divide(new BigDecimal(team.length));
-            for (String s : team) {
+            totalWages=totalWages.divide(new BigDecimal(team.length),1, RoundingMode.HALF_UP);
+            totalWorkingHours=totalWorkingHours.divide(new BigDecimal(team.length),1, RoundingMode.HALF_UP);
+            overCountWages=totalWages.multiply(new BigDecimal(team.length));
+            overWorkingHours=totalWorkingHours.multiply(new BigDecimal(team.length));
+            List<ProdProcedureTeam> procedureTeamList = prodProcedureTeamService.list(new QueryWrapper<ProdProcedureTeam>().eq("plan_procedure_id",planProcedureTotal.getId()));
+            for (int i = 0; i < team.length; i++) {
                 ProdProcedureTeam prodProcedureTeam=new ProdProcedureTeam();
                 prodProcedureTeam.setCompanyId(companyId);
-                prodProcedureTeam.setProdProcedureId(planProcedureTotal.getProdProcedureId());
-                prodProcedureTeam.setUserId(s);
-                prodProcedureTeam.setPlanId(planProcedureTotal.getPlanId());
-                prodProcedureTeam.setWorkTime(totalWorkingHours.doubleValue());
-                prodProcedureTeam.setJobOfMoney(totalWages);
+                prodProcedureTeam.setPlanProcedureId(planProcedureTotal.getId());
+                prodProcedureTeam.setUserId(team[i]);
+                int finalI = i;
+                Optional<ProdProcedureTeam> first = procedureTeamList.stream().filter(pl -> pl.getUserId().equals(team[finalI])).findFirst();
+                if(first.isPresent()){
+                    Integer cut = reportMapper.selectCount(new QueryWrapper<Report>().eq("user_procedure_team_id", first.get().getId()));
+                    if(cut>0){
+                        prodProcedureTeam.setId(first.get().getId());
+                    }else {
+                        prodProcedureTeamService.remove(new QueryWrapper<ProdProcedureTeam>().eq("plan_procedure_id",planProcedureTotal.getId()).eq("user_id",team[i]));
+                    }
+                }
+                if(i==team.length-1){
+                    double wagesAbs =new BigDecimal(planProcedureTotal.getTotalWages()).subtract(overCountWages).doubleValue();
+                    double workTimesAbs =new BigDecimal(planProcedureTotal.getTotalWorkingHours()).subtract(overWorkingHours).doubleValue();
+                    prodProcedureTeam.setWorkTime(totalWorkingHours.add(new BigDecimal(workTimesAbs)).doubleValue());
+                    prodProcedureTeam.setJobOfMoney(totalWages.add(new BigDecimal(wagesAbs)));
+                }else {
+                    prodProcedureTeam.setWorkTime(totalWorkingHours.doubleValue());
+                    prodProcedureTeam.setJobOfMoney(totalWages);
+                }
                 list.add(prodProcedureTeam);
             }
         }
-        if(!prodProcedureTeamService.saveBatch(list)){
+        if(!prodProcedureTeamService.saveOrUpdateBatch(list)){
             msg.setError("验证失败");
         }
         return msg;
@@ -670,11 +694,17 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                 case 0:
                     List<PlanProcedureTotal> procedureTotals = planProcedureTotalService.list(new QueryWrapper<PlanProcedureTotal>().eq("plan_id", plan.getId()));
                     List<ProdProcedure> prodProcedureList = prodProcedureMapper.selectList(new QueryWrapper<ProdProcedure>().eq("product_id", plan.getProductId()).eq("version_number",plan.getVersionNumber()));
+                    List<Integer> ids = procedureTotals.stream().map(PlanProcedureTotal::getId).collect(Collectors.toList());
+                    ids.add(-1);
+                    List<ProdProcedureTeam> procedureTeams = prodProcedureTeamService.list(new QueryWrapper<ProdProcedureTeam>().in("plan_procedure_id", ids));
                     procedureTotals.forEach(ps->{
                         Optional<ProdProcedure> first = prodProcedureList.stream().filter(pl -> pl.getId().equals(ps.getProdProcedureId())).findFirst();
                         if(first.isPresent()){
                             ps.setProdProcedure(first.get());
                         }
+                        if(procedureTeams.size()>0){
+                            ps.setTeamIds(procedureTeams.stream().filter(pt->pt.getPlanProcedureId().equals(ps.getId())).map(ProdProcedureTeam::getUserId).distinct().collect(Collectors.joining(",")));
+                        }
                     });
                     msg.setData(procedureTotals);
                     break;

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

@@ -4,6 +4,7 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.management.platform.entity.PlanProcedureTotal">
+        <id column="id" property="id" />
         <result column="plan_id" property="planId" />
         <result column="prod_procedure_id" property="prodProcedureId" />
         <result column="total_wages" property="totalWages" />
@@ -12,7 +13,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        plan_id, prod_procedure_id, total_wages, total_working_hours
+        id, plan_id, prod_procedure_id, total_wages, total_working_hours
     </sql>
 
 </mapper>

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

@@ -7,19 +7,18 @@
         <id column="id" property="id" />
         <result column="company_id" property="companyId" />
         <result column="user_id" property="userId" />
-        <result column="prod_procedure_id" property="prodProcedureId" />
-        <result column="plan_id" property="planId" />
         <result column="work_time" property="workTime" />
         <result column="job_of_money" property="jobOfMoney" />
         <result column="progress" property="progress" />
         <result column="checker_id" property="checkerId" />
         <result column="checker_name" property="checkerName" />
         <result column="update_time" property="updateTime" />
+        <result column="plan_procedure_id" property="planProcedureId" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, company_id, user_id, prod_procedure_id, plan_id, work_time, job_of_money, progress, checker_id, checker_name, update_time
+        id, company_id, user_id, work_time, job_of_money, progress, checker_id, checker_name, update_time, plan_procedure_id
     </sql>
 
 

fhKeeper/formulahousekeeper/timesheet-workshop-h5/package-lock.json

@@ -1817,59 +1817,6 @@
           "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
           "dev": true
         },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "emojis-list": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmmirror.com/emojis-list/-/emojis-list-3.0.0.tgz",
-          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
-          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
         "minimist": {
           "version": "1.2.5",
           "resolved": "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz",
@@ -1899,41 +1846,6 @@
           "requires": {
             "ansi-regex": "^5.0.0"
           }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "vue-loader-v16": {
-          "version": "npm:vue-loader@16.8.3",
-          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
-          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chalk": "^4.1.0",
-            "hash-sum": "^2.0.0",
-            "loader-utils": "^2.0.0"
-          },
-          "dependencies": {
-            "chalk": {
-              "version": "4.1.2",
-              "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
-              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            }
-          }
         }
       }
     },
@@ -3737,7 +3649,8 @@
       "version": "4.6.0",
       "resolved": "https://registry.npm.taobao.org/co/download/co-4.6.0.tgz",
       "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "coa": {
       "version": "2.0.2",
@@ -10415,7 +10328,8 @@
       "version": "4.0.8",
       "resolved": "https://registry.npm.taobao.org/rx-lite/download/rx-lite-4.0.8.tgz",
       "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "rx-lite-aggregates": {
       "version": "4.0.8",
@@ -12198,6 +12112,94 @@
         }
       }
     },
+    "vue-loader-v16": {
+      "version": "npm:vue-loader@16.8.3",
+      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chalk": "^4.1.0",
+        "hash-sum": "^2.0.0",
+        "loader-utils": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "emojis-list": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmmirror.com/emojis-list/-/emojis-list-3.0.0.tgz",
+          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "vue-router": {
       "version": "3.5.1",
       "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.5.1.tgz?cache=0&sync_timestamp=1617697843139&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.5.1.tgz",

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/components/chooseSomeone.vue

@@ -35,7 +35,7 @@
     </div>
     <div class="chooseSomeone_btn" v-if="newGroupViewBack">
       <van-button round size="small" v-if="newGroupViewBack" @click="newGroupViewBackCli(false, 3)">从其他工位选择员工</van-button>
-      <van-button round type="info" size="small">确定</van-button>
+      <van-button round type="info" size="small"  @click="handClick()">确定</van-button>
     </div>
     <div class="chooseSomeone_btn" v-if="!newGroupViewBack">
       <van-button round type="info" size="small" style="width: 100%;">确定</van-button>
@@ -57,7 +57,10 @@ export default {
     peopleList: {
       type: Array,
       default: () => []
-    }
+    },
+    teamAllocation:{
+      type: Function
+    },
   },
   components: {},
   data() {
@@ -148,6 +151,9 @@ export default {
           this.$toast.fail(res.msg);
         }
       }).catch(err => { this.$toast.clear(); });
+    },
+    handClick () {
+      this.teamAllocation(this.groupVal); 
     }
   },
 };

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

@@ -42,7 +42,7 @@
     </div>
     <!-- 弹出层选人 -->
     <van-popup v-model="popupShow" round position="bottom" :style="{ height: '80%',background: '#F4F4F4' }" >
-      <ChooseSomeone :groupView="2" :groupViewBack="true" :peopleList="peopleList"></ChooseSomeone>
+      <ChooseSomeone :groupView="2" :groupViewBack="true" :peopleList="peopleList" :teamAllocation="teamAllocation"></ChooseSomeone>
     </van-popup>
   </div>
 </template>
@@ -131,6 +131,22 @@ export default {
           this.$toast.fail(res.msg);
         }
       }).catch(err => { this.$toast.clear(); });
+    },
+    teamAllocation(groupVal){
+      var that=this;
+      this.$delete(this.distributionList[this.distributionIndex], 'prodProcedure')  
+      this.$axios.post('/plan/teamAllocation', {
+        ...this.distributionList[this.distributionIndex],
+        teamIds:groupVal.join(",")
+      })
+      .then(res => {
+        if (res.code == "ok") {
+          that.popupShow = false
+        } else {
+          this.$toast.clear();
+          this.$toast.fail(res.msg);
+        }
+      }).catch(err => { this.$toast.clear(); });
     }
   },
 };