钢印号修改

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

@@ -26,8 +26,8 @@ public class PlanProcedureTotalController {
     private PlanProcedureTotalService planProcedureTotalService;
 
     @RequestMapping("/getReportForWorkList")
-    public HttpRespMsg getReportForWorkList(String chicleNumStart,String chicleNumEnd){
-        return planProcedureTotalService.getReportForWorkList(chicleNumStart,chicleNumEnd);
+    public HttpRespMsg getReportForWorkList(String chicleNum){
+        return planProcedureTotalService.getReportForWorkList(chicleNum);
     }
 
     @RequestMapping("/getFillProcedureDetail")

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

@@ -0,0 +1,21 @@
+package com.management.platform.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-08-28
+ */
+@RestController
+@RequestMapping("/plan-steel-stamp-number")
+public class PlanSteelStampNumberController {
+
+}
+

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

@@ -9,7 +9,6 @@ import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 import java.util.List;
-import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -23,7 +22,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  * </p>
  *
  * @author Seyason
- * @since 2023-08-25
+ * @since 2023-08-28
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -65,18 +64,6 @@ public class Plan extends Model<Plan> {
     @TableField("company_id")
     private Integer companyId;
 
-    /**
-     * 钢印号
-     */
-    @TableField("steel_stamp_number_start")
-    private String steelStampNumberStart;
-
-    /**
-     * 钢印号
-     */
-    @TableField("steel_stamp_number_end")
-    private String steelStampNumberEnd;
-
     /**
      * 数量
      */
@@ -240,14 +227,19 @@ public class Plan extends Model<Plan> {
      * 车辆序号
      */
     @TableField("chicle_num_start")
-    private String chicleNumStart;
+    private Integer chicleNumStart;
 
     /**
      * 车辆序号
      */
     @TableField("chicle_num_end")
-    private String chicleNumEnd;
+    private Integer chicleNumEnd;
+
+    @TableField(exist = false)
+    private String  steelStampNumber;
 
+    @TableField(exist = false)
+    private List<PlanSteelStampNumber>  steelStampNumberList;
 
     @Override
     protected Serializable pkVal() {

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

@@ -0,0 +1,49 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-08-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class PlanSteelStampNumber extends Model<PlanSteelStampNumber> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 计划ID
+     */
+    @TableField("plan_id")
+    private Integer planId;
+
+    /**
+     * 钢印号
+     */
+    @TableField("steel_stamp_number_start")
+    private String steelStampNumberStart;
+
+    /**
+     * 钢印号
+     */
+    @TableField("steel_stamp_number_end")
+    private String steelStampNumberEnd;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return null;
+    }
+
+}

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/mapper/PlanSteelStampNumberMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.PlanSteelStampNumber;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-08-28
+ */
+public interface PlanSteelStampNumberMapper extends BaseMapper<PlanSteelStampNumber> {
+
+}

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/mapper/ProdProcedureTeamMapper.java

@@ -16,7 +16,7 @@ import java.util.List;
  */
 public interface ProdProcedureTeamMapper extends BaseMapper<ProdProcedureTeam> {
 
-    public List<HashMap> getReportForWorkList(String userId,String chicleNumStart,String chicleNumEnd);
+    public List<HashMap> getReportForWorkList(String userId,String chicleNum);
 
     public HashMap getFillProcedureDetail(Integer id);
 }

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

@@ -14,7 +14,7 @@ import com.management.platform.util.HttpRespMsg;
  */
 public interface PlanProcedureTotalService extends IService<PlanProcedureTotal> {
 
-    HttpRespMsg getReportForWorkList(String chicleNumStart,String chicleNumEnd);
+    HttpRespMsg getReportForWorkList(String chicleNum);
 
     HttpRespMsg getFillProcedureDetail(Integer id);
 }

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

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.PlanSteelStampNumber;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-08-28
+ */
+public interface PlanSteelStampNumberService extends IService<PlanSteelStampNumber> {
+
+}

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

@@ -40,11 +40,11 @@ public class PlanProcedureTotalServiceImpl extends ServiceImpl<PlanProcedureTota
     private ProdProcedureTeamMapper prodProcedureTeamMapper;
 
     @Override
-    public HttpRespMsg getReportForWorkList(String chicleNumStart,String chicleNumEnd) {
+    public HttpRespMsg getReportForWorkList(String chicleNum) {
         HttpRespMsg msg=new HttpRespMsg();
         User user = userMapper.selectById(request.getHeader("token"));
         /*获取作为组员参与的数据*/
-        List<HashMap> dataList = prodProcedureTeamMapper.getReportForWorkList(user.getId(),chicleNumStart,chicleNumEnd);
+        List<HashMap> dataList = prodProcedureTeamMapper.getReportForWorkList(user.getId(),chicleNum);
         //抽取出所有的planId
         List<Integer> planIdList = dataList.stream().map(item -> (Integer) item.get("planId")).collect(Collectors.toList());
         //重新封装成两层结构，第一层为planId，第二层为planId下的数据

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

@@ -1,5 +1,6 @@
 package com.management.platform.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -13,6 +14,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.util.ExcelUtil;
 import com.management.platform.util.HttpRespMsg;
 import com.management.platform.util.MessageUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.poi.EncryptedDocumentException;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.CellType;
@@ -59,6 +61,8 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
     @Resource
     private CompanyMapper companyMapper;
     @Resource
+    private PlanSteelStampNumberService planSteelStampNumberService;
+    @Resource
     private WxCorpInfoService wxCorpInfoService;
     @Resource
     private HttpServletRequest request;
@@ -151,7 +155,12 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
             }
         }
         if(!StringUtils.isEmpty(steelStampNumber)){
-            queryWrapper.apply("'"+steelStampNumber+"'"+" between steel_stamp_number_start AND steel_stamp_number_end");
+            QueryWrapper<PlanSteelStampNumber> queryWrapperSSN=new QueryWrapper<>();
+            queryWrapperSSN.apply("'"+steelStampNumber+"'"+" between steel_stamp_number_start AND steel_stamp_number_end");
+            List<PlanSteelStampNumber> list = planSteelStampNumberService.list(queryWrapperSSN);
+            List<Integer> ids = list.stream().map(PlanSteelStampNumber::getPlanId).collect(Collectors.toList());
+            ids.add(-1);
+            queryWrapper.in("id",ids);
         }
         queryWrapper.orderByDesc("create_time").orderByDesc("start_date");
         IPage<Plan> planIPage = planMapper.selectPage(new Page<>(pageIndex, pageSize), queryWrapper);
@@ -162,6 +171,7 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
         List<Integer> planIds = records.stream().map(Plan::getId).distinct().collect(Collectors.toList());
         planIds.add(-1);
         List<PlanProcedureTotal> procedureTotals = planProcedureTotalService.list(new QueryWrapper<PlanProcedureTotal>().in("plan_id", planIds));
+        List<PlanSteelStampNumber> planSteelStampNumbers = planSteelStampNumberService.list(new QueryWrapper<PlanSteelStampNumber>().in("plan_id", planIds));
         List<Integer> ptIds = procedureTotals.stream().map(PlanProcedureTotal::getId).collect(Collectors.toList());
         ptIds.add(-1);
         List<ProdProcedureTeam> procedureTeams = prodProcedureTeamService.list(new QueryWrapper<ProdProcedureTeam>().in("plan_procedure_id", ptIds));
@@ -191,6 +201,14 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                     rs.setPlanProcedureTotals(totals);
                 }
             }
+            if(planSteelStampNumbers.size()>0){
+                List<PlanSteelStampNumber> list = planSteelStampNumbers.stream().filter(ps -> ps.getPlanId().equals(rs.getId())).collect(Collectors.toList());
+                if(list.size()<=0){
+                    list.add(new PlanSteelStampNumber());
+                }
+                rs.setSteelStampNumberList(list);
+
+            }
             if(rs.getPlanType()==1){
                 BigDecimal bigDecimal=new BigDecimal(String.valueOf(rs.getMoneyOfJob()));
                 bigDecimal=bigDecimal.multiply(new BigDecimal(String.valueOf(rs.getPlanWorkHour())));
@@ -241,9 +259,6 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                     return msg;
                 }
             }
