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

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/BusinessOpportunityController.java

@@ -1,8 +1,11 @@
 package com.management.platform.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.BusinessOpportunity;
+import com.management.platform.entity.Clue;
 import com.management.platform.entity.User;
+import com.management.platform.mapper.BusinessOpportunityMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.BusinessOpportunityService;
 import com.management.platform.service.SysFunctionService;
@@ -16,6 +19,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -38,6 +42,8 @@ public class BusinessOpportunityController {
 
     @Resource
     private BusinessOpportunityService bOservice;
+    @Resource
+    private BusinessOpportunityMapper bOMapper;
 
 
     @RequestMapping("insertAndUpdate")
@@ -45,18 +51,36 @@ public class BusinessOpportunityController {
         User user = userMapper.selectById(request.getHeader("Token"));
         HttpRespMsg msg = new HttpRespMsg();
         if (bo.getId() == null){
+            if(bOMapper.selectCount(new QueryWrapper<BusinessOpportunity>().eq("name",bo.getName())) > 0){
+                msg.setError("商机名称重复");
+                return msg;
+            }
             //新增
             bo.setCompanyId(user.getCompanyId());
             bo.setCreatorId(user.getId());
+            bo.setCreateTime(new Date());
             bOservice.insert(bo);
         }else {
+            String name = bOMapper.selectById(bo).getName();
+            if(bOMapper.selectCount(new QueryWrapper<BusinessOpportunity>().eq("name",bo.getName()).ne("name",name)) > 0){
+                msg.setError("商机名称已存在");
+                return msg;
+            }
             //修改
-            bOservice.update(bo);
+            bOservice.update(bo,user.getId());
         }
         msg.setMsg("操作成功");
         return msg;
     }
 
+    @RequestMapping("claim")
+    public Object claim(Clue clue, HttpServletRequest request) {
+        User user = userMapper.selectById(request.getHeader("Token"));
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.setMsg("操作成功");
+        bOservice.getAndTransfer(clue, user);
+        return msg;
+    }
     @RequestMapping("list")
     public HttpRespMsg list(@RequestBody BusinessOpportunity bo, HttpServletRequest request) {
         HashMap<Object, Object> r = new HashMap<>();
@@ -89,6 +113,7 @@ public class BusinessOpportunityController {
         User user = userMapper.selectById(request.getHeader("Token"));
         bo.setIsDelete(1);
         bo.setCompanyId(user.getCompanyId());
+        setNull(bo);
         List<BusinessOpportunity> list = new ArrayList<>();
         boolean isAll = sysFunctionService.hasPriviledge(user.getRoleId(), "查看全部商机");
         boolean isNotAll = sysFunctionService.hasPriviledge(user.getRoleId(), "查看负责部门商机");
@@ -108,6 +133,24 @@ public class BusinessOpportunityController {
         msg.setData(r);
         return msg;
     }
+    private BusinessOpportunity setNull(BusinessOpportunity bo) {
+        if (bo.getPlate1() == "") {
+            bo.setPlate1(null);
+        }
+        if (bo.getPlate2() == "") {
+            bo.setPlate2(null);
+        }
+        if (bo.getPlate3() == "") {
+            bo.setPlate3(null);
+        }
+        if (bo.getPlate4() == "") {
+            bo.setPlate4(null);
+        }
+        if (bo.getPlate5() == "") {
+            bo.setPlate5(null);
+        }
+        return bo;
+    }
 
 
 

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/CustomController.java

@@ -37,6 +37,10 @@ public class CustomController {
     public HttpRespMsg list(Custom custom , HttpServletRequest request){
         return customService.getList(custom,request);
     }
+    @RequestMapping("deleteList")
+    public HttpRespMsg deleteList(Custom custom , HttpServletRequest request){
+        return customService.getDeleteList(custom,request);
+    }
 
 
     @RequestMapping("insertAndUpdate")

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/BusinessOpportunityService.java

@@ -2,6 +2,7 @@ package com.management.platform.service;
 
 import com.management.platform.entity.BusinessOpportunity;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.management.platform.entity.Clue;
 import com.management.platform.entity.User;
 
 import java.util.List;
@@ -28,5 +29,7 @@ public interface BusinessOpportunityService extends IService<BusinessOpportunity
 
     void insert(BusinessOpportunity bo);
 
-    void update(BusinessOpportunity bo);
+    void update(BusinessOpportunity bo,String userId);
+
+    void getAndTransfer(Clue clue, User user);
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/CustomService.java

@@ -32,4 +32,6 @@ public interface CustomService extends IService<Custom> {
     HttpRespMsg getInfo(Custom custom, HttpServletRequest request);
 
     HttpRespMsg getList(Custom custom, HttpServletRequest request);
+
+    HttpRespMsg getDeleteList(Custom custom, HttpServletRequest request);
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/BusinessOpportunityServiceImpl.java

@@ -1,8 +1,11 @@
 package com.management.platform.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.management.platform.entity.ActionLog;
 import com.management.platform.entity.BusinessOpportunity;
+import com.management.platform.entity.Clue;
 import com.management.platform.entity.User;
+import com.management.platform.mapper.ActionLogMapper;
 import com.management.platform.mapper.BusinessOpportunityMapper;
 import com.management.platform.service.BusinessOpportunityService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -25,6 +28,8 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
 
     @Resource
     private BusinessOpportunityMapper bOMapper;
+    @Resource
+    private ActionLogMapper actionLogMapper;
     @Override
     public List<BusinessOpportunity> getAll(BusinessOpportunity bo) {
         return bOMapper.selectAllList(bo);
@@ -59,12 +64,44 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
     public void insert(BusinessOpportunity bo) {
         bo.setCreateTime(new Date());
         bOMapper.insert(bo);
+
+    }
+
+    @Override
+    public void update(BusinessOpportunity bo,String userId) {
+        setNull(bo);
+        bOMapper.updateById(bo);
+        ActionLog log = new ActionLog();
+        log.setItemId(bo.getId());
+        log.setName("编辑了商机");
+        log.setCode("business");
+        log.setUserId(userId);
+        log.setCreatTime(new Date());
+        actionLogMapper.insert(log);
     }
 
     @Override
-    public void update(BusinessOpportunity bo) {
-        UpdateWrapper<Object> update = new UpdateWrapper<>();
+    public void getAndTransfer(Clue clue, User user) {
 
-//        bOMapper.update(bo);
     }
+    private BusinessOpportunity setNull(BusinessOpportunity bo) {
+        if (bo.getPlate1() == "") {
+            bo.setPlate1(null);
+        }
+        if (bo.getPlate2() == "") {
+            bo.setPlate2(null);
+        }
+        if (bo.getPlate3() == "") {
+            bo.setPlate3(null);
+        }
+        if (bo.getPlate4() == "") {
+            bo.setPlate4(null);
+        }
+        if (bo.getPlate5() == "") {
+            bo.setPlate5(null);
+        }
+        return bo;
+    }
+
+
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ClueServiceImpl.java

@@ -71,13 +71,20 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
         setNull(clue);
         clue.setCreateTime(new Date());
         clueMapper.insert(clue);
-        Integer id = clue.getId();
-        ClueLog clueLog = new ClueLog();
-        clueLog.setClueId(id);
-        clueLog.setName("创建了线索");
+//        Integer id = clue.getId();
+//        ClueLog clueLog = new ClueLog();
+//        clueLog.setClueId(id);
+//        clueLog.setName("创建了线索");
 //        clueLog.setUserId(clue.getCreateId());
-        clueLog.setCreatTime(new Date());
-        clueLogMapper.insert(clueLog);
+//        clueLog.setCreatTime(new Date());
+//        clueLogMapper.insert(clueLog);
+        ActionLog log = new ActionLog();
+        log.setItemId(clue.getId());
+        log.setName("创建了线索");
+        log.setCode("clue");
+        log.setUserId(clue.getCreateId());
+        log.setCreatTime(new Date());
+        actionLogMapper.insert(log);
     }
 
     @Override
@@ -85,12 +92,13 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
     public void update(Clue clue) {
         setNull(clue);
         clueMapper.updateById(clue);
-        ClueLog clueLog = new ClueLog();
-        clueLog.setClueId(clue.getId());
-        clueLog.setName("编辑了线索");
-//        clueLog.setUserId(clue.getCreateId());
-        clueLog.setCreatTime(new Date());
-        clueLogMapper.insert(clueLog);
+        ActionLog log = new ActionLog();
+        log.setItemId(clue.getId());
+        log.setName("编辑了线索");
+        log.setCode("clue");
+        log.setUserId(clue.getCreateId());
+        log.setCreatTime(new Date());
+        actionLogMapper.insert(log);
     }
 
     private Clue setNull(Clue clue) {

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/CustomServiceImpl.java

@@ -170,6 +170,39 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
         return msg;
     }
 
+    @Override
+    public HttpRespMsg getDeleteList(Custom custom, HttpServletRequest request) {
+        User user = userMapper.selectById(request.getHeader("Token"));
+        custom.setCompanyId(user.getCompanyId());
+        custom.setIsDelete(1);
+        custom.setUserId(user.getId());
+        custom.setEndTime(custom.getEndTime() + " 23:59:59");
+        custom.setPageIndex((custom.getPageIndex()-1) * custom.getPageFrom() );
+        boolean isAll = sysFunctionService.hasPriviledge(user.getRoleId(), "查看全部客户");
+        boolean isNotAll = sysFunctionService.hasPriviledge(user.getRoleId(), "查看负责部门客户");
+        List<Custom> list = new ArrayList<>();
+        int i = 0;
+        if (!isAll) {
+            //查看全部线索
+            list = customMapper.getList(custom);
+            i = customMapper.getTotal(custom);
+        } else if (!isNotAll) {
+            //查看负责部门线索 找出所处部门下所有的负责人
+            list = customMapper.getList1(custom);
+            i = customMapper.getTotal1(custom);
+        } else {
+            // 查看负责人为 自己 和 null的数据
+            list = customMapper.getList2(custom);
+            i = customMapper.getTotal2(custom);
+        }
+        HashMap<Object, Object> map = new HashMap<>();
+        map.put("data", list);
+        map.put("total", i);
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.setData(map);
+        return msg;
+    }
+
 
     private Custom setNull(Custom clue) {
         if (clue.getPlate1() == "") {

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

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -232,7 +233,7 @@ public class UserWithBeisenController {
             return msg;
         }
         JSONObject item = BeiSenUtils.getAttendanceStatisticWithUser(createDate,withBeisen.get().getUserId(), beisenConfig.getAppKey(), beisenConfig.getAppSecret());
-        JSONArray allOverTimeList = BeiSenUtils.getScheduledOverTimeRangeList(createDate,createDate,withBeisen.get().getUserId(), beisenConfig.getAppKey(), beisenConfig.getAppSecret());
+        JSONArray allOverTimeList = BeiSenUtils.getOverTimeList(createDate,beisenConfig.getAppKey(),beisenConfig.getAppSecret(),1,100);
         //获取当前数据下的人员工号对应到工时管家
         Optional<User> first = userList.stream().filter(f -> f.getJobNumber().equals(withBeisen.get().getJobNumber())).findFirst();
         System.out.println("考勤数据："+item.toString());
@@ -249,10 +250,6 @@ public class UserWithBeisenController {
             if(beisen.isPresent()){
                 List<JSONObject> overTimeList = overTimeStream.filter(a -> a.getString("StaffId").equals(beisen.get().getUserId())
                         && a.getIntValue("ApproveStatus") == 2).collect(Collectors.toList());
-                System.out.println("加班时长数据："+overTimeList.toString());
-                for (JSONObject jsonObject : overTimeList) {
-                    System.out.println("加班时长："+jsonObject.getDouble("ActualOverTimeDuration"));
-                }
                 if(overTimeList.size()>0){
                     double actualOverTimeDuration = overTimeList.stream().mapToDouble(i -> i.getDouble("ActualOverTimeDuration")).sum();
                     if(workDay){

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

@@ -8177,6 +8177,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 }
             }else  sDate = LocalDate.parse(startDate).atTime(LocalTime.MIN);
             List<LocalDateTime> dateTimeList=getDays(sDate, eDate);
+            //针对美莱德 去除2024-02-09
+            if(user.getCompanyId()==876){
+                dateTimeList=dateTimeList.stream().filter(d->d.isEqual(LocalDate.parse(startDate).atTime(LocalTime.MIN))).collect(Collectors.toList());
+            }
             List<Map<String,Object>> dataList=new ArrayList<>();
             long days =dateTimeList.size();
             List<LeaveSheet> leaveSheets = leaveSheetList.stream().filter(ls -> ls.getOwnerId().equals(user.getId())
@@ -8223,12 +8227,15 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             if(leaveSheets.size()>0){
                 for (LeaveSheet leaveSheet : leaveSheets) {
                     List<LocalDateTime> leaveDateList = getDays(leaveSheet.getStartDate().atTime(LocalTime.MIN), leaveSheet.getEndDate().atTime(LocalTime.MIN));
-                    /*if(leaveSheet.getTimeDays()<=1){
-                        days-=1;
-                    }else{
-                        days-=leaveSheet.getTimeDays();
-                    }*/
+                    //针对美莱德 去除2024-02-09
+                    if(user.getCompanyId()==876){
+                        leaveDateList=leaveDateList.stream().filter(d->d.isEqual(LocalDate.parse("2024-02-09").atTime(LocalTime.MIN))).collect(Collectors.toList());
+                    }
                     List<LocalDateTime> list = getDays(leaveSheet.getStartDate().atTime(LocalTime.now()), leaveSheet.getEndDate().atTime(LocalTime.now()));
+                    //针对美莱德 去除2024-02-09
+                    if(user.getCompanyId()==876){
+                        list=list.stream().filter(d->d.isEqual(LocalDate.parse("2024-02-09").atTime(LocalTime.MIN))).collect(Collectors.toList());
+                    }
                     if(list.size()>1){
                         days-=list.size();
                     }else {
@@ -8267,6 +8274,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     //去掉sql返回的毫秒值
                     Timestamp timestamp = (Timestamp) map.get("createTime");
                     LocalDate createDate = LocalDate.parse(String.valueOf(date));
+//                    针对美莱德 去除2024-02-09
+                    if(user.getCompanyId()==876){
+                        if(createDate.isEqual(LocalDate.parse("2024-02-09"))){
+                            continue;
+                        }
+                    }
                     LocalDate createTimeDate =timestamp.toLocalDateTime().toLocalDate();
                     //根据设置
                     switch (timeliness){
@@ -13119,18 +13132,19 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         row_first.add("");
         row_first.add("");
         row_first.add("");
+        row_first.add("");
         row_first.add("工时耗用率");
         for (int i = 0; i < row_first.size(); i++) {
             SXSSFCell tempCell = row0.createCell(i);
             tempCell.setCellValue(row_first.get(i));
             tempCell.setCellStyle(headStyle);
         }
-        sheet.addMergedRegion(new CellRangeAddress(0,0,4,7));
+        sheet.addMergedRegion(new CellRangeAddress(0,0,4,8));
         sheet.addMergedRegion(new CellRangeAddress(0,1,0,0));
         sheet.addMergedRegion(new CellRangeAddress(0,1,1,1));
         sheet.addMergedRegion(new CellRangeAddress(0,1,2,2));
         sheet.addMergedRegion(new CellRangeAddress(0,1,3,3));
-        sheet.addMergedRegion(new CellRangeAddress(0,1,8,8));
+        sheet.addMergedRegion(new CellRangeAddress(0,1,9,9));
         //第二行
         SXSSFRow row1 = sheet.createRow(rowNum++);
         row1.setHeight((short)500);
@@ -13139,6 +13153,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         row_second.add("");
         row_second.add("");
         row_second.add("");
+        row_second.add("增补工时");
         row_second.add("正常工时");
         row_second.add("加班工时");
         row_second.add("合计工时");
@@ -13180,6 +13195,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             }
             list.add(String.valueOf(map.get("groupName")));
             list.add(String.valueOf(map.get("planHour")));
+            list.add(String.valueOf(map.get("afterSetPlanHour")));
             list.add(String.valueOf(map.get("normalHour")));
             list.add(String.valueOf(map.get("overHour")));
             list.add(String.valueOf(map.get("realHour")));
@@ -13190,7 +13206,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         for(int i = 0;i<mapList.size();i++){
             SXSSFRow tempRow = sheet.createRow(rowNum++);
             tempRow.setHeight((short)500);
-            for(int j=0;j<9;j++){
+            for(int j=0;j<10;j++){
                 SXSSFCell tempCell = tempRow.createCell(j);
                 String cellValue = "";
                 tempCell.setCellStyle(cellStyle);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/BeiSenUtils.java

@@ -292,8 +292,8 @@ public class BeiSenUtils {
         headers.add("Authorization","Bearer "+accessToken);
         JSONObject requestMap = new JSONObject();
         requestMap.put("startDate",startDate);
-        List<String> staffIds=new ArrayList<>();
-        staffIds.add(userId);
+        List<Integer> staffIds=new ArrayList<>();
+        staffIds.add(Integer.valueOf(userId));
         requestMap.put("stopDate",endDate);
         requestMap.put("staffIds",staffIds);
         System.out.println("--------headers请求头数据-------"+headers);

fhKeeper/formulahousekeeper/octopus/src/views/customer/list.vue

@@ -151,6 +151,7 @@
                         <div style="width:33%; float:left;"><el-checkbox v-model="dialogData.packageSimple">简单表格</el-checkbox></div>
                         <div style="width:33%; float:left;"><el-checkbox v-model="dialogData.packageFinance">财务核算</el-checkbox></div>
                         <div style="width:33%; float:left;"><el-checkbox v-model="dialogData.packageProvider">供应商管理</el-checkbox></div>
+                        <div style="width:33%; float:left;"><el-checkbox v-model="dialogData.packageProjectApproval">立项管理</el-checkbox></div>
                     </div>
                     
                     <!-- <span>{{scope.row.packageWorktime ? "工时 +" : ""}}</span>
@@ -405,6 +406,7 @@ import App from '../../App.vue';
                     this.dialogData.packageFinance = this.dialogData.packageFinance ? true : false,
                     this.dialogData.packageProvider = this.dialogData.packageProvider ? true : false,
                     this.dialogData.financeAudit = this.dialogData.financeAudit ? true : false
+                    this.dialogData.packageProjectApproval = this.dialogData.packageProjectApproval ? true : false
                 }
                 else if(i == 'D'){ this.editDialogD = true }
                 else if (i=='E') {
@@ -672,6 +674,7 @@ import App from '../../App.vue';
                         packageSimple: this.dialogData.packageSimple ? 1 : 0,
                         packageFinance: this.dialogData.packageFinance ? 1 : 0,
                         packageProvider: this.dialogData.packageProvider ? 1 : 0,
+                        packageProjectApproval: this.dialogData.packageProjectApproval ? 1 : 0,
                     },
                 res => {
                     this.listLoading = false;
@@ -935,6 +938,7 @@ import App from '../../App.vue';
                             res.data.records[i].packageEngineering == 1 ? arrList.push('工程专业') : ''
                             res.data.records[i].packageSimple == 1 ? arrList.push('简单表格') : ''
                             res.data.records[i].packageFinance == 1 ? arrList.push('财务核算') : ''
+                            res.data.records[i].packageProjectApproval == 1 ? arrList.push('立项管理') : ''
                             res.data.records[i].arrList = arrList
                         }
                         var list = res.data.records;

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/entity/Company.java

@@ -72,6 +72,12 @@ public class Company extends Model<Company> {
     @TableField("package_project")
     private Integer packageProject;
 
+    /**
+     * 立项管理
+     */
+    @TableField("package_project_approval")
+    private Integer packageProjectApproval;
+
     /**
      * 合同平台
      */

fhKeeper/formulahousekeeper/ops-platform/src/main/resources/mapper/CompanyMapper.xml

@@ -20,13 +20,16 @@
         <result column="package_simple" property="packageSimple" />
         <result column="package_finance" property="packageFinance" />
         <result column="package_provider" property="packageProvider" />
+        <result column="package_project_approval" property="packageProjectApproval" />
         <result column="is_international" property="isInternational" />
         <result column="create_date" property="createDate" />
+        <result column="reg_from" property="regFrom" />
+        <result column="non_project_simple" property="nonProjectSimple" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, company_name, staff_count_max, expiration_date, set_meal, package_worktime, package_project, package_contract, package_oa, package_etimecard, package_expense, package_customer, package_engineering, package_simple, package_finance, package_provider, is_international, create_date
+        id, company_name, staff_count_max, expiration_date, set_meal, package_worktime, package_project, package_contract, package_oa, package_etimecard, package_expense, package_customer, package_engineering, package_simple, package_finance, package_provider, package_project_approval, is_international, create_date, reg_from, non_project_simple
     </sql>
 
 </mapper>

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

@@ -232,7 +232,7 @@
                     </el-table-column>
                     <el-table-column prop="workingTime" label="单件工时(分)"  width="140">
                         <template slot-scope="scope">
-                            <el-input v-model.number="scope.row.workingTime"   clearable maxlength="11" placeholder="请输入"></el-input>
+                            <el-input type="number" v-model="scope.row.workingTime"   clearable maxlength="11" placeholder="请输入"></el-input>
                         </template>
                     </el-table-column>
                     <el-table-column prop="unitPrice" label="单件工价(元)" width="140">
@@ -262,8 +262,8 @@
                         <i class="el-icon-plus" @click="addProcedure()"></i>
                         <span>合计</span>
                     </div>
-                    <div class="workshopTotalText">{{ pieceHourTotal }}</div>
-                    <div>{{ priceSingleTotal }}</div>
+                    <div class="workshopTotalText">{{ pieceHourTotal.toFixed(2) }}</div>
+                    <div>{{ priceSingleTotal.toFixed(2) }}</div>
                 </div>
 
             </div>