-            if(!StringUtils.isEmpty(plan.getSteelStampNumberStart())&&!StringUtils.isEmpty(plan.getSteelStampNumberEnd()!=null)){
-                QueryWrapper<Plan> cutQueryWrapper=new QueryWrapper();
-            }
             switch (plan.getPlanType()){
                 case 0:
                     plan.setStartDate(LocalDate.now());
@@ -292,6 +307,32 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
             }
 
         }
+        List<PlanSteelStampNumber> planSteelStampNumberList=new ArrayList<>();
+        if(!StringUtils.isEmpty(plan.getSteelStampNumber())){
+            List<Map> mapList = JSONArray.parseArray(JSON.toJSON(plan.getSteelStampNumber()).toString(), Map.class);
+            for (Map map : mapList) {
+                PlanSteelStampNumber p=new PlanSteelStampNumber();
+                p.setPlanId(plan.getId());
+                if(StringUtils.isEmpty(map.get("steelStampNumberStart"))&&StringUtils.isEmpty(map.get("steelStampNumberEnd"))){
+                    continue;
+                }
+                if(!StringUtils.isEmpty(map.get("steelStampNumberStart"))&&StringUtils.isEmpty(map.get("steelStampNumberEnd"))){
+                    p.setSteelStampNumberStart(String.valueOf(map.get("steelStampNumberStart")));
+                    p.setSteelStampNumberEnd(String.valueOf(map.get("steelStampNumberStart")));
+                }
+                if(StringUtils.isEmpty(map.get("steelStampNumberStart"))&&!StringUtils.isEmpty(map.get("steelStampNumberEnd"))){
+                    p.setSteelStampNumberStart(String.valueOf(map.get("steelStampNumberEnd")));
+                    p.setSteelStampNumberEnd(String.valueOf(map.get("steelStampNumberEnd")));
+                }
+                if(!StringUtils.isEmpty(map.get("steelStampNumberStart"))&&!StringUtils.isEmpty(map.get("steelStampNumberEnd"))){
+                    p.setSteelStampNumberStart(String.valueOf(map.get("steelStampNumberStart")));
+                    p.setSteelStampNumberEnd(String.valueOf(map.get("steelStampNumberEnd")));
+                }
+                planSteelStampNumberList.add(p);
+            }
+            planSteelStampNumberService.remove(new QueryWrapper<PlanSteelStampNumber>().eq("plan_id",plan.getId()));
+        }
+        planSteelStampNumberService.saveBatch(planSteelStampNumberList);
         if(plan.getPlanType()==0){
             list=list.stream().sorted(Comparator.comparing(ProdProcedure::getId)).collect(Collectors.toList());
             for (ProdProcedure prodProcedure : list) {
@@ -458,17 +499,6 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                         msg.setError("产品名称不能为空");
                         return msg;
                     }
-                    if(steelStampNumberCell!=null){
-                        String value = steelStampNumberCell.getStringCellValue();
-                        String[] split = value.split("-");
-                        if(split.length>1){
-                            plan.setSteelStampNumberStart(split[0]);
-                            plan.setSteelStampNumberEnd(split[1]);
-                        }
-                    }else {
-                        msg.setError("钢印号不能为空");
-                        return msg;
-                    }
                     plan.setProgress(progressCell==null?"":progressCell.getStringCellValue());
                     plan.setNum(numCell==null?0:Double.valueOf(numCell.getNumericCellValue()).intValue());
                     plan.setMainProcess(mainProcessCell==null?"":mainProcessCell.getStringCellValue());
@@ -745,7 +775,7 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                 item.add(plan.getProductSchedulingNum());
                 item.add(plan.getProductName());
                 item.add(plan.getProjectCode());
-                item.add(plan.getSteelStampNumberStart()+"-"+plan.getSteelStampNumberEnd());
+//                item.add(plan.getSteelStampNumberStart()+"-"+plan.getSteelStampNumberEnd());
                 item.add(String.valueOf(plan.getNum()==null?"":plan.getNum()));
                 item.add(plan.getMainProcess()==null?"":plan.getMainProcess());
                 item.add(plan.getStationName());

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

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.PlanSteelStampNumber;
+import com.management.platform.mapper.PlanSteelStampNumberMapper;
+import com.management.platform.service.PlanSteelStampNumberService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-08-28
+ */
+@Service
+public class PlanSteelStampNumberServiceImpl extends ServiceImpl<PlanSteelStampNumberMapper, PlanSteelStampNumber> implements PlanSteelStampNumberService {
+
+}

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

@@ -10,8 +10,6 @@
         <result column="product_name" property="productName" />
         <result column="project_code" property="projectCode" />
         <result column="company_id" property="companyId" />
-        <result column="steel_stamp_number_start" property="steelStampNumberStart" />
-        <result column="steel_stamp_number_end" property="steelStampNumberEnd" />
         <result column="num" property="num" />
         <result column="main_process" property="mainProcess" />
         <result column="station_id" property="stationId" />
@@ -42,7 +40,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, product_scheduling_num, product_id, product_name, project_code, company_id, steel_stamp_number_start, steel_stamp_number_end, num, main_process, station_id, station_name, foreman_id, foreman_name, plan_type, start_date, end_date, plan_total_wages, progress, task_name, task_type_id, task_type_name, check_type, task_change_notice_num, plan_man_num, plan_work_hour, money_of_job, describtion, version_number, create_time, create_id, status, chicle_num_start, chicle_num_end
+        id, product_scheduling_num, product_id, product_name, project_code, company_id, num, main_process, station_id, station_name, foreman_id, foreman_name, plan_type, start_date, end_date, plan_total_wages, progress, task_name, task_type_id, task_type_name, check_type, task_change_notice_num, plan_man_num, plan_work_hour, money_of_job, describtion, version_number, create_time, create_id, status, chicle_num_start, chicle_num_end
     </sql>
 
 </mapper>

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.management.platform.mapper.PlanSteelStampNumberMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.PlanSteelStampNumber">
+        <result column="plan_id" property="planId" />
+        <result column="steelStampNumberStart" property="steelStampNumberStart" />
+        <result column="steelStampNumberEnd" property="steelStampNumberEnd" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        plan_id, steelStampNumberStart, steelStampNumberEnd
+    </sql>
+
+</mapper>

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

@@ -31,17 +31,9 @@
                  LEFT JOIN product ON product.id = plan.`product_id`
                  LEFT JOIN prod_procedure ON prod_procedure.id = plan_procedure_total.prod_procedure_id
         where 1 = 1 and a.status = 1 and a.user_id=#{userId}
-        <choose>
-            <when test="chicleNumStart!=null and chicleNumStart!='' and chicleNumEnd!=null and chicleNumEnd!=''">
-                and (plan.chicle_num_start &gt;= #{chicleNumStart} and plan.chicle_num_end &lt;= #{chicleNumEnd})
-            </when>
-            <when test="chicleNumStart!=null and chicleNumStart!='' and (chicleNumEnd==null or chicleNumEnd=='')">
-                and  (#{chicleNumStart} between plan.chicle_num_start and plan.chicle_num_end)
-            </when>
-            <when test="chicleNumEnd!=null and chicleNumEnd!='' and (chicleNumStart==null or chicleNumStart=='')">
-                and  (#{chicleNumEnd} between plan.chicle_num_start and plan.chicle_num_end)
-            </when>
-        </choose>
+        <if test="chicleNum!=null and chicleNum!=''">
+            and  (#{chicleNum} &gt;= plan.chicle_num_start and #{chicleNum} &lt;= plan.chicle_num_end)
+        </if>
         order by plan.id desc
     </select>
 

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

@@ -3,9 +3,7 @@
     <van-nav-bar title="报工" left-text="返回" @click-left="back" fixed left-arrow />
     <div class="distribution_con contentRoll">
       <div> 
-        <van-field v-model="chicleNumStart" type="digit" label="车辆序号" @blur="getMyPlanProcedureList()"/>
-        -
-        <van-field  v-model="chicleNumEnd" type="digit" @blur="getMyPlanProcedureList()"/>
+        <van-field v-model="chicleNum" type="digit" label="车辆序号" @blur="getMyPlanProcedureList()"/>
       </div>
       <van-empty v-if="myPlanProcedureList.length == 0">暂无待报工任务</van-empty>
       <div v-for="(prod, prodIndex) in myPlanProcedureList">
@@ -72,8 +70,7 @@ export default {
       popupShow: false,
       titleText: '今日计划', // 默认文字
       todayAndTomorrow: true, // true 今日计划，false 明日计划
-      chicleNumStart:null,
-      chicleNumEnd:null
+      chicleNum:null
     };
   },
   computed: {},
@@ -101,8 +98,7 @@ export default {
         duration: 0
       });
       this.$axios.post("/plan-procedure-total/getReportForWorkList", {
-        chicleNumStart:this.chicleNumStart,
-        chicleNumEnd:this.chicleNumEnd
+        chicleNum:this.chicleNum
       })
         .then(res => {
           if (res.code == "ok") {

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/planComponent.vue

@@ -109,11 +109,13 @@
           <el-form-item label="项目代码" style="width: 100%" prop="projectCode">
             <el-input v-model="todayPlanForm.projectCode" maxlength="50" readonly></el-input>
           </el-form-item>
-          <el-form-item label="钢印号" style="width: 100%" prop="steelStampNumberStart">
-            <el-input class="w45" v-model="todayPlanForm.steelStampNumberStart" maxlength="20"></el-input>
+          <el-form-item label="钢印号" v-for="(item,index) in todayPlanForm.steelStampNumberList" :key="index" style="width: 100%" prop="steelStampNumberStart">
+            <el-input class="w45" v-model="item.steelStampNumberStart" maxlength="20"></el-input>
             {{ "-" }}
-            <el-input class="w45" v-model="todayPlanForm.steelStampNumberEnd" maxlength="20"></el-input>
+            <el-input class="w45" v-model="item.steelStampNumberEnd" maxlength="20"></el-input>
+            <i class="el-icon-delete" style="color:red" @click="deleteInput(index)"></i>
           </el-form-item>
+          <i class="el-icon-circle-plus" style="color:#409EFF" @click="addInput"></i>
           <el-form-item label="计划总工价" v-if="this.titleName==='编辑今日计划'"  prop="planTotalWages">
             <el-input v-model="todayPlanForm.planTotalWages" type="number"></el-input>
           </el-form-item>
@@ -166,7 +168,8 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="
-          (editPlanDiaLog = false), $refs['todayPlanForm'].resetFields()
+//          (editPlanDiaLog = false), $refs['todayPlanForm'].resetFields()
+          (editPlanDiaLog = false)
           ">取 消</el-button>
         <el-button type="primary" @click="addPlanData('todayPlanForm')">确 定</el-button>
       </span>
@@ -270,8 +273,8 @@ export default {
         productSchedulingNum: "",
         productId: "",
         projectCode: "",
-        steelStampNumberStart: "",
-        steelStampNumberEnd: "",
+        // steelStampNumberStart: "",
+        // steelStampNumberEnd: "",
         chicleNumStart:"",
         chicleNumEnd:"",
         num: "",
@@ -284,7 +287,14 @@ export default {
         endDate: "",
         describtion: "",
         versionNumber: "",
-        planTotalWages:0
+        planTotalWages:0,
+        steelStampNumberList:[
+        {
+          id:null,
+          steelStampNumberStart:'',
+          steelStampNumberEnd:''
+        }
+        ],
       },
       user: JSON.parse(sessionStorage.getItem("user")),
       foremanDetailDialog:false,
@@ -332,6 +342,25 @@ export default {
       this.getProductList();
   },
   methods: {
+    addInput(){
+      console.log('===========',this.todayPlanForm.steelStampNumberList)
+      console.log('===========',this.todayPlanForm)
+      if(this.todayPlanForm.steelStampNumberList.length>=9){
+        this.$message({
+              message: '超过最大条数(9)',
+              type: "error",
+            });
+        return
+      }
+      this.todayPlanForm.steelStampNumberList.push({
+        id:null,
+        steelStampNumberStart:'',
+        steelStampNumberEnd:'',
+      });   // 在数组中添加一个空对象
+    },
+    deleteInput(index){
+      this.todayPlanForm.steelStampNumberList.splice(index,1)
+    },
     getFormenDetail(item){
       this.foremanDetailDialog=true;
       this.http.post(
@@ -587,6 +616,7 @@ export default {
       this.getTableData(this.hasChooseDept);
     },
     addPlan() {
+      console.log('===========',this.todayPlanForm)
       this.titleName = `新增${this.titleText}`;
       this.initTodayPlanForm()
       this.editPlanDiaLog = true;
@@ -613,27 +643,38 @@ export default {
         endDate: "",
         describtion: "",
         versionNumber: "",
+        steelStampNumberList:[
+        {
+          id:null,
+          steelStampNumberStart:'',
+          steelStampNumberEnd:''
+        }
+        ],
       }
     },
     addPlanData(formName) {
       console.log(this.todayPlanForm);
-      if(!this.todayPlanForm.steelStampNumberStart){
-          if(this.todayPlanForm.steelStampNumberEnd){
-              this.$message({
-                  message:"钢印号区间填写不完整",
-                  type: "error",
-              });
-              return  
+      if(!this.todayPlanForm.steelStampNumberList){
+        for(item in this.todayPlanForm.steelStampNumberList){
+          if(!item.steelStampNumberStart){
+            if(item.steelStampNumberEnd){
+                this.$message({
+                    message:"钢印号区间填写不完整",
+                    type: "error",
+                });
+                return  
           }
       }
-      if(!this.todayPlanForm.steelStampNumberEnd){
-          if(this.todayPlanForm.steelStampNumberStart){
+      if(!item.steelStampNumberEnd){
+          if(item.steelStampNumberStart){
               this.$message({
                   message:"钢印号区间填写不完整",
                   type: "error",
               });
               return
           }
+      }
+        }
       }
       if(!this.todayPlanForm.chicleNumStart){
           if(this.todayPlanForm.chicleNumStart){
@@ -667,14 +708,17 @@ export default {
             this.todayPlanForm.stationId[
             this.todayPlanForm.stationId.length - 1
             ];
+          let steelStampNumberListArr= this.todayPlanForm.steelStampNumberList  
           this.$delete(this.todayPlanForm, 'product')
           this.$delete(this.todayPlanForm, 'planProcedureTotals')
+          this.$delete(this.todayPlanForm, 'steelStampNumberList')
           this.http.post(
             "/plan/addOrUpdatePlan",
             {
               ...this.todayPlanForm,
               stationId,
               planType: this.planType,
+              steelStampNumber:JSON.stringify(steelStampNumberListArr)
             },
             (res) => {
               if (res.code == "ok") {

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/product/list.vue

@@ -1206,8 +1206,8 @@ export default {
                         flag = false
                         break
                     }
-
-                     if(!reg.test(this.procedureLit[i].unitPrice)|| !r.test(this.procedureLit[i].workingTime)){
+//                     if(!reg.test(this.procedureLit[i].unitPrice)|| !r.test(this.procedureLit[i].workingTime)){
+                     if(!reg.test(this.procedureLit[i].unitPrice)){
                         this.$message({
                             message: "请输入正确的单件工时为和工价格式，工时为正整数，工价可保留两位小数",
                             type: "error"